From 9cd439d8c0058ba96db271d1a316e32fadbf1b21 Mon Sep 17 00:00:00 2001
From: Billy Kozak <bkozak@scanimetrics.com>
Date: Wed, 12 Aug 2015 09:51:26 -0600
Subject: [PATCH 001/393] changed tcpip static temporaries to stack vars

A number of local variables in tcpip.c were declared with static
storage for no good reason (they do not ever preserve state between
function calls).

This patch removes static declaration from these variables.
---
 core/net/ip/tcpip.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/net/ip/tcpip.c b/core/net/ip/tcpip.c
index 1c75d1bc9..b827bc9ce 100644
--- a/core/net/ip/tcpip.c
+++ b/core/net/ip/tcpip.c
@@ -249,7 +249,7 @@ tcp_connect(const uip_ipaddr_t *ripaddr, uint16_t port, void *appstate)
 void
 tcp_unlisten(uint16_t port)
 {
-  static unsigned char i;
+  unsigned char i;
   struct listenport *l;
 
   l = s.listenports;
@@ -267,7 +267,7 @@ tcp_unlisten(uint16_t port)
 void
 tcp_listen(uint16_t port)
 {
-  static unsigned char i;
+  unsigned char i;
   struct listenport *l;
 
   l = s.listenports;
@@ -371,7 +371,7 @@ static void
 eventhandler(process_event_t ev, process_data_t data)
 {
 #if UIP_TCP
-  static unsigned char i;
+  unsigned char i;
   register struct listenport *l;
 #endif /*UIP_TCP*/
   struct process *p;
@@ -764,9 +764,9 @@ tcpip_uipcall(void)
 
 #if UIP_TCP
  {
-   static unsigned char i;
+   unsigned char i;
    struct listenport *l;
-   
+
    /* If this is a connection request for a listening port, we must
       mark the connection with the right process ID. */
    if(uip_connected()) {
@@ -795,11 +795,11 @@ tcpip_uipcall(void)
 PROCESS_THREAD(tcpip_process, ev, data)
 {
   PROCESS_BEGIN();
-  
+
 #if UIP_TCP
  {
-   static unsigned char i;
-   
+   unsigned char i;
+
    for(i = 0; i < UIP_LISTENPORTS; ++i) {
      s.listenports[i].port = 0;
    }

From e544e4c5b07cceb607e4798d1234f11edc202f47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20=27Morty=27=20Str=C3=BCbe?= <morty@gmx.net>
Date: Thu, 15 Oct 2015 10:17:07 +0200
Subject: [PATCH 002/393] Cooja: Make sure motes are always removed from the
 list of unintialized motes

---
 tools/cooja/java/org/contikios/cooja/Simulation.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/cooja/java/org/contikios/cooja/Simulation.java b/tools/cooja/java/org/contikios/cooja/Simulation.java
index 18dfa7fe8..74f6ed902 100644
--- a/tools/cooja/java/org/contikios/cooja/Simulation.java
+++ b/tools/cooja/java/org/contikios/cooja/Simulation.java
@@ -847,6 +847,9 @@ public class Simulation extends Observable implements Runnable {
       }
     };
 
+    //Add to list of uninitialized motes
+    motesUninit.add(mote);
+
     if (!isRunning()) {
       /* Simulation is stopped, add mote immediately */
       addMote.run();
@@ -854,8 +857,6 @@ public class Simulation extends Observable implements Runnable {
       /* Add mote from simulation thread */
       invokeSimulationThread(addMote);
     }
-    //Add to list of uninitialized motes
-    motesUninit.add(mote);
     
   }
 

From e5c7437e17a5d7b6ad78dc2cc757b86b8859c23e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= <gaetan.harter@inria.fr>
Date: Thu, 15 Oct 2015 17:11:09 +0200
Subject: [PATCH 003/393] Fix default tun/tap issue with multiple tunslip6

When running multiple tunslip6 instances, it collides with tun0 being already
used (cannot open file).
However, system default is already to use "tun0" and "tap0".

By putting the default empty string as name, system automatically increment and
selects a free interface, "tun0", "tun1".
---
 tools/tunslip6.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tools/tunslip6.c b/tools/tunslip6.c
index 4f3ff7e3e..3dda01c66 100644
--- a/tools/tunslip6.c
+++ b/tools/tunslip6.c
@@ -852,14 +852,6 @@ exit(1);
     break;
   }
 
-  if(*tundev == '\0') {
-    /* Use default. */
-    if(tap) {
-      strcpy(tundev, "tap0");
-    } else {
-      strcpy(tundev, "tun0");
-    }
-  }
   if(host != NULL) {
     struct addrinfo hints, *servinfo, *p;
     int rv;

From fbc5b5300de430f1149606a7297acfc7e65c0cf6 Mon Sep 17 00:00:00 2001
From: Valentin Sawadski <valentin@tado.com>
Date: Wed, 28 Oct 2015 14:58:52 +0100
Subject: [PATCH 004/393] trims resolv.c by removing unrequired static
 declarations

Closes https://github.com/contiki-os/contiki/issues/1333
---
 core/net/ip/resolv.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/net/ip/resolv.c b/core/net/ip/resolv.c
index 0dd06104b..3cc179046 100644
--- a/core/net/ip/resolv.c
+++ b/core/net/ip/resolv.c
@@ -783,9 +783,9 @@ check_entries(void)
 static void
 newdata(void)
 {
-  static uint8_t nquestions, nanswers;
+  uint8_t nquestions, nanswers;
 
-  static int8_t i;
+  int8_t i;
 
   register struct namemap *namemapptr = NULL;
 
@@ -872,7 +872,7 @@ newdata(void)
         }
         return;
       } else {
-        static uint8_t nauthrr;
+        uint8_t nauthrr;
         PRINTF("resolver: But we are still probing. Waiting...\n");
         /* We are still probing. We need to do the mDNS
          * probe race condition check here and make sure
@@ -960,7 +960,7 @@ newdata(void)
 #endif /* !ARCH_DOESNT_NEED_ALIGNED_STRUCTS */
 
 #if VERBOSE_DEBUG
-    static char debug_name[40];
+    char debug_name[40];
     decode_name(queryptr, debug_name, uip_appdata);
     DEBUG_PRINTF("resolver: Answer %d: \"%s\", type %d, class %d, ttl %d, length %d\n",
                  ++i, debug_name, uip_ntohs(ans->type),
@@ -1266,9 +1266,9 @@ remove_trailing_dots(const char *name) {
 void
 resolv_query(const char *name)
 {
-  static uint8_t i;
+  uint8_t i;
 
-  static uint8_t lseq, lseqi;
+  uint8_t lseq, lseqi;
 
   register struct namemap *nameptr = 0;
 
@@ -1315,7 +1315,7 @@ resolv_query(const char *name)
   {
     size_t name_len = strlen(name);
 
-    static const char local_suffix[] = "local";
+    const char local_suffix[] = "local";
 
     if((name_len > (sizeof(local_suffix) - 1)) &&
        (0 == strcasecmp(name + name_len - (sizeof(local_suffix) - 1), local_suffix))) {
@@ -1347,7 +1347,7 @@ resolv_lookup(const char *name, uip_ipaddr_t ** ipaddr)
 {
   resolv_status_t ret = RESOLV_STATUS_UNCACHED;
 
-  static uint8_t i;
+  uint8_t i;
 
   struct namemap *nameptr;
 

From 0e0bf33d311528adf4e293fc73044e5af0fbcf05 Mon Sep 17 00:00:00 2001
From: Tommy Sparber <tommy@sparber.net>
Date: Tue, 3 Nov 2015 14:19:47 +1100
Subject: [PATCH 005/393] uIP Stats: Count sent ICMP6 packets

The sent ICMP6 packets (for example from RPL) are currently
not counted towards the sum of sent ip and icmp packets.

Is there any reason behind this or is it just a bug?
Looking at the code I found no side effects of adding these two lines.

Debug output:
```
uip_stat.ip .recv 10 .sent 23 .forwared 0 .drop 0
uip_stat.icmp .recv 10 .sent 11 .drop 0
uip_stat.udp .recv 0 .sent 12 .drop 0
```
(Sum of ip.sent matches icmp.sent and udp.sent)
---
 core/net/ipv6/uip-icmp6.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/net/ipv6/uip-icmp6.c b/core/net/ipv6/uip-icmp6.c
index a9dc9e352..8f5772833 100644
--- a/core/net/ipv6/uip-icmp6.c
+++ b/core/net/ipv6/uip-icmp6.c
@@ -38,7 +38,7 @@
 /**
  * \file
  *    ICMPv6 (RFC 4443) implementation, with message and error handling
- * \author Julien Abeille <jabeille@cisco.com> 
+ * \author Julien Abeille <jabeille@cisco.com>
  * \author Mathilde Durvy <mdurvy@cisco.com>
  */
 
@@ -313,6 +313,10 @@ uip_icmp6_send(const uip_ipaddr_t *dest, int type, int code, int payload_len)
   UIP_ICMP_BUF->icmpchksum = ~uip_icmp6chksum();
 
   uip_len = UIP_IPH_LEN + UIP_ICMPH_LEN + payload_len;
+
+  UIP_STAT(++uip_stat.icmp.sent);
+  UIP_STAT(++uip_stat.ip.sent);
+
   tcpip_ipv6_output();
 }
 /*---------------------------------------------------------------------------*/

From 5a440dd00319851138cbdf9f4e1c27aad2f19d8b Mon Sep 17 00:00:00 2001
From: myrfy001 <mmh_web@163.com>
Date: Tue, 17 Nov 2015 14:30:04 +0800
Subject: [PATCH 006/393] off_t changed to signed to stay the same as POSIX

On many other tool chains, like TI's new MSG430-GCC, the typedef will be conflict.
---
 platform/sky/platform-conf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/sky/platform-conf.h b/platform/sky/platform-conf.h
index f5530f3aa..a4a7300b6 100644
--- a/platform/sky/platform-conf.h
+++ b/platform/sky/platform-conf.h
@@ -71,7 +71,7 @@
 /* Types for clocks and uip_stats */
 typedef unsigned short uip_stats_t;
 typedef unsigned long clock_time_t;
-typedef unsigned long off_t;
+typedef long off_t;
 
 /* the low-level radio driver */
 #define NETSTACK_CONF_RADIO   cc2420_driver

From 92840e7adc927ecccdf3902a66bb325702e48130 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Fri, 20 Nov 2015 19:07:20 +0100
Subject: [PATCH 007/393] Simplify uip-ds6-nbr module further when NDP is
 disabled. Avoids known issue
 https://github.com/contiki-os/contiki/issues/1380 of neighbors in
 non-REACHABLE state.

---
 core/net/ipv6/uip-ds6-nbr.c | 14 +++++++++-----
 core/net/ipv6/uip-ds6-nbr.h |  8 +++++---
 core/net/ipv6/uip-ds6.c     |  2 ++
 core/net/rpl/rpl-icmp6.c    |  4 ++++
 core/net/rpl/rpl.c          |  4 ++++
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/core/net/ipv6/uip-ds6-nbr.c b/core/net/ipv6/uip-ds6-nbr.c
index db14f8647..75e949c1b 100644
--- a/core/net/ipv6/uip-ds6-nbr.c
+++ b/core/net/ipv6/uip-ds6-nbr.c
@@ -84,15 +84,19 @@ uip_ds6_nbr_add(const uip_ipaddr_t *ipaddr, const uip_lladdr_t *lladdr,
   uip_ds6_nbr_t *nbr = nbr_table_add_lladdr(ds6_neighbors, (linkaddr_t*)lladdr);
   if(nbr) {
     uip_ipaddr_copy(&nbr->ipaddr, ipaddr);
+#if UIP_ND6_SEND_NA || UIP_ND6_SEND_RA || !UIP_CONF_ROUTER
     nbr->isrouter = isrouter;
+#endif /* UIP_ND6_SEND_NA || UIP_ND6_SEND_RA || !UIP_CONF_ROUTER */
     nbr->state = state;
-  #if UIP_CONF_IPV6_QUEUE_PKT
+#if UIP_CONF_IPV6_QUEUE_PKT
     uip_packetqueue_new(&nbr->packethandle);
-  #endif /* UIP_CONF_IPV6_QUEUE_PKT */
+#endif /* UIP_CONF_IPV6_QUEUE_PKT */
+#if UIP_ND6_SEND_NA
     /* timers are set separately, for now we put them in expired state */
     stimer_set(&nbr->reachable, 0);
     stimer_set(&nbr->sendns, 0);
     nbr->nscount = 0;
+#endif /* UIP_ND6_SEND_NA */
     PRINTF("Adding neighbor with ip addr ");
     PRINT6ADDR(ipaddr);
     PRINTF(" link addr ");
@@ -230,6 +234,7 @@ uip_ds6_link_neighbor_callback(int status, int numtx)
 #endif /* UIP_DS6_LL_NUD */
 
 }
+#if UIP_ND6_SEND_NA
 /*---------------------------------------------------------------------------*/
 void
 uip_ds6_neighbor_periodic(void)
@@ -241,7 +246,7 @@ uip_ds6_neighbor_periodic(void)
     case NBR_REACHABLE:
       if(stimer_expired(&nbr->reachable)) {
 #if UIP_CONF_IPV6_RPL
-        /* when a neighbor leave it's REACHABLE state and is a default router,
+        /* when a neighbor leave its REACHABLE state and is a default router,
            instead of going to STALE state it enters DELAY state in order to
            force a NUD on it. Otherwise, if there is no upward traffic, the
            node never knows if the default router is still reachable. This
@@ -268,7 +273,6 @@ uip_ds6_neighbor_periodic(void)
 #endif /* UIP_CONF_IPV6_RPL */
       }
       break;
-#if UIP_ND6_SEND_NA
     case NBR_INCOMPLETE:
       if(nbr->nscount >= UIP_ND6_MAX_MULTICAST_SOLICIT) {
         uip_ds6_nbr_rm(nbr);
@@ -304,7 +308,6 @@ uip_ds6_neighbor_periodic(void)
         stimer_set(&nbr->sendns, uip_ds6_if.retrans_timer / 1000);
       }
       break;
-#endif /* UIP_ND6_SEND_NA */
     default:
       break;
     }
@@ -330,5 +333,6 @@ uip_ds6_get_least_lifetime_neighbor(void)
   }
   return nbr_expiring;
 }
+#endif /* UIP_ND6_SEND_NA */
 /*---------------------------------------------------------------------------*/
 /** @} */
diff --git a/core/net/ipv6/uip-ds6-nbr.h b/core/net/ipv6/uip-ds6-nbr.h
index 36a202e86..24e3f7aaf 100644
--- a/core/net/ipv6/uip-ds6-nbr.h
+++ b/core/net/ipv6/uip-ds6-nbr.h
@@ -69,12 +69,14 @@ NBR_TABLE_DECLARE(ds6_neighbors);
 /** \brief An entry in the nbr cache */
 typedef struct uip_ds6_nbr {
   uip_ipaddr_t ipaddr;
-  struct stimer reachable;
-  struct stimer sendns;
-  uint8_t nscount;
   uint8_t isrouter;
   uint8_t state;
   uint16_t link_metric;
+#if UIP_ND6_SEND_NA || UIP_ND6_SEND_RA
+  struct stimer reachable;
+  struct stimer sendns;
+  uint8_t nscount;
+#endif /* UIP_ND6_SEND_NA || UIP_ND6_SEND_RA */
 #if UIP_CONF_IPV6_QUEUE_PKT
   struct uip_packetqueue_handle packethandle;
 #define UIP_DS6_NBR_PACKET_LIFETIME CLOCK_SECOND * 4
diff --git a/core/net/ipv6/uip-ds6.c b/core/net/ipv6/uip-ds6.c
index 148c8aa24..458b6b14e 100644
--- a/core/net/ipv6/uip-ds6.c
+++ b/core/net/ipv6/uip-ds6.c
@@ -186,7 +186,9 @@ uip_ds6_periodic(void)
   }
 #endif /* !UIP_CONF_ROUTER */
 
+#if UIP_ND6_SEND_NA
   uip_ds6_neighbor_periodic();
+#endif /* UIP_ND6_SEND_RA */
 
 #if UIP_CONF_ROUTER && UIP_ND6_SEND_RA
   /* Periodic RA sending */
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 3732dec92..4f79d91ec 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -243,8 +243,10 @@ dio_input(void)
     if((nbr = uip_ds6_nbr_add(&from, (uip_lladdr_t *)
                               packetbuf_addr(PACKETBUF_ADDR_SENDER),
                               0, NBR_REACHABLE)) != NULL) {
+#if UIP_ND6_SEND_NA
       /* set reachable timer */
       stimer_set(&nbr->reachable, UIP_ND6_REACHABLE_TIME / 1000);
+#endif /* UIP_ND6_SEND_NA */
       PRINTF("RPL: Neighbor added to neighbor cache ");
       PRINT6ADDR(&from);
       PRINTF(", ");
@@ -754,8 +756,10 @@ dao_input(void)
     if((nbr = uip_ds6_nbr_add(&dao_sender_addr,
                               (uip_lladdr_t *)packetbuf_addr(PACKETBUF_ADDR_SENDER),
                               0, NBR_REACHABLE)) != NULL) {
+#if UIP_ND6_SEND_NA
       /* set reachable timer */
       stimer_set(&nbr->reachable, UIP_ND6_REACHABLE_TIME / 1000);
+#endif /* UIP_ND6_SEND_NA */
       PRINTF("RPL: Neighbor added to neighbor cache ");
       PRINT6ADDR(&dao_sender_addr);
       PRINTF(", ");
diff --git a/core/net/rpl/rpl.c b/core/net/rpl/rpl.c
index 82b11721a..7e7947e34 100644
--- a/core/net/rpl/rpl.c
+++ b/core/net/rpl/rpl.c
@@ -285,7 +285,11 @@ rpl_ipv6_neighbor_callback(uip_ds6_nbr_t *nbr)
 
   PRINTF("RPL: Neighbor state changed for ");
   PRINT6ADDR(&nbr->ipaddr);
+#if UIP_ND6_SEND_NA || UIP_ND6_SEND_RA
   PRINTF(", nscount=%u, state=%u\n", nbr->nscount, nbr->state);
+#else /* UIP_ND6_SEND_NA || UIP_ND6_SEND_RA */
+  PRINTF(", state=%u\n", nbr->state);
+#endif /* UIP_ND6_SEND_NA || UIP_ND6_SEND_RA */
   for(instance = &instance_table[0], end = instance + RPL_MAX_INSTANCES; instance < end; ++instance) {
     if(instance->used == 1 ) {
       p = rpl_find_parent_any_dag(instance, &nbr->ipaddr);

From 1eb1f88aa4ad8e5263abea172db7c28b20a8f1a9 Mon Sep 17 00:00:00 2001
From: Tommy Sparber <tommy@sparber.net>
Date: Wed, 28 Oct 2015 23:32:04 +1100
Subject: [PATCH 008/393] collect-view gui: Add support for OS X serialdump and
 motelist

Select the tools for macos when checking for motes or opening a
serial dump connection on OS X.
---
 .../src/org/contikios/contiki/collect/MoteFinder.java      | 7 ++++++-
 .../contikios/contiki/collect/SerialDumpConnection.java    | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/collect-view/src/org/contikios/contiki/collect/MoteFinder.java b/tools/collect-view/src/org/contikios/contiki/collect/MoteFinder.java
index 9afcf028b..2c3c86d5b 100644
--- a/tools/collect-view/src/org/contikios/contiki/collect/MoteFinder.java
+++ b/tools/collect-view/src/org/contikios/contiki/collect/MoteFinder.java
@@ -54,9 +54,11 @@ public class MoteFinder {
 
   public static final String MOTELIST_WINDOWS = "./tools/motelist-windows.exe";
   public static final String MOTELIST_LINUX = "./tools/motelist-linux";
+  public static final String MOTELIST_MACOS = "./tools/motelist-macos";
 
   private final Pattern motePattern;
   private final boolean isWindows;
+  private final boolean isMacos;
   private Process moteListProcess;
 //  private boolean hasVerifiedProcess;
   private ArrayList<String> comList = new ArrayList<String>();
@@ -65,7 +67,8 @@ public class MoteFinder {
   public MoteFinder() {
     String osName = System.getProperty("os.name", "").toLowerCase();
     isWindows = osName.startsWith("win");
-    motePattern = Pattern.compile("\\s(COM|/dev/[a-zA-Z]+)(\\d+)\\s");
+    isMacos = osName.startsWith("mac");
+    motePattern = Pattern.compile("\\s(COM|/dev/[a-zA-Z]+|/dev/tty.usbserial-)(\\d+|[A-Z0-9]+)\\s");
   }
 
   public String[] getMotes() throws IOException {
@@ -87,6 +90,8 @@ public class MoteFinder {
     String fullCommand;
     if (isWindows) {
       fullCommand = MOTELIST_WINDOWS;
+    } else if (isMacos) {
+      fullCommand = MOTELIST_MACOS;
     } else {
       fullCommand = MOTELIST_LINUX;
     }
diff --git a/tools/collect-view/src/org/contikios/contiki/collect/SerialDumpConnection.java b/tools/collect-view/src/org/contikios/contiki/collect/SerialDumpConnection.java
index 9669b89f4..c624ea64a 100644
--- a/tools/collect-view/src/org/contikios/contiki/collect/SerialDumpConnection.java
+++ b/tools/collect-view/src/org/contikios/contiki/collect/SerialDumpConnection.java
@@ -46,6 +46,7 @@ public class SerialDumpConnection extends CommandConnection {
 
   public static final String SERIALDUMP_WINDOWS = "./tools/serialdump-windows.exe";
   public static final String SERIALDUMP_LINUX = "./tools/serialdump-linux";
+  public static final String SERIALDUMP_MACOS = "./tools/serialdump-macos";
 
   public SerialDumpConnection(SerialConnectionListener listener) {
     super(listener);
@@ -72,6 +73,8 @@ public class SerialDumpConnection extends CommandConnection {
     String fullCommand;
     if (osName.startsWith("win")) {
       fullCommand = SERIALDUMP_WINDOWS + " " + "-b115200" + " " + getMappedComPortForWindows(comPort);
+    } else if (osName.startsWith("mac")) {
+      fullCommand = SERIALDUMP_MACOS + " " + "-b115200" + " " + comPort;
     } else {
       fullCommand = SERIALDUMP_LINUX + " " + "-b115200" + " " + comPort;
     }

From 7dc15816317e75ffe429e0f82f6e3fad990ba7c4 Mon Sep 17 00:00:00 2001
From: Jeff Kent <jeff@jkent.net>
Date: Mon, 28 Dec 2015 09:47:12 -0600
Subject: [PATCH 009/393] jsonparse: multiple improvements

* input string now can be any json value type
* syntax handling completed
* stack is now used more efficiently for objects
* implemented atomic values true, false, and null
* jsonparse_copy_value now handles escapes
---
 apps/json/json.h      |   1 +
 apps/json/jsonparse.c | 156 +++++++++++++++++++++++++++++++++---------
 2 files changed, 125 insertions(+), 32 deletions(-)

diff --git a/apps/json/json.h b/apps/json/json.h
index a698464a5..8a443a8be 100644
--- a/apps/json/json.h
+++ b/apps/json/json.h
@@ -62,6 +62,7 @@ enum {
   JSON_ERROR_UNEXPECTED_ARRAY,
   JSON_ERROR_UNEXPECTED_END_OF_ARRAY,
   JSON_ERROR_UNEXPECTED_OBJECT,
+  JSON_ERROR_UNEXPECTED_END_OF_OBJECT,
   JSON_ERROR_UNEXPECTED_STRING
 };
 
diff --git a/apps/json/jsonparse.c b/apps/json/jsonparse.c
index 8089ae9fb..6277b56c4 100644
--- a/apps/json/jsonparse.c
+++ b/apps/json/jsonparse.c
@@ -43,6 +43,14 @@ push(struct jsonparse_state *state, char c)
   return state->depth < JSONPARSE_MAX_DEPTH;
 }
 /*--------------------------------------------------------------------*/
+static void
+modify(struct jsonparse_state *state, char c)
+{
+  if(state->depth > 0) {
+    state->stack[state->depth - 1] = c;
+  }
+}
+/*--------------------------------------------------------------------*/
 static char
 pop(struct jsonparse_state *state)
 {
@@ -50,25 +58,31 @@ pop(struct jsonparse_state *state)
     return JSON_TYPE_ERROR;
   }
   state->depth--;
+  state->vtype = state->stack[state->depth];
   return state->stack[state->depth];
 }
 /*--------------------------------------------------------------------*/
 /* will pass by the value and store the start and length of the value for
    atomic types */
 /*--------------------------------------------------------------------*/
-static void
+static char
 atomic(struct jsonparse_state *state, char type)
 {
   char c;
+  const char *str;
+  int len;
 
   state->vstart = state->pos;
-  state->vtype = type;
   if(type == JSON_TYPE_STRING || type == JSON_TYPE_PAIR_NAME) {
     while((c = state->json[state->pos++]) && c != '"') {
       if(c == '\\') {
         state->pos++;           /* skip current char */
       }
     }
+    if (c != '"') {
+      state->error = JSON_ERROR_SYNTAX;
+      return JSON_TYPE_ERROR;
+    }
     state->vlen = state->pos - state->vstart - 1;
   } else if(type == JSON_TYPE_NUMBER) {
     do {
@@ -82,8 +96,31 @@ atomic(struct jsonparse_state *state, char type)
     /* need to back one step since first char is already gone */
     state->vstart--;
     state->vlen = state->pos - state->vstart;
+  } else if(type == JSON_TYPE_NULL || type == JSON_TYPE_TRUE || type == JSON_TYPE_FALSE) {
+    state->vstart--;
+    switch (type) {
+    case JSON_TYPE_NULL:  str = "null";  break;
+    case JSON_TYPE_TRUE:  str = "true";  break;
+    case JSON_TYPE_FALSE: str = "false"; break;
+    default:              str = "";      break;
+    }
+
+    while ((c = state->json[state->pos]) && c != ' ' && c != ',' && c != ']' && c != '}') {
+      state->pos++;
+    }
+
+    state->vlen = state->pos - state->vstart;
+    len = strlen(str);
+    len = state->vlen > len ? state->vlen : len;
+
+    if (strncmp(str, &state->json[state->vstart], len) != 0) {
+      state->error = JSON_ERROR_SYNTAX;
+      return JSON_TYPE_ERROR;
+    }
   }
-  /* no other types for now... */
+
+  state->vtype = type;
+  return state->vtype;
 }
 /*--------------------------------------------------------------------*/
 static void
@@ -97,6 +134,17 @@ skip_ws(struct jsonparse_state *state)
   }
 }
 /*--------------------------------------------------------------------*/
+static int
+is_atomic(struct jsonparse_state *state)
+{
+  char v = state->vtype;
+  if(v == 'N' || v == '"' || v == '0' || v == 'n' || v == 't' || v == 'f') {
+    return 1;
+  } else {
+    return 0;
+  }
+}
+/*--------------------------------------------------------------------*/
 void
 jsonparse_setup(struct jsonparse_state *state, const char *json, int len)
 {
@@ -105,6 +153,7 @@ jsonparse_setup(struct jsonparse_state *state, const char *json, int len)
   state->pos = 0;
   state->depth = 0;
   state->error = 0;
+  state->vtype = 0;
   state->stack[0] = 0;
 }
 /*--------------------------------------------------------------------*/
@@ -113,31 +162,33 @@ jsonparse_next(struct jsonparse_state *state)
 {
   char c;
   char s;
+  char v;
 
   skip_ws(state);
   c = state->json[state->pos];
   s = jsonparse_get_type(state);
+  v = state->vtype;
   state->pos++;
 
   switch(c) {
   case '{':
-    push(state, c);
+    if((s == 0 && v == 0) || s == '[' || s == ':') {
+      push(state, c);
+    } else {
+      state->error = JSON_ERROR_UNEXPECTED_OBJECT;
+      return JSON_TYPE_ERROR;
+    }
     return c;
   case '}':
-    if(s == ':' && state->vtype != 0) {
-/*       printf("Popping vtype: '%c'\n", state->vtype); */
-      pop(state);
-      s = jsonparse_get_type(state);
-    }
-    if(s == '{') {
+    if((s == ':' && v != ',' && v != 0 ) || (s == '{' && v == 0)) {
       pop(state);
     } else {
-      state->error = JSON_ERROR_SYNTAX;
+      state->error = JSON_ERROR_UNEXPECTED_END_OF_OBJECT;
       return JSON_TYPE_ERROR;
     }
     return c;
   case ']':
-    if(s == '[') {
+    if(s == '[' && v != ',') {
       pop(state);
     } else {
       state->error = JSON_ERROR_UNEXPECTED_END_OF_ARRAY;
@@ -145,41 +196,67 @@ jsonparse_next(struct jsonparse_state *state)
     }
     return c;
   case ':':
-    push(state, c);
-    return c;
+    if(s == '{' && v == 'N') {
+      modify(state, ':');
+      state->vtype = 0;
+    } else {
+      state->error = JSON_ERROR_SYNTAX;
+      return JSON_TYPE_ERROR;
+    }
+    return jsonparse_next(state);
   case ',':
-    /* if x:y ... , */
-    if(s == ':' && state->vtype != 0) {
-      pop(state);
+    if(s == ':' && v != 0) {
+      modify(state, '{');
+      state->vtype = c;
     } else if(s == '[') {
-      /* ok! */
+      state->vtype = c;
     } else {
       state->error = JSON_ERROR_SYNTAX;
       return JSON_TYPE_ERROR;
     }
     return c;
   case '"':
-    if(s == '{' || s == '[' || s == ':') {
-      atomic(state, c = (s == '{' ? JSON_TYPE_PAIR_NAME : c));
+    if((s == 0 && v == 0) || s == '{' || s == '[' || s == ':') {
+      return atomic(state, c = (s == '{' ? JSON_TYPE_PAIR_NAME : c));
     } else {
       state->error = JSON_ERROR_UNEXPECTED_STRING;
       return JSON_TYPE_ERROR;
     }
     return c;
   case '[':
-    if(s == '{' || s == '[' || s == ':') {
+    if((s == 0 && v == 0) || s == '[' || s == ':') {
       push(state, c);
     } else {
       state->error = JSON_ERROR_UNEXPECTED_ARRAY;
       return JSON_TYPE_ERROR;
     }
     return c;
+  case 0:
+    if(v == 0 || state->depth > 0) {
+      state->error = JSON_ERROR_SYNTAX;
+    }
+    return JSON_TYPE_ERROR;
   default:
-    if(s == ':' || s == '[') {
-      if(c <= '9' && c >= '0') {
-        atomic(state, JSON_TYPE_NUMBER);
-        return JSON_TYPE_NUMBER;
+    if(s == 0 || s == ':' || s == '[') {
+      if (v != 0 && v != ',') {
+        state->error = JSON_ERROR_SYNTAX;
+        return JSON_TYPE_ERROR;
       }
+      if(c == '-' || (c <= '9' && c >= '0')) {
+        return atomic(state, JSON_TYPE_NUMBER);
+      } else if(c == 'n') {
+        return atomic(state, JSON_TYPE_NULL);
+      } else if(c == 't') {
+        return atomic(state, JSON_TYPE_TRUE);
+      } else if(c == 'f') {
+        return atomic(state, JSON_TYPE_FALSE);
+      } else {
+        state->error = JSON_ERROR_SYNTAX;
+        return JSON_TYPE_ERROR;
+      }
+    } else if(s == '{') {
+      state->error = JSON_ERROR_SYNTAX;
+      return JSON_TYPE_ERROR;
     }
   }
   return 0;
@@ -192,16 +269,31 @@ jsonparse_next(struct jsonparse_state *state)
 int
 jsonparse_copy_value(struct jsonparse_state *state, char *str, int size)
 {
-  int i;
+  int i, o;
+  char c;
 
-  if(state->vtype == 0) {
+  if(!is_atomic(state)) {
     return 0;
   }
-  size = size <= state->vlen ? (size - 1) : state->vlen;
-  for(i = 0; i < size; i++) {
-    str[i] = state->json[state->vstart + i];
+  for(i = 0, o = 0; i < state->vlen && o < size - 1; i++) {
+    c = state->json[state->vstart + i];
+    if(c == '\\') {
+      i++;
+      switch(state->json[state->vstart + i]) {
+      case '"':  str[o++] = '"';  break;
+      case '\\': str[o++] = '\\'; break;
+      case '/':  str[o++] = '/';  break;
+      case 'b':  str[o++] = '\b'; break;
+      case 'f':  str[o++] = '\f'; break;
+      case 'n':  str[o++] = '\n'; break;
+      case 'r':  str[o++] = '\r'; break;
+      case 't':  str[o++] = '\t'; break;
+      }
+      continue;
+    }
+    str[o++] = c;
   }
-  str[i] = 0;
+  str[o] = 0;
   return state->vtype;
 }
 /*--------------------------------------------------------------------*/
@@ -228,7 +320,7 @@ jsonparse_get_value_as_long(struct jsonparse_state *state)
 int
 jsonparse_strcmp_value(struct jsonparse_state *state, const char *str)
 {
-  if(state->vtype == 0) {
+  if(!is_atomic(state)) {
     return -1;
   }
   return strncmp(str, &state->json[state->vstart], state->vlen);

From 8456b8333fc58d865f4eb6d441a01eeb7869f223 Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Fri, 8 Jan 2016 14:30:38 +0100
Subject: [PATCH 010/393] Added sensniff support for the CC1200

---
 dev/cc1200/cc1200.c                           | 31 +++++-
 .../zolertia/zoul/cc1200-sniffer/Makefile     | 10 ++
 .../zoul/cc1200-sniffer/Makefile.target       |  1 +
 .../zolertia/zoul/cc1200-sniffer/README.md    | 35 +++++++
 .../zolertia/zoul/cc1200-sniffer/netstack.c   | 46 +++++++++
 .../zoul/cc1200-sniffer/project-conf.h        | 59 ++++++++++++
 .../zolertia/zoul/cc1200-sniffer/sniffer.c    | 67 +++++++++++++
 .../zolertia/zoul/cc1200-sniffer/stub-rdc.c   | 96 +++++++++++++++++++
 8 files changed, 344 insertions(+), 1 deletion(-)
 create mode 100644 examples/zolertia/zoul/cc1200-sniffer/Makefile
 create mode 100644 examples/zolertia/zoul/cc1200-sniffer/Makefile.target
 create mode 100644 examples/zolertia/zoul/cc1200-sniffer/README.md
 create mode 100644 examples/zolertia/zoul/cc1200-sniffer/netstack.c
 create mode 100644 examples/zolertia/zoul/cc1200-sniffer/project-conf.h
 create mode 100644 examples/zolertia/zoul/cc1200-sniffer/sniffer.c
 create mode 100644 examples/zolertia/zoul/cc1200-sniffer/stub-rdc.c

diff --git a/dev/cc1200/cc1200.c b/dev/cc1200/cc1200.c
index 1f3bfd499..bed33c5b6 100644
--- a/dev/cc1200/cc1200.c
+++ b/dev/cc1200/cc1200.c
@@ -374,6 +374,17 @@ extern const cc1200_rf_cfg_t CC1200_RF_CFG;
   } while(0)
 #endif
 /*---------------------------------------------------------------------------*/
+/* Sniffer configuration */
+#if CC1200_SNIFFER
+static const uint8_t magic[] = { 0x53, 0x6E, 0x69, 0x66 };
+#include "dev/uart.h"
+#define write_byte(b) uart_write_byte(CC1200_RF_CONF_SNIFFER_UART, b)
+#define flush()
+#else /* CC1200_SNIFFER */
+#define write_byte(b)
+#define flush()
+#endif /* CC1200_SNIFFER */
+/*---------------------------------------------------------------------------*/
 /* Variables */
 /*---------------------------------------------------------------------------*/
 /* Flag indicating whether non-interrupt routines are using SPI */
@@ -870,6 +881,10 @@ read(void *buf, unsigned short buf_len)
 
   int len = 0;
 
+  #if CC1200_SNIFFER
+    uint8_t i;
+  #endif
+
   if(rx_pkt_len > 0) {
 
     int8_t rssi = rx_pkt[rx_pkt_len - 2];
@@ -896,8 +911,22 @@ read(void *buf, unsigned short buf_len)
       packetbuf_set_attr(PACKETBUF_ATTR_LINK_QUALITY,
                          crc_lqi & ~(1 << 7));
 
-      RIMESTATS_ADD(llrx);
 
+      #if CC1200_SNIFFER
+        write_byte(magic[0]);
+        write_byte(magic[1]);
+        write_byte(magic[2]);
+        write_byte(magic[3]);
+        write_byte(len + 2);
+        for(i = 0; i < len; ++i) {
+          write_byte(((unsigned char *)(buf))[i]);
+        }
+        write_byte(rssi);
+        write_byte(crc_lqi);
+        flush();
+      #endif
+
+      RIMESTATS_ADD(llrx);
     }
 
   }
diff --git a/examples/zolertia/zoul/cc1200-sniffer/Makefile b/examples/zolertia/zoul/cc1200-sniffer/Makefile
new file mode 100644
index 000000000..5c2fa1675
--- /dev/null
+++ b/examples/zolertia/zoul/cc1200-sniffer/Makefile
@@ -0,0 +1,10 @@
+DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
+PROJECT_SOURCEFILES += stub-rdc.c
+
+CONTIKI_PROJECT = sniffer
+
+all: $(CONTIKI_PROJECT)
+
+CONTIKI = ../../../..
+CONTIKI_WITH_RIME = 1
+include $(CONTIKI)/Makefile.include
diff --git a/examples/zolertia/zoul/cc1200-sniffer/Makefile.target b/examples/zolertia/zoul/cc1200-sniffer/Makefile.target
new file mode 100644
index 000000000..75430a6e4
--- /dev/null
+++ b/examples/zolertia/zoul/cc1200-sniffer/Makefile.target
@@ -0,0 +1 @@
+TARGET = zoul
diff --git a/examples/zolertia/zoul/cc1200-sniffer/README.md b/examples/zolertia/zoul/cc1200-sniffer/README.md
new file mode 100644
index 000000000..95ec65193
--- /dev/null
+++ b/examples/zolertia/zoul/cc1200-sniffer/README.md
@@ -0,0 +1,35 @@
+CC1200 README
+========================
+
+The CC1200 sniffer is heavily based on the CC2538 sniffer, used with the
+IEEE 802.15.4 Sensniff application by George Oikonomou.
+
+Sensniff requires [Wireshark](http://www.wireshark.org/).
+
+Get Wireshark
+-----------------
+The best way is to go to the Wireshark site and follow the instructions for your
+specific OS, in a bundle this will install for Ubuntu/LInux systems:
+
+`sudo apt-get install wireshark`
+
+To allow non-super users to capture packets:
+
+`sudo dpkg-reconfigure wireshark`
+
+Flash the sniffer application to the Zoul
+-----------------
+make sniffer.upload
+
+Run Sensniff
+-----------------
+```
+git clone https://github.com/g-oikonomou/sensniff
+cd sensniff/host
+python sensniff.py --non-interactive -d /dev/ttyUSB0 -b 460800
+```
+
+On another terminal run:
+
+`sudo wireshark -i /tmp/sensnifff`
+
diff --git a/examples/zolertia/zoul/cc1200-sniffer/netstack.c b/examples/zolertia/zoul/cc1200-sniffer/netstack.c
new file mode 100644
index 000000000..3aeb6968e
--- /dev/null
+++ b/examples/zolertia/zoul/cc1200-sniffer/netstack.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, Loughborough University - 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.
+ */
+/**
+ * \file
+ *         Stub file overriding core/net/netstack.c. What we want to achieve
+ *         here is call netstack_init from main without initialising the RDC,
+ *         MAC and Network layers. It will just turn on the radio instead.
+ *
+ * \author
+ *         George Oikonomou - <oikonomou@users.sourceforge.net>
+ */
+#include "netstack.h"
+/*---------------------------------------------------------------------------*/
+void
+netstack_init(void)
+{
+  NETSTACK_RADIO.init();
+  NETSTACK_RADIO.on();
+}
+/*---------------------------------------------------------------------------*/
diff --git a/examples/zolertia/zoul/cc1200-sniffer/project-conf.h b/examples/zolertia/zoul/cc1200-sniffer/project-conf.h
new file mode 100644
index 000000000..fca02e711
--- /dev/null
+++ b/examples/zolertia/zoul/cc1200-sniffer/project-conf.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2012, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/**
+ * \addtogroup zoul-cc1200-sniffer
+ * @{
+ *
+ * \file
+ *         Project specific configuration defines for the CC1200 sniffer
+ */
+#ifndef PROJECT_CONF_H_
+#define PROJECT_CONF_H_
+
+#define CC1200_CONF_SNIFFER         1
+#define CC1200_RF_CONF_SNIFFER_UART 0
+#define CC1200_CONF_RF_CFG          cc1200_802154g_863_870_fsk_50kbps
+
+#undef  NETSTACK_CONF_RADIO
+#define NETSTACK_CONF_RADIO         cc1200_driver
+
+#define CC1200_CONF_USE_GPIO2       0
+#define CC1200_CONF_USE_RX_WATCHDOG 0
+#define ANTENNA_SW_SELECT_DEF_CONF  ANTENNA_SW_SELECT_SUBGHZ
+
+#undef NETSTACK_CONF_RDC
+#define NETSTACK_CONF_RDC           stub_rdc_driver
+
+#define UART0_CONF_BAUD_RATE        460800
+
+#endif /* PROJECT_CONF_H_ */
+
+/** @} */
diff --git a/examples/zolertia/zoul/cc1200-sniffer/sniffer.c b/examples/zolertia/zoul/cc1200-sniffer/sniffer.c
new file mode 100644
index 000000000..a0241f795
--- /dev/null
+++ b/examples/zolertia/zoul/cc1200-sniffer/sniffer.c
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2012, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/**
+ * \addtogroup zoul-examples
+ * @{
+ *
+ * \defgroup zoul-cc1200-sniffer CC1200 Sniffer
+ *
+ * Sniffer for the Zolertia's Zoul CC1200 on-board radio
+ *
+ * This example is to be used combined with the sensniff host-side tool,
+ * which can be downloaded from: https://github.com/g-oikonomou/sensniff
+ *
+ * @{
+ *
+ * \file
+ * Implementation of a Sniffer Process Thread
+ */
+#include "contiki.h"
+
+#define DEBUG DEBUG_NONE
+#include "net/ip/uip-debug.h"
+/*---------------------------------------------------------------------------*/
+PROCESS(sniffer_process, "Sniffer process");
+AUTOSTART_PROCESSES(&sniffer_process);
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(sniffer_process, ev, data)
+{
+  PROCESS_BEGIN();
+  PRINTF("Sniffer started\n");
+  PROCESS_EXIT();
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+
+/**
+ * @}
+ * @}
+ */
diff --git a/examples/zolertia/zoul/cc1200-sniffer/stub-rdc.c b/examples/zolertia/zoul/cc1200-sniffer/stub-rdc.c
new file mode 100644
index 000000000..a8c54de6a
--- /dev/null
+++ b/examples/zolertia/zoul/cc1200-sniffer/stub-rdc.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2010, Loughborough University - 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.
+ */
+/**
+ * \file
+ *         Definition of a fake RDC driver to be used with passive
+ *         examples. The sniffer will never send packets and it will never
+ *         push incoming packets up the stack. We do this by defining this
+ *         driver as our RDC. We then drop everything
+ *
+ * \author
+ *         George Oikonomou - <oikonomou@users.sourceforge.net>
+ */
+#include "net/mac/mac.h"
+#include "net/mac/rdc.h"
+/*---------------------------------------------------------------------------*/
+static void
+send(mac_callback_t sent, void *ptr)
+{
+  if(sent) {
+    sent(ptr, MAC_TX_OK, 1);
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+send_list(mac_callback_t sent, void *ptr, struct rdc_buf_list *list)
+{
+  if(sent) {
+    sent(ptr, MAC_TX_OK, 1);
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+input(void)
+{
+}
+/*---------------------------------------------------------------------------*/
+static int
+on(void)
+{
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+static int
+off(int keep_radio_on)
+{
+  return keep_radio_on;
+}
+/*---------------------------------------------------------------------------*/
+static unsigned short
+cca(void)
+{
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static void
+init(void)
+{
+}
+/*---------------------------------------------------------------------------*/
+const struct rdc_driver stub_rdc_driver = {
+  "stub-rdc",
+  init,
+  send,
+  send_list,
+  input,
+  on,
+  off,
+  cca,
+};
+/*---------------------------------------------------------------------------*/

From a40e28a7c8f9167d8d32cc6c52e9b822907dff1f Mon Sep 17 00:00:00 2001
From: Michael Klemm <michael.klemm@jambit.com>
Date: Sat, 16 Jan 2016 12:45:21 +0100
Subject: [PATCH 011/393] Fixed using target AVR ATmega128RFA1

Set operating speed to 16MHz and added missing dependency to llsec.
This fix was tested with sparkfun ATmega128RFA1 Dev Board.
---
 platform/avr-atmega128rfa1/Makefile.avr-atmega128rfa1 | 4 ++--
 platform/avr-atmega128rfa1/contiki-conf.h             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/avr-atmega128rfa1/Makefile.avr-atmega128rfa1 b/platform/avr-atmega128rfa1/Makefile.avr-atmega128rfa1
index f99e85291..2fd8a9ac2 100644
--- a/platform/avr-atmega128rfa1/Makefile.avr-atmega128rfa1
+++ b/platform/avr-atmega128rfa1/Makefile.avr-atmega128rfa1
@@ -9,7 +9,7 @@ CONTIKI_TARGET_SOURCEFILES += button-sensor.c sensors.c slip_uart0.c slip.c
 CONTIKIAVR=$(CONTIKI)/cpu/avr
 CONTIKIBOARD=.
 
-CONTIKI_PLAT_DEFS = -DF_CPU=8000000UL -DAUTO_CRC_PADDING=2
+CONTIKI_PLAT_DEFS = -DF_CPU=16000000UL -DAUTO_CRC_PADDING=2
 
 MCU=atmega128rfa1
 
@@ -31,4 +31,4 @@ AVRDUDE_MCU=m128rfa1
 
 include $(CONTIKIAVR)/Makefile.avr
 include $(CONTIKIAVR)/radio/Makefile.radio
-MODULES += core/net/mac core/net core/net/mac/sicslowmac core/net/mac/contikimac
+MODULES += core/net/mac core/net core/net/mac/sicslowmac core/net/mac/contikimac core/net/llsec
diff --git a/platform/avr-atmega128rfa1/contiki-conf.h b/platform/avr-atmega128rfa1/contiki-conf.h
index 9dfbd9518..21fb497c3 100644
--- a/platform/avr-atmega128rfa1/contiki-conf.h
+++ b/platform/avr-atmega128rfa1/contiki-conf.h
@@ -45,7 +45,7 @@
 #define PLATFORM_NAME  "RFA1"
 #define PLATFORM_TYPE  ATMEGA128RFA1
 #ifndef F_CPU
-#define F_CPU          8000000UL
+#define F_CPU          16000000UL
 #endif
 
 #include <stdint.h>

From 24871b070253c218a8a427a334e3f2ec09d5f2c1 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Sun, 24 Jan 2016 16:49:51 +0000
Subject: [PATCH 012/393] Extend the Sensortag external flash Driver to support
 more parts

The driver currently supports two Winbond external flash parts with identical instruction sets. The instruction set of the Macronix MX25R8035F appears to be a superset. We therefore change the driver to add the MID/DID of the Macronix to the list of supported parts.

This will subsequently allow us to share the same driver for both the SensorTag and the CC2650 LauchPad.
---
 platform/srf06-cc26xx/sensortag/ext-flash.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/platform/srf06-cc26xx/sensortag/ext-flash.c b/platform/srf06-cc26xx/sensortag/ext-flash.c
index c35bd4d0f..d469c1d56 100644
--- a/platform/srf06-cc26xx/sensortag/ext-flash.c
+++ b/platform/srf06-cc26xx/sensortag/ext-flash.c
@@ -72,8 +72,10 @@
 /* Part specific constants */
 #define BLS_DEVICE_ID_W25X20CL    0x11
 #define BLS_DEVICE_ID_W25X40CL    0x12
+#define BLS_DEVICE_ID_MX25R8035F  0x14
 
-#define BLS_MANUFACTURER_ID       0xEF
+#define BLS_WINBOND_MID           0xEF
+#define BLS_MACRONIX_MID          0xC2
 
 #define BLS_PROGRAM_PAGE_SIZE      256
 #define BLS_ERASE_SECTOR_SIZE     4096
@@ -175,8 +177,9 @@ verify_part(void)
     return VERIFY_PART_ERROR;
   }
 
-  if(rbuf[0] != BLS_MANUFACTURER_ID ||
-     (rbuf[1] != BLS_DEVICE_ID_W25X20CL && rbuf[1] != BLS_DEVICE_ID_W25X40CL)) {
+  if((rbuf[0] != BLS_WINBOND_MID && rbuf[0] != BLS_MACRONIX_MID) ||
+     (rbuf[1] != BLS_DEVICE_ID_W25X20CL && rbuf[1] != BLS_DEVICE_ID_W25X40CL
+      && rbuf[1] != BLS_DEVICE_ID_MX25R8035F)) {
     return VERIFY_PART_POWERED_DOWN;
   }
   return VERIFY_PART_OK;

From 5eb0470ad403cd398de0d4e2f8e25e0b0e1f6277 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Sun, 24 Jan 2016 16:52:56 +0000
Subject: [PATCH 013/393] Move the SPI and Ext Flash Driver to a common
 directory

This commit creates a `common` directory, aimed to host drivers supported by multiple boards of the CC13xx/CC26xx family.

We move the Sensortag SPI and External Flash drivers to this location and we change the Sensortag build system to pull the  respective files from therein.
---
 .../{sensortag => common}/board-spi.c             |  4 ++--
 .../{sensortag => common}/board-spi.h             | 15 ++++++++++++---
 .../{sensortag => common}/ext-flash.c             |  4 ++--
 .../{sensortag => common}/ext-flash.h             |  6 +++---
 .../srf06-cc26xx/sensortag/Makefile.sensortag     |  2 +-
 5 files changed, 20 insertions(+), 11 deletions(-)
 rename platform/srf06-cc26xx/{sensortag => common}/board-spi.c (98%)
 rename platform/srf06-cc26xx/{sensortag => common}/board-spi.h (89%)
 rename platform/srf06-cc26xx/{sensortag => common}/ext-flash.c (99%)
 rename platform/srf06-cc26xx/{sensortag => common}/ext-flash.h (95%)

diff --git a/platform/srf06-cc26xx/sensortag/board-spi.c b/platform/srf06-cc26xx/common/board-spi.c
similarity index 98%
rename from platform/srf06-cc26xx/sensortag/board-spi.c
rename to platform/srf06-cc26xx/common/board-spi.c
index 960db75c8..fb9fecd63 100644
--- a/platform/srf06-cc26xx/sensortag/board-spi.c
+++ b/platform/srf06-cc26xx/common/board-spi.c
@@ -33,7 +33,7 @@
  * @{
  *
  * \file
- * Board-specific SPI driver for the Sensortag-CC26xx
+ * Board-specific SPI driver common to the Sensortag and LaunchPad
  */
 /*---------------------------------------------------------------------------*/
 #include "contiki.h"
@@ -120,7 +120,7 @@ board_spi_open(uint32_t bit_rate, uint32_t clk_pin)
   /* First, make sure the SERIAL PD is on */
   ti_lib_prcm_power_domain_on(PRCM_DOMAIN_SERIAL);
   while((ti_lib_prcm_power_domain_status(PRCM_DOMAIN_SERIAL)
-        != PRCM_DOMAIN_POWER_ON));
+         != PRCM_DOMAIN_POWER_ON));
 
   /* Enable clock in active mode */
   ti_lib_rom_prcm_peripheral_run_enable(PRCM_PERIPH_SSI0);
diff --git a/platform/srf06-cc26xx/sensortag/board-spi.h b/platform/srf06-cc26xx/common/board-spi.h
similarity index 89%
rename from platform/srf06-cc26xx/sensortag/board-spi.h
rename to platform/srf06-cc26xx/common/board-spi.h
index 26bdff162..3699db120 100644
--- a/platform/srf06-cc26xx/sensortag/board-spi.h
+++ b/platform/srf06-cc26xx/common/board-spi.h
@@ -29,14 +29,22 @@
  */
 /*---------------------------------------------------------------------------*/
 /**
- * \addtogroup sensortag-cc26xx-peripherals
+ * \addtogroup cc26xx-srf-tag
  * @{
  *
- * \defgroup sensortag-cc26xx-spi SensorTag 2.0 SPI functions
+ * \defgroup common-cc26xx-peripherals CC13xx/CC26xx peripheral driver pool
+ *
+ * Drivers for peripherals present on more than one CC13xx/CC26xx board. For
+ * example, the same external flash driver is used for both the part found on
+ * the Sensortag as well as the part on the LaunchPad.
+ *
+ * @{
+ *
+ * \defgroup sensortag-cc26xx-spi SensorTag/LaunchPad SPI functions
  * @{
  *
  * \file
- * Header file for the Sensortag-CC26xx SPI Driver
+ * Header file for the Sensortag/LaunchPad SPI Driver
  */
 /*---------------------------------------------------------------------------*/
 #ifndef BOARD_SPI_H_
@@ -100,6 +108,7 @@ bool board_spi_write(const uint8_t *buf, size_t length);
 #endif /* BOARD_SPI_H_ */
 /*---------------------------------------------------------------------------*/
 /**
+ * @}
  * @}
  * @}
  */
diff --git a/platform/srf06-cc26xx/sensortag/ext-flash.c b/platform/srf06-cc26xx/common/ext-flash.c
similarity index 99%
rename from platform/srf06-cc26xx/sensortag/ext-flash.c
rename to platform/srf06-cc26xx/common/ext-flash.c
index d469c1d56..721a36424 100644
--- a/platform/srf06-cc26xx/sensortag/ext-flash.c
+++ b/platform/srf06-cc26xx/common/ext-flash.c
@@ -33,7 +33,7 @@
  * @{
  *
  * \file
- *  Driver for the Sensortag-CC26xx WinBond W25X20CL Flash
+ *  Driver for the LaunchPad Flash and the Sensortag WinBond W25X20CL/W25X40CL
  */
 /*---------------------------------------------------------------------------*/
 #include "contiki.h"
@@ -158,7 +158,7 @@ static uint8_t
 verify_part(void)
 {
   const uint8_t wbuf[] = { BLS_CODE_MDID, 0xFF, 0xFF, 0x00 };
-  uint8_t rbuf[2] = {0, 0};
+  uint8_t rbuf[2] = { 0, 0 };
   bool ret;
 
   select_on_bus();
diff --git a/platform/srf06-cc26xx/sensortag/ext-flash.h b/platform/srf06-cc26xx/common/ext-flash.h
similarity index 95%
rename from platform/srf06-cc26xx/sensortag/ext-flash.h
rename to platform/srf06-cc26xx/common/ext-flash.h
index 3038872cd..5f2717edb 100644
--- a/platform/srf06-cc26xx/sensortag/ext-flash.h
+++ b/platform/srf06-cc26xx/common/ext-flash.h
@@ -29,14 +29,14 @@
  */
 /*---------------------------------------------------------------------------*/
 /**
- * \addtogroup sensortag-cc26xx-peripherals
+ * \addtogroup common-cc26xx-peripherals
  * @{
  *
- * \defgroup sensortag-cc26xx-ext-flash SensorTag 2.0 External Flash
+ * \defgroup sensortag-cc26xx-ext-flash SensorTag/LaunchPad External Flash
  * @{
  *
  * \file
- * Header file for the Sensortag-CC26xx External Flash Driver
+ * Header file for the Sensortag/LaunchPad External Flash Driver
  */
 /*---------------------------------------------------------------------------*/
 #ifndef EXT_FLASH_H_
diff --git a/platform/srf06-cc26xx/sensortag/Makefile.sensortag b/platform/srf06-cc26xx/sensortag/Makefile.sensortag
index a37f8dd05..68e4b007f 100644
--- a/platform/srf06-cc26xx/sensortag/Makefile.sensortag
+++ b/platform/srf06-cc26xx/sensortag/Makefile.sensortag
@@ -1,7 +1,7 @@
 CFLAGS += -DBOARD_SENSORTAG=1
 CFLAGS += -DBACKDOOR_IOID=0x00000000
 
-CONTIKI_TARGET_DIRS += sensortag
+CONTIKI_TARGET_DIRS += sensortag common
 
 BOARD_SOURCEFILES += sensortag-sensors.c  sensor-common.c
 BOARD_SOURCEFILES += bmp-280-sensor.c tmp-007-sensor.c opt-3001-sensor.c

From 387bb96ca47a824828b6024beac623006a950e79 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Sun, 24 Jan 2016 16:53:47 +0000
Subject: [PATCH 014/393] Add support for the CC2650 LaunchPad

---
 .../srf06-cc26xx/launchpad/Makefile.launchpad |   6 +
 .../launchpad/board-peripherals.h             |  56 +++++
 platform/srf06-cc26xx/launchpad/board.c       | 115 +++++++++
 .../srf06-cc26xx/launchpad/button-sensor.c    | 218 ++++++++++++++++++
 .../srf06-cc26xx/launchpad/button-sensor.h    |  65 ++++++
 .../launchpad/cc2650/Makefile.cc2650          |   8 +
 .../srf06-cc26xx/launchpad/cc2650/board.h     | 189 +++++++++++++++
 .../launchpad/launchpad-sensors.c             |  47 ++++
 platform/srf06-cc26xx/launchpad/leds-arch.c   |  81 +++++++
 9 files changed, 785 insertions(+)
 create mode 100644 platform/srf06-cc26xx/launchpad/Makefile.launchpad
 create mode 100644 platform/srf06-cc26xx/launchpad/board-peripherals.h
 create mode 100644 platform/srf06-cc26xx/launchpad/board.c
 create mode 100644 platform/srf06-cc26xx/launchpad/button-sensor.c
 create mode 100644 platform/srf06-cc26xx/launchpad/button-sensor.h
 create mode 100644 platform/srf06-cc26xx/launchpad/cc2650/Makefile.cc2650
 create mode 100644 platform/srf06-cc26xx/launchpad/cc2650/board.h
 create mode 100644 platform/srf06-cc26xx/launchpad/launchpad-sensors.c
 create mode 100644 platform/srf06-cc26xx/launchpad/leds-arch.c

diff --git a/platform/srf06-cc26xx/launchpad/Makefile.launchpad b/platform/srf06-cc26xx/launchpad/Makefile.launchpad
new file mode 100644
index 000000000..deefeed81
--- /dev/null
+++ b/platform/srf06-cc26xx/launchpad/Makefile.launchpad
@@ -0,0 +1,6 @@
+CFLAGS += -DBOARD_LAUNCHPAD=1
+
+CONTIKI_TARGET_DIRS += launchpad common
+
+BOARD_SOURCEFILES += board.c launchpad-sensors.c leds-arch.c button-sensor.c
+BOARD_SOURCEFILES += ext-flash.c board-spi.c
diff --git a/platform/srf06-cc26xx/launchpad/board-peripherals.h b/platform/srf06-cc26xx/launchpad/board-peripherals.h
new file mode 100644
index 000000000..3e1220234
--- /dev/null
+++ b/platform/srf06-cc26xx/launchpad/board-peripherals.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2015, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/** \addtogroup cc26xx-srf-tag
+ * @{
+ *
+ * \defgroup launchpad-peripherals LaunchPad peripherals
+ *
+ * Defines related to LaunchPad peripherals.
+ *
+ * @{
+ *
+ * \file
+ * Header file with definitions related to LaunchPad peripherals
+ *
+ * \note   Do not include this file directly.
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef BOARD_PERIPHERALS_H_
+#define BOARD_PERIPHERALS_H_
+/*---------------------------------------------------------------------------*/
+#include "ext-flash.h"
+/*---------------------------------------------------------------------------*/
+#endif /* BOARD_PERIPHERALS_H_ */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/srf06-cc26xx/launchpad/board.c b/platform/srf06-cc26xx/launchpad/board.c
new file mode 100644
index 000000000..6482212d8
--- /dev/null
+++ b/platform/srf06-cc26xx/launchpad/board.c
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2015, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup launchpad-peripherals
+ * @{
+ *
+ * \file
+ *  LaunchPad-specific board initialisation driver
+ */
+/*---------------------------------------------------------------------------*/
+#include "contiki-conf.h"
+#include "lib/sensors.h"
+#include "lpm.h"
+#include "ti-lib.h"
+#include "board-peripherals.h"
+
+#include <stdint.h>
+#include <string.h>
+#include <stdbool.h>
+/*---------------------------------------------------------------------------*/
+static void
+wakeup_handler(void)
+{
+  /* Turn on the PERIPH PD */
+  ti_lib_prcm_power_domain_on(PRCM_DOMAIN_PERIPH);
+  while((ti_lib_prcm_power_domain_status(PRCM_DOMAIN_PERIPH)
+         != PRCM_DOMAIN_POWER_ON));
+}
+/*---------------------------------------------------------------------------*/
+/*
+ * Declare a data structure to register with LPM.
+ * We don't care about what power mode we'll drop to, we don't care about
+ * getting notified before deep sleep. All we need is to be notified when we
+ * wake up so we can turn power domains back on
+ */
+LPM_MODULE(launchpad_module, NULL, NULL, wakeup_handler, LPM_DOMAIN_NONE);
+/*---------------------------------------------------------------------------*/
+static void
+configure_unused_pins(void)
+{
+  uint32_t pins[] = {
+    BOARD_IOID_CS, BOARD_IOID_TDO, BOARD_IOID_TDI, BOARD_IOID_DIO12,
+    BOARD_IOID_DIO15, BOARD_IOID_DIO21, BOARD_IOID_DIO22, BOARD_IOID_DIO23,
+    BOARD_IOID_DIO24, BOARD_IOID_DIO25, BOARD_IOID_DIO26, BOARD_IOID_DIO27,
+    BOARD_IOID_DIO28, BOARD_IOID_DIO29, BOARD_IOID_DIO30,
+    IOID_UNUSED
+  };
+
+  uint32_t *pin;
+
+  for(pin = pins; *pin != IOID_UNUSED; pin++) {
+    ti_lib_ioc_pin_type_gpio_input(*pin);
+    ti_lib_ioc_io_port_pull_set(*pin, IOC_IOPULL_DOWN);
+  }
+}
+/*---------------------------------------------------------------------------*/
+void
+board_init()
+{
+  /* Disable global interrupts */
+  bool int_disabled = ti_lib_int_master_disable();
+
+  /* Turn on relevant PDs */
+  wakeup_handler();
+
+  /* Enable GPIO peripheral */
+  ti_lib_prcm_peripheral_run_enable(PRCM_PERIPH_GPIO);
+
+  /* Apply settings and wait for them to take effect */
+  ti_lib_prcm_load_set();
+  while(!ti_lib_prcm_load_get());
+
+  /* Make sure the external flash is in the lower power mode */
+  ext_flash_init();
+
+  lpm_register_module(&launchpad_module);
+
+  /* For unsupported peripherals, select a default pin configuration */
+  configure_unused_pins();
+
+  /* Re-enable interrupt if initially enabled. */
+  if(!int_disabled) {
+    ti_lib_int_master_enable();
+  }
+}
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/platform/srf06-cc26xx/launchpad/button-sensor.c b/platform/srf06-cc26xx/launchpad/button-sensor.c
new file mode 100644
index 000000000..d37369d0a
--- /dev/null
+++ b/platform/srf06-cc26xx/launchpad/button-sensor.c
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2015, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup launchpad-button-sensor
+ * @{
+ *
+ * \file
+ * Driver for LaunchPad buttons
+ */
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+#include "lib/sensors.h"
+#include "launchpad/button-sensor.h"
+#include "gpio-interrupt.h"
+#include "sys/timer.h"
+#include "lpm.h"
+
+#include "ti-lib.h"
+
+#include <stdint.h>
+/*---------------------------------------------------------------------------*/
+#ifdef BUTTON_SENSOR_CONF_ENABLE_SHUTDOWN
+#define BUTTON_SENSOR_ENABLE_SHUTDOWN BUTTON_SENSOR_CONF_ENABLE_SHUTDOWN
+#else
+#define BUTTON_SENSOR_ENABLE_SHUTDOWN 1
+#endif
+/*---------------------------------------------------------------------------*/
+#define BUTTON_GPIO_CFG         (IOC_CURRENT_2MA  | IOC_STRENGTH_AUTO | \
+                                 IOC_IOPULL_UP    | IOC_SLEW_DISABLE  | \
+                                 IOC_HYST_DISABLE | IOC_BOTH_EDGES    | \
+                                 IOC_INT_ENABLE   | IOC_IOMODE_NORMAL | \
+                                 IOC_NO_WAKE_UP   | IOC_INPUT_ENABLE)
+/*---------------------------------------------------------------------------*/
+#define DEBOUNCE_DURATION (CLOCK_SECOND >> 5)
+
+struct btn_timer {
+  struct timer debounce;
+  clock_time_t start;
+  clock_time_t duration;
+};
+
+static struct btn_timer left_timer, right_timer;
+/*---------------------------------------------------------------------------*/
+static void
+button_press_handler(uint8_t ioid)
+{
+  if(ioid == BOARD_IOID_KEY_LEFT) {
+    if(!timer_expired(&left_timer.debounce)) {
+      return;
+    }
+
+    timer_set(&left_timer.debounce, DEBOUNCE_DURATION);
+
+    /*
+     * Start press duration counter on press (falling), notify on release
+     * (rising)
+     */
+    if(ti_lib_gpio_pin_read(BOARD_KEY_LEFT) == 0) {
+      left_timer.start = clock_time();
+      left_timer.duration = 0;
+    } else {
+      left_timer.duration = clock_time() - left_timer.start;
+      sensors_changed(&button_left_sensor);
+    }
+  }
+
+  if(ioid == BOARD_IOID_KEY_RIGHT) {
+    if(BUTTON_SENSOR_ENABLE_SHUTDOWN == 0) {
+      if(!timer_expired(&right_timer.debounce)) {
+        return;
+      }
+
+      timer_set(&right_timer.debounce, DEBOUNCE_DURATION);
+
+      /*
+       * Start press duration counter on press (falling), notify on release
+       * (rising)
+       */
+      if(ti_lib_gpio_pin_read(BOARD_KEY_RIGHT) == 0) {
+        right_timer.start = clock_time();
+        right_timer.duration = 0;
+      } else {
+        right_timer.duration = clock_time() - right_timer.start;
+        sensors_changed(&button_right_sensor);
+      }
+    } else {
+      lpm_shutdown(BOARD_IOID_KEY_RIGHT, IOC_IOPULL_UP, IOC_WAKE_ON_LOW);
+    }
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+config_buttons(int type, int c, uint32_t key)
+{
+  switch(type) {
+  case SENSORS_HW_INIT:
+    ti_lib_gpio_event_clear(1 << key);
+    ti_lib_ioc_port_configure_set(key, IOC_PORT_GPIO, BUTTON_GPIO_CFG);
+    ti_lib_gpio_dir_mode_set((1 << key), GPIO_DIR_MODE_IN);
+    gpio_interrupt_register_handler(key, button_press_handler);
+    break;
+  case SENSORS_ACTIVE:
+    if(c) {
+      ti_lib_gpio_event_clear(1 << key);
+      ti_lib_ioc_port_configure_set(key, IOC_PORT_GPIO, BUTTON_GPIO_CFG);
+      ti_lib_gpio_dir_mode_set((1 << key), GPIO_DIR_MODE_IN);
+      ti_lib_ioc_int_enable(key);
+    } else {
+      ti_lib_ioc_int_disable(key);
+    }
+    break;
+  default:
+    break;
+  }
+}
+/*---------------------------------------------------------------------------*/
+static int
+config_left(int type, int value)
+{
+  config_buttons(type, value, BOARD_IOID_KEY_LEFT);
+
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+static int
+config_right(int type, int value)
+{
+  config_buttons(type, value, BOARD_IOID_KEY_RIGHT);
+
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type, uint32_t key_io_id)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+  case SENSORS_READY:
+    if(ti_lib_ioc_port_configure_get(key_io_id) & IOC_INT_ENABLE) {
+      return 1;
+    }
+    break;
+  default:
+    break;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+value_left(int type)
+{
+  if(type == BUTTON_SENSOR_VALUE_STATE) {
+    return ti_lib_gpio_pin_read(BOARD_KEY_LEFT) == 0 ?
+           BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
+  } else if(type == BUTTON_SENSOR_VALUE_DURATION) {
+    return (int)left_timer.duration;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+value_right(int type)
+{
+  if(type == BUTTON_SENSOR_VALUE_STATE) {
+    return ti_lib_gpio_pin_read(BOARD_KEY_RIGHT) == 0 ?
+           BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
+  } else if(type == BUTTON_SENSOR_VALUE_DURATION) {
+    return (int)right_timer.duration;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+status_left(int type)
+{
+  return status(type, BOARD_IOID_KEY_LEFT);
+}
+/*---------------------------------------------------------------------------*/
+static int
+status_right(int type)
+{
+  return status(type, BOARD_IOID_KEY_RIGHT);
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(button_left_sensor, BUTTON_SENSOR, value_left, config_left,
+               status_left);
+SENSORS_SENSOR(button_right_sensor, BUTTON_SENSOR, value_right, config_right,
+               status_right);
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/platform/srf06-cc26xx/launchpad/button-sensor.h b/platform/srf06-cc26xx/launchpad/button-sensor.h
new file mode 100644
index 000000000..0c945d3f7
--- /dev/null
+++ b/platform/srf06-cc26xx/launchpad/button-sensor.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2015, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup launchpad-peripherals
+ * @{
+ *
+ * \defgroup launchpad-button-sensor LaunchPad Button Driver
+ *
+ * One of the buttons can be configured as general purpose or as an on/off key
+ * @{
+ *
+ * \file
+ * Header file for the LaunchPad Button Driver
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef BUTTON_SENSOR_H_
+#define BUTTON_SENSOR_H_
+/*---------------------------------------------------------------------------*/
+#include "lib/sensors.h"
+/*---------------------------------------------------------------------------*/
+#define BUTTON_SENSOR "Button"
+/*---------------------------------------------------------------------------*/
+#define BUTTON_SENSOR_VALUE_STATE    0
+#define BUTTON_SENSOR_VALUE_DURATION 1
+
+#define BUTTON_SENSOR_VALUE_RELEASED 0
+#define BUTTON_SENSOR_VALUE_PRESSED  1
+/*---------------------------------------------------------------------------*/
+extern const struct sensors_sensor button_left_sensor;
+extern const struct sensors_sensor button_right_sensor;
+/*---------------------------------------------------------------------------*/
+#endif /* BUTTON_SENSOR_H_ */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/srf06-cc26xx/launchpad/cc2650/Makefile.cc2650 b/platform/srf06-cc26xx/launchpad/cc2650/Makefile.cc2650
new file mode 100644
index 000000000..72e50de3a
--- /dev/null
+++ b/platform/srf06-cc26xx/launchpad/cc2650/Makefile.cc2650
@@ -0,0 +1,8 @@
+### Will allow the inclusion of the correct CPU makefile
+CPU_FAMILY = cc26xx
+
+### Add to the source dirs
+CONTIKI_TARGET_DIRS += launchpad/cc2650
+
+### Include the common launchpad makefile
+include $(PLATFORM_ROOT_DIR)/launchpad/Makefile.launchpad
diff --git a/platform/srf06-cc26xx/launchpad/cc2650/board.h b/platform/srf06-cc26xx/launchpad/cc2650/board.h
new file mode 100644
index 000000000..a65ca5361
--- /dev/null
+++ b/platform/srf06-cc26xx/launchpad/cc2650/board.h
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2015, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/** \addtogroup launchpad-peripherals
+ * @{
+ *
+ * \defgroup launchpad-cc26xx-specific CC2650 LaunchPad Peripherals
+ *
+ * Defines related to the CC2650 LaunchPad
+ *
+ * This file provides connectivity information on LEDs, Buttons, UART and
+ * other peripherals
+ *
+ * This file is not meant to be modified by the user.
+ * @{
+ *
+ * \file
+ * Header file with definitions related to the I/O connections on the TI
+ * CC2650 LaunchPad
+ *
+ * \note   Do not include this file directly. It gets included by contiki-conf
+ *         after all relevant directives have been set.
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef BOARD_H_
+#define BOARD_H_
+/*---------------------------------------------------------------------------*/
+#include "ioc.h"
+/*---------------------------------------------------------------------------*/
+/**
+ * \name LED configurations
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+/* Some files include leds.h before us, so we need to get rid of defaults in
+ * leds.h before we provide correct definitions */
+#undef LEDS_GREEN
+#undef LEDS_YELLOW
+#undef LEDS_RED
+#undef LEDS_CONF_ALL
+
+#define LEDS_RED       1
+#define LEDS_GREEN     2
+#define LEDS_YELLOW    LEDS_GREEN
+#define LEDS_ORANGE    LEDS_RED
+
+#define LEDS_CONF_ALL  3
+
+/* Notify various examples that we have LEDs */
+#define PLATFORM_HAS_LEDS        1
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name LED IOID mappings
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#define BOARD_IOID_LED_1          IOID_6
+#define BOARD_IOID_LED_2          IOID_7
+#define BOARD_LED_1               (1 << BOARD_IOID_LED_1)
+#define BOARD_LED_2               (1 << BOARD_IOID_LED_2)
+#define BOARD_LED_ALL             (BOARD_LED_1 | BOARD_LED_2)
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name UART IOID mapping
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#define BOARD_IOID_UART_RX        IOID_2
+#define BOARD_IOID_UART_TX        IOID_3
+#define BOARD_IOID_UART_RTS       IOID_18
+#define BOARD_IOID_UART_CTS       IOID_19
+#define BOARD_UART_RX             (1 << BOARD_IOID_UART_RX)
+#define BOARD_UART_TX             (1 << BOARD_IOID_UART_TX)
+#define BOARD_UART_RTS            (1 << BOARD_IOID_UART_RTS)
+#define BOARD_UART_CTS            (1 << BOARD_IOID_UART_CTS)
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name Button IOID mapping
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#define BOARD_IOID_KEY_LEFT       IOID_13
+#define BOARD_IOID_KEY_RIGHT      IOID_14
+#define BOARD_KEY_LEFT            (1 << BOARD_IOID_KEY_LEFT)
+#define BOARD_KEY_RIGHT           (1 << BOARD_IOID_KEY_RIGHT)
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief SPI IOID mappings
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#define BOARD_IOID_SPI_MOSI       IOID_9
+#define BOARD_IOID_SPI_MISO       IOID_8
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name External flash IOID mapping
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#define BOARD_IOID_FLASH_CS       IOID_20
+#define BOARD_FLASH_CS            (1 << BOARD_IOID_FLASH_CS)
+#define BOARD_IOID_SPI_CLK_FLASH  IOID_10
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief I2C IOID mappings
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#define BOARD_IOID_SCL            IOID_4
+#define BOARD_IOID_SDA            IOID_5
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Remaining pins
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#define BOARD_IOID_CS             IOID_11
+#define BOARD_IOID_TDO            IOID_16
+#define BOARD_IOID_TDI            IOID_17
+#define BOARD_IOID_DIO12          IOID_12
+#define BOARD_IOID_DIO15          IOID_15
+#define BOARD_IOID_DIO21          IOID_21
+#define BOARD_IOID_DIO22          IOID_22
+#define BOARD_IOID_DIO23          IOID_23
+#define BOARD_IOID_DIO24          IOID_24
+#define BOARD_IOID_DIO25          IOID_25
+#define BOARD_IOID_DIO26          IOID_26
+#define BOARD_IOID_DIO27          IOID_27
+#define BOARD_IOID_DIO28          IOID_28
+#define BOARD_IOID_DIO29          IOID_29
+#define BOARD_IOID_DIO30          IOID_30
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name Device string used on startup
+ * @{
+ */
+#define BOARD_STRING "TI CC2650 LaunchPad"
+
+/** @} */
+/*---------------------------------------------------------------------------*/
+#endif /* BOARD_H_ */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/srf06-cc26xx/launchpad/launchpad-sensors.c b/platform/srf06-cc26xx/launchpad/launchpad-sensors.c
new file mode 100644
index 000000000..c940ec68c
--- /dev/null
+++ b/platform/srf06-cc26xx/launchpad/launchpad-sensors.c
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2015, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup launchpad-peripherals
+ * @{
+ *
+ * \file
+ * Generic module controlling LaunchPad sensors
+ */
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+#include "launchpad/button-sensor.h"
+
+#include <string.h>
+/*---------------------------------------------------------------------------*/
+/** \brief Exports a global symbol to be used by the sensor API */
+SENSORS(&button_left_sensor, &button_right_sensor);
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/platform/srf06-cc26xx/launchpad/leds-arch.c b/platform/srf06-cc26xx/launchpad/leds-arch.c
new file mode 100644
index 000000000..e853487fd
--- /dev/null
+++ b/platform/srf06-cc26xx/launchpad/leds-arch.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2015, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup launchpad-peripherals
+ * @{
+ *
+ * \file
+ *  Driver for LaunchPad LEDs
+ */
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+#include "dev/leds.h"
+
+#include "ti-lib.h"
+/*---------------------------------------------------------------------------*/
+static unsigned char c;
+static int inited = 0;
+/*---------------------------------------------------------------------------*/
+void
+leds_arch_init(void)
+{
+  if(inited) {
+    return;
+  }
+  inited = 1;
+
+  ti_lib_rom_ioc_pin_type_gpio_output(BOARD_IOID_LED_1);
+  ti_lib_rom_ioc_pin_type_gpio_output(BOARD_IOID_LED_2);
+
+  ti_lib_gpio_pin_write(BOARD_LED_ALL, 0);
+}
+/*---------------------------------------------------------------------------*/
+unsigned char
+leds_arch_get(void)
+{
+  return c;
+}
+/*---------------------------------------------------------------------------*/
+void
+leds_arch_set(unsigned char leds)
+{
+  c = leds;
+  ti_lib_gpio_pin_write(BOARD_LED_ALL, 0);
+
+  if((leds & LEDS_RED) == LEDS_RED) {
+    ti_lib_gpio_pin_write(BOARD_LED_1, 1);
+  }
+  if((leds & LEDS_YELLOW) == LEDS_YELLOW) {
+    ti_lib_gpio_pin_write(BOARD_LED_2, 1);
+  }
+}
+/*---------------------------------------------------------------------------*/
+/** @} */

From 54f0a2ecbd8cdd64f8e022d5478ae8e383bcff1a Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Sun, 24 Jan 2016 16:54:20 +0000
Subject: [PATCH 015/393] Extend the CC26xx demo to support the LaunchPad

---
 examples/cc26xx/cc26xx-demo.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/examples/cc26xx/cc26xx-demo.c b/examples/cc26xx/cc26xx-demo.c
index 544ae4dd8..53c607837 100644
--- a/examples/cc26xx/cc26xx-demo.c
+++ b/examples/cc26xx/cc26xx-demo.c
@@ -44,6 +44,7 @@
  *   This example will work for the following boards:
  *   - srf06-cc26xx: SmartRF06EB + CC26XX EM
  *   - sensortag-cc26xx: CC26XX sensortag
+ *   - The CC2650 LaunchPad
  *
  *   By default, the example will build for the srf06-cc26xx board. To switch
  *   between platforms:
@@ -114,6 +115,10 @@
 #define CC26XX_DEMO_SENSOR_3     CC26XX_DEMO_SENSOR_NONE
 #define CC26XX_DEMO_SENSOR_4     CC26XX_DEMO_SENSOR_NONE
 #define CC26XX_DEMO_SENSOR_5     &reed_relay_sensor
+#elif BOARD_LAUNCHPAD
+#define CC26XX_DEMO_SENSOR_3     CC26XX_DEMO_SENSOR_NONE
+#define CC26XX_DEMO_SENSOR_4     CC26XX_DEMO_SENSOR_NONE
+#define CC26XX_DEMO_SENSOR_5     CC26XX_DEMO_SENSOR_NONE
 #else
 #define CC26XX_DEMO_SENSOR_3     &button_up_sensor
 #define CC26XX_DEMO_SENSOR_4     &button_down_sensor
@@ -423,7 +428,7 @@ PROCESS_THREAD(cc26xx_demo_process, ev, data)
         get_tmp_reading();
       } else if(ev == sensors_event && data == &mpu_9250_sensor) {
         get_mpu_reading();
-#else
+#elif BOARD_SMARTRF06EB
         printf("Sel: Pin %d, press duration %d clock ticks\n",
                button_select_sensor.value(BUTTON_SENSOR_VALUE_STATE),
                button_select_sensor.value(BUTTON_SENSOR_VALUE_DURATION));

From 61e619dfcd340d22b7e79a37963389f7cadabae8 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Sun, 24 Jan 2016 16:54:45 +0000
Subject: [PATCH 016/393] Extend the CC26xx web demo to support the LaunchPad

---
 .../cc26xx/cc26xx-web-demo/cc26xx-web-demo.c   |  4 ++--
 .../cc26xx/cc26xx-web-demo/cc26xx-web-demo.h   |  2 ++
 examples/cc26xx/cc26xx-web-demo/coap-server.c  | 18 ++++++++----------
 .../cc26xx-web-demo/resources/res-leds.c       |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c b/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c
index 1eaf35648..a363c31d5 100644
--- a/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c
+++ b/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c
@@ -175,7 +175,7 @@ static void
 save_config()
 {
   /* Dump current running config to flash */
-#if BOARD_SENSORTAG
+#if BOARD_SENSORTAG || BOARD_LAUNCHPAD
   int rv;
   cc26xx_web_demo_sensor_reading_t *reading = NULL;
 
@@ -218,7 +218,7 @@ save_config()
 static void
 load_config()
 {
-#if BOARD_SENSORTAG
+#if BOARD_SENSORTAG || BOARD_LAUNCHPAD
   /* Read from flash into a temp buffer */
   cc26xx_web_demo_config_t tmp_cfg;
   cc26xx_web_demo_sensor_reading_t *reading = NULL;
diff --git a/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h b/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h
index 026461f32..14bf3150c 100644
--- a/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h
+++ b/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h
@@ -100,6 +100,8 @@
 #if BOARD_SENSORTAG
 /* Force an MQTT publish on sensor event */
 #define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER &reed_relay_sensor
+#elif BOARD_LAUNCHPAD
+#define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER &button_left_sensor
 #else
 #define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER &button_down_sensor
 #endif
diff --git a/examples/cc26xx/cc26xx-web-demo/coap-server.c b/examples/cc26xx/cc26xx-web-demo/coap-server.c
index 9b4155d00..518065f6e 100644
--- a/examples/cc26xx/cc26xx-web-demo/coap-server.c
+++ b/examples/cc26xx/cc26xx-web-demo/coap-server.c
@@ -63,6 +63,9 @@ extern resource_t res_parent_ip;
 extern resource_t res_ble_advd;
 #endif
 
+extern resource_t res_toggle_red;
+extern resource_t res_toggle_green;
+
 /* Board-specific resources */
 #if BOARD_SENSORTAG
 extern resource_t res_bmp280_temp;
@@ -78,11 +81,7 @@ extern resource_t res_mpu_acc_z;
 extern resource_t res_mpu_gyro_x;
 extern resource_t res_mpu_gyro_y;
 extern resource_t res_mpu_gyro_z;
-extern resource_t res_toggle_red;
-extern resource_t res_toggle_green;
 #else
-extern resource_t res_toggle_red;
-extern resource_t res_toggle_green;
 extern resource_t res_toggle_orange;
 extern resource_t res_toggle_yellow;
 #endif
@@ -96,6 +95,11 @@ const char *coap_server_supported_msg = "Supported:"
 static void
 start_board_resources(void)
 {
+
+  rest_activate_resource(&res_toggle_green, "lt/g");
+  rest_activate_resource(&res_toggle_red, "lt/r");
+  rest_activate_resource(&res_leds, "lt");
+
 #if BOARD_SENSORTAG
   rest_activate_resource(&res_bmp280_temp, "sen/bar/temp");
   rest_activate_resource(&res_bmp280_press, "sen/bar/pres");
@@ -110,14 +114,8 @@ start_board_resources(void)
   rest_activate_resource(&res_mpu_gyro_x, "sen/mpu/gyro/x");
   rest_activate_resource(&res_mpu_gyro_y, "sen/mpu/gyro/y");
   rest_activate_resource(&res_mpu_gyro_z, "sen/mpu/gyro/z");
-  rest_activate_resource(&res_leds, "lt");
-  rest_activate_resource(&res_toggle_green, "lt/g");
-  rest_activate_resource(&res_toggle_red, "lt/r");
 #elif BOARD_SMARTRF06EB
-  rest_activate_resource(&res_leds, "lt");
-  rest_activate_resource(&res_toggle_red, "lt/r");
   rest_activate_resource(&res_toggle_yellow, "lt/y");
-  rest_activate_resource(&res_toggle_green, "lt/g");
   rest_activate_resource(&res_toggle_orange, "lt/o");
 #endif
 }
diff --git a/examples/cc26xx/cc26xx-web-demo/resources/res-leds.c b/examples/cc26xx/cc26xx-web-demo/resources/res-leds.c
index 2a86ad25b..85ce353b5 100644
--- a/examples/cc26xx/cc26xx-web-demo/resources/res-leds.c
+++ b/examples/cc26xx/cc26xx-web-demo/resources/res-leds.c
@@ -94,7 +94,7 @@ res_post_put_handler(void *request, void *response, uint8_t *buffer,
  * A simple actuator example, depending on the color query parameter and post
  * variable mode, corresponding led is activated or deactivated
  */
-#if BOARD_SENSORTAG
+#if BOARD_SENSORTAG || BOARD_LAUNCHPAD
 #define RESOURCE_PARAMS "r|g"
 #elif BOARD_SMARTRF06EB
 #define RESOURCE_PARAMS "r|g|y|o"

From c71eacbcc92e232e95250e3a905a93c16d075a6c Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Sun, 24 Jan 2016 16:56:22 +0000
Subject: [PATCH 017/393] Compile-test CC2650 LaunchPad sources

---
 regression-tests/18-compile-arm-ports/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/regression-tests/18-compile-arm-ports/Makefile b/regression-tests/18-compile-arm-ports/Makefile
index a292bb3e3..4243e05b0 100644
--- a/regression-tests/18-compile-arm-ports/Makefile
+++ b/regression-tests/18-compile-arm-ports/Makefile
@@ -11,6 +11,7 @@ cc26xx/cc26xx-web-demo/srf06-cc26xx \
 cc26xx/very-sleepy-demo/srf06-cc26xx:BOARD=sensortag/cc2650 \
 cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=sensortag/cc2650 \
 cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=srf06/cc13xx \
+cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc2650 \
 cc26xx/very-sleepy-demo/srf06-cc26xx \
 hello-world/cc2538dk \
 ipv6/rpl-border-router/cc2538dk \

From deb633216cc3150db632a51e3c1b976bcf310bed Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Sun, 24 Jan 2016 16:57:08 +0000
Subject: [PATCH 018/393] Document support for the CC2650 LaunchPad

---
 platform/srf06-cc26xx/README.md      | 6 ++++++
 platform/srf06-cc26xx/contiki-main.c | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/platform/srf06-cc26xx/README.md b/platform/srf06-cc26xx/README.md
index 32071745c..1be849c3b 100644
--- a/platform/srf06-cc26xx/README.md
+++ b/platform/srf06-cc26xx/README.md
@@ -7,6 +7,7 @@ platform supports two different boards:
 * SmartRF 06 Evaluation Board with a CC26xx or CC13xx Evaluation Module
   (relevant files and drivers are under `srf06/`)
 * CC2650 SensorTag 2.0 (relevant drivers under `sensortag/cc2650`)
+* CC2650 LaunchPad (relevant drivers under `launchpad/cc2650`)
 
 The CPU code, common for both platforms, can be found under `$(CONTIKI)/cpu/cc26xx-cc13xx`.
 The port was developed and tested with CC2650s, but the intention is for it to
@@ -44,6 +45,10 @@ In terms of hardware support, the following drivers have been implemented:
   * OPT3001 sensor
   * Buzzer
   * External SPI flash
+* Launchpad
+  * LEDs
+  * Buttons
+  * External SPI flash
 
 Requirements
 ============
@@ -93,6 +98,7 @@ Other options for the `BOARD` make variable are:
 * Srf06+CC26xxEM: Set `BOARD=srf06/cc26xx`
 * Srf06+CC13xxEM: Set `BOARD=srf06/cc13xx`
 * CC2650 tag: Set `BOARD=sensortag/cc2650`
+* CC2650 Launchpad: Set `BOARD=launchpad/cc2650`
 
 If the `BOARD` variable is unspecified, an image for the Srf06 CC26XXEM will be built.
 
diff --git a/platform/srf06-cc26xx/contiki-main.c b/platform/srf06-cc26xx/contiki-main.c
index 83b67118f..b103918e7 100644
--- a/platform/srf06-cc26xx/contiki-main.c
+++ b/platform/srf06-cc26xx/contiki-main.c
@@ -32,12 +32,13 @@
  * \addtogroup cc26xx-platforms
  * @{
  *
- * \defgroup cc26xx-srf-tag SmartRF+CC13xx/CC26xx EM and the CC2650 SensorTag
+ * \defgroup cc26xx-srf-tag SmartRF+CC13xx/CC26xx EM, CC2650 SensorTag and LaunchPad
  *
  * This platform supports a number of different boards:
  * - A standard TI SmartRF06EB with a CC26xx EM mounted on it
  * - A standard TI SmartRF06EB with a CC1310 EM mounted on it
  * - The new TI SensorTag2.0
+ * - The TI CC2650 LaunchPad
  * @{
  */
 #include "ti-lib.h"

From 16145f645a1a48abb865f978ffea847ae7f4b027 Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Fri, 12 Feb 2016 13:45:25 -0800
Subject: [PATCH 019/393] galileo: build_newlib.sh: Only apply patch files with
 the extension ".patch"

This avoids treating as patches other files that may happen to be
present in the newlib patch directory in a working tree.
---
 platform/galileo/bsp/libc/build_newlib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/galileo/bsp/libc/build_newlib.sh b/platform/galileo/bsp/libc/build_newlib.sh
index cef167e14..a3354a286 100755
--- a/platform/galileo/bsp/libc/build_newlib.sh
+++ b/platform/galileo/bsp/libc/build_newlib.sh
@@ -38,7 +38,7 @@ prepare() {
     tar xf ${TARBALL}
     cd ${SRC_DIR}
 
-    for i in  `ls ${PATCH_DIR}`; do patch -p0 < ${PATCH_DIR}/${i}; done
+    for i in  `ls ${PATCH_DIR}/*.patch`; do patch -p0 < ${i}; done
 }
 
 

From 1cc659d882bbb07f1bb9c2f993cc4127163c0e9f Mon Sep 17 00:00:00 2001
From: Wojciech Bober <wojciech.bober@nordicsemi.no>
Date: Sat, 24 Oct 2015 18:21:05 +0200
Subject: [PATCH 020/393] Allow for using a fixed frame header length.

When SICSLOWPAN_FRAMER_HDRLEN is defined its value is used
as a frame header length. This allows for using sicslowpan
without calling a framer. This is usefull if framer is not
used on a given platform or when header length is always
the same.

In addition this commit also fixes an inline define.
---
 core/net/ipv6/sicslowpan.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/net/ipv6/sicslowpan.c b/core/net/ipv6/sicslowpan.c
index d0bf14799..7fbdbefc7 100644
--- a/core/net/ipv6/sicslowpan.c
+++ b/core/net/ipv6/sicslowpan.c
@@ -169,6 +169,14 @@ void uip_log(char *msg);
 #define COMPRESSION_THRESHOLD 0
 #endif
 
+/** \brief Fixed size of a frame header. This value is
+ * used in case framer returns an error or if SICSLOWPAN_USE_FIXED_HDRLEN
+ * is defined.
+ */
+#ifndef SICSLOWPAN_FIXED_HDRLEN
+#define SICSLOWPAN_FIXED_HDRLEN 21
+#endif
+
 /** \name General variables
  *  @{
  */
@@ -1345,16 +1353,15 @@ output(const uip_lladdr_t *localdest)
   /* Calculate NETSTACK_FRAMER's header length, that will be added in the NETSTACK_RDC.
    * We calculate it here only to make a better decision of whether the outgoing packet
    * needs to be fragmented or not. */
-#define USE_FRAMER_HDRLEN 1
-#if USE_FRAMER_HDRLEN
+#ifndef SICSLOWPAN_USE_FIXED_HDRLEN
   packetbuf_set_addr(PACKETBUF_ADDR_RECEIVER, &dest);
   framer_hdrlen = NETSTACK_FRAMER.length();
   if(framer_hdrlen < 0) {
     /* Framing failed, we assume the maximum header length */
-    framer_hdrlen = 21;
+    framer_hdrlen = SICSLOWPAN_FIXED_HDRLEN;
   }
 #else /* USE_FRAMER_HDRLEN */
-  framer_hdrlen = 21;
+  framer_hdrlen = SICSLOWPAN_FIXED_HDRLEN;
 #endif /* USE_FRAMER_HDRLEN */
 
   max_payload = MAC_MAX_PAYLOAD - framer_hdrlen;

From 803d170b55ab8725c8a3733c83ae06afea126bab Mon Sep 17 00:00:00 2001
From: Wojciech Bober <wojciech.bober@nordicsemi.no>
Date: Wed, 23 Dec 2015 21:21:51 +0100
Subject: [PATCH 021/393] Fixed unsused variable warning when
 SICSLOWPAN_CONF_FRAG is undefined

---
 core/net/ipv6/sicslowpan.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/net/ipv6/sicslowpan.c b/core/net/ipv6/sicslowpan.c
index 7fbdbefc7..5453d9e21 100644
--- a/core/net/ipv6/sicslowpan.c
+++ b/core/net/ipv6/sicslowpan.c
@@ -1285,11 +1285,6 @@ output(const uip_lladdr_t *localdest)
   /* The MAC address of the destination of the packet */
   linkaddr_t dest;
 
-#if SICSLOWPAN_CONF_FRAG
-  /* Number of bytes processed. */
-  uint16_t processed_ip_out_len;
-#endif /* SICSLOWPAN_CONF_FRAG */
-
   /* init */
   uncomp_hdr_len = 0;
   packetbuf_hdr_len = 0;
@@ -1367,6 +1362,9 @@ output(const uip_lladdr_t *localdest)
   max_payload = MAC_MAX_PAYLOAD - framer_hdrlen;
   if((int)uip_len - (int)uncomp_hdr_len > max_payload - (int)packetbuf_hdr_len) {
 #if SICSLOWPAN_CONF_FRAG
+    /* Number of bytes processed. */
+    uint16_t processed_ip_out_len;
+
     struct queuebuf *q;
     uint16_t frag_tag;
 

From 0671640ea285beffb11e8d0f074c194e4d090119 Mon Sep 17 00:00:00 2001
From: Wojciech Bober <wojciech.bober@nordicsemi.no>
Date: Wed, 23 Dec 2015 21:29:03 +0100
Subject: [PATCH 022/393] Extended SOURCEDIRS variable with EXTRALDIRS variable
 in Makefile.include

Directories listed in this variable are added to include and
source (vpath) search paths.

Contents of this variable aren't automatically prefixed with
Contki root. This allows for inclusion of folders that are
outside Contiki root.
---
 Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.include b/Makefile.include
index 36b5e06ca..67b0ff595 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -182,7 +182,7 @@ CONTIKI_CPU_DIRS_CONCAT    = ${addprefix $(CONTIKI_CPU)/, \
                                $(CONTIKI_CPU_DIRS)}
 
 SOURCEDIRS = . $(PROJECTDIRS) $(CONTIKI_TARGET_DIRS_CONCAT) \
-             $(CONTIKI_CPU_DIRS_CONCAT) $(CONTIKIDIRS) $(APPDS) ${dir $(target_makefile)}
+             $(CONTIKI_CPU_DIRS_CONCAT) $(CONTIKIDIRS) $(APPDS) $(EXTERNALDIRS) ${dir $(target_makefile)}
 
 vpath %.c $(SOURCEDIRS)
 vpath %.S $(SOURCEDIRS)

From 20f9515ed1b7fdf7cdd097e19ea0821e3f6cd86c Mon Sep 17 00:00:00 2001
From: Wojciech Bober <wojciech.bober@gmail.com>
Date: Sat, 9 Jan 2016 14:44:18 +0100
Subject: [PATCH 023/393] nrf52dk: cpu/nrf52832 support

---
 cpu/nrf52832/Makefile.nrf52832       | 262 ++++++++++++++++++
 cpu/nrf52832/ble/ble-core.c          | 238 +++++++++++++++++
 cpu/nrf52832/ble/ble-core.h          |  61 +++++
 cpu/nrf52832/ble/ble-mac.c           | 386 +++++++++++++++++++++++++++
 cpu/nrf52832/ble/ble-mac.h           |  53 ++++
 cpu/nrf52832/dev/clock.c             | 171 ++++++++++++
 cpu/nrf52832/dev/lpm.h               |  67 +++++
 cpu/nrf52832/dev/random.c            |  90 +++++++
 cpu/nrf52832/dev/uart0.c             | 118 ++++++++
 cpu/nrf52832/dev/uart0.h             |  57 ++++
 cpu/nrf52832/dev/watchdog.c          |  93 +++++++
 cpu/nrf52832/erase.jlink             |   2 +
 cpu/nrf52832/flash.jlink             |   4 +
 cpu/nrf52832/ld/nrf52-pca10036-sd.ld |  12 +
 cpu/nrf52832/ld/nrf52-pca10040-sd.ld |  12 +
 cpu/nrf52832/ld/nrf52.ld             |  12 +
 cpu/nrf52832/mtarch.h                |  48 ++++
 cpu/nrf52832/putchar.c               |  70 +++++
 cpu/nrf52832/rtimer-arch.c           | 110 ++++++++
 cpu/nrf52832/rtimer-arch.h           |  52 ++++
 20 files changed, 1918 insertions(+)
 create mode 100644 cpu/nrf52832/Makefile.nrf52832
 create mode 100644 cpu/nrf52832/ble/ble-core.c
 create mode 100644 cpu/nrf52832/ble/ble-core.h
 create mode 100644 cpu/nrf52832/ble/ble-mac.c
 create mode 100644 cpu/nrf52832/ble/ble-mac.h
 create mode 100644 cpu/nrf52832/dev/clock.c
 create mode 100644 cpu/nrf52832/dev/lpm.h
 create mode 100644 cpu/nrf52832/dev/random.c
 create mode 100644 cpu/nrf52832/dev/uart0.c
 create mode 100644 cpu/nrf52832/dev/uart0.h
 create mode 100644 cpu/nrf52832/dev/watchdog.c
 create mode 100644 cpu/nrf52832/erase.jlink
 create mode 100644 cpu/nrf52832/flash.jlink
 create mode 100644 cpu/nrf52832/ld/nrf52-pca10036-sd.ld
 create mode 100644 cpu/nrf52832/ld/nrf52-pca10040-sd.ld
 create mode 100644 cpu/nrf52832/ld/nrf52.ld
 create mode 100644 cpu/nrf52832/mtarch.h
 create mode 100644 cpu/nrf52832/putchar.c
 create mode 100644 cpu/nrf52832/rtimer-arch.c
 create mode 100644 cpu/nrf52832/rtimer-arch.h

diff --git a/cpu/nrf52832/Makefile.nrf52832 b/cpu/nrf52832/Makefile.nrf52832
new file mode 100644
index 000000000..f93f063f3
--- /dev/null
+++ b/cpu/nrf52832/Makefile.nrf52832
@@ -0,0 +1,262 @@
+ifndef NRF52_SDK_ROOT
+  $(error NRF52_SDK_ROOT not defined! You must specify where nRF52 SDK resides!)
+endif
+
+ifneq ($(filter %.flash erase,$(MAKECMDGOALS)),)
+ifeq ($(NRF52_JLINK_PATH),)
+NRF52_JLINK_PATH=$(shell location=$$(which JLinkExe) && dirname $$location)
+endif
+ifeq ($(NRF52_JLINK_PATH),)
+  $(error JLink not found in PATH and NRF52_JLINK_PATH path is not defined)
+endif
+endif
+
+ifeq ($(CONTIKI_WITH_RIME),1)
+  $(error Rime stack is not supported!)
+endif
+
+ifneq ($(CONTIKI_WITH_IPV6),1)
+  $(error Only IPv6 stack is supported!)
+endif
+
+$(info SDK: $(NRF52_SDK_ROOT))
+
+ifeq ($(NRF52_DK_REVISION),)
+NRF52_DK_REVISION=pca10040
+endif
+
+ifneq ($(NRF52_WITHOUT_SOFTDEVICE),1)
+  ifeq ($(NRF52_SOFTDEVICE),)
+    NRF52_SOFTDEVICE := $(shell find $(NRF52_SDK_ROOT) -name *iot*_softdevice.hex | head -n 1)
+  endif
+  $(info SoftDevice: $(NRF52_SOFTDEVICE))
+  LINKER_SCRIPT := $(CONTIKI_CPU)/ld/nrf52-$(NRF52_DK_REVISION)-sd.ld
+else
+  LINKER_SCRIPT := $(CONTIKI_CPU)/ld/nrf52.ld
+endif
+
+OUTPUT_FILENAME := $(CONTIKI_PROJECT)
+MAKEFILE_NAME := $(MAKEFILE_LIST)
+MAKEFILE_DIR := $(dir $(MAKEFILE_NAME) ) 
+
+TEMPLATE_PATH = $(NRF52_SDK_ROOT)/components/toolchain/gcc
+
+OBJECT_DIRECTORY = $(OBJECTDIR)
+LISTING_DIRECTORY := $(OBJECTDIR)
+OUTPUT_BINARY_DIRECTORY := bin_$(TARGET)
+
+MK := mkdir
+RM := rm -rf
+
+# Toolchain commands
+CC := arm-none-eabi-gcc
+AS := arm-none-eabi-as
+AR := arm-none-eabi-ar
+LD := arm-none-eabi-ld
+NM := arm-none-eabi-nm
+OBJDUMP := arm-none-eabi-objdump
+OBJCOPY := arm-none-eabi-objcopy
+SIZE := arm-none-eabi-size
+
+# JLink
+JLINK := $(NRF52_JLINK_PATH)/JLinkExe
+JLINK_OPTS = -Device NRF52 -if swd -speed 1000
+ifneq ($(NRF52_JLINK_SN),)
+JLINK_OPTS += -SelectEmuBySN $(NRF52_JLINK_SN)
+endif
+
+#function for removing duplicates in a list
+remduplicates = $(strip $(if $1,$(firstword $1) $(call remduplicates,$(filter-out $(firstword $1),$1))))
+
+### CPU-dependent directories
+CONTIKI_CPU_DIRS += . dev ble #compat
+
+### CPU-dependent source files
+CONTIKI_CPU_SOURCEFILES += clock.c rtimer-arch.c uart0.c putchar.c watchdog.c
+
+ifneq ($(NRF52_WITHOUT_SOFTDEVICE),1)
+CONTIKI_CPU_SOURCEFILES += ble-core.c ble-mac.c
+endif
+
+CONTIKI_SOURCEFILES += $(CONTIKI_CPU_SOURCEFILES)
+
+#source common to all targets
+C_SOURCE_FILES += $(NRF52_SDK_ROOT)/components/drivers_nrf/common/nrf_drv_common.c \
+                  $(NRF52_SDK_ROOT)/components/drivers_nrf/gpiote/nrf_drv_gpiote.c \
+                  $(NRF52_SDK_ROOT)/components/drivers_nrf/rtc/nrf_drv_rtc.c \
+                  $(NRF52_SDK_ROOT)/components/drivers_nrf/clock/nrf_drv_clock.c \
+                  $(NRF52_SDK_ROOT)/components/drivers_nrf/timer/nrf_drv_timer.c \
+                  $(NRF52_SDK_ROOT)/components/drivers_nrf/wdt/nrf_drv_wdt.c \
+                  $(NRF52_SDK_ROOT)/components/drivers_nrf/rng/nrf_drv_rng.c \
+                  $(NRF52_SDK_ROOT)/components/drivers_nrf/delay/nrf_delay.c \
+                  $(NRF52_SDK_ROOT)/components/drivers_nrf/uart/nrf_drv_uart.c \
+                  $(NRF52_SDK_ROOT)/components/libraries/util/app_error.c \
+                  $(NRF52_SDK_ROOT)/components/toolchain/system_nrf52.c
+                  
+ifneq ($(NRF52_WITHOUT_SOFTDEVICE),1)
+C_SOURCE_FILES += $(NRF52_SDK_ROOT)/components/softdevice/common/softdevice_handler/softdevice_handler.c \
+                  $(NRF52_SDK_ROOT)/components/ble/common/ble_advdata.c
+else
+C_SOURCE_FILES += $(NRF52_SDK_ROOT)/components/libraries/fifo/app_fifo.c \
+                  $(NRF52_SDK_ROOT)/components/libraries/util/app_util_platform.c
+endif
+
+#assembly files common to all targets
+ASM_SOURCE_FILES  = $(NRF52_SDK_ROOT)/components/toolchain/gcc/gcc_startup_nrf52.s
+
+#includes common to all targets
+INC_PATHS += components/drivers_nrf/gpiote
+INC_PATHS += components/drivers_nrf/hal
+INC_PATHS += components/drivers_nrf/config
+INC_PATHS += components/drivers_nrf/delay
+INC_PATHS += components/drivers_nrf/uart
+INC_PATHS += components/drivers_nrf/common
+INC_PATHS += components/drivers_nrf/rtc
+INC_PATHS += components/drivers_nrf/wdt
+INC_PATHS += components/drivers_nrf/rng
+INC_PATHS += components/drivers_nrf/clock
+INC_PATHS += components/drivers_nrf/timer
+INC_PATHS += components/libraries/util
+INC_PATHS += components/libraries/timer
+INC_PATHS += components/device
+INC_PATHS += components/toolchain/gcc
+INC_PATHS += components/toolchain
+INC_PATHS += examples/bsp
+
+ifneq ($(NRF52_WITHOUT_SOFTDEVICE),1)
+INC_PATHS += components/softdevice/s1xx_iot/headers
+INC_PATHS += components/softdevice/s1xx_iot/headers/nrf52
+INC_PATHS += components/softdevice/common/softdevice_handler
+INC_PATHS += components/ble/common
+INC_PATHS += components/iot/common
+INC_PATHS += components/iot/ble_ipsp
+else
+INC_PATHS += components/drivers_nrf/nrf_soc_nosd
+INC_PATHS += components/libraries/fifo
+endif
+
+EXTERNALDIRS += $(addprefix $(NRF52_SDK_ROOT)/, $(INC_PATHS))
+
+# Sorting removes duplicates
+BUILD_DIRECTORIES := $(sort $(OUTPUT_BINARY_DIRECTORY) $(LISTING_DIRECTORY))
+
+# Clean files and directories
+CLEAN += bin_$(TARGET) lst_$(TARGET) nrf52832.a *.elf *.hex
+
+#flags common to all targets
+ifneq ($(NRF52_WITHOUT_SOFTDEVICE),1)
+CFLAGS += -DSOFTDEVICE_PRESENT
+CFLAGS += -DS132
+endif
+
+ifeq ($(SMALL),1)
+CFLAGS += -Os
+else
+CFLAGS += -O2
+endif
+
+CFLAGS += -DNRF52
+CFLAGS += -DBOARD_$(shell echo $(NRF52_DK_REVISION) | tr a-z A-Z)
+CFLAGS += -D__HEAP_SIZE=512
+CFLAGS += -DSWI_DISABLE0
+CFLAGS += -DCONFIG_GPIO_AS_PINRESET
+CFLAGS += -DBLE_STACK_SUPPORT_REQD
+CFLAGS += -mcpu=cortex-m4
+CFLAGS += -mthumb -mabi=aapcs --std=gnu99
+CFLAGS += -Wall -Werror
+CFLAGS += -ggdb
+CFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
+# keep every function in separate section. This will allow linker to dump unused functions
+CFLAGS += -ffunction-sections -fdata-sections -fno-strict-aliasing
+CFLAGS += -fno-builtin --short-enums
+
+# keep every function in separate section. This will allow linker to dump unused functions
+LDFLAGS += -Xlinker -Map=$(LISTING_DIRECTORY)/$(OUTPUT_FILENAME).map
+LDFLAGS += -mthumb -mabi=aapcs -L $(TEMPLATE_PATH) -T$(LINKER_SCRIPT)
+LDFLAGS += -mcpu=cortex-m4
+LDFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
+# let linker to dump unused sections
+LDFLAGS += -Wl,--gc-sections
+# use newlib in nano version
+LDFLAGS += --specs=nano.specs -lc -lnosys
+
+# Assembler flags
+ifneq ($(NRF52_WITHOUT_SOFTDEVICE),1)
+ASMFLAGS += -DSOFTDEVICE_PRESENT
+ASMFLAGS += -DS132
+endif
+ASMFLAGS += -x assembler-with-cpp
+ASMFLAGS += -DSWI_DISABLE0
+ASMFLAGS += -DNRF52
+ASMFLAGS += -DBOARD_$(shell echo $(NRF52_DK_REVISION) | tr a-z A-Z)
+ASMFLAGS += -DCONFIG_GPIO_AS_PINRESET
+ASMFLAGS += -DBLE_STACK_SUPPORT_REQD
+
+C_SOURCE_FILE_NAMES = $(notdir $(C_SOURCE_FILES))
+C_PATHS = $(call remduplicates, $(dir $(C_SOURCE_FILES) ) )
+C_OBJECTS = $(addprefix $(OBJECT_DIRECTORY)/, $(C_SOURCE_FILE_NAMES:.c=.o) )
+
+ASM_SOURCE_FILE_NAMES = $(notdir $(ASM_SOURCE_FILES))
+ASM_PATHS = $(call remduplicates, $(dir $(ASM_SOURCE_FILES) ))
+ASM_OBJECTS = $(addprefix $(OBJECT_DIRECTORY)/, $(ASM_SOURCE_FILE_NAMES:.s=.o) )
+
+vpath %.c $(C_PATHS)
+vpath %.s $(ASM_PATHS)
+
+OBJECTS = $(C_OBJECTS) $(ASM_OBJECTS)
+
+TARGET_LIBS= nrf52832.a $(NRF52_SDK_ROOT)/components/iot/ble_6lowpan/lib/ble_6lowpan.a
+
+### Don't treat the .elf as intermediate
+.PRECIOUS: %.hex %.bin
+
+nrf52832.a: $(OBJECTS)
+	$(TRACE_AR)
+	$(Q)$(AR) $(AROPTS) $@ $^
+
+### Compilation rules
+CUSTOM_RULE_LINK=1
+
+%.elf: $(TARGET_STARTFILES) %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a $(TARGET_LIBS)
+	$(TRACE_LD)
+	$(Q)$(CC) $(LDFLAGS) ${filter %o %.co %.a,$^} -o $@
+	
+# Assemble files
+$(OBJECT_DIRECTORY)/%.o: %.s
+	@echo Compiling file: $(notdir $<)
+	$(Q)$(CC) $(ASMFLAGS) $(addprefix -I$(NRF52_SDK_ROOT)/, $(INC_PATHS)) -c -o $@ $<
+
+# Create binary file from the .out file
+%.bin: %.elf
+	@echo Preparing: $@
+	$(Q)$(OBJCOPY) -O binary $^ $@
+
+# Create binary .hex file from the .out file
+%.hex: %.elf 
+	@echo Preparing: $@
+	$(Q)$(OBJCOPY) -O ihex $^ $@
+
+### We don't really need the .hex and .bin for the .$(TARGET) but let's make
+### sure they get built
+%.$(TARGET): %.elf %.hex %.bin
+	cp $*.elf $@
+	$(Q)$(SIZE) $@
+	
+%.jlink:
+	sed -e 's/#OUTPUT_FILENAME#/$*.hex/' $(CONTIKI_CPU)/flash.jlink > $@
+
+%.flash: %.hex %.jlink 
+	@echo Flashing: $^
+	$(JLINK) $(JLINK_OPTS) -CommanderScript $*.jlink
+
+softdevice.jlink:
+	sed -e 's,#OUTPUT_FILENAME#,$(NRF52_SOFTDEVICE),' $(CONTIKI_CPU)/flash.jlink > $@
+	
+softdevice.flash: softdevice.jlink
+	@echo Flashing: $(notdir $(NRF52_SOFTDEVICE))
+	$(JLINK) $(JLINK_OPTS) -CommanderScript $^
+
+erase:
+	$(JLINK) $(JLINK_OPTS) -CommanderScript $(CONTIKI_CPU)/erase.jlink
+
+.PHONY: softdevice.jlink
diff --git a/cpu/nrf52832/ble/ble-core.c b/cpu/nrf52832/ble/ble-core.c
new file mode 100644
index 000000000..cb3d4ce66
--- /dev/null
+++ b/cpu/nrf52832/ble/ble-core.c
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+/**
+ * \addtogroup cpu
+ * @{
+ *
+ * \addtogroup nrf52832
+ * @{
+ *
+ * \addtogroup nrf52832-ble Bluetooth Low Energy drivers
+ * @{
+ *
+ * \file
+ *         Basic BLE functions.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ *
+ */
+#include <stdbool.h>
+#include <stdint.h>
+#include "boards.h"
+#include "nordic_common.h"
+#include "nrf_delay.h"
+#include "nrf_sdm.h"
+#include "ble_advdata.h"
+#include "ble_srv_common.h"
+#include "ble_ipsp.h"
+#include "softdevice_handler.h"
+#include "app_error.h"
+#include "iot_defines.h"
+#include "ble-core.h"
+
+#define DEBUG 0
+#if DEBUG
+#include <stdio.h>
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+
+#define IS_SRVC_CHANGED_CHARACT_PRESENT 1
+#define APP_ADV_TIMEOUT                 0                                  /**< Time for which the device must be advertising in non-connectable mode (in seconds). 0 disables timeout. */
+#define APP_ADV_ADV_INTERVAL            MSEC_TO_UNITS(333, UNIT_0_625_MS)  /**< The advertising interval. This value can vary between 100ms to 10.24s). */
+
+static ble_gap_adv_params_t m_adv_params; /**< Parameters to be passed to the stack when starting advertising. */
+
+static void
+ble_evt_dispatch(ble_evt_t * p_ble_evt);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Initialize and enable the BLE stack.
+ */
+void
+ble_stack_init(void)
+{
+  uint32_t err_code;
+
+  // Enable BLE stack.
+  ble_enable_params_t ble_enable_params;
+  memset(&ble_enable_params, 0, sizeof(ble_enable_params));
+  ble_enable_params.gatts_enable_params.attr_tab_size =
+  BLE_GATTS_ATTR_TAB_SIZE_DEFAULT;
+  ble_enable_params.gatts_enable_params.service_changed =
+  IS_SRVC_CHANGED_CHARACT_PRESENT;
+  err_code = sd_ble_enable(&ble_enable_params);
+  APP_ERROR_CHECK(err_code);
+
+  // Register with the SoftDevice handler module for BLE events.
+  err_code = softdevice_ble_evt_handler_set(ble_evt_dispatch);
+  APP_ERROR_CHECK(err_code);
+
+  // Setup address
+  ble_gap_addr_t ble_addr;
+  err_code = sd_ble_gap_address_get(&ble_addr);
+  APP_ERROR_CHECK(err_code);
+
+  ble_addr.addr[5] = 0x00;
+  ble_addr.addr_type = BLE_GAP_ADDR_TYPE_PUBLIC;
+
+  err_code = sd_ble_gap_address_set(BLE_GAP_ADDR_CYCLE_MODE_NONE, &ble_addr);
+  APP_ERROR_CHECK(err_code);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Return device EUI64 MAC address
+ * \param addr pointer to a buffer to store the address
+ */
+void
+ble_get_mac(uint8_t addr[8])
+{
+  uint32_t err_code;
+  ble_gap_addr_t ble_addr;
+
+  err_code = sd_ble_gap_address_get(&ble_addr);
+  APP_ERROR_CHECK(err_code);
+
+  IPV6_EUI64_CREATE_FROM_EUI48(addr, ble_addr.addr, ble_addr.addr_type);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Initialize BLE advertising data.
+ * \param name Human readable device name that will be advertised
+ */
+void
+ble_advertising_init(const char *name)
+{
+  uint32_t err_code;
+  ble_advdata_t advdata;
+  uint8_t flags = BLE_GAP_ADV_FLAG_BR_EDR_NOT_SUPPORTED;
+  ble_gap_conn_sec_mode_t sec_mode;
+
+  BLE_GAP_CONN_SEC_MODE_SET_OPEN(&sec_mode);
+
+  err_code = sd_ble_gap_device_name_set(&sec_mode, (const uint8_t *)name,
+                                        strlen(name));
+  APP_ERROR_CHECK(err_code);
+
+  ble_uuid_t adv_uuids[] = {{BLE_UUID_IPSP_SERVICE, BLE_UUID_TYPE_BLE}};
+
+  // Build and set advertising data.
+  memset(&advdata, 0, sizeof(advdata));
+
+  advdata.name_type = BLE_ADVDATA_FULL_NAME;
+  advdata.flags = flags;
+  advdata.uuids_complete.uuid_cnt = sizeof(adv_uuids) / sizeof(adv_uuids[0]);
+  advdata.uuids_complete.p_uuids = adv_uuids;
+
+  err_code = ble_advdata_set(&advdata, NULL);
+  APP_ERROR_CHECK(err_code);
+
+  // Initialize advertising parameters (used when starting advertising).
+  memset(&m_adv_params, 0, sizeof(m_adv_params));
+
+  m_adv_params.type = BLE_GAP_ADV_TYPE_ADV_IND;
+  m_adv_params.p_peer_addr = NULL; // Undirected advertisement.
+  m_adv_params.fp = BLE_GAP_ADV_FP_ANY;
+  m_adv_params.interval = APP_ADV_ADV_INTERVAL;
+  m_adv_params.timeout = APP_ADV_TIMEOUT;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Start BLE advertising.
+ */
+void
+ble_advertising_start(void)
+{
+  uint32_t err_code;
+
+  err_code = sd_ble_gap_adv_start(&m_adv_params);
+  APP_ERROR_CHECK(err_code);
+
+  PRINTF("ble-core: advertising started\n");
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Print GAP address.
+ * \param addr a pointer to address
+ */
+void
+ble_gap_addr_print(const ble_gap_addr_t *addr)
+{
+  unsigned int i;
+  for(i = 0; i < sizeof(addr->addr); i++) {
+    if(i > 0) {
+      PRINTF(":");
+    }PRINTF("%02x", addr->addr[i]);
+  }PRINTF(" (%d)", addr->addr_type);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Function for handling the Application's BLE Stack events.
+ * \param[in]   p_ble_evt   Bluetooth stack event.
+ */
+static void
+on_ble_evt(ble_evt_t *p_ble_evt)
+{
+  switch(p_ble_evt->header.evt_id) {
+    case BLE_GAP_EVT_CONNECTED:
+      PRINTF("ble-core: connected [handle:%d, peer: ", p_ble_evt->evt.gap_evt.conn_handle);
+      ble_gap_addr_print(&(p_ble_evt->evt.gap_evt.params.connected.peer_addr));
+      PRINTF("]\n");
+      sd_ble_gap_rssi_start(p_ble_evt->evt.gap_evt.conn_handle,
+                            BLE_GAP_RSSI_THRESHOLD_INVALID,
+                            0);
+      break;
+
+    case BLE_GAP_EVT_DISCONNECTED:
+      PRINTF("ble-core: disconnected [handle:%d]\n", p_ble_evt->evt.gap_evt.conn_handle);
+      ble_advertising_start();
+      break;
+    default:
+      break;
+  }
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief SoftDevice BLE event callback.
+ * \param[in]   p_ble_evt   Bluetooth stack event.
+ */
+static void
+ble_evt_dispatch(ble_evt_t *p_ble_evt)
+{
+  ble_ipsp_evt_handler(p_ble_evt);
+  on_ble_evt(p_ble_evt);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ * @}
+ */
diff --git a/cpu/nrf52832/ble/ble-core.h b/cpu/nrf52832/ble/ble-core.h
new file mode 100644
index 000000000..84c181d2e
--- /dev/null
+++ b/cpu/nrf52832/ble/ble-core.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+/**
+ * \addtogroup cpu
+ * @{
+ *
+ * \addtogroup nrf52832
+ * @{
+ *
+ * \addtogroup nrf52832-ble Bluetooth Low Energy drivers
+ * @{
+ *
+ * \file
+ *         Basic BLE functions.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ */
+#ifndef DEV_BLE_H_
+#define DEV_BLE_H_
+
+#include <stdint.h>
+
+void ble_stack_init(void);
+void ble_advertising_init(const char *name);
+void ble_advertising_start(void);
+void ble_get_mac(uint8_t addr[8]);
+
+#endif /* DEV_BLE_H_ */
+
+/**
+ * @}
+ * @}
+ * @}
+ */
diff --git a/cpu/nrf52832/ble/ble-mac.c b/cpu/nrf52832/ble/ble-mac.c
new file mode 100644
index 000000000..6ffd87a82
--- /dev/null
+++ b/cpu/nrf52832/ble/ble-mac.c
@@ -0,0 +1,386 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+/**
+ * \addtogroup nrf52832-ble
+ * @{
+ *
+ * \file
+ *         A MAC protocol implementation that uses nRF52 IPSP implementation
+ *         as a link layer.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ */
+#include <stdint.h>
+#include <ble-core.h>
+#include "app_error.h"
+#include "ble_ipsp.h"
+#include "nrf_soc.h"
+#include "iot_defines.h"
+
+#include "net/mac/nullmac.h"
+#include "net/netstack.h"
+#include "net/ip/uip.h"
+#include "net/ip/tcpip.h"
+#include "net/packetbuf.h"
+#include "net/netstack.h"
+#include "net/linkaddr.h"
+
+#include "dev/watchdog.h"
+
+#define DEBUG 0
+#if DEBUG
+#include <stdio.h>
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+
+#ifndef BLE_MAC_MAX_INTERFACE_NUM
+#define BLE_MAC_MAX_INTERFACE_NUM 1 /**< Maximum number of interfaces, i.e., connection to master devices */
+#endif
+
+/*---------------------------------------------------------------------------*/
+process_event_t ble_event_interface_added; /**< This event is broadcast when BLE connection is established */
+process_event_t ble_event_interface_deleted; /**< This event is broadcast when BLE connection is destroyed */
+
+/*---------------------------------------------------------------------------*/
+PROCESS(ble_ipsp_process, "BLE IPSP process");
+
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief A structure that binds IPSP connection with a peer address.
+ */
+typedef struct {
+  eui64_t peer_addr;
+  ble_ipsp_handle_t handle;
+} ble_mac_interface_t;
+
+static ble_mac_interface_t interfaces[BLE_MAC_MAX_INTERFACE_NUM];
+
+static volatile int busy_tx; /**< Flag is set to 1 when the driver is busy transmitting a packet. */
+static volatile int busy_rx; /**< Flag is set to 1 when there is a received packet pending. */
+
+struct {
+  eui64_t src;
+  uint8_t payload[PACKETBUF_SIZE];
+  uint16_t len;
+  int8_t rssi;
+} input_packet;
+
+static mac_callback_t mac_sent_cb;
+static void *mac_sent_ptr;
+
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Lookup interface by IPSP connection.
+ *
+ * \param handle a pointer to IPSP handle.
+ * \retval a pointer to interface structure
+ * \retval NULL if no interface has been found for a given handle
+ */
+static ble_mac_interface_t *
+ble_mac_interface_lookup(ble_ipsp_handle_t *handle)
+{
+  int i;
+  for(i = 0; i < BLE_MAC_MAX_INTERFACE_NUM; i++) {
+    if(interfaces[i].handle.conn_handle == handle->conn_handle &&
+        interfaces[i].handle.cid == handle->cid) {
+      return &interfaces[i];
+    }
+  }
+  return NULL;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Add IPSP connection to the interface table.
+ *
+ * This function binds IPSP connection with peer address.
+ *
+ * \param peer a pointer to eui64 address
+ * \param handle a pointer to IPSP handle
+ *
+ * \retval a pointer to an interface structure on success
+ * \retval NULL if interface table is full
+ */
+static ble_mac_interface_t *
+ble_mac_interface_add(eui64_t *peer, ble_ipsp_handle_t *handle)
+{
+  int i;
+  for(i = 0; i < BLE_MAC_MAX_INTERFACE_NUM; i++) {
+    if(interfaces[i].handle.conn_handle == 0 && interfaces[i].handle.cid == 0) {
+      memcpy(&interfaces[i].handle, handle, sizeof(ble_ipsp_handle_t));
+      memcpy(&interfaces[i].peer_addr, peer, sizeof(eui64_t));
+      process_post(PROCESS_BROADCAST, ble_event_interface_added, NULL);
+      return &interfaces[i];
+    }
+  }
+  return NULL;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Remove interface from the interface table.
+ * \param interface a pointer to interface
+ */
+static void
+ble_mac_interface_delete(ble_mac_interface_t *interface)
+{
+  memset(interface, 0, sizeof(ble_mac_interface_t));
+  process_post(PROCESS_BROADCAST, ble_event_interface_deleted, NULL);
+}
+
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Callback registered with IPSP to receive asynchronous events from the module.
+ * \note This function is called from SoftDevice interrupt context.
+ *
+ * \param[in]   p_handle  Pointer to IPSP handle.
+ * \param[in]   p_evt     Pointer to specific event, generated by IPSP module.
+ *
+ * \return      NRF_SUCCESS on success, otherwise NRF_ERROR_NO_MEM error.
+ */
+static uint32_t
+ble_mac_ipsp_evt_handler_irq(ble_ipsp_handle_t *p_handle, ble_ipsp_evt_t *p_evt)
+{
+  uint32_t retval = NRF_SUCCESS;
+
+  ble_mac_interface_t *p_instance = NULL;
+  p_instance = ble_mac_interface_lookup(p_handle);
+
+  if(p_handle) {
+    PRINTF("ble-mac: IPSP event [handle:%d CID 0x%04X]\n", p_handle->conn_handle, p_handle->cid);
+  }
+
+  switch(p_evt->evt_id) {
+    case BLE_IPSP_EVT_CHANNEL_CONNECTED: {
+      eui64_t peer_addr;
+
+      PRINTF("ble-mac: channel connected\n");
+
+      IPV6_EUI64_CREATE_FROM_EUI48(
+          peer_addr.identifier,
+          p_evt->evt_param->params.ch_conn_request.peer_addr.addr,
+          p_evt->evt_param->params.ch_conn_request.peer_addr.addr_type);
+
+      p_instance = ble_mac_interface_add(&peer_addr, p_handle);
+
+      if(p_instance != NULL) {
+        PRINTF("ble-mac: added new IPSP interface\n");
+      } else {
+        PRINTF("ble-mac: cannot add new interface. Table is full\n");
+        ble_ipsp_disconnect(p_handle);
+      }
+      break;
+    }
+
+    case BLE_IPSP_EVT_CHANNEL_DISCONNECTED: {
+      PRINTF("ble-mac: channel disconnected\n");
+      if(p_instance != NULL) {
+        PRINTF("ble-mac: removed IPSP interface\n");
+        ble_mac_interface_delete(p_instance);
+      }
+      break;
+    }
+
+    case BLE_IPSP_EVT_CHANNEL_DATA_RX: {
+      PRINTF("ble-mac: data received\n");
+      if(p_instance != NULL) {
+        if(busy_rx) {
+          PRINTF("ble-mac: packet dropped as input buffer is busy\n");
+          break;
+        }
+
+        if(p_evt->evt_param->params.ch_rx.len > PACKETBUF_SIZE) {
+          PRINTF("ble-mac: packet buffer is too small!\n");
+          break;
+        }
+
+        busy_rx = 1;
+
+        input_packet.len = p_evt->evt_param->params.ch_rx.len;
+        memcpy(input_packet.payload, p_evt->evt_param->params.ch_rx.p_data, input_packet.len);
+        memcpy(input_packet.src.identifier, p_instance->peer_addr.identifier, sizeof(eui64_t));
+        sd_ble_gap_rssi_get(p_handle->conn_handle, &input_packet.rssi);
+
+        process_poll(&ble_ipsp_process);
+      } else {
+        PRINTF("ble-mac: got data to unknown interface!\n");
+      }
+      break;
+    }
+
+    case BLE_IPSP_EVT_CHANNEL_DATA_TX_COMPLETE: {
+      PRINTF("ble-mac: data transmitted\n");
+      busy_tx = 0;
+      break;
+    }
+  }
+
+  return retval;
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(ble_ipsp_process, ev, data)
+{
+  PROCESS_BEGIN();
+
+  while(1) {
+    PROCESS_WAIT_EVENT();
+    if(ev == PROCESS_EVENT_POLL) {
+      packetbuf_copyfrom(input_packet.payload, input_packet.len);
+      packetbuf_set_attr(PACKETBUF_ATTR_RSSI, input_packet.rssi);
+      packetbuf_set_addr(PACKETBUF_ADDR_SENDER, (const linkaddr_t *)input_packet.src.identifier);
+      packetbuf_set_addr(PACKETBUF_ADDR_RECEIVER, &linkaddr_node_addr);
+      busy_rx = 0;
+      NETSTACK_LLSEC.input();
+    }
+  }
+
+  PROCESS_END();
+}
+
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Lookup IPSP handle by peer address.
+ *
+ * \param addr a pointer to eui64 address.
+ * \retval a pointer to IPSP handle on success
+ * \retval NULL if an IPSP handle for given address haven't been found
+ */
+static ble_ipsp_handle_t *
+find_handle(const linkaddr_t *addr)
+{
+  int i;
+  for(i = 0; i < BLE_MAC_MAX_INTERFACE_NUM; i++) {
+    if(linkaddr_cmp((const linkaddr_t *)&interfaces[i].peer_addr, addr)) {
+      return &interfaces[i].handle;
+    }
+  }
+  return NULL;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Send packet on a given IPSP handle.
+ *
+ * \param handle a pointer to IPSP handle.
+ * \return 1 on success, 0 otherwise
+ */
+static int
+send_to_peer(ble_ipsp_handle_t *handle)
+{
+  PRINTF("ble-mac: sending packet[GAP handle:%d CID:0x%04X]\n", handle->conn_handle, handle->cid);
+  return (ble_ipsp_send(handle, packetbuf_dataptr(), packetbuf_datalen()) == NRF_SUCCESS);
+}
+/*---------------------------------------------------------------------------*/
+static void
+send_packet(mac_callback_t sent, void *ptr)
+{
+  int i;
+  const linkaddr_t *dest;
+  ble_ipsp_handle_t *handle;
+  int ret = 0;
+
+  mac_sent_cb = sent;
+  mac_sent_ptr = ptr;
+
+  dest = packetbuf_addr(PACKETBUF_ADDR_RECEIVER);
+
+  if(linkaddr_cmp(dest, &linkaddr_null)) {
+    for(i = 0; i < BLE_MAC_MAX_INTERFACE_NUM; i++) {
+      if(interfaces[i].handle.cid != 0 && interfaces[i].handle.conn_handle != 0) {
+        ret = send_to_peer(&interfaces[i].handle);
+        watchdog_periodic();
+      }
+    }
+  } else if((handle = find_handle(dest)) != NULL) {
+    ret = send_to_peer(handle);
+  } else {
+    PRINTF("ble-mac: no connection found for peer");
+  }
+
+  if(ret) {
+    busy_tx = 1;
+    while(busy_tx) {
+      watchdog_periodic();
+      sd_app_evt_wait();
+    }
+    mac_call_sent_callback(sent, ptr, MAC_TX_OK, 1);
+  } else {
+    mac_call_sent_callback(sent, ptr, MAC_TX_ERR, 1);
+  }
+}
+/*---------------------------------------------------------------------------*/
+static int
+on(void)
+{
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+static int
+off(int keep_radio_on)
+{
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+static unsigned short
+channel_check_interval(void)
+{
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static void
+init(void)
+{
+// Initialize IPSP service
+  uint32_t err_code;
+  ble_ipsp_init_t ipsp_init_params;
+
+  memset(&ipsp_init_params, 0, sizeof(ipsp_init_params));
+  ipsp_init_params.evt_handler = ble_mac_ipsp_evt_handler_irq;
+  err_code = ble_ipsp_init(&ipsp_init_params);
+  APP_ERROR_CHECK(err_code);
+
+  ble_event_interface_added = process_alloc_event();
+  ble_event_interface_deleted = process_alloc_event();
+
+  process_start(&ble_ipsp_process, NULL);
+}
+/*---------------------------------------------------------------------------*/
+const struct mac_driver ble_ipsp_mac_driver = {
+  "nRF52 IPSP driver",
+  init,
+  send_packet,
+  NULL,
+  on,
+  off,
+  channel_check_interval,
+};
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ */
diff --git a/cpu/nrf52832/ble/ble-mac.h b/cpu/nrf52832/ble/ble-mac.h
new file mode 100644
index 000000000..3dd9b82af
--- /dev/null
+++ b/cpu/nrf52832/ble/ble-mac.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+/**
+ * \addtogroup nrf52832-ble
+ * @{
+ *
+ * \file
+ *         A MAC protocol implementation that uses nRF52 IPSP implementation
+ *         as a link layer.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ */
+#ifndef BLE_MAC_H_
+#define BLE_MAC_H_
+
+#include "sys/process.h"
+#include "net/mac/mac.h"
+
+extern const struct mac_driver ble_ipsp_mac_driver; /**< BLE over IPSP MAC driver structure */
+extern process_event_t ble_event_interface_added; /**< This event is broadcast when a new IPSP connection is established */
+extern process_event_t ble_event_interface_deleted; /**< This event is broadcast when a IPSP connection is deleted */
+
+#endif /* BLE_MAC_H_ */
+/**
+ * @}
+ */
diff --git a/cpu/nrf52832/dev/clock.c b/cpu/nrf52832/dev/clock.c
new file mode 100644
index 000000000..4ee09839d
--- /dev/null
+++ b/cpu/nrf52832/dev/clock.c
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2015 Nordic Semiconductor. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+/**
+ * \addtogroup nrf52832
+ * @{
+ *
+ * \addtogroup nrf52832-dev Device drivers
+ * @{
+ *
+ * \addtogroup nrf52832-clock Clock driver
+ * @{
+ *
+ * \file
+ *         Software clock implementation for the nRF52.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ *
+ */
+/*---------------------------------------------------------------------------*/
+#include <stdint.h>
+#include <stdbool.h>
+#include "nrf.h"
+#include "nrf_drv_config.h"
+#include "nrf_drv_rtc.h"
+#include "nrf_drv_clock.h"
+#include "nrf_delay.h"
+#include "app_error.h"
+#include "contiki.h"
+#include "platform-conf.h"
+
+/*---------------------------------------------------------------------------*/
+const nrf_drv_rtc_t rtc = NRF_DRV_RTC_INSTANCE(PLATFORM_RTC_INSTANCE_ID); /**< RTC instance used for platform clock */
+/*---------------------------------------------------------------------------*/
+static volatile uint32_t ticks;
+void clock_update(void);
+
+#define TICKS (RTC1_CONFIG_FREQUENCY/CLOCK_CONF_SECOND)
+
+/**
+ * \brief Function for handling the RTC0 interrupts
+ * \param int_type Type of interrupt to be handled
+ */
+static void
+rtc_handler(nrf_drv_rtc_int_type_t int_type)
+{
+  if (int_type == NRF_DRV_RTC_INT_TICK) {
+    clock_update();
+  }
+}
+
+#ifndef SOFTDEVICE_PRESENT
+/** \brief Function starting the internal LFCLK XTAL oscillator.
+ */
+static void
+lfclk_config(void)
+{
+  ret_code_t err_code = nrf_drv_clock_init(NULL);
+  APP_ERROR_CHECK(err_code);
+
+  nrf_drv_clock_lfclk_request();
+}
+#endif
+
+/**
+ * \brief Function initialization and configuration of RTC driver instance.
+ */
+static void
+rtc_config(void)
+{
+  uint32_t err_code;
+
+  //Initialize RTC instance
+  err_code = nrf_drv_rtc_init(&rtc, NULL, rtc_handler);
+  APP_ERROR_CHECK(err_code);
+
+  //Enable tick event & interrupt
+  nrf_drv_rtc_tick_enable(&rtc, true);
+
+  //Power on RTC instance
+  nrf_drv_rtc_enable(&rtc);
+}
+/*---------------------------------------------------------------------------*/
+void
+clock_init(void)
+{
+  ticks = 0;
+#ifndef SOFTDEVICE_PRESENT
+  lfclk_config();
+#endif
+  rtc_config();
+}
+/*---------------------------------------------------------------------------*/
+CCIF clock_time_t
+clock_time(void)
+{
+  return (clock_time_t)(ticks & 0xFFFFFFFF);
+}
+/*---------------------------------------------------------------------------*/
+void
+clock_update(void)
+{
+  ticks++;
+  if (etimer_pending()) {
+    etimer_request_poll();
+  }
+}
+/*---------------------------------------------------------------------------*/
+CCIF unsigned long
+clock_seconds(void)
+{
+  return (unsigned long)ticks/CLOCK_CONF_SECOND;
+}
+/*---------------------------------------------------------------------------*/
+void
+clock_wait(clock_time_t i)
+{
+  clock_time_t start;
+  start = clock_time();
+  while (clock_time() - start < (clock_time_t)i) {
+    __WFE();
+  }
+}
+/*---------------------------------------------------------------------------*/
+void
+clock_delay_usec(uint16_t dt)
+{
+  nrf_delay_us(dt);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Obsolete delay function but we implement it here since some code
+ * still uses it
+ */
+void
+clock_delay(unsigned int i)
+{
+  clock_delay_usec(i);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ * @}
+ */
diff --git a/cpu/nrf52832/dev/lpm.h b/cpu/nrf52832/dev/lpm.h
new file mode 100644
index 000000000..192165a49
--- /dev/null
+++ b/cpu/nrf52832/dev/lpm.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+/**
+ * \addtogroup nrf52832-dev Device drivers
+ * @{
+ *
+ * \addtogroup nrf52832-lpm Low power mode functions
+ * @{
+ *
+ * \file
+ *         A header file for low power mode functions.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ */
+#ifndef LPM_H
+#define LPM_H
+
+#ifdef SOFTDEVICE_PRESENT
+#include "nrf_soc.h"
+#endif
+
+/**
+ * \brief Stop and wait for an event
+ *
+ */
+static inline void
+lpm_drop(void)
+{
+#ifdef SOFTDEVICE_PRESENT
+  sd_app_evt_wait();
+#else
+  __WFI();
+#endif
+}
+
+#endif /* DEV_LPM_H_ */
+/**
+ * @}
+ * @}
+ */
diff --git a/cpu/nrf52832/dev/random.c b/cpu/nrf52832/dev/random.c
new file mode 100644
index 000000000..d21bf18ff
--- /dev/null
+++ b/cpu/nrf52832/dev/random.c
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+/**
+ * \addtogroup nrf52832
+ * @{
+ *
+ * \addtogroup nrf52832-dev Device drivers
+ * @{
+ *
+ * \addtogroup nrf52832-rng Hardware random number generator
+ * @{
+ *
+ * \file
+ *         Random number generator routines exploiting the nRF52 hardware
+ *         capabilities.
+ *
+ *         This file overrides core/lib/random.c.
+ *
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ */
+#include <stddef.h>
+#include <nrf_drv_rng.h>
+#include "app_error.h"
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Generates a new random number using the nRF52 RNG.
+ * \return a random number.
+ */
+unsigned short
+random_rand(void)
+{
+  unsigned short value = 42;
+  uint8_t available;
+  ret_code_t err_code;
+
+  do {
+    nrf_drv_rng_bytes_available(&available);
+  } while (available < sizeof(value));
+
+  err_code = nrf_drv_rng_rand((uint8_t *)&value, sizeof(value));
+  APP_ERROR_CHECK(err_code);
+
+  return value;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Initialize the nRF52 random number generator.
+ * \param seed Ignored. It's here because the function prototype is in core.
+ *
+ */
+void
+random_init(unsigned short seed)
+{
+  (void)seed;
+  ret_code_t err_code = nrf_drv_rng_init(NULL);
+  APP_ERROR_CHECK(err_code);
+}
+/**
+ * @}
+ * @}
+ * @}
+ */
diff --git a/cpu/nrf52832/dev/uart0.c b/cpu/nrf52832/dev/uart0.c
new file mode 100644
index 000000000..df9c7b9e3
--- /dev/null
+++ b/cpu/nrf52832/dev/uart0.c
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+/**
+ * \addtogroup nrf52832-dev Device drivers
+ * @{
+ *
+ * \addtogroup nrf52832-uart UART driver
+ * @{
+ *
+ * \file
+ *         Contiki compatible UART driver.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ */
+#include <stdlib.h>
+#include "nrf.h"
+#include "nrf_drv_config.h"
+#include "nrf_drv_uart.h"
+#include "app_util_platform.h"
+#include "app_error.h"
+
+#include "contiki.h"
+#include "dev/uart0.h"
+#include "dev/watchdog.h"
+#include "lib/ringbuf.h"
+
+#define TXBUFSIZE 128
+static uint8_t rx_buffer[1];
+
+static int (*uart0_input_handler)(unsigned char c);
+
+static struct ringbuf txbuf;
+static uint8_t txbuf_data[TXBUFSIZE];
+
+/*---------------------------------------------------------------------------*/
+static void
+uart_event_handler(nrf_drv_uart_event_t * p_event, void * p_context)
+{
+  ENERGEST_ON(ENERGEST_TYPE_IRQ);
+
+  if (p_event->type == NRF_DRV_UART_EVT_RX_DONE) {
+    if (uart0_input_handler != NULL) {
+      uart0_input_handler(p_event->data.rxtx.p_data[0]);
+    }
+    (void)nrf_drv_uart_rx(rx_buffer, 1);
+  } else if (p_event->type == NRF_DRV_UART_EVT_TX_DONE) {
+    if (ringbuf_elements(&txbuf) > 0) {
+      uint8_t c = ringbuf_get(&txbuf);
+      nrf_drv_uart_tx(&c, 1);
+    }
+  }
+
+  ENERGEST_OFF(ENERGEST_TYPE_IRQ);
+}
+/*---------------------------------------------------------------------------*/
+void
+uart0_set_input(int (*input)(unsigned char c))
+{
+  uart0_input_handler = input;
+}
+/*---------------------------------------------------------------------------*/
+void
+uart0_writeb(unsigned char c)
+{
+  if (nrf_drv_uart_tx(&c, 1) == NRF_ERROR_BUSY) {
+    while (ringbuf_put(&txbuf, c) == 0) {
+      __WFE();
+    }
+  }
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * Initialize the RS232 port.
+ *
+ */
+void
+uart0_init(unsigned long ubr)
+{
+  nrf_drv_uart_config_t config = NRF_DRV_UART_DEFAULT_CONFIG;
+  ret_code_t retcode = nrf_drv_uart_init(&config, uart_event_handler);
+  APP_ERROR_CHECK(retcode);
+
+  ringbuf_init(&txbuf, txbuf_data, sizeof(txbuf_data));
+
+  nrf_drv_uart_rx_enable();
+  nrf_drv_uart_rx(rx_buffer, 1);
+}
+/**
+ * @}
+ * @}
+ */
diff --git a/cpu/nrf52832/dev/uart0.h b/cpu/nrf52832/dev/uart0.h
new file mode 100644
index 000000000..c6b3938ea
--- /dev/null
+++ b/cpu/nrf52832/dev/uart0.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+/**
+ * \addtogroup nrf52832-dev Device drivers
+ * @{
+ *
+ * \addtogroup nrf52832-uart UART driver
+ * @{
+ *
+ * \file
+ *         A header file for Contiki compatible UART driver.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ */
+#ifndef UART_0_H
+#define UART_0_H
+
+#include <stdint.h>
+#include "contiki-conf.h"
+
+void uart0_init();
+void uart0_writeb(uint8_t byte);
+
+void uart0_set_input(int (* input)(unsigned char c));
+
+#endif /* UART_0_H */
+/**
+ * @}
+ * @}
+ */
diff --git a/cpu/nrf52832/dev/watchdog.c b/cpu/nrf52832/dev/watchdog.c
new file mode 100644
index 000000000..50e26d72b
--- /dev/null
+++ b/cpu/nrf52832/dev/watchdog.c
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+/**
+ * \addtogroup nrf52832-dev Device drivers
+ * @{
+ *
+ * \addtogroup nrf52832-watchdog Watchdog driver
+ * @{
+ *
+ * \file
+ *         Contiki compatible watchdog driver implementation.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ */
+#include <nrf_drv_wdt.h>
+#include "app_error.h"
+#include "contiki-conf.h"
+
+static nrf_drv_wdt_channel_id wdt_channel_id;
+static uint8_t wdt_initialized = 0;
+
+/**
+ * \brief WDT events handler.
+ */
+static void wdt_event_handler(void)
+{
+    LEDS_OFF(LEDS_MASK);
+}
+
+/*---------------------------------------------------------------------------*/
+void
+watchdog_init(void)
+{
+  ret_code_t err_code;
+  err_code = nrf_drv_wdt_init(NULL, &wdt_event_handler);
+  APP_ERROR_CHECK(err_code);
+  err_code = nrf_drv_wdt_channel_alloc(&wdt_channel_id);
+  APP_ERROR_CHECK(err_code);
+  wdt_initialized = 1;
+}
+/*---------------------------------------------------------------------------*/
+void
+watchdog_start(void)
+{
+  if(wdt_initialized) {
+    nrf_drv_wdt_enable();
+  }
+}
+/*---------------------------------------------------------------------------*/
+void
+watchdog_periodic(void)
+{
+  if(wdt_initialized) {
+    nrf_drv_wdt_channel_feed(wdt_channel_id);
+  }
+}
+/*---------------------------------------------------------------------------*/
+void
+watchdog_reboot(void)
+{
+  NVIC_SystemReset();
+}
+/**
+ * @}
+ * @}
+ */
diff --git a/cpu/nrf52832/erase.jlink b/cpu/nrf52832/erase.jlink
new file mode 100644
index 000000000..5f08d8d86
--- /dev/null
+++ b/cpu/nrf52832/erase.jlink
@@ -0,0 +1,2 @@
+erase
+q
\ No newline at end of file
diff --git a/cpu/nrf52832/flash.jlink b/cpu/nrf52832/flash.jlink
new file mode 100644
index 000000000..787670d55
--- /dev/null
+++ b/cpu/nrf52832/flash.jlink
@@ -0,0 +1,4 @@
+loadfile #OUTPUT_FILENAME#
+r
+g
+q
\ No newline at end of file
diff --git a/cpu/nrf52832/ld/nrf52-pca10036-sd.ld b/cpu/nrf52832/ld/nrf52-pca10036-sd.ld
new file mode 100644
index 000000000..455749e29
--- /dev/null
+++ b/cpu/nrf52832/ld/nrf52-pca10036-sd.ld
@@ -0,0 +1,12 @@
+/* Linker script to configure memory regions. */
+
+SEARCH_DIR(.)
+GROUP(-lgcc -lc -lnosys)
+
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x1f000, LENGTH = 0x61000
+  RAM (rwx) :  ORIGIN = 0x08000000, LENGTH = 0x8000
+}
+
+INCLUDE "nrf5x_common.ld"
\ No newline at end of file
diff --git a/cpu/nrf52832/ld/nrf52-pca10040-sd.ld b/cpu/nrf52832/ld/nrf52-pca10040-sd.ld
new file mode 100644
index 000000000..f30aad455
--- /dev/null
+++ b/cpu/nrf52832/ld/nrf52-pca10040-sd.ld
@@ -0,0 +1,12 @@
+/* Linker script to configure memory regions. */
+
+SEARCH_DIR(.)
+GROUP(-lgcc -lc -lnosys)
+
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x1f000, LENGTH = 0x61000
+  RAM (rwx) :  ORIGIN = 0x20002800, LENGTH = 0xD800
+}
+
+INCLUDE "nrf5x_common.ld"
\ No newline at end of file
diff --git a/cpu/nrf52832/ld/nrf52.ld b/cpu/nrf52832/ld/nrf52.ld
new file mode 100644
index 000000000..268794d04
--- /dev/null
+++ b/cpu/nrf52832/ld/nrf52.ld
@@ -0,0 +1,12 @@
+/* Linker script to configure memory regions. */
+
+SEARCH_DIR(.)
+GROUP(-lgcc -lc -lnosys)
+
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x0, LENGTH = 0x80000
+  RAM (rwx) :  ORIGIN = 0x20000000, LENGTH = 0x8000
+}
+
+INCLUDE "nrf5x_common.ld"
\ No newline at end of file
diff --git a/cpu/nrf52832/mtarch.h b/cpu/nrf52832/mtarch.h
new file mode 100644
index 000000000..4f696669d
--- /dev/null
+++ b/cpu/nrf52832/mtarch.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, Loughborough University - 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. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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
+ * Stub header file for multi-threading. It doesn't do anything, it
+ * just exists so that mt.c can compile cleanly.
+ *
+ * This is based on the original mtarch.h for z80 by Takahide Matsutsuka
+ *
+ * \author
+ * George Oikonomou - <oikonomou@users.sourceforge.net>
+ */
+#ifndef __MTARCH_H__
+#define __MTARCH_H__
+
+struct mtarch_thread {
+  unsigned char *sp;
+};
+
+#endif /* __MTARCH_H__ */
diff --git a/cpu/nrf52832/putchar.c b/cpu/nrf52832/putchar.c
new file mode 100644
index 000000000..c4163ba3d
--- /dev/null
+++ b/cpu/nrf52832/putchar.c
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+/**
+ * \addtogroup nrf52832
+ * @{
+ *
+ * \file
+ *         Hardware specific implementation of putchar() and puts() functions.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ *
+ */
+/*---------------------------------------------------------------------------*/
+#include <string.h>
+#include "dev/uart0.h"
+/*---------------------------------------------------------------------------*/
+int
+putchar(int c)
+{
+  uart0_writeb(c);
+  return c;
+}
+/*---------------------------------------------------------------------------*/
+int
+puts(const char *str)
+{
+  int i;
+
+  if (str == NULL) {
+    return 0;
+  }
+
+  for (i = 0; i < strlen(str); i++) {
+    uart0_writeb(str[i]);
+  }
+
+  uart0_writeb('\n');
+  return i;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ */
diff --git a/cpu/nrf52832/rtimer-arch.c b/cpu/nrf52832/rtimer-arch.c
new file mode 100644
index 000000000..78f4790f2
--- /dev/null
+++ b/cpu/nrf52832/rtimer-arch.c
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2015 Nordic Semiconductor. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+/**
+ * \addtogroup nrf52832
+ * @{
+ *
+ * \file
+ *      Implementation of the architecture dependent rtimer functions for the nRF52
+ *
+ * \author
+ *      Wojciech Bober <wojciech.bober@nordicsemi.no>
+ */
+/*---------------------------------------------------------------------------*/
+#include <stdint.h>
+#include <stddef.h>
+#include "nrf.h"
+#include "nrf_drv_timer.h"
+#include "app_error.h"
+#include "contiki.h"
+#include "platform-conf.h"
+
+static const nrf_drv_timer_t timer = NRF_DRV_TIMER_INSTANCE(PLATFORM_TIMER_INSTANCE_ID); /**< Timer instance used for rtimer */
+
+/**
+ * \brief Handler for timer events.
+ *
+ * \param event_type type of an event that should be handled
+ * \param p_context opaque data pointer passed from nrf_drv_timer_init()
+ */
+static void
+timer_event_handler(nrf_timer_event_t event_type, void* p_context)
+{
+  switch (event_type) {
+    case NRF_TIMER_EVENT_COMPARE1:
+      rtimer_run_next();
+      break;
+
+    default:
+      //Do nothing.
+      break;
+  }
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Initialize platform rtimer
+ */
+void
+rtimer_arch_init(void)
+{
+  ret_code_t err_code = nrf_drv_timer_init(&timer, NULL, timer_event_handler);
+  APP_ERROR_CHECK(err_code);
+  nrf_drv_timer_enable(&timer);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Schedules an rtimer task to be triggered at time t
+ * \param t The time when the task will need executed.
+ *
+ * \e t is an absolute time, in other words the task will be executed AT
+ * time \e t, not IN \e t rtimer ticks.
+ *
+ * This function schedules a one-shot event with the nRF RTC.
+ */
+void
+rtimer_arch_schedule(rtimer_clock_t t)
+{
+  nrf_drv_timer_compare(&timer, NRF_TIMER_CC_CHANNEL1, t, true);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Returns the current real-time clock time
+ * \return The current rtimer time in ticks
+ *
+ */
+rtimer_clock_t
+rtimer_arch_now()
+{
+  return nrf_drv_timer_capture(&timer, NRF_TIMER_CC_CHANNEL0);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ */
diff --git a/cpu/nrf52832/rtimer-arch.h b/cpu/nrf52832/rtimer-arch.h
new file mode 100644
index 000000000..da709dae2
--- /dev/null
+++ b/cpu/nrf52832/rtimer-arch.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+/**
+ * \addtogroup nrf52832 nRF52832
+ * @{
+ *
+ * \file
+ *         Architecture dependent rtimer implementation header file.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ *
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef RTIMER_ARCH_H_
+#define RTIMER_ARCH_H_
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+/*---------------------------------------------------------------------------*/
+rtimer_clock_t rtimer_arch_now(void);
+/*---------------------------------------------------------------------------*/
+#endif /* RTIMER_ARCH_H_ */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ */

From d39ad95db5f1625dac61b91a1d0a6d16c0b43938 Mon Sep 17 00:00:00 2001
From: Wojciech Bober <wojciech.bober@gmail.com>
Date: Sat, 9 Jan 2016 14:44:39 +0100
Subject: [PATCH 024/393] nrf52dk: platform support

---
 platform/nrf52dk/Makefile.nrf52dk           |   34 +
 platform/nrf52dk/README-BLE-6LoWPAN.md      |  100 ++
 platform/nrf52dk/README.md                  |  254 +++++
 platform/nrf52dk/config/nrf_drv_config.h    |  329 ++++++
 platform/nrf52dk/config/pstorage_platform.h |   74 ++
 platform/nrf52dk/contiki-conf.h             |  153 +++
 platform/nrf52dk/contiki-main.c             |  203 ++++
 platform/nrf52dk/dbg-io/dbg.c               |   72 ++
 platform/nrf52dk/dbg-io/dbg.h               |   67 ++
 platform/nrf52dk/dbg-io/debug-uart.h        |   54 +
 platform/nrf52dk/dev/button-sensor.c        |  330 ++++++
 platform/nrf52dk/dev/button-sensor.h        |   72 ++
 platform/nrf52dk/dev/leds-arch.c            |   77 ++
 platform/nrf52dk/dev/nrf52dk-sensors.c      |   66 ++
 platform/nrf52dk/dev/temperature-sensor.c   |  109 ++
 platform/nrf52dk/dev/temperature-sensor.h   |   59 +
 platform/nrf52dk/platform-conf.h            |  145 +++
 platform/nrf52dk/rtt/rtt-printf.c           |   24 +
 platform/nrf52dk/rtt/segger-rtt-conf.h      |  135 +++
 platform/nrf52dk/rtt/segger-rtt-printf.c    |  510 +++++++++
 platform/nrf52dk/rtt/segger-rtt.c           | 1102 +++++++++++++++++++
 platform/nrf52dk/rtt/segger-rtt.h           |  204 ++++
 22 files changed, 4173 insertions(+)
 create mode 100644 platform/nrf52dk/Makefile.nrf52dk
 create mode 100644 platform/nrf52dk/README-BLE-6LoWPAN.md
 create mode 100644 platform/nrf52dk/README.md
 create mode 100644 platform/nrf52dk/config/nrf_drv_config.h
 create mode 100644 platform/nrf52dk/config/pstorage_platform.h
 create mode 100644 platform/nrf52dk/contiki-conf.h
 create mode 100644 platform/nrf52dk/contiki-main.c
 create mode 100644 platform/nrf52dk/dbg-io/dbg.c
 create mode 100644 platform/nrf52dk/dbg-io/dbg.h
 create mode 100644 platform/nrf52dk/dbg-io/debug-uart.h
 create mode 100644 platform/nrf52dk/dev/button-sensor.c
 create mode 100644 platform/nrf52dk/dev/button-sensor.h
 create mode 100644 platform/nrf52dk/dev/leds-arch.c
 create mode 100644 platform/nrf52dk/dev/nrf52dk-sensors.c
 create mode 100644 platform/nrf52dk/dev/temperature-sensor.c
 create mode 100644 platform/nrf52dk/dev/temperature-sensor.h
 create mode 100644 platform/nrf52dk/platform-conf.h
 create mode 100644 platform/nrf52dk/rtt/rtt-printf.c
 create mode 100644 platform/nrf52dk/rtt/segger-rtt-conf.h
 create mode 100644 platform/nrf52dk/rtt/segger-rtt-printf.c
 create mode 100644 platform/nrf52dk/rtt/segger-rtt.c
 create mode 100644 platform/nrf52dk/rtt/segger-rtt.h

diff --git a/platform/nrf52dk/Makefile.nrf52dk b/platform/nrf52dk/Makefile.nrf52dk
new file mode 100644
index 000000000..8fa911cc4
--- /dev/null
+++ b/platform/nrf52dk/Makefile.nrf52dk
@@ -0,0 +1,34 @@
+ifndef CONTIKI
+  $(error CONTIKI not defined! You must specify where CONTIKI resides!)
+endif
+
+### Include the board-specific makefile
+PLATFORM_ROOT_DIR = $(CONTIKI)/platform/$(TARGET)
+
+CONTIKI_TARGET_DIRS += . dev config
+CONTIKI_SOURCEFILES += contiki-main.c leds-arch.c nrf52dk-sensors.c button-sensor.c temperature-sensor.c
+
+ifeq ($(NRF52_USE_RTT),1)
+### Use the existing debug I/O in cpu/arm/common
+CONTIKI_TARGET_DIRS += rtt
+CONTIKI_SOURCEFILES += rtt-printf.c segger-rtt.c segger-rtt-printf.c
+else
+CONTIKI_TARGET_DIRS += dbg-io
+CONTIKI_SOURCEFILES += dbg.c
+CONTIKI_CPU_DIRS += ../arm/common/dbg-io
+CONTIKI_CPU_SOURCEFILES += dbg-printf.c dbg-putchar.c dbg-snprintf.c dbg-sprintf.c strformat.c
+endif
+
+CLEAN += *.nrf52dk
+
+### Unless the example dictates otherwise, build with code size optimisations switched
+### off
+ifndef SMALL
+  SMALL = 0
+endif
+
+### Define the CPU directory and pull in the correct CPU makefile.
+CONTIKI_CPU=$(CONTIKI)/cpu/nrf52832
+include $(CONTIKI_CPU)/Makefile.nrf52832
+
+MODULES += core/net core/net/mac core/net/llsec
diff --git a/platform/nrf52dk/README-BLE-6LoWPAN.md b/platform/nrf52dk/README-BLE-6LoWPAN.md
new file mode 100644
index 000000000..e4c9ef5f6
--- /dev/null
+++ b/platform/nrf52dk/README-BLE-6LoWPAN.md
@@ -0,0 +1,100 @@
+This README contains information how to establish an IPv6 connecton between
+Linux BLE router and an IPSP enabled BLE device.
+
+Prerequisites
+=============
+In general, any device capable of running Linux operating system, can be used
+as a BLE router provided the following conditions are met:
+
+* Linux Kernel >3.18 is used
+* bluez, libcap-ng0, radvd tools are present.
+
+If a built-in Bluetooth device is not available then Bluetooth 4.0 compatible 
+USB dongle can be used.
+
+The following procedures have been tested on Ubuntu 15.10.
+
+Establishing an IPv6 connection
+===============================
+Use the following procedure to establish a connection between an nRF52 device 
+and Linux router:
+
+First enable 6LoWPAN module. This is neccessary only once per session:
+
+	# Log in as a root user.
+	sudo su
+	
+	# Mount debugfs file system.
+	mount -t debugfs none /sys/kernel/debug
+	
+	# Load 6LoWPAN module.
+	modprobe bluetooth_6lowpan
+	
+	# Enable the bluetooth 6lowpan module.
+	echo 1 > /sys/kernel/debug/bluetooth/6lowpan_enable
+	
+	# Look for available HCI devices.
+	hciconfig
+	
+	# Reset HCI device - for example hci0 device.
+	hciconfig hci0 reset
+	
+	# Read 00:AA:BB:XX:YY:ZZ address of the nRF5x device.
+	hcitool lescan
+	
+If you see device name and address in lescan output then you can connect to the
+device:
+	
+	echo "connect 00:AA:BB:XX:YY:ZZ 1" > /sys/kernel/debug/bluetooth/6lowpan_control
+	
+If above is successful then LED1 will stop blinking and LED2 will switch on. 
+You can then check the connection using the following commands:
+
+	# Check if bt0 interface is present and up
+	ifconfig
+	
+	# Try to ping the device using its link-local address, for example, on bt0 interface.
+	ping6 -I bt0 fe80::2aa:bbff:fexx:yyzz
+	
+If you'd like to learn more about the procedure please refer to 
+[Connecting devices to the router].
+
+Distributing routable IPv6 prefix
+=================================
+In Linux, Router Advertisement Daemon (RADVD) can be used to distribute prefixes
+in the network, hance configure routable IPv6 address.
+ 
+To configure RADVD create `/etc/radvd.conf` file and paste the following contents:
+
+	interface bt0
+	{
+	    AdvSendAdvert on;
+	    prefix 2001:db8::/64
+	    {
+	        AdvOnLink off;
+	        AdvAutonomous on;
+	        AdvRouterAddr on;
+	    };
+	};
+
+Next, start RADVD daemon:
+
+	# Set IPv6 forwarding (must be present).
+	sudo echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
+	# Run radvd daemon.
+	sudo service radvd restart
+	
+If successfull then all devices connected to the host will receive 
+a routable `2001:db8` prefix.
+
+This can be verified by sending echo request to the full address:
+
+	ping6 -I bt0 2001:db8::2aa:bbff:fexx:yyzz
+	
+where `aa:bbff:fexx:yyzz` is device Bluetooth address.
+
+If you'd like to learn more about the procedure please refer to
+[Distributing a global IPv6 prefix].
+
+* [Connecting devices to the router]: http://developer.nordicsemi.com/nRF5_IoT_SDK/doc/0.9.0/html/a00089.html
+* [Distributing a global IPv6 prefix]: http://developer.nordicsemi.com/nRF5_IoT_SDK/doc/0.9.0/html/a00090.html 
\ No newline at end of file
diff --git a/platform/nrf52dk/README.md b/platform/nrf52dk/README.md
new file mode 100644
index 000000000..236892858
--- /dev/null
+++ b/platform/nrf52dk/README.md
@@ -0,0 +1,254 @@
+Contiki for nRF52 Development Kit
+=================================
+This guide's aim is to help you with using Contiki for 
+Nordic Semiconductor's nRF52 DK. 
+
+The port depends on Nordic Semiconductor IoT SDK for nRF52. 
+The IoT SDK contains source code and libraries which are 
+required for successfull port compilation. It also contains 
+SoftDevice binary driver which is required for BLE operation. 
+See prerequisites section for details on how to set up the SDK. 
+
+For more information about SoftDevice please refer to the SDK 
+docummentation [nRF52 Datasheet and SDK documentation].
+
+This port supports DK versions PCA10040 and PCA10036.
+
+Port Features
+=============
+The following features have been implemented:
+* Support for IPv6 over BLE using Contiki 6LoWPAN implementation
+* Contiki system clock and rtimers (using 32kHz and 1MHz timers)
+* UART driver
+* Watchdog driver
+* Hardware RNG
+* Temperature sensor driver
+* DK LED driver
+* DK Buttons driver
+* Real Time Transfer (RTT) I/O support
+
+Note that this port supports only IPv6 network stack.
+
+The port is organized as follows:
+* nRF52832 CPU and BLE drivers are located in `cpu/nrf52832` folder
+* nRF52 Development Kit drivers are located in `platform/nrf52dk` folder
+* Platform examples are located in `examples/nrf52dk` folder 
+
+Prerequisites and Setup
+=======================
+In order to compile for the nRF52 DK platform you'll need:
+
+* nRF5 IOT SDK
+  https://developer.nordicsemi.com
+  
+  Download nRF5 IOT SDK, extract it to a folder of your choice,
+  and point `NRF52_SDK_ROOT` environmental variable to it, e.g.,:
+    
+    ```
+    wget https://developer.nordicsemi.com/nRF5_IoT_SDK/nRF5_IoT_SDK_v0.9.x/nrf5_iot_sdk_3288530.zip
+    unzip nrf5_iot_sdk_3288530.zip -d /path/to/sdk
+    export NRF52_SDK_ROOT=/path/to/sdk
+    ```
+    
+* An ARM compatible toolchain
+  The port has been tested with GNU Tools for ARM Embedded Processors 
+  version 5.2.1. 
+  
+  For Ubuntu you can use package version provided by your distribution:
+    ```
+    sudo apt-get install gcc-arm-none-eabi
+    ```
+
+  Alternatively, install the toolchain from PPA to get the latest version
+  of the compiler: https://launchpad.net/~team-gcc-arm-embedded/+archive/ubuntu/ppa
+  
+  For other systems please download and install toolchain available at 
+  https://launchpad.net/gcc-arm-embedded
+
+* GNU make
+
+* Segger JLink Software for Linux
+  https://www.segger.com/jlink-software.html
+
+  This package contains tools necessary for programming and debugging nRF52 DK. 
+
+  For Ubuntu you can download and install a .deb package.  Alternatively download 
+  tar.gz archive and extract it to a folder of your choice. In this case you 
+  need to set `NRF52_JLINK_PATH` environmental variable to point to the
+  JLink tools location:
+  
+    ```
+    export NRF52_JLINK_PATH=/path/to/jlink/tools
+    ```
+    
+  To keep this variable set between sessions please add the above line to your
+  `rc.local` file. 
+  
+  In order to access the DK as a regular Linux user create a `99-jlink.rules`
+  file in your udev rules folder (e.g., `/etc/udev/rules.d/`) and add the 
+  following line to it:
+    
+    ```
+    ATTRS{idProduct}=="1015", ATTRS{idVendor}=="1366", MODE="0666"
+    ```
+  When installing from a deb package, the `99-jlink.rules` file is added
+  automatically to /etc/udev/rules.d folder. However, the syntax of the file
+  doesn't work on newer udev versions. To fix this problem edit this file and
+  replace ATTR keyword with ATTRS.
+
+To fully use the platform a BLE enabled router device is needed. Please refer
+to `Preqrequisites` section in `README-BLE-6LoWPAN.md` for details.
+
+Getting Started
+===============
+Once all tools are installed it is recommended to start by compiling 
+and flashing `examples/hello-word` application. This allows to verify 
+that toolchain setup is correct.
+
+To compile the example, go to `examples/hello-world` and execute:
+
+    make TARGET=nrf52dk
+
+If you haven't used the device with Contiki before we advise to
+erase the device and flash new SoftDevice:
+
+    make TARGET=nrf52dk erase
+    make TARGET=nrf52dk softdevice.flash
+
+If the compilation is completed without errors flash the board:
+
+    make TARGET=nrf52dk hello-world.flash
+
+The device will start BLE advertising as soon as initialized. By
+default the device name is set to 'Contiki nRF52 DK'. To verify
+that the device is advertising properly run:
+
+    sudo hcitool lescan
+
+And observe if the device name appears in the output. Also, observe
+if LED1 is blinking what indicates that device is waiting for a connection
+from BLE master.
+
+If device is functioning as expected you can test IPv6 connection 
+to the device. Please refer to `README-BLE-6LoWPAN.md` on details how to do
+this.
+
+Examples
+========
+Examples specific for nRF52 DK can be found in `examples/nrf52dk` folder. Please 
+refer to README.md in respective examples for detailed description.
+
+The DK has also been tested with the `examples/hello-world` and `examples/webserver-ipv6`
+generic examples. 
+
+Compilation Options
+===================
+The Contiki TARGET name for this port is `nrf52dk`, so in order to compile 
+an application you need to invoke GNU make as follows:
+
+    make TARGET=nrf52dk
+
+In addition to this port supports the following variables which can be
+set on the compilation command line:
+
+* `NRF52_SDK_ROOT=<SDK PATH>`
+  This variable allows to specify a path to the nRF52 SDK which should 
+  be used for the build.
+  
+* `NRF52_WITHOUT_SOFTDEVICE={0|1}`
+  Disables SoftDevice support if set to 1. By default, SoftDevice support
+  is used. Note that SoftDevice must be present (flashed) in the device
+  before you run an application that requires it's presence. 
+  
+* `NRF52_USE_RTT={0|1}`
+  Enables RealTime Terminal I/O. See VCOM and RTT for details. By default,
+  RTT is disabled and IO is done using Virtual COM port.
+
+* `NRF52_JLINK_SN=<serial number>`
+  Allows to choose a particular DK by its serial number (printed on the
+  label). This is useful if you have more than one DK connected to your
+  PC and whish to flash a particular device. 
+
+* `NRF52_DK_REVISION={pca10040|pca10036}`
+  Allows to specify DK revision. By default, pca10040 is used.
+
+Compilation Targets
+===================
+Invoking make solely with the `TARGET` variable set will build all
+applications in a given folder. A particular application can be built
+by invoking make with its name as a compilation target:
+
+    make TARGET=nrf52dk hello-world 
+
+In order to flash the application binary to the device use `<application>.flash`
+as make target, e.g.: 
+
+    make TARGET=nrf52dk hello-world.flash
+
+In addition, the SoftDevice binary can be flashed to the DK by invoking:
+
+    make TARGET=nrf52dk softdevice.flash
+
+To remove all build results invoke:
+
+    make TARGET=nrf52dk clean
+
+The device memory can be erased using:
+
+    make TARGET=nrf52dk erase
+
+Note, that once the device is erased, the SoftDevice must be programmed again.
+
+Virtual COM and Real Time Transfer
+==================================
+By default, the nRF52 DK uses a Virtual COM port to output logs. Once
+the DK is plugged in a `/tty/ACM<n>` or `/ttyUSB<n>` device should appear in
+your filesystem. A terminal emulator, such as picocom or minicom, can be 
+used to connect to the device. Default serial port speed is 38400 bps. 
+
+To connect to serial port using picocom invoke:
+
+    picocom -fh -b 38400 --imap lfcrlf /dev/ttyACM0 
+
+Note, that if you have not fixed file permissions for `/dev/ttyACM0` 
+according to section `Segger JLink Software for Linux` you'll need to use
+root or sudo to open the port with `picocom`.
+
+In addition to Virtual COM the port supports SEGGER's Real Time Transfer
+for low overhead I/O support. This allows for outputting debugging information
+at much higher rate with significantly lower overhead than regular I/O.
+
+To compile an application with RTT rather that VCOM set `NRF52_USE_RTT` to 1 on
+the compilation command line:
+
+    make TARGET=nrf52dk NRF52_USE_RTT=1 hello-world
+
+You can then connect to the device terminal using `JLinkRTTClient`. Note that
+a JLlink gdb or commander must be connected to the target for the RTT to work.
+
+More details regarding RTT can be found at https://www.segger.com/jlink-rtt.html
+
+Docummentation
+==============
+This port provides doxygen source code docummentation. To build the 
+docummentation please run:
+
+    sudo apt-get install doxygen
+    cd <CONTIKI_ROOT>\doc
+    make
+
+Support
+=======
+This port is officially supported by Nordic Semiconductor. Please send bug 
+reports or/and suggestions to <wojciech.bober@nordicsemi.no>.
+
+License
+=======
+All files in the port are under BSD license. nRF52 SDK and SoftDevice are
+licensed on a separate terms.
+
+Resources
+=========
+* nRF52 Datasheet and SDK documentation (http://infocenter.nordicsemi.com)
+* nRF52 SDK Downloads (https://developer.nordicsemi.com/)
+* JLink Tools (https://www.segger.com/)
\ No newline at end of file
diff --git a/platform/nrf52dk/config/nrf_drv_config.h b/platform/nrf52dk/config/nrf_drv_config.h
new file mode 100644
index 000000000..cfc3595b2
--- /dev/null
+++ b/platform/nrf52dk/config/nrf_drv_config.h
@@ -0,0 +1,329 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup nrf52dk
+ * @{
+ *
+ * \defgroup nrf52dk-config nRF52 SDK configuration
+ * @{
+ */
+
+#ifndef NRF_DRV_CONFIG_H
+#define NRF_DRV_CONFIG_H
+
+/* CLOCK */
+#define CLOCK_CONFIG_XTAL_FREQ          NRF_CLOCK_XTALFREQ_Default
+#define CLOCK_CONFIG_LF_SRC             NRF_CLOCK_LF_SRC_Xtal
+#define CLOCK_CONFIG_LF_RC_CAL_INTERVAL RC_2000MS_CALIBRATION_INTERVAL
+#define CLOCK_CONFIG_IRQ_PRIORITY       APP_IRQ_PRIORITY_LOW
+
+/* GPIOTE */
+#define GPIOTE_ENABLED 1
+
+#if (GPIOTE_ENABLED == 1)
+#define GPIOTE_CONFIG_USE_SWI_EGU false
+#define GPIOTE_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_HIGH
+#define GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS 4
+#endif
+
+/* TIMER */
+#define TIMER0_ENABLED 0
+
+#if (TIMER0_ENABLED == 1)
+#define TIMER0_CONFIG_FREQUENCY    NRF_TIMER_FREQ_16MHz
+#define TIMER0_CONFIG_MODE         TIMER_MODE_MODE_Timer
+#define TIMER0_CONFIG_BIT_WIDTH    TIMER_BITMODE_BITMODE_32Bit
+#define TIMER0_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+
+#define TIMER0_INSTANCE_INDEX      0
+#endif
+
+#define TIMER1_ENABLED 1
+
+#if (TIMER1_ENABLED == 1)
+#define TIMER1_CONFIG_FREQUENCY    NRF_TIMER_FREQ_62500Hz
+#define TIMER1_CONFIG_MODE         TIMER_MODE_MODE_Timer
+#define TIMER1_CONFIG_BIT_WIDTH    TIMER_BITMODE_BITMODE_32Bit
+#define TIMER1_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+
+#define TIMER1_INSTANCE_INDEX      (TIMER0_ENABLED)
+#endif
+ 
+#define TIMER2_ENABLED 0
+
+#if (TIMER2_ENABLED == 1)
+#define TIMER2_CONFIG_FREQUENCY    NRF_TIMER_FREQ_16MHz
+#define TIMER2_CONFIG_MODE         TIMER_MODE_MODE_Timer
+#define TIMER2_CONFIG_BIT_WIDTH    TIMER_BITMODE_BITMODE_16Bit
+#define TIMER2_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+
+#define TIMER2_INSTANCE_INDEX      (TIMER1_ENABLED+TIMER0_ENABLED)
+#endif
+
+#define TIMER3_ENABLED 0
+
+#if (TIMER3_ENABLED == 1)
+#define TIMER3_CONFIG_FREQUENCY    NRF_TIMER_FREQ_16MHz
+#define TIMER3_CONFIG_MODE         TIMER_MODE_MODE_Timer
+#define TIMER3_CONFIG_BIT_WIDTH    TIMER_BITMODE_BITMODE_16Bit
+#define TIMER3_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+
+#define TIMER3_INSTANCE_INDEX      (TIMER2_ENABLED+TIMER2_INSTANCE_INDEX)
+#endif
+
+#define TIMER4_ENABLED 0
+
+#if (TIMER4_ENABLED == 1)
+#define TIMER4_CONFIG_FREQUENCY    NRF_TIMER_FREQ_16MHz
+#define TIMER4_CONFIG_MODE         TIMER_MODE_MODE_Timer
+#define TIMER4_CONFIG_BIT_WIDTH    TIMER_BITMODE_BITMODE_16Bit
+#define TIMER4_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+
+#define TIMER4_INSTANCE_INDEX      (TIMER3_ENABLED+TIMER3_INSTANCE_INDEX)
+#endif
+
+
+#define TIMER_COUNT (TIMER0_ENABLED + TIMER1_ENABLED + TIMER2_ENABLED + TIMER3_ENABLED + TIMER4_ENABLED)
+
+/* RTC */
+#define RTC0_ENABLED 0
+
+#if (RTC0_ENABLED == 1)
+#define RTC0_CONFIG_FREQUENCY    32678
+#define RTC0_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+#define RTC0_CONFIG_RELIABLE     false
+
+#define RTC0_INSTANCE_INDEX      0
+#endif
+
+#define RTC1_ENABLED 1
+
+#if (RTC1_ENABLED == 1)
+#define RTC1_CONFIG_FREQUENCY    128
+#define RTC1_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+#define RTC1_CONFIG_RELIABLE     false
+
+#define RTC1_INSTANCE_INDEX      (RTC0_ENABLED)
+#endif
+
+#define RTC_COUNT                (RTC0_ENABLED+RTC1_ENABLED)
+
+#define NRF_MAXIMUM_LATENCY_US 2000
+
+/* RNG */
+#define RNG_ENABLED 1
+
+#if (RNG_ENABLED == 1)
+#define RNG_CONFIG_ERROR_CORRECTION true
+#define RNG_CONFIG_POOL_SIZE        8
+#define RNG_CONFIG_IRQ_PRIORITY     APP_IRQ_PRIORITY_LOW
+#endif
+
+/* SPI */
+#define SPI0_ENABLED 0
+
+#if (SPI0_ENABLED == 1)
+#define SPI0_USE_EASY_DMA 0
+
+#define SPI0_CONFIG_SCK_PIN         2
+#define SPI0_CONFIG_MOSI_PIN        3
+#define SPI0_CONFIG_MISO_PIN        4
+#define SPI0_CONFIG_IRQ_PRIORITY    APP_IRQ_PRIORITY_LOW
+
+#define SPI0_INSTANCE_INDEX 0
+#endif
+
+#define SPI1_ENABLED 0
+
+#if (SPI1_ENABLED == 1)
+#define SPI1_USE_EASY_DMA 0
+
+#define SPI1_CONFIG_SCK_PIN         2
+#define SPI1_CONFIG_MOSI_PIN        3
+#define SPI1_CONFIG_MISO_PIN        4
+#define SPI1_CONFIG_IRQ_PRIORITY    APP_IRQ_PRIORITY_LOW
+
+#define SPI1_INSTANCE_INDEX (SPI0_ENABLED)
+#endif
+
+#define SPI2_ENABLED 0
+
+#if (SPI2_ENABLED == 1)
+#define SPI2_USE_EASY_DMA 0
+
+#define SPI2_CONFIG_SCK_PIN         2
+#define SPI2_CONFIG_MOSI_PIN        3
+#define SPI2_CONFIG_MISO_PIN        4
+#define SPI2_CONFIG_IRQ_PRIORITY    APP_IRQ_PRIORITY_LOW
+
+#define SPI2_INSTANCE_INDEX (SPI0_ENABLED + SPI1_ENABLED)
+#endif
+
+#define SPI_COUNT   (SPI0_ENABLED + SPI1_ENABLED + SPI2_ENABLED)
+
+/* UART */
+#define UART0_ENABLED 1
+
+#if (UART0_ENABLED == 1)
+#define UART0_CONFIG_HWFC         NRF_UART_HWFC_DISABLED
+#define UART0_CONFIG_PARITY       NRF_UART_PARITY_EXCLUDED
+#define UART0_CONFIG_BAUDRATE     NRF_UART_BAUDRATE_38400
+#define UART0_CONFIG_PSEL_TXD 6
+#define UART0_CONFIG_PSEL_RXD 8
+#define UART0_CONFIG_PSEL_CTS 7
+#define UART0_CONFIG_PSEL_RTS 5
+#define UART0_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+#ifdef NRF52
+#define UART0_CONFIG_USE_EASY_DMA false
+//Compile time flag
+#define UART_EASY_DMA_SUPPORT     1
+#define UART_LEGACY_SUPPORT       1
+#endif //NRF52
+#endif
+
+#define TWI0_ENABLED 0
+
+#if (TWI0_ENABLED == 1)
+#define TWI0_CONFIG_FREQUENCY    NRF_TWI_FREQ_100K
+#define TWI0_CONFIG_SCL          0
+#define TWI0_CONFIG_SDA          1
+#define TWI0_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_HIGH
+
+#define TWI0_INSTANCE_INDEX      0
+#endif
+
+#define TWI1_ENABLED 0
+
+#if (TWI1_ENABLED == 1)
+#define TWI1_CONFIG_FREQUENCY    NRF_TWI_FREQ_100K
+#define TWI1_CONFIG_SCL          0
+#define TWI1_CONFIG_SDA          1
+#define TWI1_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_HIGH
+
+#define TWI1_INSTANCE_INDEX      (TWI0_ENABLED)
+#endif
+
+#define TWI_COUNT                (TWI0_ENABLED+TWI1_ENABLED)
+
+/* TWIS */
+#define TWIS0_ENABLED 0
+
+#if (TWIS0_ENABLED == 1)
+    #define TWIS0_CONFIG_ADDR0        0
+    #define TWIS0_CONFIG_ADDR1        0 /* 0: Disabled */
+    #define TWIS0_CONFIG_SCL          0
+    #define TWIS0_CONFIG_SDA          1
+    #define TWIS0_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_HIGH
+
+    #define TWIS0_INSTANCE_INDEX      0
+#endif
+
+#define TWIS1_ENABLED 0
+
+#if (TWIS1_ENABLED ==  1)
+    #define TWIS1_CONFIG_ADDR0        0
+    #define TWIS1_CONFIG_ADDR1        0 /* 0: Disabled */
+    #define TWIS1_CONFIG_SCL          0
+    #define TWIS1_CONFIG_SDA          1
+    #define TWIS1_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_HIGH
+
+    #define TWIS1_INSTANCE_INDEX      (TWIS0_ENABLED)
+#endif
+
+#define TWIS_COUNT (TWIS0_ENABLED + TWIS1_ENABLED)
+/* For more documentation see nrf_drv_twis.h file */
+#define TWIS_ASSUME_INIT_AFTER_RESET_ONLY 0
+/* For more documentation see nrf_drv_twis.h file */
+#define TWIS_NO_SYNC_MODE 0
+/**
+ * \brief Definition for patching PAN problems
+ *
+ * Set this definition to nonzero value to patch anomalies
+ * from MPW3 - first lunch microcontroller.
+ *
+ * Concerns:
+ * - PAN-29: TWIS: incorrect bits in ERRORSRC
+ * - PAN-30: TWIS: STOP task does not work as expected
+ */
+#define NRF_TWIS_PATCH_FOR_MPW3 1
+
+
+/* QDEC */
+#define QDEC_ENABLED 0
+
+#if (QDEC_ENABLED == 1)
+#define QDEC_CONFIG_REPORTPER    NRF_QDEC_REPORTPER_10
+#define QDEC_CONFIG_SAMPLEPER    NRF_QDEC_SAMPLEPER_16384us
+#define QDEC_CONFIG_PIO_A        1
+#define QDEC_CONFIG_PIO_B        2
+#define QDEC_CONFIG_PIO_LED      3
+#define QDEC_CONFIG_LEDPRE       511
+#define QDEC_CONFIG_LEDPOL       NRF_QDEC_LEPOL_ACTIVE_HIGH
+#define QDEC_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+#define QDEC_CONFIG_DBFEN        false
+#define QDEC_CONFIG_SAMPLE_INTEN false
+#endif
+
+/* SAADC */
+#define SAADC_ENABLED 0
+
+#if (SAADC_ENABLED == 1)
+#define SAADC_CONFIG_RESOLUTION      NRF_SAADC_RESOLUTION_10BIT
+#define SAADC_CONFIG_OVERSAMPLE      NRF_SAADC_OVERSAMPLE_DISABLED
+#define SAADC_CONFIG_IRQ_PRIORITY    APP_IRQ_PRIORITY_LOW
+#endif
+
+/* LPCOMP */
+#define LPCOMP_ENABLED 0
+
+#if (LPCOMP_ENABLED == 1)
+#define LPCOMP_CONFIG_REFERENCE    NRF_LPCOMP_REF_SUPPLY_4_8
+#define LPCOMP_CONFIG_DETECTION    NRF_LPCOMP_DETECT_DOWN
+#define LPCOMP_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+#define LPCOMP_CONFIG_INPUT        NRF_LPCOMP_INPUT_0
+#endif
+
+/* WDT */
+#define WDT_ENABLED 1
+
+#if (WDT_ENABLED == 1)
+#define WDT_CONFIG_BEHAVIOUR     NRF_WDT_BEHAVIOUR_RUN_SLEEP
+#define WDT_CONFIG_RELOAD_VALUE  2000
+#define WDT_CONFIG_IRQ_PRIORITY  APP_IRQ_PRIORITY_HIGH
+#endif
+
+#include "nrf_drv_config_validation.h"
+#endif // NRF_DRV_CONFIG_H
+
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/nrf52dk/config/pstorage_platform.h b/platform/nrf52dk/config/pstorage_platform.h
new file mode 100644
index 000000000..3102b2097
--- /dev/null
+++ b/platform/nrf52dk/config/pstorage_platform.h
@@ -0,0 +1,74 @@
+/* Copyright (c)  2013 Nordic Semiconductor. All Rights Reserved.
+ *
+ * The information contained herein is property of Nordic Semiconductor ASA.
+ * Terms and conditions of usage are described in detail in NORDIC
+ * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
+ *
+ * Licensees are granted free, non-transferable use of the information. NO
+ * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
+ * the file.
+ *
+ */
+
+ /** @cond To make doxygen skip this file */
+
+/** @file
+ *  This header contains defines with respect persistent storage that are specific to
+ *  persistent storage implementation and application use case.
+ */
+#ifndef PSTORAGE_PL_H__
+#define PSTORAGE_PL_H__
+
+#include <stdint.h>
+#include "nrf.h"
+
+static __INLINE uint16_t pstorage_flash_page_size()
+{
+  return (uint16_t)NRF_FICR->CODEPAGESIZE;
+}
+
+#define PSTORAGE_FLASH_PAGE_SIZE     pstorage_flash_page_size()          /**< Size of one flash page. */
+#define PSTORAGE_FLASH_EMPTY_MASK    0xFFFFFFFF                          /**< Bit mask that defines an empty address in flash. */
+
+#ifdef NRF51
+#define BOOTLOADER_ADDRESS           (NRF_UICR->BOOTLOADERADDR)
+#elif defined NRF52
+#define BOOTLOADER_ADDRESS           (PSTORAGE_FLASH_EMPTY_MASK)
+#endif
+
+#define PSTORAGE_FLASH_PAGE_END                               \
+        ((BOOTLOADER_ADDRESS != PSTORAGE_FLASH_EMPTY_MASK)    \
+        ? (BOOTLOADER_ADDRESS / PSTORAGE_FLASH_PAGE_SIZE)     \
+        : NRF_FICR->CODESIZE)
+
+
+#define PSTORAGE_NUM_OF_PAGES       2                                                           /**< Number of flash pages allocated for the pstorage module excluding the swap page, configurable based on system requirements. */
+#define PSTORAGE_MIN_BLOCK_SIZE     0x0010                                                      /**< Minimum size of block that can be registered with the module. Should be configured based on system requirements, recommendation is not have this value to be at least size of word. */
+
+#define PSTORAGE_DATA_START_ADDR    ((PSTORAGE_FLASH_PAGE_END - PSTORAGE_NUM_OF_PAGES - 1) \
+                                    * PSTORAGE_FLASH_PAGE_SIZE)                                 /**< Start address for persistent data, configurable according to system requirements. */
+#define PSTORAGE_DATA_END_ADDR      ((PSTORAGE_FLASH_PAGE_END - 1) * PSTORAGE_FLASH_PAGE_SIZE)  /**< End address for persistent data, configurable according to system requirements. */
+#define PSTORAGE_SWAP_ADDR          PSTORAGE_DATA_END_ADDR                                      /**< Top-most page is used as swap area for clear and update. */
+
+#define PSTORAGE_MAX_BLOCK_SIZE     PSTORAGE_FLASH_PAGE_SIZE                                    /**< Maximum size of block that can be registered with the module. Should be configured based on system requirements. And should be greater than or equal to the minimum size. */
+#define PSTORAGE_CMD_QUEUE_SIZE     30                                                          /**< Maximum number of flash access commands that can be maintained by the module for all applications. Configurable. */
+
+
+/** Abstracts persistently memory block identifier. */
+typedef uint32_t pstorage_block_t;
+
+typedef struct
+{
+    uint32_t            module_id;      /**< Module ID.*/
+    pstorage_block_t    block_id;       /**< Block ID.*/
+} pstorage_handle_t;
+
+typedef uint16_t pstorage_size_t;      /** Size of length and offset fields. */
+
+/**\brief Handles Flash Access Result Events. To be called in the system event dispatcher of the application. */
+void pstorage_sys_event_handler (uint32_t sys_evt);
+
+#endif // PSTORAGE_PL_H__
+
+/** @} */
+/** @endcond */
diff --git a/platform/nrf52dk/contiki-conf.h b/platform/nrf52dk/contiki-conf.h
new file mode 100644
index 000000000..6303c90db
--- /dev/null
+++ b/platform/nrf52dk/contiki-conf.h
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+/**
+ * \addtogroup nrf52dk
+ * @{
+ *
+ * \addtogroup nrf52dk-contikic-conf Contiki configuration
+ * @{
+ *
+ * \file
+ *  Contiki configuration for the nRF52 DK
+ */
+#ifndef CONTIKI_CONF_H
+#define CONTIKI_CONF_H
+
+#include <stdint.h>
+/*---------------------------------------------------------------------------*/
+/* Include Project Specific conf */
+#ifdef PROJECT_CONF_H
+#include PROJECT_CONF_H
+#endif /* PROJECT_CONF_H */
+/*---------------------------------------------------------------------------*/
+/* Include platform peripherals configuration */
+#include "platform-conf.h"
+/*---------------------------------------------------------------------------*/
+/**
+ * \name Network Stack Configuration
+ *
+ * @{
+ */
+#ifndef NETSTACK_CONF_NETWORK
+#define NETSTACK_CONF_NETWORK sicslowpan_driver
+#endif /* NETSTACK_CONF_NETWORK */
+
+#ifndef NETSTACK_CONF_MAC
+#define NETSTACK_CONF_MAC     ble_ipsp_mac_driver
+#endif /* NETSTACK_CONF_MAC */
+
+/* 6LoWPAN */
+#define SICSLOWPAN_CONF_MAC_MAX_PAYLOAD         1280
+#define SICSLOWPAN_CONF_COMPRESSION             SICSLOWPAN_COMPRESSION_HC06
+#define SICSLOWPAN_CONF_COMPRESSION_THRESHOLD   0     /**< Always compress IPv6 packets. */
+#define SICSLOWPAN_CONF_FRAG                    0     /**< We don't use 6LoWPAN fragmentation as IPSP takes care of that for us.*/
+#define SICSLOWPAN_FRAMER_HDRLEN                0     /**< Use fixed header len rather than framer.length() function */
+
+/* Packet buffer */
+#define PACKETBUF_CONF_SIZE                     1280  /**< Required IPv6 MTU size */
+/** @} */
+
+/**
+ * \name BLE configuration
+ * @{
+ */
+#ifndef DEVICE_NAME
+#define DEVICE_NAME "Contiki nRF52dk"  /**< Device name used in BLE undirected advertisement. */
+#endif
+/**
+ * @}
+ */
+
+/**
+ * \name IPv6 network buffer configuration
+ *
+ * @{
+ */
+/* Don't let contiki-default-conf.h decide if we are an IPv6 build */
+#ifndef NETSTACK_CONF_WITH_IPV6
+#define NETSTACK_CONF_WITH_IPV6              0
+#endif
+
+#if NETSTACK_CONF_WITH_IPV6
+/*---------------------------------------------------------------------------*/
+/* Addresses, Sizes and Interfaces */
+#define LINKADDR_CONF_SIZE                   8
+#define UIP_CONF_LL_802154                   1
+#define UIP_CONF_LLH_LEN                     0
+
+/* The size of the uIP main buffer */
+#ifndef UIP_CONF_BUFFER_SIZE
+#define UIP_CONF_BUFFER_SIZE              1280
+#endif
+
+/* ND and Routing */
+#define UIP_CONF_ROUTER                      0 /**< BLE master role, which allows for routing, isn't supported. */
+#define UIP_CONF_ND6_SEND_NA                 1
+#define UIP_CONF_IP_FORWARD                  0 /**< No packet forwarding. */
+
+#define UIP_CONF_ND6_REACHABLE_TIME     600000
+#define UIP_CONF_ND6_RETRANS_TIMER       10000
+
+#ifndef NBR_TABLE_CONF_MAX_NEIGHBORS
+#define NBR_TABLE_CONF_MAX_NEIGHBORS        20
+#endif
+
+#ifndef UIP_CONF_MAX_ROUTES
+#define UIP_CONF_MAX_ROUTES                 20
+#endif
+
+#ifndef UIP_CONF_TCP
+#define UIP_CONF_TCP                         1
+#endif
+
+#ifndef UIP_CONF_TCP_MSS
+#define UIP_CONF_TCP_MSS                    64
+#endif
+
+#define UIP_CONF_UDP                         1
+#define UIP_CONF_UDP_CHECKSUMS               1
+#define UIP_CONF_ICMP6                       1
+#endif /* NETSTACK_CONF_WITH_IPV6 */
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name Generic Configuration directives
+ *
+ * @{
+ */
+#ifndef ENERGEST_CONF_ON
+#define ENERGEST_CONF_ON                     1 /**< Energest Module */
+#endif
+/** @} */
+#endif /* CONTIKI_CONF_H */
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/nrf52dk/contiki-main.c b/platform/nrf52dk/contiki-main.c
new file mode 100644
index 000000000..50fcfcd28
--- /dev/null
+++ b/platform/nrf52dk/contiki-main.c
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup nrf52dk nRF52 Development Kit
+ * @{
+ */
+#include <stdio.h>
+#include <stdint.h>
+
+#include "nordic_common.h"
+#include "nrf_drv_config.h"
+#include "nrf_drv_gpiote.h"
+#ifdef SOFTDEVICE_PRESENT
+#include "softdevice_handler.h"
+#include "ble/ble-core.h"
+#include "ble/ble-mac.h"
+#endif
+
+#include "contiki.h"
+#include "contiki-net.h"
+#include "leds.h"
+#include "lib/sensors.h"
+
+#include "dev/watchdog.h"
+#include "dev/serial-line.h"
+#include "dev/uart0.h"
+#include "dev/lpm.h"
+
+#define DEBUG 0
+
+#if NETSTACK_CONF_WITH_IPV6
+#include "uip-debug.h"
+#include "net/ipv6/uip-ds6.h"
+#else
+#if DEBUG
+#include <stdio.h>
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+#endif
+
+#if defined(SOFTDEVICE_PRESENT) && PLATFORM_INDICATE_BLE_STATE
+PROCESS(ble_iface_observer, "BLE interface observer");
+
+/**
+ * \brief A process that handles adding/removing
+ *        BLE IPSP interfaces.
+ */
+PROCESS_THREAD(ble_iface_observer, ev, data)
+{
+  static struct etimer led_timer;
+
+  PROCESS_BEGIN();
+
+  etimer_set(&led_timer, CLOCK_SECOND/2);
+
+  while(1) {
+    PROCESS_WAIT_EVENT();
+    if(ev == ble_event_interface_added) {
+      etimer_stop(&led_timer);
+      leds_off(LEDS_1);
+      leds_on(LEDS_2);
+    } else if(ev == ble_event_interface_deleted) {
+      etimer_set(&led_timer, CLOCK_SECOND/2);
+      leds_off(LEDS_2);
+    } else if(ev == PROCESS_EVENT_TIMER && etimer_expired(&led_timer)) {
+      etimer_reset(&led_timer);
+      leds_toggle(LEDS_1);
+    }
+  }
+  PROCESS_END();
+}
+#endif
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Board specific initialization
+ *
+ * This function will enable SoftDevice is present.
+ */
+static void
+board_init(void)
+{
+#ifdef SOFTDEVICE_PRESENT
+  // Initialize the SoftDevice handler module.
+  SOFTDEVICE_HANDLER_INIT(NRF_CLOCK_LFCLKSRC_XTAL_20_PPM, NULL);
+#endif
+#ifdef PLATFORM_HAS_BUTTON
+  if (!nrf_drv_gpiote_is_init()) {
+    nrf_drv_gpiote_init();
+  }
+#endif
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Main function for nRF52dk platform.
+ * \note This function doesn't return.
+ */
+int
+main(void)
+{
+  board_init();
+  leds_init();
+
+  clock_init();
+  rtimer_init();
+
+  watchdog_init();
+  process_init();
+
+  // Seed value is ignored since hardware RNG is used.
+  random_init(0);
+
+#ifdef UART0_ENABLED
+  uart0_init();
+#if SLIP_ARCH_CONF_ENABLE
+  slip_arch_init(0);
+#else
+  uart0_set_input(serial_line_input_byte);
+  serial_line_init();
+#endif
+#endif
+
+  PRINTF("Starting " CONTIKI_VERSION_STRING "\n");
+
+  process_start(&etimer_process, NULL);
+  ctimer_init();
+
+#if ENERGEST_CONF_ON
+  energest_init();
+  ENERGEST_ON(ENERGEST_TYPE_CPU);
+#endif
+
+#ifdef SOFTDEVICE_PRESENT
+  ble_stack_init();
+  ble_advertising_init(DEVICE_NAME);
+
+#if NETSTACK_CONF_WITH_IPV6
+  netstack_init();
+  linkaddr_t linkaddr;
+  ble_get_mac(linkaddr.u8);
+  // Set link layer address
+  linkaddr_set_node_addr(&linkaddr);
+  // Set device link layer address in uip stack.
+  memcpy(&uip_lladdr.addr, &linkaddr, sizeof(uip_lladdr.addr));
+  uip_debug_lladdr_print(&uip_lladdr);
+  PRINTF("\n");
+  process_start(&ble_iface_observer, NULL);
+  process_start(&tcpip_process, NULL);
+#endif /* NETSTACK_CONF_WITH_IPV6 */
+#endif /* SOFTDEVICE_PRESENT */
+
+  process_start(&sensors_process, NULL);
+  autostart_start(autostart_processes);
+
+  watchdog_start();
+
+#ifdef SOFTDEVICE_PRESENT
+  ble_advertising_start();
+  PRINTF("Advertising name [%s]\n", DEVICE_NAME);
+#endif
+
+  while(1) {
+    uint8_t r;
+    do {
+      r = process_run();
+      watchdog_periodic();
+    } while(r > 0);
+
+    lpm_drop();
+  }
+}
+/**
+ * @}
+ */
diff --git a/platform/nrf52dk/dbg-io/dbg.c b/platform/nrf52dk/dbg-io/dbg.c
new file mode 100644
index 000000000..db9bb63c0
--- /dev/null
+++ b/platform/nrf52dk/dbg-io/dbg.c
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup nrf52dk
+ * @{
+ *
+ * \addtogroup nrf52dk-dbg-io Debug IO over UART
+ * @{
+ *
+ * \file
+ *         Function implementations for debug io module.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ *
+ */
+#include "dev/uart0.h"
+/*---------------------------------------------------------------------------*/
+unsigned int
+dbg_send_bytes(const unsigned char *s, unsigned int len)
+{
+  unsigned int i = 0;
+
+  while (s && *s != 0) {
+    if (i >= len) {
+      break;
+    }
+    uart0_writeb(*s++);
+    i++;
+  }
+
+  return i;
+}
+/*---------------------------------------------------------------------------*/
+int
+dbg_putchar(int c)
+{
+  uart0_writeb(c);
+  return c;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/nrf52dk/dbg-io/dbg.h b/platform/nrf52dk/dbg-io/dbg.h
new file mode 100644
index 000000000..7c623336b
--- /dev/null
+++ b/platform/nrf52dk/dbg-io/dbg.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * All rights reserved.
+ *
+3 * 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.
+ *
+ */
+/**
+ * \addtogroup nrf52dk
+ * @{
+ *
+ * \addtogroup nrf52dk-dbg-io Debug IO over UART
+ * @{
+ *
+ * \file
+ *         Header file for the debug module.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ *
+ */
+#ifndef DBG_H_
+#define DBG_H_
+/*---------------------------------------------------------------------------*/
+#include "contiki-conf.h"
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Print a stream of bytes
+ * \param seq A pointer to the stream
+ * \param len The number of bytes to print
+ * \return The number of printed bytes
+ */
+unsigned int dbg_send_bytes(const unsigned char *seq, unsigned int len);
+/**
+ * \brief Print a character to debug output
+ * \param c Character to print
+ * \return Printed character
+ */
+int dbg_putchar(int c);
+/*---------------------------------------------------------------------------*/
+#endif /* DBG_H_ */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/nrf52dk/dbg-io/debug-uart.h b/platform/nrf52dk/dbg-io/debug-uart.h
new file mode 100644
index 000000000..b52d2fb50
--- /dev/null
+++ b/platform/nrf52dk/dbg-io/debug-uart.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+/**
+ * \addtogroup nrf52dk
+ * @{
+ *
+ * \addtogroup nrf52dk-dbg-io Debug IO over UART
+ * @{
+ *
+ * \file
+ *      A header file to maintain compatibility with DBG I/O.
+ * \author
+ *      Wojciech Bober <wojciech.bober@nordicsemi.no>
+ *
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef DEBUG_UART_H_
+#define DEBUG_UART_H_
+/*---------------------------------------------------------------------------*/
+#include "dbg.h"
+/*---------------------------------------------------------------------------*/
+#endif /* DEBUG_UART_H_ */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/nrf52dk/dev/button-sensor.c b/platform/nrf52dk/dev/button-sensor.c
new file mode 100644
index 000000000..3c218a439
--- /dev/null
+++ b/platform/nrf52dk/dev/button-sensor.c
@@ -0,0 +1,330 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup nrf52dk-devices Device drivers
+ * @{
+ *
+ * \addtogroup nrf52dk-devices-button Buttons driver
+ * @{
+ *
+ * \file
+ *         Driver for nRF52 DK buttons.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ */
+/*---------------------------------------------------------------------------*/
+#include <stdint.h>
+#include "nordic_common.h"
+#include "nrf_drv_gpiote.h"
+#include "nrf_assert.h"
+#include "boards.h"
+#include "contiki.h"
+#include "lib/sensors.h"
+#include "button-sensor.h"
+
+/*---------------------------------------------------------------------------*/
+#define DEBOUNCE_DURATION (CLOCK_SECOND >> 5) /**< Delay before button state is assumed to be stable */
+
+/*---------------------------------------------------------------------------*/
+struct btn_timer
+{
+  struct timer debounce;
+  clock_time_t start;
+  clock_time_t duration;
+};
+
+static struct btn_timer btn_timer[BUTTONS_NUMBER];
+static int btn_state = 0;
+
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Button toggle handler
+ * \param pin GPIO pin which has been triggered
+ * \param action toggle direction
+ *
+ */
+static void
+gpiote_event_handler(nrf_drv_gpiote_pin_t pin, nrf_gpiote_polarity_t action)
+{
+  int id = pin - BUTTON_START;
+
+  if(!timer_expired(&(btn_timer[id].debounce))) {
+    return;
+  }
+
+  /* Set timer to ignore consecutive changes for
+   * DEBOUNCE_DURATION.
+   */
+  timer_set(&(btn_timer[id].debounce), DEBOUNCE_DURATION);
+
+  /*
+   * Start measuring duration on falling edge, stop on rising edge.
+   */
+  if(nrf_drv_gpiote_in_is_set(pin) == 0) {
+    btn_timer[id].start = clock_time();
+    btn_timer[id].duration = 0;
+  } else {
+    btn_timer[id].duration = clock_time() - btn_timer[id].start;
+  }
+  sensors_changed(&buttons[id]);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Configuration function for the button sensor for all buttons.
+ *
+ * \param type if \a SENSORS_HW_INIT is passed the function will initialize
+ *             given button
+ *             if \a SENSORS_ACTIVE is passed then \p c parameter defines
+ *             whether button should be set active or inactive
+ * \param c    0 to disable the button, non-zero: enable
+ * \param pin  GPIOE pin number
+ */
+static int
+config(int type, int c, nrf_drv_gpiote_pin_t pin)
+{
+  int id = pin - BUTTON_START;
+
+  switch(type) {
+    case SENSORS_HW_INIT: {
+      nrf_drv_gpiote_in_config_t config = GPIOTE_CONFIG_IN_SENSE_TOGGLE(false);
+      config.pull = NRF_GPIO_PIN_PULLUP;
+      nrf_drv_gpiote_in_init(pin, &config, gpiote_event_handler);
+      timer_set(&(btn_timer[id].debounce), DEBOUNCE_DURATION);
+      return 1;
+    }
+    case SENSORS_ACTIVE: {
+      if(c) {
+        nrf_drv_gpiote_in_event_enable(pin, true);
+        btn_state |= (1 << id);
+      } else {
+        nrf_drv_gpiote_in_event_disable(pin);
+        btn_state &= ~(1 << id);
+      }
+      return 1;
+    }
+    default:
+      return 0;
+  }
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Configuration function for button 1
+ *
+ * \param type passed to config() as-is
+ * \param value passed to config() as-is
+ * \return same as config() return value
+ */
+static int
+config_button_1(int type, int value)
+{
+  return config(type, value, BSP_BUTTON_0);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Configuration function for button 2
+ *
+ * \param type passed to config() as-is
+ * \param value passed to config() as-is
+ * \return same as config() return value
+ */
+static int
+config_button_2(int type, int value)
+{
+  return config(type, value, BSP_BUTTON_1);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Configuration function for button 3
+ *
+ * \param type passed to config() as-is
+ * \param value passed to config() as-is
+ * \return same as config() return value
+ */
+static int
+config_button_3(int type, int value)
+{
+  return config(type, value, BSP_BUTTON_2);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Configuration function for button 4
+ *
+ * \param type passed to config() as-is
+ * \param value passed to config() as-is
+ * \return same as config() return value
+ */
+static int
+config_button_4(int type, int value)
+{
+  return config(type, value, BSP_BUTTON_3);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Return current state of a button
+ * \param type pass \ref BUTTON_SENSOR_VALUE_STATE to get current button state
+ *             or \ref BUTTON_SENSOR_VALUE_DURATION to get active state duration
+ * \param pin GPIOE pin number
+ *
+ * \retval BUTTON_SENSOR_VALUE_PRESSED
+ * \retval BUTTON_SENSOR_VALUE_RELEASED when \a type is \ref BUTTON_SENSOR_VALUE_STATE
+ * \retval duration Active state duration in clock ticks
+ */
+static int
+value(int type, nrf_drv_gpiote_pin_t pin)
+{
+
+  if(type == BUTTON_SENSOR_VALUE_STATE) {
+    return nrf_drv_gpiote_in_is_set(pin) == 0 ?
+           BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
+  } else if(type == BUTTON_SENSOR_VALUE_DURATION) {
+    return btn_timer[pin - BUTTON_START].duration;
+  }
+
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Return current state of a button 1
+ * \param type passed to value() as-is
+ * \return same as value returned by value()
+ */
+static int
+value_button_1(int type)
+{
+  return value(type, BSP_BUTTON_0);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Return current state of a button 2
+ * \param type passed to value() as-is
+ * \return same as value returned by value()
+ */
+static int
+value_button_2(int type)
+{
+  return value(type, BSP_BUTTON_1);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Return current state of a button 3
+ * \param type passed to value() as-is
+ * \return same as value returned by value()
+ */
+static int
+value_button_3(int type)
+{
+  return value(type, BSP_BUTTON_2);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Return current state of a button 4
+ * \param type passed to value() as-is
+ * \return same as value returned by value()
+ */
+static int
+value_button_4(int type)
+{
+  return value(type, BSP_BUTTON_3);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Get status of a given button
+ * \param type \a SENSORS_ACTIVE or \a SENSORS_READY
+ * \param pin GPIOE pin number
+ * \return 1 if the button's port interrupt is enabled
+ */
+static int
+status(int type, nrf_drv_gpiote_pin_t pin)
+{
+  switch(type) {
+    case SENSORS_ACTIVE:
+    case SENSORS_READY:
+      return (btn_state & (1 << (pin - BUTTON_START)));
+    default:
+      break;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Status function for button 1
+ * \param type passed to state() as-is
+ * \return value returned by state()
+ */
+static int
+status_button_1(int type)
+{
+  return status(type, BSP_BUTTON_0);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Status function for button 2
+ * \param type passed to state() as-is
+ * \return value returned by state()
+ */
+static int
+status_button_2(int type)
+{
+  return status(type, BSP_BUTTON_1);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Status function for button 3
+ * \param type passed to state() as-is
+ * \return value returned by state()
+ */
+static int
+status_button_3(int type)
+{
+  return status(type, BSP_BUTTON_2);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Status function for button 3
+ * \param type passed to state() as-is
+ * \return value returned by state()
+ */
+static int
+status_button_4(int type)
+{
+  return status(type, BSP_BUTTON_3);
+}
+/*---------------------------------------------------------------------------*/
+const struct sensors_sensor buttons[BUTTONS_NUMBER] = {
+    {BUTTON_SENSOR, value_button_1, config_button_1, status_button_1},
+    {BUTTON_SENSOR, value_button_2, config_button_2, status_button_2},
+    {BUTTON_SENSOR, value_button_3, config_button_3, status_button_3},
+    {BUTTON_SENSOR, value_button_4, config_button_4, status_button_4}, };
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/nrf52dk/dev/button-sensor.h b/platform/nrf52dk/dev/button-sensor.h
new file mode 100644
index 000000000..ababb1c1c
--- /dev/null
+++ b/platform/nrf52dk/dev/button-sensor.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup nrf52dk-devices Device drivers
+ * @{
+ *
+ * \addtogroup nrf52dk-devices-button Buttons driver
+ * @{
+ *
+ * \file
+ *         Header file for the nRF52dk button driver.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ *
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef BUTTON_SENSOR_H_
+#define BUTTON_SENSOR_H_
+/*---------------------------------------------------------------------------*/
+#include "lib/sensors.h"
+/*---------------------------------------------------------------------------*/
+#define BUTTON_SENSOR "Button"
+/*---------------------------------------------------------------------------*/
+#define BUTTON_SENSOR_VALUE_STATE    0 /**< Can be passed to value() function
+                                            to get current button state */
+#define BUTTON_SENSOR_VALUE_DURATION 1 /**< Can be passed to value() function
+                                            to get low state duration */
+
+#define BUTTON_SENSOR_VALUE_RELEASED 0
+#define BUTTON_SENSOR_VALUE_PRESSED  1
+/*---------------------------------------------------------------------------*/
+extern const struct sensors_sensor buttons[];
+/*---------------------------------------------------------------------------*/
+#define button_1 buttons[0]
+#define button_2 buttons[1]
+#define button_3 buttons[2]
+#define button_4 buttons[3]
+/*---------------------------------------------------------------------------*/
+#endif /* BUTTON_SENSOR_H_ */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/nrf52dk/dev/leds-arch.c b/platform/nrf52dk/dev/leds-arch.c
new file mode 100644
index 000000000..019589493
--- /dev/null
+++ b/platform/nrf52dk/dev/leds-arch.c
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup nrf52dk
+ * @{
+ *
+ * \addtogroup nrf52dk-devices Device drivers
+ * @{
+ *
+ * \addtogroup nrf52dk-devices-led LED driver
+ * @{
+ *
+ * \file
+ *         Architecture specific LED driver implementation for nRF52 DK.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ */
+#include "boards.h"
+#include "contiki.h"
+#include "dev/leds.h"
+
+/*---------------------------------------------------------------------------*/
+void
+leds_arch_init(void)
+{
+  LEDS_CONFIGURE(LEDS_MASK);
+  LEDS_OFF(LEDS_MASK);
+}
+/*---------------------------------------------------------------------------*/
+unsigned char
+leds_arch_get(void)
+{
+  return (unsigned char)(LED_IS_ON(LEDS_MASK) >> LED_START);
+}
+/*---------------------------------------------------------------------------*/
+void
+leds_arch_set(unsigned char leds)
+{
+  unsigned int mask = (unsigned int)leds << LED_START;
+  LEDS_OFF(LEDS_MASK);
+  LEDS_ON(mask);
+}
+/*---------------------------------------------------------------------------*/
+
+/**
+ * @}
+ * @}
+ * @}
+ */
diff --git a/platform/nrf52dk/dev/nrf52dk-sensors.c b/platform/nrf52dk/dev/nrf52dk-sensors.c
new file mode 100644
index 000000000..3d56e91d1
--- /dev/null
+++ b/platform/nrf52dk/dev/nrf52dk-sensors.c
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup nrf52dk
+ * @{
+ *
+ * \addtogroup nrf52dk-devices Device drivers
+ * @{
+ *
+ * \addtogroup nrf52dk-sensors Sensors
+ *  The nRF52 DK exports 4 button sensors and an internal temperature sensor.
+ * @{
+ *
+ * \file
+ *         This file exports a global sensors table.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ */
+/*---------------------------------------------------------------------------*/
+#include <string.h>
+#include "contiki.h"
+#include "lib/sensors.h"
+#include "dev/button-sensor.h"
+#include "dev/temperature-sensor.h"
+/*---------------------------------------------------------------------------*/
+SENSORS(
+    &button_1,
+    &button_2,
+    &button_3,
+    &button_4,
+    &temperature_sensor
+);
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ * @}
+ */
diff --git a/platform/nrf52dk/dev/temperature-sensor.c b/platform/nrf52dk/dev/temperature-sensor.c
new file mode 100644
index 000000000..5aac8b3ef
--- /dev/null
+++ b/platform/nrf52dk/dev/temperature-sensor.c
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup nrf52dk-devices Device drivers
+ * @{
+ *
+ * \addtogroup nrf52dk-devices-temp Temperature sensor driver
+ * This is a driver for nRF52832 hardware sensor.
+ *
+ * @{
+ *
+ * \file
+ *         Temperature sensor implementation.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ *
+ */
+#ifndef SOFTDEVICE_PRESENT
+#include "nrf_temp.h"
+#else
+#include "nrf_soc.h"
+#endif
+#include "contiki.h"
+#include "dev/temperature-sensor.h"
+
+
+const struct sensors_sensor temperature_sensor;
+
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Returns device temperature
+ * \param type ignored
+ * \return Device temperature in degrees Celsius
+ */
+static int
+value(int type)
+{
+#ifndef SOFTDEVICE_PRESENT
+  return nrf_temp_read();
+#else
+  int32_t temp;
+  sd_temp_get(&temp);
+  return temp >> 2;
+#endif
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Configures temperature sensor
+ * \param type initializes the hardware sensor when \a type is set to
+ *             \a SENSORS_HW_INIT
+ * \param c ignored
+ * \return 1
+ * \note  This function does nothing when SoftDevice is present
+ */
+static int
+configure(int type, int c)
+{
+#ifndef SOFTDEVICE_PRESENT
+  if (type == SENSORS_HW_INIT) {
+    nrf_temp_init();
+  }
+#endif
+  return 1;
+}
+/**
+ * \brief Return temperature sensor status
+ * \param type ignored
+ * \return 1
+ */
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(temperature_sensor, TEMPERATURE_SENSOR, value, configure, status);
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/nrf52dk/dev/temperature-sensor.h b/platform/nrf52dk/dev/temperature-sensor.h
new file mode 100644
index 000000000..27b246b2d
--- /dev/null
+++ b/platform/nrf52dk/dev/temperature-sensor.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup nrf52dk-devices Device drivers
+ * @{
+ *
+ * \addtogroup nrf52dk-devices-temp Temperature sensor driver
+ * @{
+ *
+ * \file
+ *         Temperature sensor header file.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ *
+ */
+
+#ifndef TEMPERATURE_SENSOR_H_
+#define TEMPERATURE_SENSOR_H_
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor temperature_sensor;
+
+#define TEMPERATURE_SENSOR "Temperature"
+
+#endif /* TEMPERATURE_SENSOR_H_ */
+
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/nrf52dk/platform-conf.h b/platform/nrf52dk/platform-conf.h
new file mode 100644
index 000000000..931a3c275
--- /dev/null
+++ b/platform/nrf52dk/platform-conf.h
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup platform
+ * @{
+ *
+ * \addtogroup nrf52dk nRF52 Development Kit
+ * @{
+ *
+ * \addtogroup nrf52dk-platform-conf Platform configuration
+ * @{
+ * \file
+ *         Platform features configuration.
+ * \author
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no>
+ *
+ */
+#ifndef PLATFORM_CONF_H_
+#define PLATFORM_CONF_H_
+
+#include "boards.h"
+
+#define PLATFORM_HAS_BATTERY                    0
+#define PLATFORM_HAS_RADIO                      0
+#define PLATFORM_HAS_TEMPERATURE                1
+
+/**
+ * \name Leds configurations
+ *
+ * On nRF52dk all leds are green.
+ *
+ * @{
+ */
+#define PLATFORM_HAS_LEDS                       1
+
+#define LEDS_1         (1 << (LED_1 - LED_START)) // 1
+#define LEDS_2         (1 << (LED_2 - LED_START)) // 2
+#define LEDS_3         (1 << (LED_3 - LED_START)) // 4
+#define LEDS_4         (1 << (LED_4 - LED_START)) // 8
+
+#define LEDS_GREEN     LEDS_1
+#define LEDS_YELLOW    LEDS_2
+#define LEDS_RED       LEDS_3
+#define LEDS_BLUE      LEDS_4
+
+#define LEDS_CONF_ALL  (LEDS_1 | LEDS_2 | LEDS_3 | LEDS_4)
+
+/**
+ * \brief If set to 1 then LED1 and LED2 are used by the
+ *        platform to indicate BLE connection state.
+ */
+#define PLATFORM_INDICATE_BLE_STATE             1
+/** @} */
+
+/**
+ * \name Button configurations
+ *
+ * @{
+ */
+/* Notify various examples that we have Buttons */
+#define PLATFORM_HAS_BUTTON      1
+
+/*
+ * Override button symbols from dev/button-sensor.h, for the examples that
+ * include it
+ */
+#define button_sensor button_1
+#define button_sensor2 button_2
+
+/**
+ * \brief nRF52 RTC instance to be used for Contiki clock driver.
+ * \note RTC 0 is used by the SoftDevice.
+ */
+#define PLATFORM_RTC_INSTANCE_ID     1
+
+/**
+ * \brief nRF52 timer instance to be used for Contiki rtimer driver.
+ * \note Timer 0 is used by the SoftDevice.
+ */
+#define PLATFORM_TIMER_INSTANCE_ID   1
+
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name Compiler configuration and platform-specific type definitions
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#define CLOCK_CONF_SECOND 128
+
+/* Compiler configurations */
+#define CCIF
+#define CLIF
+
+/* Platform typedefs */
+typedef uint32_t clock_time_t;
+typedef uint32_t uip_stats_t;
+
+/* Clock (time) comparison macro */
+#define CLOCK_LT(a, b)  ((signed long)((a) - (b)) < 0)
+
+#define RTIMER_ARCH_SECOND 62500
+/*
+ * rtimer.h typedefs rtimer_clock_t as unsigned short. We need to define
+ * RTIMER_CLOCK_LT to override this
+ */
+typedef uint32_t rtimer_clock_t;
+#define RTIMER_CLOCK_LT(a, b)     ((int32_t)((a) - (b)) < 0)
+
+/** @} */
+/*---------------------------------------------------------------------------*/
+/** @}
+ *  @}
+ *  @}
+ */
+#endif /* PLATFORM_CONF_H_ */
diff --git a/platform/nrf52dk/rtt/rtt-printf.c b/platform/nrf52dk/rtt/rtt-printf.c
new file mode 100644
index 000000000..416fff0ab
--- /dev/null
+++ b/platform/nrf52dk/rtt/rtt-printf.c
@@ -0,0 +1,24 @@
+#include <stdarg.h>
+#include "segger-rtt.h"
+
+int SEGGER_RTT_vprintf(unsigned BufferIndex, const char * sFormat, va_list * pParamList);
+
+int
+putchar(int c)
+{
+  SEGGER_RTT_Write(0, &c, 1);
+  return c;
+}
+
+int
+printf(const char *fmt, ...)
+{
+  int res;
+  va_list ap;
+  va_start(ap, fmt);
+  res = SEGGER_RTT_vprintf(0, fmt, &ap);
+  va_end(ap);
+  return res;
+}
+
+
diff --git a/platform/nrf52dk/rtt/segger-rtt-conf.h b/platform/nrf52dk/rtt/segger-rtt-conf.h
new file mode 100644
index 000000000..ac996644f
--- /dev/null
+++ b/platform/nrf52dk/rtt/segger-rtt-conf.h
@@ -0,0 +1,135 @@
+/*********************************************************************
+*               SEGGER MICROCONTROLLER GmbH & Co. KG                 *
+*       Solutions for real time microcontroller applications         *
+**********************************************************************
+*                                                                    *
+*       (c) 2014 - 2015  SEGGER Microcontroller GmbH & Co. KG        *
+*                                                                    *
+*       www.segger.com     Support: support@segger.com               *
+*                                                                    *
+**********************************************************************
+----------------------------------------------------------------------
+File    : SEGGER_RTT_Conf.h
+Purpose : Implementation of SEGGER real-time transfer (RTT) which 
+          allows real-time communication on targets which support 
+          debugger memory accesses while the CPU is running.
+---------------------------END-OF-HEADER------------------------------
+*/
+
+#ifndef SEGGER_RTT_CONF_H
+#define SEGGER_RTT_CONF_H
+
+#ifdef __ICCARM__
+  #include <intrinsics.h>
+#endif
+
+/*********************************************************************
+*
+*       Defines, configurable
+*
+**********************************************************************
+*/
+
+#define SEGGER_RTT_MAX_NUM_UP_BUFFERS             (2)     // Max. number of up-buffers (T->H) available on this target    (Default: 2)
+#define SEGGER_RTT_MAX_NUM_DOWN_BUFFERS           (2)     // Max. number of down-buffers (H->T) available on this target  (Default: 2)
+
+#define BUFFER_SIZE_UP                            (1024)  // Size of the buffer for terminal output of target, up to host (Default: 1k)
+#define BUFFER_SIZE_DOWN                          (16)    // Size of the buffer for terminal input to target from host (Usually keyboard input) (Default: 16)
+
+#define SEGGER_RTT_PRINTF_BUFFER_SIZE             (64u)    // Size of buffer for RTT printf to bulk-send chars via RTT     (Default: 64)
+
+#define SEGGER_RTT_MODE_DEFAULT                   SEGGER_RTT_MODE_NO_BLOCK_SKIP // Mode for pre-initialized terminal channel (buffer 0)
+
+//
+// Target is not allowed to perform other RTT operations while string still has not been stored completely.
+// Otherwise we would probably end up with a mixed string in the buffer.
+// If using  RTT from within interrupts, multiple tasks or multi processors, define the SEGGER_RTT_LOCK() and SEGGER_RTT_UNLOCK() function here.
+//
+/*********************************************************************
+*
+*       RTT lock configuration for SEGGER Embedded Studio, 
+*       Rowley CrossStudio and GCC
+*/
+#if (defined __SES_ARM) || (defined __CROSSWORKS_ARM) || (defined __GNUC__)
+  #ifdef __ARM_ARCH_6M__
+    #define SEGGER_RTT_LOCK(SavedState)   {                                               \
+                                          asm volatile ("mrs   %0, primask  \n\t"         \
+                                                        "mov   r1, $1     \n\t"           \
+                                                        "msr   primask, r1  \n\t"         \
+                                                        : "=r" (SavedState)               \
+                                                        :                                 \
+                                                        : "r1"                            \
+                                                        );                                \
+                                          }
+
+    #define SEGGER_RTT_UNLOCK(SavedState) {                                               \
+                                          asm volatile ("msr   primask, %0  \n\t"         \
+                                                        :                                 \
+                                                        : "r" (SavedState)                \
+                                                        :                                 \
+                                                        );                                \
+                                          }
+                                  
+  #elif (defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__))
+    #define SEGGER_RTT_LOCK(SavedState)   {                                               \
+                                          asm volatile ("mrs   %0, basepri  \n\t"         \
+                                                      "mov   r1, $128     \n\t"           \
+                                                      "msr   basepri, r1  \n\t"           \
+                                                      : "=r" (SavedState)                 \
+                                                      :                                   \
+                                                      : "r1"                              \
+                                                      );                                  \
+                                          }
+    #define SEGGER_RTT_UNLOCK(SavedState) {                                               \
+                                          asm volatile ("msr   basepri, %0  \n\t"         \
+                                                        :                                 \
+                                                        : "r" (SavedState)                \
+                                                        :                                 \
+                                                        );                                \
+                                          }
+  #else
+    #define SEGGER_RTT_LOCK(SavedState)   (void)(SavedState)
+    #define SEGGER_RTT_UNLOCK(SavedState) (void)(SavedState)
+  #endif
+#endif
+
+/*********************************************************************
+*
+*       RTT lock configuration for IAR EWARM
+*/
+#ifdef __ICCARM__
+  #if (defined (__ARM7M__) && (__CORE__ == __ARM7M__))
+    #define SEGGER_RTT_LOCK(SavedState)   {                                     \
+                                          SavedState = __get_PRIMASK();         \
+                                          __set_PRIMASK(1);                     \
+                                          }
+                                    
+    #define SEGGER_RTT_UNLOCK(SavedState) {                                     \
+                                          __set_PRIMASK(SavedState);            \
+                                          }
+  #elif (defined (__ARM7EM__) && (__CORE__ == __ARM7EM__))
+    #define SEGGER_RTT_LOCK(SavedState)   {                                     \
+                                          SavedState = __get_BASEPRI();         \
+                                          __set_BASEPRI(128);                   \
+                                          }
+                                    
+    #define SEGGER_RTT_UNLOCK(SavedState) {                                     \
+                                          __set_BASEPRI(SavedState);            \
+                                          }  
+  #endif
+#endif
+
+/*********************************************************************
+*
+*       RTT lock configuration fallback
+*/
+#ifndef   SEGGER_RTT_LOCK
+  #define SEGGER_RTT_LOCK(SavedState)   (void)(SavedState)
+#endif
+
+#ifndef   SEGGER_RTT_UNLOCK
+  #define SEGGER_RTT_UNLOCK(SavedState) (void)(SavedState)
+#endif
+
+#endif
+/*************************** End of file ****************************/
diff --git a/platform/nrf52dk/rtt/segger-rtt-printf.c b/platform/nrf52dk/rtt/segger-rtt-printf.c
new file mode 100644
index 000000000..e992e7a36
--- /dev/null
+++ b/platform/nrf52dk/rtt/segger-rtt-printf.c
@@ -0,0 +1,510 @@
+/*********************************************************************
+*               SEGGER MICROCONTROLLER GmbH & Co. KG                 *
+*       Solutions for real time microcontroller applications         *
+**********************************************************************
+*                                                                    *
+*       (c) 2014 - 2015  SEGGER Microcontroller GmbH & Co. KG        *
+*                                                                    *
+*       www.segger.com     Support: support@segger.com               *
+*                                                                    *
+**********************************************************************
+*                                                                    *
+* All rights reserved.                                               *
+*                                                                    *
+* * This software may in its unmodified form be freely redistributed *
+*   in source form.                                                  *
+* * The source code may be modified, provided the source code        *
+*   retains the above copyright notice, this list of conditions and  *
+*   the following disclaimer.                                        *
+* * Modified versions of this software in source or linkable form    *
+*   may not be distributed without prior consent of SEGGER.          *
+* * This software may only be used for communication with SEGGER     *
+*   J-Link debug probes.                                             *
+*                                                                    *
+* 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 SEGGER Microcontroller 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.                                                            *
+*                                                                    *
+**********************************************************************
+---------------------------END-OF-HEADER------------------------------
+File    : SEGGER_RTT_printf.c
+Purpose : Replacement for printf to write formatted data via RTT
+----------------------------------------------------------------------
+*/
+#include "segger-rtt.h"
+#include "segger-rtt-conf.h"
+
+/*********************************************************************
+*
+*       Defines, configurable
+*
+**********************************************************************
+*/
+
+#ifndef SEGGER_RTT_PRINTF_BUFFER_SIZE
+  #define SEGGER_RTT_PRINTF_BUFFER_SIZE (64)
+#endif
+
+#include <stdlib.h>
+#include <stdarg.h>
+
+
+#define FORMAT_FLAG_LEFT_JUSTIFY   (1u << 0)
+#define FORMAT_FLAG_PAD_ZERO       (1u << 1)
+#define FORMAT_FLAG_PRINT_SIGN     (1u << 2)
+#define FORMAT_FLAG_ALTERNATE      (1u << 3)
+
+/*********************************************************************
+*
+*       Types
+*
+**********************************************************************
+*/
+
+typedef struct {
+  char*     pBuffer;
+  unsigned  BufferSize;
+  unsigned  Cnt;
+
+  int   ReturnValue;
+
+  unsigned RTTBufferIndex;
+} SEGGER_RTT_PRINTF_DESC;
+
+/*********************************************************************
+*
+*       Function prototypes
+*
+**********************************************************************
+*/
+int SEGGER_RTT_vprintf(unsigned BufferIndex, const char * sFormat, va_list * pParamList);
+
+/*********************************************************************
+*
+*       Static code
+*
+**********************************************************************
+*/
+/*********************************************************************
+*
+*       _StoreChar
+*/
+static void _StoreChar(SEGGER_RTT_PRINTF_DESC * p, char c) {
+  unsigned Cnt;
+
+  Cnt = p->Cnt;
+  if ((Cnt + 1u) <= p->BufferSize) {
+    *(p->pBuffer + Cnt) = c;
+    p->Cnt = Cnt + 1u;
+    p->ReturnValue++;
+  }
+  //
+  // Write part of string, when the buffer is full
+  //
+  if (p->Cnt == p->BufferSize) {
+    if (SEGGER_RTT_Write(p->RTTBufferIndex, p->pBuffer, p->Cnt) != p->Cnt) {
+      p->ReturnValue = -1;
+    } else {
+      p->Cnt = 0u;
+    }
+  }
+}
+
+/*********************************************************************
+*
+*       _PrintUnsigned
+*/
+static void _PrintUnsigned(SEGGER_RTT_PRINTF_DESC * pBufferDesc, unsigned v, unsigned Base, unsigned NumDigits, unsigned FieldWidth, unsigned FormatFlags) {
+  static const char _aV2C[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+  unsigned Div;
+  unsigned Digit;
+  unsigned Number;
+  unsigned Width;
+  char c;
+
+  Number = v;
+  Digit = 1u;
+  //
+  // Get actual field width
+  //
+  Width = 1u;
+  while (Number >= Base) {
+    Number = (Number / Base);
+    Width++;
+  }
+  if (NumDigits > Width) {
+    Width = NumDigits;
+  }
+  //
+  // Print leading chars if necessary
+  //
+  if ((FormatFlags & FORMAT_FLAG_LEFT_JUSTIFY) == 0u) {
+    if (FieldWidth != 0u) {
+      if (((FormatFlags & FORMAT_FLAG_PAD_ZERO) == FORMAT_FLAG_PAD_ZERO) && (NumDigits == 0u)) {
+        c = '0';
+      } else {
+        c = ' ';
+      }
+      while ((FieldWidth != 0u) && (Width < FieldWidth)) {
+        FieldWidth--;
+        _StoreChar(pBufferDesc, c);
+        if (pBufferDesc->ReturnValue < 0) {
+          break;
+        }
+      }
+    }
+  }
+  if (pBufferDesc->ReturnValue >= 0) {
+    //
+    // Compute Digit.
+    // Loop until Digit has the value of the highest digit required.
+    // Example: If the output is 345 (Base 10), loop 2 times until Digit is 100.
+    //
+    while (1) {
+      if (NumDigits > 1u) {       // User specified a min number of digits to print? => Make sure we loop at least that often, before checking anything else (> 1 check avoids problems with NumDigits being signed / unsigned)
+        NumDigits--;
+      } else {
+        Div = v / Digit;
+        if (Div < Base) {        // Is our divider big enough to extract the highest digit from value? => Done
+          break;
+        }
+      }
+      Digit *= Base;
+    }
+    //
+    // Output digits
+    //
+    do {
+      Div = v / Digit;
+      v -= Div * Digit;
+      _StoreChar(pBufferDesc, _aV2C[Div]);
+      if (pBufferDesc->ReturnValue < 0) {
+        break;
+      }
+      Digit /= Base;
+    } while (Digit);
+    //
+    // Print trailing spaces if necessary
+    //
+    if ((FormatFlags & FORMAT_FLAG_LEFT_JUSTIFY) == FORMAT_FLAG_LEFT_JUSTIFY) {
+      if (FieldWidth != 0u) {
+        while ((FieldWidth != 0u) && (Width < FieldWidth)) {
+          FieldWidth--;
+          _StoreChar(pBufferDesc, ' ');
+          if (pBufferDesc->ReturnValue < 0) {
+            break;
+          }
+        }
+      }
+    }
+  }
+}
+
+/*********************************************************************
+*
+*       _PrintInt
+*/
+static void _PrintInt(SEGGER_RTT_PRINTF_DESC * pBufferDesc, int v, unsigned Base, unsigned NumDigits, unsigned FieldWidth, unsigned FormatFlags) {
+  unsigned Width;
+  int Number;
+
+  Number = (v < 0) ? -v : v;
+
+  //
+  // Get actual field width
+  //
+  Width = 1u;
+  while (Number >= (int)Base) {
+    Number = (Number / (int)Base);
+    Width++;
+  }
+  if (NumDigits > Width) {
+    Width = NumDigits;
+  }
+  if ((FieldWidth > 0u) && ((v < 0) || ((FormatFlags & FORMAT_FLAG_PRINT_SIGN) == FORMAT_FLAG_PRINT_SIGN))) {
+    FieldWidth--;
+  }
+
+  //
+  // Print leading spaces if necessary
+  //
+  if ((((FormatFlags & FORMAT_FLAG_PAD_ZERO) == 0u) || (NumDigits != 0u)) && ((FormatFlags & FORMAT_FLAG_LEFT_JUSTIFY) == 0u)) {
+    if (FieldWidth != 0u) {
+      while ((FieldWidth != 0u) && (Width < FieldWidth)) {
+        FieldWidth--;
+        _StoreChar(pBufferDesc, ' ');
+        if (pBufferDesc->ReturnValue < 0) {
+          break;
+        }
+      }
+    }
+  }
+  //
+  // Print sign if necessary
+  //
+  if (pBufferDesc->ReturnValue >= 0) {
+    if (v < 0) {
+      v = -v;
+      _StoreChar(pBufferDesc, '-');
+    } else if ((FormatFlags & FORMAT_FLAG_PRINT_SIGN) == FORMAT_FLAG_PRINT_SIGN) {
+      _StoreChar(pBufferDesc, '+');
+    } else {
+
+    }
+    if (pBufferDesc->ReturnValue >= 0) {
+      //
+      // Print leading zeros if necessary
+      //
+      if (((FormatFlags & FORMAT_FLAG_PAD_ZERO) == FORMAT_FLAG_PAD_ZERO) && ((FormatFlags & FORMAT_FLAG_LEFT_JUSTIFY) == 0u) && (NumDigits == 0u)) {
+        if (FieldWidth != 0u) {
+          while ((FieldWidth != 0u) && (Width < FieldWidth)) {
+            FieldWidth--;
+            _StoreChar(pBufferDesc, '0');
+            if (pBufferDesc->ReturnValue < 0) {
+              break;
+            }
+          }
+        }
+      }
+      if (pBufferDesc->ReturnValue >= 0) {
+        //
+        // Print number without sign
+        //
+        _PrintUnsigned(pBufferDesc, (unsigned)v, Base, NumDigits, FieldWidth, FormatFlags);
+      }
+    }
+  }
+}
+
+/*********************************************************************
+*
+*       Public code
+*
+**********************************************************************
+*/
+/*********************************************************************
+*
+*       SEGGER_RTT_vprintf
+*
+*  Function description
+*    Stores a formatted string in SEGGER RTT control block.
+*    This data is read by the host.
+*
+*  Parameters
+*    BufferIndex  Index of "Up"-buffer to be used. (e.g. 0 for "Terminal")
+*    sFormat      Pointer to format string
+*    pParamList   Pointer to the list of arguments for the format string
+*
+*  Return values
+*    >= 0:  Number of bytes which have been stored in the "Up"-buffer.
+*     < 0:  Error
+*/
+int SEGGER_RTT_vprintf(unsigned BufferIndex, const char * sFormat, va_list * pParamList) {
+  char c;
+  SEGGER_RTT_PRINTF_DESC BufferDesc;
+  int v;
+  unsigned NumDigits;
+  unsigned FormatFlags;
+  unsigned FieldWidth;
+  char acBuffer[SEGGER_RTT_PRINTF_BUFFER_SIZE];
+
+  BufferDesc.pBuffer        = acBuffer;
+  BufferDesc.BufferSize     = SEGGER_RTT_PRINTF_BUFFER_SIZE;
+  BufferDesc.Cnt            = 0u;
+  BufferDesc.RTTBufferIndex = BufferIndex;
+  BufferDesc.ReturnValue    = 0;
+
+  do {
+    c = *sFormat;
+    sFormat++;
+    if (c == 0u) {
+      break;
+    }
+    if (c == '%') {
+      //
+      // Filter out flags
+      //
+      FormatFlags = 0u;
+      v = 1;
+      do {
+        c = *sFormat;
+        switch (c) {
+        case '-': FormatFlags |= FORMAT_FLAG_LEFT_JUSTIFY; sFormat++; break;
+        case '0': FormatFlags |= FORMAT_FLAG_PAD_ZERO;     sFormat++; break;
+        case '+': FormatFlags |= FORMAT_FLAG_PRINT_SIGN;   sFormat++; break;
+        case '#': FormatFlags |= FORMAT_FLAG_ALTERNATE;    sFormat++; break;
+        default:  v = 0; break;
+        }
+      } while (v);
+      //
+      // filter out field with
+      //
+      FieldWidth = 0u;
+      do {
+        c = *sFormat;
+        if ((c < '0') || (c > '9')) {
+          break;
+        }
+        sFormat++;
+        FieldWidth = (FieldWidth * 10u) + ((unsigned)c - '0');
+      } while (1);
+
+      //
+      // Filter out precision (number of digits to display)
+      //
+      NumDigits = 0u;
+      c = *sFormat;
+      if (c == '.') {
+        sFormat++;
+        do {
+          c = *sFormat;
+          if (c == '*') {
+            sFormat++;
+            v = va_arg(*pParamList, int);
+            NumDigits = (unsigned)v;
+            break;
+          }
+          if ((c < '0') || (c > '9')) {
+            break;
+          }
+          sFormat++;
+          NumDigits = NumDigits * 10u + ((unsigned)c - '0');
+        } while (1);
+      }
+      //
+      // Filter out length modifier
+      //
+      c = *sFormat;
+      do {
+        if ((c == 'l') || (c == 'h')) {
+          c = *sFormat;
+          sFormat++;
+        } else {
+          break;
+        }
+      } while (1);
+      //
+      // Handle specifiers
+      //
+      switch (c) {
+      case 'c': {
+        char c0;
+        v = va_arg(*pParamList, int);
+        c0 = (char)v;
+        _StoreChar(&BufferDesc, c0);
+        break;
+      }
+      case 'd':
+        v = va_arg(*pParamList, int);
+        _PrintInt(&BufferDesc, v, 10u, NumDigits, FieldWidth, FormatFlags);
+        break;
+      case 'u':
+        v = va_arg(*pParamList, int);
+        _PrintUnsigned(&BufferDesc, (unsigned)v, 10u, NumDigits, FieldWidth, FormatFlags);
+        break;
+      case 'x':
+      case 'X':
+        v = va_arg(*pParamList, int);
+        _PrintUnsigned(&BufferDesc, (unsigned)v, 16u, NumDigits, FieldWidth, FormatFlags);
+        break;
+      case 's':
+        {
+          const char * s = va_arg(*pParamList, const char *);
+          if (NumDigits > 0) {
+            do {
+              c = *s;
+              s++;
+              if (NumDigits == 0) {
+                break;
+              }
+              NumDigits--;
+              _StoreChar(&BufferDesc, c);
+            } while (BufferDesc.ReturnValue >= 0);
+          } else {
+            do {
+              c = *s;
+              s++;
+              if (c == '\0' || NumDigits == 0) {
+                break;
+              }
+              _StoreChar(&BufferDesc, c);
+            } while (BufferDesc.ReturnValue >= 0);
+          }
+        }
+        break;
+      case 'p':
+        v = va_arg(*pParamList, int);
+        _PrintUnsigned(&BufferDesc, (unsigned)v, 16u, 8u, 8u, 0u);
+        break;
+      case '%':
+        _StoreChar(&BufferDesc, '%');
+        break;
+      default:
+        break;
+      }
+      sFormat++;
+    } else {
+      _StoreChar(&BufferDesc, c);
+    }
+  } while (BufferDesc.ReturnValue >= 0);
+
+  if (BufferDesc.ReturnValue > 0) {
+    //
+    // Write remaining data, if any
+    //
+    if (BufferDesc.Cnt != 0u) {
+      SEGGER_RTT_Write(BufferIndex, acBuffer, BufferDesc.Cnt);
+    }
+    BufferDesc.ReturnValue += (int)BufferDesc.Cnt;
+  }
+  return BufferDesc.ReturnValue;
+}
+
+/*********************************************************************
+*
+*       SEGGER_RTT_printf
+*
+*  Function description
+*    Stores a formatted string in SEGGER RTT control block.
+*    This data is read by the host.
+*
+*  Parameters
+*    BufferIndex  Index of "Up"-buffer to be used. (e.g. 0 for "Terminal")
+*    sFormat      Pointer to format string, followed by the arguments for conversion
+*
+*  Return values
+*    >= 0:  Number of bytes which have been stored in the "Up"-buffer.
+*     < 0:  Error
+*
+*  Notes
+*    (1) Conversion specifications have following syntax:
+*          %[flags][FieldWidth][.Precision]ConversionSpecifier
+*    (2) Supported flags:
+*          -: Left justify within the field width
+*          +: Always print sign extension for signed conversions
+*          0: Pad with 0 instead of spaces. Ignored when using '-'-flag or precision
+*        Supported conversion specifiers:
+*          c: Print the argument as one char
+*          d: Print the argument as a signed integer
+*          u: Print the argument as an unsigned integer
+*          x: Print the argument as an hexadecimal integer
+*          s: Print the string pointed to by the argument
+*          p: Print the argument as an 8-digit hexadecimal integer. (Argument shall be a pointer to void.)
+*/
+int SEGGER_RTT_printf(unsigned BufferIndex, const char * sFormat, ...) {
+  va_list ParamList;
+
+  va_start(ParamList, sFormat);
+  return SEGGER_RTT_vprintf(BufferIndex, sFormat, &ParamList);
+}
+/*************************** End of file ****************************/
diff --git a/platform/nrf52dk/rtt/segger-rtt.c b/platform/nrf52dk/rtt/segger-rtt.c
new file mode 100644
index 000000000..453a6a0e4
--- /dev/null
+++ b/platform/nrf52dk/rtt/segger-rtt.c
@@ -0,0 +1,1102 @@
+/*********************************************************************
+*               SEGGER MICROCONTROLLER GmbH & Co. KG                 *
+*       Solutions for real time microcontroller applications         *
+**********************************************************************
+*                                                                    *
+*       (c) 2014 - 2015  SEGGER Microcontroller GmbH & Co. KG        *
+*                                                                    *
+*       www.segger.com     Support: support@segger.com               *
+*                                                                    *
+**********************************************************************
+*                                                                    *
+* All rights reserved.                                               *
+*                                                                    *
+* * This software may in its unmodified form be freely redistributed *
+*   in source form.                                                  *
+* * The source code may be modified, provided the source code        *
+*   retains the above copyright notice, this list of conditions and  *
+*   the following disclaimer.                                        *
+* * Modified versions of this software in source or linkable form    *
+*   may not be distributed without prior consent of SEGGER.          *
+* * This software may only be used for communication with SEGGER     *
+*   J-Link debug probes.                                             *
+*                                                                    *
+* 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 SEGGER Microcontroller 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.                                                            *
+*                                                                    *
+**********************************************************************
+---------------------------END-OF-HEADER------------------------------
+File    : SEGGER_RTT.c
+Purpose : Implementation of SEGGER real-time transfer (RTT) which
+          allows real-time communication on targets which support
+          debugger memory accesses while the CPU is running.
+
+Additional information:
+          Type "int" is assumed to be 32-bits in size
+          H->T    Host to target communication
+          T->H    Target to host communication
+
+          RTT channel 0 is always present and reserved for Terminal usage.
+          Name is fixed to "Terminal"
+
+----------------------------------------------------------------------
+*/
+
+#include "segger-rtt.h"
+
+#include <string.h>                 // for memcpy
+
+/*********************************************************************
+*
+*       Configuration, default values
+*
+**********************************************************************
+*/
+
+#ifndef   BUFFER_SIZE_UP
+  #define BUFFER_SIZE_UP                                  1024  // Size of the buffer for terminal output of target, up to host
+#endif
+
+#ifndef   BUFFER_SIZE_DOWN
+  #define BUFFER_SIZE_DOWN                                16    // Size of the buffer for terminal input to target from host (Usually keyboard input)
+#endif
+
+#ifndef   SEGGER_RTT_MAX_NUM_UP_BUFFERS
+  #define SEGGER_RTT_MAX_NUM_UP_BUFFERS                    2    // Number of up-buffers (T->H) available on this target
+#endif
+
+#ifndef   SEGGER_RTT_MAX_NUM_DOWN_BUFFERS
+  #define SEGGER_RTT_MAX_NUM_DOWN_BUFFERS                  2    // Number of down-buffers (H->T) available on this target
+#endif
+
+#ifndef   SEGGER_RTT_MODE_DEFAULT
+  #define SEGGER_RTT_MODE_DEFAULT                         SEGGER_RTT_MODE_NO_BLOCK_SKIP
+#endif
+
+#ifndef   SEGGER_RTT_LOCK
+  #define SEGGER_RTT_LOCK(SavedState)
+#endif
+
+#ifndef   SEGGER_RTT_UNLOCK
+  #define SEGGER_RTT_UNLOCK(SavedState)
+#endif
+
+#ifndef   STRLEN
+  #define STRLEN(a)                                       strlen((a))
+#endif
+
+#ifndef   MEMCPY
+  #define MEMCPY(pDest, pSrc, NumBytes)                   memcpy((pDest), (pSrc), (NumBytes))
+#endif
+
+#ifndef   MIN
+  #define MIN(a, b)         (((a) < (b)) ? (a) : (b))
+#endif
+
+#ifndef   MAX
+  #define MAX(a, b)         (((a) > (b)) ? (a) : (b))
+#endif
+//
+// For some environments, NULL may not be defined until certain headers are included
+//
+#ifndef NULL
+  #define NULL 0
+#endif
+
+/*********************************************************************
+*
+*       Static const data
+*
+**********************************************************************
+*/
+
+static unsigned char _aTerminalId[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+
+/*********************************************************************
+*
+*       Static data
+*
+**********************************************************************
+*/
+//
+// Allocate buffers for channel 0
+//
+static char _acUpBuffer  [BUFFER_SIZE_UP];
+static char _acDownBuffer[BUFFER_SIZE_DOWN];
+//
+// Initialize SEGGER Real-time-Terminal control block (CB)
+//
+SEGGER_RTT_CB _SEGGER_RTT;
+
+static char _ActiveTerminal;
+
+/*********************************************************************
+*
+*       Static functions
+*
+**********************************************************************
+*/
+
+/*********************************************************************
+*
+*       _DoInit()
+*
+*  Function description
+*    Initializes the control block an buffers.
+*    May only be called via INIT() to avoid overriding settings.
+*
+*/
+#define INIT()  do {                                            \
+                  if (_SEGGER_RTT.acID[0] == '\0') { _DoInit(); }  \
+                } while (0)
+static void _DoInit(void) {
+  SEGGER_RTT_CB* p;
+  //
+  // Initialize control block
+  //
+  p = &_SEGGER_RTT;
+  p->MaxNumUpBuffers    = SEGGER_RTT_MAX_NUM_UP_BUFFERS;
+  p->MaxNumDownBuffers  = SEGGER_RTT_MAX_NUM_DOWN_BUFFERS;
+  //
+  // Initialize up buffer 0
+  //
+  p->aUp[0].sName         = "Terminal";
+  p->aUp[0].pBuffer       = _acUpBuffer;
+  p->aUp[0].SizeOfBuffer  = sizeof(_acUpBuffer);
+  p->aUp[0].RdOff         = 0u;
+  p->aUp[0].WrOff         = 0u;
+  p->aUp[0].Flags         = SEGGER_RTT_MODE_DEFAULT;
+  //
+  // Initialize down buffer 0
+  //
+  p->aDown[0].sName         = "Terminal";
+  p->aDown[0].pBuffer       = _acDownBuffer;
+  p->aDown[0].SizeOfBuffer  = sizeof(_acDownBuffer);
+  p->aDown[0].RdOff         = 0u;
+  p->aDown[0].WrOff         = 0u;
+  p->aDown[0].Flags         = SEGGER_RTT_MODE_DEFAULT;
+  //
+  // Finish initialization of the control block.
+  // Copy Id string in three steps to make sure "SEGGER RTT" is not found
+  // in initializer memory (usually flash) by J-Link
+  //
+  strcpy(&p->acID[7], "RTT");
+  strcpy(&p->acID[0], "SEGGER");
+  p->acID[6] = ' ';
+}
+
+/*********************************************************************
+*
+*       _WriteBlocking()
+*
+*  Function description
+*    Stores a specified number of characters in SEGGER RTT ring buffer
+*    and updates the associated write pointer which is periodically
+*    read by the host.
+*    The caller is responsible for managing the write chunk sizes as
+*    _WriteBlocking() will block until all data has been posted successfully.
+*
+*  Parameters
+*    pRing        Ring buffer to post to.
+*    pBuffer      Pointer to character array. Does not need to point to a \0 terminated string.
+*    NumBytes     Number of bytes to be stored in the SEGGER RTT control block.
+*
+*  Return value
+*    >= 0 - Number of bytes written into buffer.
+*/
+static unsigned _WriteBlocking(SEGGER_RTT_RING_BUFFER *pRing, const char* pBuffer, unsigned NumBytes) {
+  unsigned NumBytesToWrite;
+  unsigned NumBytesWritten;
+  unsigned RdOff;
+  unsigned WrOff;
+  //
+  // Write data to buffer and handle wrap-around if necessary
+  //
+  NumBytesWritten = 0u;
+  WrOff = pRing->WrOff;
+  do {
+    RdOff = pRing->RdOff;                         // May be changed by host (debug probe) in the meantime
+    if (RdOff > WrOff) {
+      NumBytesToWrite = RdOff - WrOff - 1u;
+    } else {
+      NumBytesToWrite = pRing->SizeOfBuffer - (WrOff - RdOff + 1u);
+    }
+    NumBytesToWrite = MIN(NumBytesToWrite, (pRing->SizeOfBuffer - WrOff));      // Number of bytes that can be written until buffer wrap-around
+    NumBytesToWrite = MIN(NumBytesToWrite, NumBytes);
+    memcpy(pRing->pBuffer + WrOff, pBuffer, NumBytesToWrite);
+    NumBytesWritten += NumBytesToWrite;
+    pBuffer         += NumBytesToWrite;
+    NumBytes        -= NumBytesToWrite;
+    WrOff           += NumBytesToWrite;
+    if (WrOff == pRing->SizeOfBuffer) {
+      WrOff = 0u;
+    }
+    pRing->WrOff = WrOff;
+  } while (NumBytes);
+  //
+  return NumBytesWritten;
+}
+
+/*********************************************************************
+*
+*       _WriteNoCheck()
+*
+*  Function description
+*    Stores a specified number of characters in SEGGER RTT ring buffer
+*    and updates the associated write pointer which is periodically
+*    read by the host.
+*    It is callers responsibility to make sure data actually fits in buffer.
+*
+*  Parameters
+*    pRing        Ring buffer to post to.
+*    pBuffer      Pointer to character array. Does not need to point to a \0 terminated string.
+*    NumBytes     Number of bytes to be stored in the SEGGER RTT control block.
+*
+*  Notes
+*    (1) If there might not be enough space in the "Up"-buffer, call _WriteBlocking
+*/
+static void _WriteNoCheck(SEGGER_RTT_RING_BUFFER *pRing, const char* pData, unsigned NumBytes) {
+  unsigned NumBytesAtOnce;
+  unsigned WrOff;
+  unsigned Rem;
+
+  WrOff = pRing->WrOff;
+  Rem = pRing->SizeOfBuffer - WrOff;
+  if (Rem > NumBytes) {
+    //
+    // All data fits before wrap around
+    //
+    memcpy(pRing->pBuffer + WrOff, pData, NumBytes);
+    pRing->WrOff = WrOff + NumBytes;
+  } else {
+    //
+    // We reach the end of the buffer, so need to wrap around
+    //
+    NumBytesAtOnce = Rem;
+    memcpy(pRing->pBuffer + WrOff, pData, NumBytesAtOnce);
+    NumBytesAtOnce = NumBytes - Rem;
+    memcpy(pRing->pBuffer, pData + Rem, NumBytesAtOnce);
+    pRing->WrOff = NumBytesAtOnce;
+  }
+}
+
+/*********************************************************************
+*
+*       _PostTerminalSwitch()
+*
+*  Function description
+*    Switch terminal to the given terminal ID.  It is the caller's
+*    responsibility to ensure the terminal ID is correct and there is
+*    enough space in the buffer for this to complete successfully.
+*
+*  Parameters
+*    pRing        Ring buffer to post to.
+*    TerminalId   Terminal ID to switch to.
+*/
+static void _PostTerminalSwitch(SEGGER_RTT_RING_BUFFER *pRing, char TerminalId) {
+  char ac[2];
+
+  ac[0] = 0xFFu;
+  ac[1] = _aTerminalId[(int)TerminalId];  // Caller made already sure that TerminalId does not exceed our terminal limit
+  _WriteBlocking(pRing, ac, 2u);
+}
+
+/*********************************************************************
+*
+*       _GetAvailWriteSpace()
+*
+*  Function description
+*    Returns the number of bytes that can be written to the ring
+*    buffer without blocking.
+*
+*  Parameters
+*    pRing        Ring buffer to check.
+*
+*  Return value
+*    Number of bytes that are free in the buffer.
+*/
+static unsigned _GetAvailWriteSpace(SEGGER_RTT_RING_BUFFER *pRing) {
+  unsigned RdOff;
+  unsigned WrOff;
+  unsigned r;
+  //
+  // Avoid warnings regarding volatile access order.  It's not a problem
+  // in this case, but dampen compiler enthusiasm.
+  //
+  RdOff = pRing->RdOff;
+  WrOff = pRing->WrOff;
+  if (RdOff <= WrOff) {
+    r = pRing->SizeOfBuffer - 1u - WrOff + RdOff;
+  } else {
+    r = RdOff - WrOff - 1u;
+  }
+  return r;
+}
+
+/*********************************************************************
+*
+*       Public code
+*
+**********************************************************************
+*/
+/*********************************************************************
+*
+*       SEGGER_RTT_ReadNoLock()
+*
+*  Function description
+*    Reads characters from SEGGER real-time-terminal control block
+*    which have been previously stored by the host.
+*    Do not lock against interrupts and multiple access.
+*
+*  Parameters
+*    BufferIndex  Index of Down-buffer to be used (e.g. 0 for "Terminal").
+*    pBuffer      Pointer to buffer provided by target application, to copy characters from RTT-down-buffer to.
+*    BufferSize   Size of the target application buffer.
+*
+*  Return value
+*    Number of bytes that have been read.
+*/
+unsigned SEGGER_RTT_ReadNoLock(unsigned BufferIndex, void* pData, unsigned BufferSize) {
+  unsigned NumBytesRem;
+  unsigned NumBytesRead;
+  unsigned RdOff;
+  unsigned WrOff;
+  unsigned char* pBuffer;
+  SEGGER_RTT_RING_BUFFER* pRing;
+  //
+  INIT();
+  pRing = &_SEGGER_RTT.aDown[BufferIndex];
+  pBuffer = (unsigned char*)pData;
+  RdOff = pRing->RdOff;
+  WrOff = pRing->WrOff;
+  NumBytesRead = 0u;
+  //
+  // Read from current read position to wrap-around of buffer, first
+  //
+  if (RdOff > WrOff) {
+    NumBytesRem = pRing->SizeOfBuffer - RdOff;
+    NumBytesRem = MIN(NumBytesRem, BufferSize);
+    memcpy(pBuffer, pRing->pBuffer + RdOff, NumBytesRem);
+    NumBytesRead += NumBytesRem;
+    pBuffer      += NumBytesRem;
+    BufferSize   -= NumBytesRem;
+    RdOff        += NumBytesRem;
+    //
+    // Handle wrap-around of buffer
+    //
+    if (RdOff == pRing->SizeOfBuffer) {
+      RdOff = 0u;
+    }
+  }
+  //
+  // Read remaining items of buffer
+  //
+  NumBytesRem = WrOff - RdOff;
+  NumBytesRem = MIN(NumBytesRem, BufferSize);
+  if (NumBytesRem > 0u) {
+    memcpy(pBuffer, pRing->pBuffer + RdOff, NumBytesRem);
+    NumBytesRead += NumBytesRem;
+    pBuffer      += NumBytesRem;
+    BufferSize   -= NumBytesRem;
+    RdOff        += NumBytesRem;
+  }
+  if (NumBytesRead) {
+    pRing->RdOff = RdOff;
+  }
+  //
+  return NumBytesRead;
+}
+
+/*********************************************************************
+*
+*       SEGGER_RTT_Read
+*
+*  Function description
+*    Reads characters from SEGGER real-time-terminal control block
+*    which have been previously stored by the host.
+*
+*  Parameters
+*    BufferIndex  Index of Down-buffer to be used (e.g. 0 for "Terminal").
+*    pBuffer      Pointer to buffer provided by target application, to copy characters from RTT-down-buffer to.
+*    BufferSize   Size of the target application buffer.
+*
+*  Return value
+*    Number of bytes that have been read.
+*/
+unsigned SEGGER_RTT_Read(unsigned BufferIndex, void* pBuffer, unsigned BufferSize) {
+  unsigned NumBytesRead;
+  volatile unsigned SavedState;
+  //
+  SEGGER_RTT_LOCK(SavedState);
+  //
+  // Call the non-locking read function
+  //
+  NumBytesRead = SEGGER_RTT_ReadNoLock(BufferIndex, pBuffer, BufferSize);
+  //
+  // Finish up.
+  //
+  SEGGER_RTT_UNLOCK(SavedState);
+  //
+  return NumBytesRead;
+}
+
+/*********************************************************************
+*
+*       SEGGER_RTT_WriteSkipNoLock
+*
+*  Function description
+*    Stores a specified number of characters in SEGGER RTT
+*    control block which is then read by the host.
+*    SEGGER_RTT_WriteSkipNoLock does not lock the application and
+*    skips all data, if the data does not fit into the buffer.
+*
+*  Parameters
+*    BufferIndex  Index of "Up"-buffer to be used (e.g. 0 for "Terminal").
+*    pBuffer      Pointer to character array. Does not need to point to a \0 terminated string.
+*    NumBytes     Number of bytes to be stored in the SEGGER RTT control block.
+*
+*  Return value
+*    Number of bytes which have been stored in the "Up"-buffer.
+*
+*  Notes
+*    (1) If there is not enough space in the "Up"-buffer, all data is dropped.
+*    (2) For performance reasons this function does not call Init()
+*        and may only be called after RTT has been initialized.
+*        Either by calling SEGGER_RTT_Init() or calling another RTT API function first.
+*/
+unsigned SEGGER_RTT_WriteSkipNoLock(unsigned BufferIndex, const void* pBuffer, unsigned NumBytes) {
+  const char*  pData;
+  SEGGER_RTT_RING_BUFFER* pRing;
+  unsigned     Avail;
+  unsigned     RdOff;
+  unsigned     WrOff;
+  unsigned     Rem;
+
+  pData = (const char *)pBuffer;
+  //
+  // Get "to-host" ring buffer and copy some elements into local variables.
+  //
+  pRing = &_SEGGER_RTT.aUp[BufferIndex];
+  RdOff = pRing->RdOff;
+  WrOff = pRing->WrOff;
+  //
+  // Handle the most common cases fastest.
+  // Which is:
+  //    RdOff <= WrOff -> Space until wrap around is free.
+  //  AND
+  //    WrOff + NumBytes < SizeOfBuffer -> No Wrap around necessary.
+  //
+  //  OR
+  //
+  //    RdOff > WrOff -> Space until RdOff - 1 is free.
+  //  AND
+  //    WrOff + NumBytes < RdOff -> Data fits into buffer
+  //
+  if (RdOff <= WrOff) {
+    //
+    // Get space until WrOff will be at wrap around.
+    //
+    Avail = pRing->SizeOfBuffer - 1u - WrOff ;
+    if (Avail >= NumBytes) {
+      memcpy(pRing->pBuffer + WrOff, pData, NumBytes);
+      pRing->WrOff = WrOff + NumBytes;
+      return 1;
+    }
+    //
+    // If data did not fit into space until wrap around calculate complete space in buffer.
+    //
+    Avail += RdOff;
+    //
+    // If there is still no space for the whole of this output, don't bother.
+    //
+    if (Avail >= NumBytes) {
+      //
+      //  OK, we have enough space in buffer. Copy in one or 2 chunks
+      //
+      Rem = pRing->SizeOfBuffer - WrOff;      // Space until end of buffer
+      if (Rem > NumBytes) {
+        memcpy(pRing->pBuffer + WrOff, pData, NumBytes);
+        pRing->WrOff = WrOff + NumBytes;
+      } else {
+        //
+        // We reach the end of the buffer, so need to wrap around
+        //
+        memcpy(pRing->pBuffer + WrOff, pData, Rem);
+        memcpy(pRing->pBuffer, pData + Rem, NumBytes - Rem);
+        pRing->WrOff = NumBytes - Rem;
+      }
+      return 1;
+    }
+  } else {
+    Avail = RdOff - WrOff - 1u;
+    if (Avail >= NumBytes) {
+      memcpy(pRing->pBuffer + WrOff, pData, NumBytes);
+      pRing->WrOff = WrOff + NumBytes;
+      return 1;
+    }
+  }
+  //
+  // If we reach this point no data has been written
+  //
+  return 0;
+}
+
+/*********************************************************************
+*
+*       SEGGER_RTT_WriteNoLock
+*
+*  Function description
+*    Stores a specified number of characters in SEGGER RTT
+*    control block which is then read by the host.
+*    SEGGER_RTT_WriteNoLock does not lock the application.
+*
+*  Parameters
+*    BufferIndex  Index of "Up"-buffer to be used (e.g. 0 for "Terminal").
+*    pBuffer      Pointer to character array. Does not need to point to a \0 terminated string.
+*    NumBytes     Number of bytes to be stored in the SEGGER RTT control block.
+*
+*  Return value
+*    Number of bytes which have been stored in the "Up"-buffer.
+*
+*  Notes
+*    (1) If there is not enough space in the "Up"-buffer, remaining characters of pBuffer are dropped.
+*    (2) For performance reasons this function does not call Init()
+*        and may only be called after RTT has been initialized.
+*        Either by calling SEGGER_RTT_Init() or calling another RTT API function first.
+*/
+unsigned SEGGER_RTT_WriteNoLock(unsigned BufferIndex, const void* pBuffer, unsigned NumBytes) {
+  unsigned Status;
+  unsigned Avail;
+  const char*  pData;
+  SEGGER_RTT_RING_BUFFER *pRing;
+  
+  pData = (const char *)pBuffer;
+  //
+  // Get "to-host" ring buffer.
+  //
+  pRing = &_SEGGER_RTT.aUp[BufferIndex];
+  //
+  // How we output depends upon the mode...
+  //
+  switch (pRing->Flags) {
+  case SEGGER_RTT_MODE_NO_BLOCK_SKIP:
+    //
+    // If we are in skip mode and there is no space for the whole
+    // of this output, don't bother.
+    //
+    Avail = _GetAvailWriteSpace(pRing);
+    if (Avail < NumBytes) {
+      Status = 0u;
+    } else {
+      Status = NumBytes;
+      _WriteNoCheck(pRing, pData, NumBytes);
+    }
+    break;
+  case SEGGER_RTT_MODE_NO_BLOCK_TRIM:
+    //
+    // If we are in trim mode, trim to what we can output without blocking.
+    //
+    Avail = _GetAvailWriteSpace(pRing);
+    Status = Avail < NumBytes ? Avail : NumBytes;
+    _WriteNoCheck(pRing, pData, Status);
+    break;
+  case SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL:
+    //
+    // If we are in blocking mode, output everything.
+    //
+    Status = _WriteBlocking(pRing, pData, NumBytes);
+    break;
+  default:
+    Status = 0u;
+    break;
+  }
+  //
+  // Finish up.
+  //
+  return Status;
+}
+
+/*********************************************************************
+*
+*       SEGGER_RTT_Write
+*
+*  Function description
+*    Stores a specified number of characters in SEGGER RTT
+*    control block which is then read by the host.
+*
+*  Parameters
+*    BufferIndex  Index of "Up"-buffer to be used (e.g. 0 for "Terminal").
+*    pBuffer      Pointer to character array. Does not need to point to a \0 terminated string.
+*    NumBytes     Number of bytes to be stored in the SEGGER RTT control block.
+*
+*  Return value
+*    Number of bytes which have been stored in the "Up"-buffer.
+*
+*  Notes
+*    (1) If there is not enough space in the "Up"-buffer, remaining characters of pBuffer are dropped.
+*/
+unsigned SEGGER_RTT_Write(unsigned BufferIndex, const void* pBuffer, unsigned NumBytes) {
+  unsigned Status;
+  volatile unsigned SavedState;
+  //
+  INIT();
+  SEGGER_RTT_LOCK(SavedState);
+  //
+  // Call the non-locking write function
+  //
+  Status = SEGGER_RTT_WriteNoLock(BufferIndex, pBuffer, NumBytes);
+  //
+  // Finish up.
+  //
+  SEGGER_RTT_UNLOCK(SavedState);
+  //
+  return Status;
+}
+
+/*********************************************************************
+*
+*       SEGGER_RTT_WriteString
+*
+*  Function description
+*    Stores string in SEGGER RTT control block.
+*    This data is read by the host.
+*
+*  Parameters
+*    BufferIndex  Index of "Up"-buffer to be used (e.g. 0 for "Terminal").
+*    s            Pointer to string.
+*
+*  Return value
+*    Number of bytes which have been stored in the "Up"-buffer.
+*
+*  Notes
+*    (1) If there is not enough space in the "Up"-buffer, depending on configuration,
+*        remaining characters may be dropped or RTT module waits until there is more space in the buffer.
+*    (2) String passed to this function has to be \0 terminated
+*    (3) \0 termination character is *not* stored in RTT buffer
+*/
+unsigned SEGGER_RTT_WriteString(unsigned BufferIndex, const char* s) {
+  unsigned Len;
+
+  Len = STRLEN(s);
+  return SEGGER_RTT_Write(BufferIndex, s, Len);
+}
+
+/*********************************************************************
+*
+*       SEGGER_RTT_GetKey
+*
+*  Function description
+*    Reads one character from the SEGGER RTT buffer.
+*    Host has previously stored data there.
+*
+*  Return value
+*    <  0 -   No character available (buffer empty).
+*    >= 0 -   Character which has been read. (Possible values: 0 - 255)
+*
+*  Notes
+*    (1) This function is only specified for accesses to RTT buffer 0.
+*/
+int SEGGER_RTT_GetKey(void) {
+  char c;
+  int r;
+
+  r = (int)SEGGER_RTT_Read(0u, &c, 1u);
+  if (r == 1) {
+    r = (int)(unsigned char)c;
+  } else {
+    r = -1;
+  }
+  return r;
+}
+
+/*********************************************************************
+*
+*       SEGGER_RTT_WaitKey
+*
+*  Function description
+*    Waits until at least one character is avaible in the SEGGER RTT buffer.
+*    Once a character is available, it is read and this function returns.
+*
+*  Return value
+*    >=0 -   Character which has been read.
+*
+*  Notes
+*    (1) This function is only specified for accesses to RTT buffer 0
+*    (2) This function is blocking if no character is present in RTT buffer
+*/
+int SEGGER_RTT_WaitKey(void) {
+  int r;
+
+  do {
+    r = SEGGER_RTT_GetKey();
+  } while (r < 0);
+  return r;
+}
+
+/*********************************************************************
+*
+*       SEGGER_RTT_HasKey
+*
+*  Function description
+*    Checks if at least one character for reading is available in the SEGGER RTT buffer.
+*
+*  Return value
+*    == 0 -     No characters are available to read.
+*    == 1 -     At least one character is available.
+*
+*  Notes
+*    (1) This function is only specified for accesses to RTT buffer 0
+*/
+int SEGGER_RTT_HasKey(void) {
+  unsigned RdOff;
+  int r;
+
+  INIT();
+  RdOff = _SEGGER_RTT.aDown[0].RdOff;
+  if (RdOff != _SEGGER_RTT.aDown[0].WrOff) {
+    r = 1;
+  } else {
+    r = 0;
+  }
+  return r;
+}
+
+/*********************************************************************
+*
+*       SEGGER_RTT_HasData
+*
+*  Function description
+*    Check if there is data from the host in the given buffer.
+*
+*  Return value:
+*  ==0:  No data
+*  !=0:  Data in buffer
+*
+*/
+unsigned SEGGER_RTT_HasData(unsigned BufferIndex) {
+  SEGGER_RTT_RING_BUFFER *pRing;
+  unsigned v;
+
+  pRing = &_SEGGER_RTT.aDown[BufferIndex];
+  v = pRing->WrOff;
+  return v - pRing->RdOff;
+}
+
+
+/*********************************************************************
+*
+*       SEGGER_RTT_ConfigUpBuffer
+*
+*  Function description
+*    Run-time configuration of a specific up-buffer (T->H).
+*    Buffer to be configured is specified by index.
+*    This includes: Buffer address, size, name, flags, ...
+*
+*  Parameters
+*    BufferIndex  Index of the buffer to configure.
+*    sName        Pointer to a constant name string.
+*    pBuffer      Pointer to a buffer to be used.
+*    BufferSize   Size of the buffer.
+*    Flags        Operating modes. Define behavior if buffer is full (not enough space for entire message).
+*
+*  Return value
+*    >= 0 - O.K.
+*     < 0 - Error
+*/
+int SEGGER_RTT_ConfigUpBuffer(unsigned BufferIndex, const char* sName, void* pBuffer, unsigned BufferSize, unsigned Flags) {
+  int r;
+  volatile unsigned SavedState;
+
+  INIT();
+  if (BufferIndex < (unsigned)_SEGGER_RTT.MaxNumUpBuffers) {
+    SEGGER_RTT_LOCK(SavedState);
+    if (BufferIndex > 0u) {
+      _SEGGER_RTT.aUp[BufferIndex].sName        = sName;
+      _SEGGER_RTT.aUp[BufferIndex].pBuffer      = pBuffer;
+      _SEGGER_RTT.aUp[BufferIndex].SizeOfBuffer = BufferSize;
+      _SEGGER_RTT.aUp[BufferIndex].RdOff        = 0u;
+      _SEGGER_RTT.aUp[BufferIndex].WrOff        = 0u;
+    }
+    _SEGGER_RTT.aUp[BufferIndex].Flags          = Flags;
+    SEGGER_RTT_UNLOCK(SavedState);
+    r =  0;
+  } else {
+    r = -1;
+  }
+  return r;
+}
+
+/*********************************************************************
+*
+*       SEGGER_RTT_ConfigDownBuffer
+*
+*  Function description
+*    Run-time configuration of a specific down-buffer (H->T).
+*    Buffer to be configured is specified by index.
+*    This includes: Buffer address, size, name, flags, ...
+*
+*  Parameters
+*    BufferIndex  Index of the buffer to configure.
+*    sName        Pointer to a constant name string.
+*    pBuffer      Pointer to a buffer to be used.
+*    BufferSize   Size of the buffer.
+*    Flags        Operating modes. Define behavior if buffer is full (not enough space for entire message).
+*
+*  Return value
+*    >= 0  O.K.
+*     < 0  Error
+*/
+int SEGGER_RTT_ConfigDownBuffer(unsigned BufferIndex, const char* sName, void* pBuffer, unsigned BufferSize, unsigned Flags) {
+  int r;
+  volatile unsigned SavedState;
+
+  INIT();
+  if (BufferIndex < (unsigned)_SEGGER_RTT.MaxNumDownBuffers) {
+    SEGGER_RTT_LOCK(SavedState);
+    if (BufferIndex > 0u) {
+      _SEGGER_RTT.aDown[BufferIndex].sName        = sName;
+      _SEGGER_RTT.aDown[BufferIndex].pBuffer      = pBuffer;
+      _SEGGER_RTT.aDown[BufferIndex].SizeOfBuffer = BufferSize;
+      _SEGGER_RTT.aDown[BufferIndex].RdOff        = 0u;
+      _SEGGER_RTT.aDown[BufferIndex].WrOff        = 0u;
+    }
+    _SEGGER_RTT.aDown[BufferIndex].Flags          = Flags;
+    SEGGER_RTT_UNLOCK(SavedState);
+    r =  0;
+  } else {
+    r = -1;
+  }
+  return r;
+}
+
+/*********************************************************************
+*
+*       SEGGER_RTT_SetNameUpBuffer
+*
+*  Function description
+*    Run-time configuration of a specific up-buffer name (T->H).
+*    Buffer to be configured is specified by index.
+*
+*  Parameters
+*    BufferIndex  Index of the buffer to renamed.
+*    sName        Pointer to a constant name string.
+*
+*  Return value
+*    >= 0  O.K.
+*     < 0  Error
+*/
+int SEGGER_RTT_SetNameUpBuffer(unsigned BufferIndex, const char* sName) {
+  int r;
+  volatile unsigned SavedState;
+
+  INIT();
+  if (BufferIndex < (unsigned)_SEGGER_RTT.MaxNumUpBuffers) {
+    SEGGER_RTT_LOCK(SavedState);
+    _SEGGER_RTT.aUp[BufferIndex].sName = sName;
+    SEGGER_RTT_UNLOCK(SavedState);
+    r =  0;
+  } else {
+    r = -1;
+  }
+  return r;
+}
+
+/*********************************************************************
+*
+*       SEGGER_RTT_SetNameDownBuffer
+*
+*  Function description
+*    Run-time configuration of a specific Down-buffer name (T->H).
+*    Buffer to be configured is specified by index.
+*
+*  Parameters
+*    BufferIndex  Index of the buffer to renamed.
+*    sName        Pointer to a constant name string.
+*
+*  Return value
+*    >= 0  O.K.
+*     < 0  Error
+*/
+int SEGGER_RTT_SetNameDownBuffer(unsigned BufferIndex, const char* sName) {
+  int r;
+  volatile unsigned SavedState;
+
+  INIT();
+  if (BufferIndex < (unsigned)_SEGGER_RTT.MaxNumDownBuffers) {
+    SEGGER_RTT_LOCK(SavedState);
+    _SEGGER_RTT.aDown[BufferIndex].sName = sName;
+    SEGGER_RTT_UNLOCK(SavedState);
+    r =  0;
+  } else {
+    r = -1;
+  }
+  return r;
+}
+
+/*********************************************************************
+*
+*       SEGGER_RTT_Init
+*
+*  Function description
+*    Initializes the RTT Control Block.
+*    Should be used in RAM targets, at start of the application.
+*
+*/
+void SEGGER_RTT_Init (void) {
+  INIT();
+}
+
+/*********************************************************************
+*
+*       SEGGER_RTT_SetTerminal
+*
+*  Function description
+*    Sets the terminal to be used for output on channel 0.
+*
+*  Parameters
+*    TerminalId  Index of the terminal.
+*
+*  Return value
+*    >= 0  O.K.
+*     < 0  Error (e.g. if RTT is configured for non-blocking mode and there was no space in the buffer to set the new terminal Id)
+*/
+int SEGGER_RTT_SetTerminal (char TerminalId) {
+  char ac[2];
+  SEGGER_RTT_RING_BUFFER *pRing;
+  volatile unsigned SavedState;
+  unsigned Avail;
+  int r;
+  //
+  INIT();
+  //
+  r = 0;
+  ac[0] = 0xFFU;
+  if (TerminalId < (char)sizeof(_aTerminalId)) { // We only support a certain number of channels
+    ac[1] = _aTerminalId[(int)TerminalId];
+    pRing = &_SEGGER_RTT.aUp[0];    // Buffer 0 is always reserved for terminal I/O, so we can use index 0 here, fixed
+    SEGGER_RTT_LOCK(SavedState);    // Lock to make sure that no other task is writing into buffer, while we are and number of free bytes in buffer does not change downwards after checking and before writing
+    if ((pRing->Flags & SEGGER_RTT_MODE_MASK) == SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL) {
+      _ActiveTerminal = TerminalId;
+      _WriteBlocking(pRing, ac, 2u);
+    } else {                                                                            // Skipping mode or trim mode? => We cannot trim this command so handling is the same for both modes
+      Avail = _GetAvailWriteSpace(pRing);
+      if (Avail >= 2) {
+        _ActiveTerminal = TerminalId;    // Only change active terminal in case of success
+        _WriteNoCheck(pRing, ac, 2u);
+      } else {
+        r = -1;
+      }
+    }
+    SEGGER_RTT_UNLOCK(SavedState);
+  } else {
+    r = -1;
+  }
+  return r;
+}
+
+/*********************************************************************
+*
+*       SEGGER_RTT_TerminalOut
+*
+*  Function description
+*    Writes a string to the given terminal
+*     without changing the terminal for channel 0.
+*
+*  Parameters
+*    TerminalId   Index of the terminal.
+*    s            String to be printed on the terminal.
+*
+*  Return value
+*    >= 0 - Number of bytes written.
+*     < 0 - Error.
+*
+*/
+int SEGGER_RTT_TerminalOut (char TerminalId, const char* s) {
+  int  Status;
+  unsigned  FragLen;
+  unsigned  Avail;
+  SEGGER_RTT_RING_BUFFER *pRing;
+  volatile unsigned SavedState;
+  //
+  INIT();
+  //
+  // Validate terminal ID.
+  //
+  if (TerminalId < (char)sizeof(_aTerminalId)) { // We only support a certain number of channels
+    //
+    // Get "to-host" ring buffer.
+    //
+    pRing = &_SEGGER_RTT.aUp[0];
+    //
+    // Need to be able to change terminal, write data, change back.
+    // Compute the fixed and variable sizes.
+    //
+    FragLen = strlen(s);
+    //
+    // How we output depends upon the mode...
+    //
+    SEGGER_RTT_LOCK(SavedState);
+    Avail = _GetAvailWriteSpace(pRing);
+    switch (pRing->Flags & SEGGER_RTT_MODE_MASK) {
+    case SEGGER_RTT_MODE_NO_BLOCK_SKIP:
+      //
+      // If we are in skip mode and there is no space for the whole
+      // of this output, don't bother switching terminals at all.
+      //
+      if (Avail < (FragLen + 4u)) {
+        Status = 0;
+      } else {
+        _PostTerminalSwitch(pRing, TerminalId);
+        Status = (int)_WriteBlocking(pRing, s, FragLen);
+        _PostTerminalSwitch(pRing, _ActiveTerminal);
+      }
+      break;
+    case SEGGER_RTT_MODE_NO_BLOCK_TRIM:
+      //
+      // If we are in trim mode and there is not enough space for everything,
+      // trim the output but always include the terminal switch.  If no room
+      // for terminal switch, skip that totally.
+      //
+      if (Avail < 4u) {
+        Status = -1;
+      } else {
+        _PostTerminalSwitch(pRing, TerminalId);
+        Status = (int)_WriteBlocking(pRing, s, (FragLen < (Avail - 4u)) ? FragLen : (Avail - 4u));
+        _PostTerminalSwitch(pRing, _ActiveTerminal);
+      }
+      break;
+    case SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL:
+      //
+      // If we are in blocking mode, output everything.
+      //
+      _PostTerminalSwitch(pRing, TerminalId);
+      Status = (int)_WriteBlocking(pRing, s, FragLen);
+      _PostTerminalSwitch(pRing, _ActiveTerminal);
+      break;
+    default:
+      Status = -1;
+      break;
+    }
+    //
+    // Finish up.
+    //
+    SEGGER_RTT_UNLOCK(SavedState);
+  } else {
+    Status = -1;
+  }
+  return Status;
+}
+
+
+/*************************** End of file ****************************/
diff --git a/platform/nrf52dk/rtt/segger-rtt.h b/platform/nrf52dk/rtt/segger-rtt.h
new file mode 100644
index 000000000..e3436c462
--- /dev/null
+++ b/platform/nrf52dk/rtt/segger-rtt.h
@@ -0,0 +1,204 @@
+/*********************************************************************
+*               SEGGER MICROCONTROLLER GmbH & Co. KG                 *
+*       Solutions for real time microcontroller applications         *
+**********************************************************************
+*                                                                    *
+*       (c) 2014 - 2015  SEGGER Microcontroller GmbH & Co. KG        *
+*                                                                    *
+*       www.segger.com     Support: support@segger.com               *
+*                                                                    *
+**********************************************************************
+*                                                                    *
+* All rights reserved.                                               *
+*                                                                    *
+* * This software may in its unmodified form be freely redistributed *
+*   in source form.                                                  *
+* * The source code may be modified, provided the source code        *
+*   retains the above copyright notice, this list of conditions and  *
+*   the following disclaimer.                                        *
+* * Modified versions of this software in source or linkable form    *
+*   may not be distributed without prior consent of SEGGER.          *
+* * This software may only be used for communication with SEGGER     *
+*   J-Link debug probes.                                             *
+*                                                                    *
+* 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 SEGGER Microcontroller 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.                                                            *
+*                                                                    *
+**********************************************************************
+---------------------------END-OF-HEADER------------------------------
+File    : SEGGER_RTT.h
+Purpose : Implementation of SEGGER real-time transfer which allows
+          real-time communication on targets which support debugger 
+          memory accesses while the CPU is running.
+----------------------------------------------------------------------
+*/
+
+#ifndef SEGGER_RTT_H
+#define SEGGER_RTT_H
+
+#include "segger-rtt-conf.h"
+
+/*********************************************************************
+*
+*       Defines, fixed
+*
+**********************************************************************
+*/
+
+/*********************************************************************
+*
+*       Types
+*
+**********************************************************************
+*/
+
+//
+// Description for a circular buffer (also called "ring buffer")
+// which is used as up- (T->H) or down-buffer (H->T)
+//
+typedef struct {
+  const     char*    sName;         // Optional name. Standard names so far are: "Terminal", "SysView", "J-Scope_t4i4"
+            char*    pBuffer;       // Pointer to start of buffer
+            unsigned SizeOfBuffer;  // Buffer size in bytes. Note that one byte is lost, as this implementation does not fill up the buffer in order to avoid the problem of being unable to distinguish between full and empty.
+  volatile  unsigned WrOff;         // Position of next item to be written by either host (down-buffer) or target (up-buffer). Must be volatile since it may be modified by host (down-buffer)
+  volatile  unsigned RdOff;         // Position of next item to be read by target (down-buffer) or host (up-buffer). Must be volatile since it may be modified by host (up-buffer)
+            unsigned Flags;         // Contains configuration flags
+} SEGGER_RTT_RING_BUFFER;
+
+//
+// RTT control block which describes the number of buffers available
+// as well as the configuration for each buffer
+//
+//
+typedef struct {
+  char                    acID[16];                                 // Initialized to "SEGGER RTT"
+  int                     MaxNumUpBuffers;                          // Initialized to SEGGER_RTT_MAX_NUM_UP_BUFFERS (type. 2)
+  int                     MaxNumDownBuffers;                        // Initialized to SEGGER_RTT_MAX_NUM_DOWN_BUFFERS (type. 2)
+  SEGGER_RTT_RING_BUFFER  aUp[SEGGER_RTT_MAX_NUM_UP_BUFFERS];       // Up buffers, transferring information up from target via debug probe to host
+  SEGGER_RTT_RING_BUFFER  aDown[SEGGER_RTT_MAX_NUM_DOWN_BUFFERS];   // Down buffers, transferring information down from host via debug probe to target
+} SEGGER_RTT_CB;
+
+/*********************************************************************
+*
+*       Global data
+*
+**********************************************************************
+*/
+extern SEGGER_RTT_CB _SEGGER_RTT;
+
+/*********************************************************************
+*
+*       RTT API functions
+*
+**********************************************************************
+*/
+int          SEGGER_RTT_ConfigUpBuffer   (unsigned BufferIndex, const char* sName, void* pBuffer, unsigned BufferSize, unsigned Flags);
+int          SEGGER_RTT_ConfigDownBuffer (unsigned BufferIndex, const char* sName, void* pBuffer, unsigned BufferSize, unsigned Flags);
+int          SEGGER_RTT_GetKey           (void);
+unsigned     SEGGER_RTT_HasData          (unsigned BufferIndex);
+int          SEGGER_RTT_HasKey           (void);
+void         SEGGER_RTT_Init             (void);
+unsigned     SEGGER_RTT_Read             (unsigned BufferIndex,       void* pBuffer, unsigned BufferSize);
+unsigned     SEGGER_RTT_ReadNoLock       (unsigned BufferIndex,       void* pData,   unsigned BufferSize);
+int          SEGGER_RTT_SetNameDownBuffer(unsigned BufferIndex, const char* sName);
+int          SEGGER_RTT_SetNameUpBuffer  (unsigned BufferIndex, const char* sName);
+int          SEGGER_RTT_WaitKey          (void);
+unsigned     SEGGER_RTT_Write            (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
+unsigned     SEGGER_RTT_WriteNoLock      (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
+unsigned     SEGGER_RTT_WriteSkipNoLock  (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
+unsigned     SEGGER_RTT_WriteString      (unsigned BufferIndex, const char* s);
+//
+// Function macro for performance optimization
+//
+#define      SEGGER_RTT_HASDATA(n)       (_SEGGER_RTT.aDown[n].WrOff - _SEGGER_RTT.aDown[n].RdOff)
+
+/*********************************************************************
+*
+*       RTT "Terminal" API functions
+*
+**********************************************************************
+*/
+int     SEGGER_RTT_SetTerminal        (char TerminalId);
+int     SEGGER_RTT_TerminalOut        (char TerminalId, const char* s);
+
+/*********************************************************************
+*
+*       RTT printf functions (require SEGGER_RTT_printf.c)
+*
+**********************************************************************
+*/
+int SEGGER_RTT_printf(unsigned BufferIndex, const char * sFormat, ...);
+
+/*********************************************************************
+*
+*       Defines
+*
+**********************************************************************
+*/
+
+//
+// Operating modes. Define behavior if buffer is full (not enough space for entire message)
+//
+#define SEGGER_RTT_MODE_NO_BLOCK_SKIP         (0U)     // Skip. Do not block, output nothing. (Default)
+#define SEGGER_RTT_MODE_NO_BLOCK_TRIM         (1U)     // Trim: Do not block, output as much as fits.
+#define SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL    (2U)     // Block: Wait until there is space in the buffer.
+#define SEGGER_RTT_MODE_MASK                  (3U)
+
+//
+// Control sequences, based on ANSI.
+// Can be used to control color, and clear the screen
+//
+#define RTT_CTRL_RESET                "\e[0m"         // Reset to default colors
+#define RTT_CTRL_CLEAR                "\e[2J"         // Clear screen, reposition cursor to top left
+
+#define RTT_CTRL_TEXT_BLACK           "\e[2;30m"
+#define RTT_CTRL_TEXT_RED             "\e[2;31m"
+#define RTT_CTRL_TEXT_GREEN           "\e[2;32m"
+#define RTT_CTRL_TEXT_YELLOW          "\e[2;33m"
+#define RTT_CTRL_TEXT_BLUE            "\e[2;34m"
+#define RTT_CTRL_TEXT_MAGENTA         "\e[2;35m"
+#define RTT_CTRL_TEXT_CYAN            "\e[2;36m"
+#define RTT_CTRL_TEXT_WHITE           "\e[2;37m"
+
+#define RTT_CTRL_TEXT_BRIGHT_BLACK    "\e[1;30m"
+#define RTT_CTRL_TEXT_BRIGHT_RED      "\e[1;31m"
+#define RTT_CTRL_TEXT_BRIGHT_GREEN    "\e[1;32m"
+#define RTT_CTRL_TEXT_BRIGHT_YELLOW   "\e[1;33m"
+#define RTT_CTRL_TEXT_BRIGHT_BLUE     "\e[1;34m"
+#define RTT_CTRL_TEXT_BRIGHT_MAGENTA  "\e[1;35m"
+#define RTT_CTRL_TEXT_BRIGHT_CYAN     "\e[1;36m"
+#define RTT_CTRL_TEXT_BRIGHT_WHITE    "\e[1;37m"
+
+#define RTT_CTRL_BG_BLACK             "\e[24;40m"
+#define RTT_CTRL_BG_RED               "\e[24;41m"
+#define RTT_CTRL_BG_GREEN             "\e[24;42m"
+#define RTT_CTRL_BG_YELLOW            "\e[24;43m"
+#define RTT_CTRL_BG_BLUE              "\e[24;44m"
+#define RTT_CTRL_BG_MAGENTA           "\e[24;45m"
+#define RTT_CTRL_BG_CYAN              "\e[24;46m"
+#define RTT_CTRL_BG_WHITE             "\e[24;47m"
+
+#define RTT_CTRL_BG_BRIGHT_BLACK      "\e[4;40m"
+#define RTT_CTRL_BG_BRIGHT_RED        "\e[4;41m"
+#define RTT_CTRL_BG_BRIGHT_GREEN      "\e[4;42m"
+#define RTT_CTRL_BG_BRIGHT_YELLOW     "\e[4;43m"
+#define RTT_CTRL_BG_BRIGHT_BLUE       "\e[4;44m"
+#define RTT_CTRL_BG_BRIGHT_MAGENTA    "\e[4;45m"
+#define RTT_CTRL_BG_BRIGHT_CYAN       "\e[4;46m"
+#define RTT_CTRL_BG_BRIGHT_WHITE      "\e[4;47m"
+
+
+#endif
+
+/*************************** End of file ****************************/

From 38481c513d3f7222a738973ccbbd17e012f0a898 Mon Sep 17 00:00:00 2001
From: Wojciech Bober <wojciech.bober@gmail.com>
Date: Sat, 9 Jan 2016 14:44:58 +0100
Subject: [PATCH 025/393] nrf52dk: added examples

---
 examples/nrf52dk/blink-hello/Makefile         |   9 +
 examples/nrf52dk/blink-hello/README.md        |  14 +
 examples/nrf52dk/blink-hello/blink-hello.c    | 182 +++++
 examples/nrf52dk/coap-demo/Makefile           |  35 +
 examples/nrf52dk/coap-demo/README.md          |  63 ++
 examples/nrf52dk/coap-demo/coap-client.c      | 185 +++++
 examples/nrf52dk/coap-demo/coap-server.c      | 130 ++++
 examples/nrf52dk/coap-demo/project-conf.h     |  85 +++
 .../nrf52dk/coap-demo/resources/res-leds.c    | 106 +++
 examples/nrf52dk/mqtt-demo/Makefile           |  11 +
 examples/nrf52dk/mqtt-demo/README.md          |  74 ++
 examples/nrf52dk/mqtt-demo/mqtt-demo.c        | 721 ++++++++++++++++++
 examples/nrf52dk/mqtt-demo/project-conf.h     |  51 ++
 examples/nrf52dk/timer-test/Makefile          |   9 +
 examples/nrf52dk/timer-test/README.md         |  20 +
 examples/nrf52dk/timer-test/timer-test.c      | 131 ++++
 16 files changed, 1826 insertions(+)
 create mode 100644 examples/nrf52dk/blink-hello/Makefile
 create mode 100644 examples/nrf52dk/blink-hello/README.md
 create mode 100644 examples/nrf52dk/blink-hello/blink-hello.c
 create mode 100644 examples/nrf52dk/coap-demo/Makefile
 create mode 100644 examples/nrf52dk/coap-demo/README.md
 create mode 100644 examples/nrf52dk/coap-demo/coap-client.c
 create mode 100644 examples/nrf52dk/coap-demo/coap-server.c
 create mode 100644 examples/nrf52dk/coap-demo/project-conf.h
 create mode 100644 examples/nrf52dk/coap-demo/resources/res-leds.c
 create mode 100644 examples/nrf52dk/mqtt-demo/Makefile
 create mode 100644 examples/nrf52dk/mqtt-demo/README.md
 create mode 100644 examples/nrf52dk/mqtt-demo/mqtt-demo.c
 create mode 100644 examples/nrf52dk/mqtt-demo/project-conf.h
 create mode 100644 examples/nrf52dk/timer-test/Makefile
 create mode 100644 examples/nrf52dk/timer-test/README.md
 create mode 100644 examples/nrf52dk/timer-test/timer-test.c

diff --git a/examples/nrf52dk/blink-hello/Makefile b/examples/nrf52dk/blink-hello/Makefile
new file mode 100644
index 000000000..5b056a518
--- /dev/null
+++ b/examples/nrf52dk/blink-hello/Makefile
@@ -0,0 +1,9 @@
+CONTIKI_PROJECT = blink-hello
+
+CONTIKI_WITH_RPL=0
+NRF52_WITHOUT_SOFTDEVICE=1
+
+all: $(CONTIKI_PROJECT) 
+
+CONTIKI = ../../..
+include $(CONTIKI)/Makefile.include
diff --git a/examples/nrf52dk/blink-hello/README.md b/examples/nrf52dk/blink-hello/README.md
new file mode 100644
index 000000000..00064f993
--- /dev/null
+++ b/examples/nrf52dk/blink-hello/README.md
@@ -0,0 +1,14 @@
+Blink Hello example
+===================
+This example shows basic usage of DK's buttons and LEDs. It also shows basic 
+usage of Contiki's processes. The application autostarts 5 processes: 4 processes
+for button and LED control and 1 to display current temperature to the console.
+
+A process reacts to a press of a respective button (process 1 reacts to button 1, etc.)
+and doubles the current blinking frequency. The cycle restarts for beginning when blinking
+frequency is greater than 8Hz.  
+
+The example requires one DK and it doesn't use SoftDevice. To compile and flash the
+example run:
+
+	make TARGET=nrf52dk blink-hello.flash
\ No newline at end of file
diff --git a/examples/nrf52dk/blink-hello/blink-hello.c b/examples/nrf52dk/blink-hello/blink-hello.c
new file mode 100644
index 000000000..ebc1e451c
--- /dev/null
+++ b/examples/nrf52dk/blink-hello/blink-hello.c
@@ -0,0 +1,182 @@
+/* This is a very simple hello_world program.
+ * It aims to demonstrate the co-existence of two processes:
+ * One of them prints a hello world message and the other blinks the LEDs
+ *
+ * It is largely based on hello_world in $(CONTIKI)/examples/sensinode
+ *
+ * Author: George Oikonomou - <oikonomou@users.sourceforge.net>
+ */
+
+/**
+ * \addtogroup nrf52dk nRF52 Development Kit
+ * @{
+ *
+ * \addtogroup nrf52dk-examples Demo projects for nRF52 DK
+ * @{
+ *
+ * \defgroup nrf52dk-blink-hello Basic sensors and LEDs demo
+ * @{
+ *
+ * This demo demonstrates use of Contiki processes, sensors, and LEDs
+ * on nRF52 DK. Pressing a button will start a timer that blinks a
+ * respective LED (e.g., button 1 controls LED 1). Each time the button
+ * is pressed blinking frequency is doubled. On 4th press the LED is
+ * switched off and the sequence can be started from the beginning.
+ *
+ * \file Main file for Basic sensors and LEDs demo.
+ */
+#include <stdio.h> /* For printf() */
+#include <inttypes.h>
+#include "contiki.h"
+#include "dev/leds.h"
+#include "dev/temperature-sensor.h"
+#include "lib/sensors.h"
+#include "button-sensor.h"
+
+/*---------------------------------------------------------------------------*/
+PROCESS(blink_process_1, "LED1 blink process");
+PROCESS(blink_process_2, "LED2 blink process");
+PROCESS(blink_process_3, "LED3 blink process");
+PROCESS(blink_process_4, "LED4 blink process");
+PROCESS(temp, "Temperautre");
+
+AUTOSTART_PROCESSES(
+    &blink_process_1,
+    &blink_process_2,
+    &blink_process_3,
+    &blink_process_4,
+    &temp
+);
+
+struct blink_process_ctx {
+  struct etimer et_blink;
+  unsigned char c;
+  const struct sensors_sensor *button;
+  unsigned char led;
+};
+
+static void handle_event(process_event_t ev, process_data_t data, struct blink_process_ctx *ctx)
+{
+  if (ev == PROCESS_EVENT_TIMER && etimer_expired(&ctx->et_blink)) {
+    leds_toggle(ctx->led);
+    etimer_set(&ctx->et_blink, CLOCK_SECOND / ctx->c);
+    printf("Blink %d\n", ctx->led);
+  } else if (ev == sensors_event && data == ctx->button) {
+    if (ctx->button->value(BUTTON_SENSOR_VALUE_STATE) == 0) {
+      if (ctx->c == 0) {
+        ctx->c = 1;
+      } else if (ctx->c < 8){
+        ctx->c <<= 1;
+      } else {
+        ctx->c = 0;
+        leds_off(ctx->led);
+      }
+      if (ctx->c) {
+        etimer_set(&ctx->et_blink, CLOCK_SECOND / ctx->c);
+      } else {
+        etimer_stop(&ctx->et_blink);
+      }
+    }
+  }
+}
+
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(blink_process_1, ev, data)
+{
+  static struct blink_process_ctx ctx;
+
+  PROCESS_BEGIN();
+
+  ctx.button = &button_1;
+  ctx.c = 0;
+  ctx.led = LEDS_1;
+  ctx.button->configure(SENSORS_ACTIVE, 1);
+
+  while (1) {
+    PROCESS_WAIT_EVENT();
+    handle_event(ev, data, &ctx);
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(blink_process_2, ev, data)
+{
+  static struct blink_process_ctx ctx;
+
+  PROCESS_BEGIN();
+
+  ctx.button = &button_2;
+  ctx.c = 0;
+  ctx.led = LEDS_2;
+  ctx.button->configure(SENSORS_ACTIVE, 1);
+
+  while (1) {
+    PROCESS_WAIT_EVENT();
+    handle_event(ev, data, &ctx);
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(blink_process_3, ev, data)
+{
+  static struct blink_process_ctx ctx;
+
+  PROCESS_BEGIN();
+
+  ctx.button = &button_3;
+  ctx.c = 0;
+  ctx.led = LEDS_3;
+  ctx.button->configure(SENSORS_ACTIVE, 1);
+
+  while (1) {
+    PROCESS_WAIT_EVENT();
+    handle_event(ev, data, &ctx);
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(blink_process_4, ev, data)
+{
+  static struct blink_process_ctx ctx;
+
+  PROCESS_BEGIN();
+
+  ctx.button = &button_4;
+  ctx.c = 0;
+  ctx.led = LEDS_4;
+  ctx.button->configure(SENSORS_ACTIVE, 1);
+
+  while (1) {
+    PROCESS_WAIT_EVENT();
+    handle_event(ev, data, &ctx);
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(temp, ev, data)
+{
+  static struct etimer tick;
+  PROCESS_BEGIN();
+
+  etimer_set(&tick, CLOCK_SECOND);
+
+  while (1) {
+    PROCESS_WAIT_EVENT();
+    if (ev == PROCESS_EVENT_TIMER && etimer_expired(&tick)) {
+      int32_t temp = temperature_sensor.value(0);
+      printf("temp: %"PRId32".%02"PRId32"\n", temp >> 2, (temp & 0x03)*25);
+      etimer_reset(&tick);
+    }
+  }
+
+  PROCESS_END();
+}
+/**
+ * @}
+ * @}
+ * @}
+ */
diff --git a/examples/nrf52dk/coap-demo/Makefile b/examples/nrf52dk/coap-demo/Makefile
new file mode 100644
index 000000000..077e469be
--- /dev/null
+++ b/examples/nrf52dk/coap-demo/Makefile
@@ -0,0 +1,35 @@
+CONTIKI=../../..
+CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
+
+ifeq ($(MAKECMDGOALS),)
+$(error Please specify whether coap-client or coap-server should be built)
+endif
+
+ifneq ($(filter coap-client coap-client.flash, $(MAKECMDGOALS)),)
+ifeq ($(SERVER_IPV6_ADDR),)
+$(error Please define SERVER_IPV6_ADDR=<full ipv6 addr>)
+else
+CFLAGS += -DSERVER_IPV6_ADDR=\"$(SERVER_IPV6_ADDR)\"
+CFLAGS += -DDEVICE_NAME=\"nRF52_DK_CoAP_Client\"
+endif
+else
+CFLAGS += -DDEVICE_NAME=\"nRF52-DK-CoAP-Server\"
+endif
+
+# automatically build RESTful resources
+REST_RESOURCES_DIR = ./resources
+REST_RESOURCES_FILES = $(notdir $(shell find $(REST_RESOURCES_DIR) -name '*.c' ! -name 'res-plugtest*'))
+
+PROJECTDIRS += $(REST_RESOURCES_DIR)
+PROJECT_SOURCEFILES += $(REST_RESOURCES_FILES)
+
+# linker optimizations
+SMALL=1
+
+# REST Engine shall use Erbium CoAP implementation
+APPS += er-coap
+APPS += rest-engine
+
+CONTIKI_WITH_RPL = 0
+
+include $(CONTIKI)/Makefile.include
diff --git a/examples/nrf52dk/coap-demo/README.md b/examples/nrf52dk/coap-demo/README.md
new file mode 100644
index 000000000..1262ce114
--- /dev/null
+++ b/examples/nrf52dk/coap-demo/README.md
@@ -0,0 +1,63 @@
+A CoAP demo for nRF52 DK
+========================
+This demo contains two applications: coap-server and coap-client which are similar to 
+[Coap Observable Server] and [Coap Observer Client] examples provided by the nRF5 IoT SDK.
+
+Note that before any CoAP requests can be made you'll need to configure an IPv6 connection 
+to the device and assign a routable IPv6 address.
+
+For details how to do this please refer to sections 'Establishing an IPv6 connection'
+and 'Distributing routable IPv6 prefix' in `platform/nrf52dk/README-BLE-6LoWPAN.md`.
+
+CoAP Server
+===========
+The server exposes the following resources:
+
+	host
+    |-- .well-known
+    |   `-- core
+    `-- lights
+        `-- led3
+        
+The state of LED 3 can be set and queried via CoAP through the observable resource `lights/led3`. Current
+state of LED 3 is returned as a text string in the payload. The value 0 means that LED 3 is off, 1 otherwise.
+
+Button 1 can be used to toggle state of the LED 3. This will cause a notification to be sent to 
+any subscriber observing `lights/led3`. The state of the resource can also be changed by using POST/PUT to
+the resource with desired state encoded as a text in the payload. Send 1 to switch on and 0 to switch off.
+
+In order to compile and flash the CoAP server to a DK execute:
+
+	make TARGET=nrf52dk coap-server.flash
+	
+Note, if you haven't previously used a given device with Contiki it is recommended
+to erase the device and flash SoftDevice before flashing CoAP application, i.e.,
+
+    make TARGET=nrf52dk erase
+    make TARGET=nrf52dk softdevice.flash
+
+Please refer to the *Testing* and *Python Example* sections of [Coap Observable Server] tutorial for detailed description how to query the Coap Server using a PC.
+
+CoAP Client
+===========
+CoAP client compliments the CoAP server application. When Button 1 on the DK is pressed the the 
+client subscribes to `lights/led3` resource. If successful the LED 4 will blink briefly. From this moment
+any change of the `lights/led3` resource will be automatically reflected by the client's LED 3. 
+
+Note that the client must know the server's IPv6 address. The address is specified as a make variable
+during compliation.
+  
+In order to compile and flash the CoAP client to DK execute:
+
+	make TARGET=nrf52dk SERVER_IPV6_ADDR=<full-ip6-address> coap-client.flash
+	
+Note, that you can use `NRF52_JLINK_SN=<SN>` to select a particular devkit in a case when
+you have more than one boards connected to PC. Please refer to `platform/README.md` for 
+details.
+	
+Please refer to the *Testing* and *Python Server Example* sections of [Coap Observer Client] tutorial for detailed description how to use CoAP client demo with a PC.
+
+Resources
+=========
+[Coap Observable Server] http://developer.nordicsemi.com/nRF5_IoT_SDK/doc/0.9.0/html/a00054.html
+[Coap Observer Client] http://developer.nordicsemi.com/nRF5_IoT_SDK/doc/0.9.0/html/a00051.html
diff --git a/examples/nrf52dk/coap-demo/coap-client.c b/examples/nrf52dk/coap-demo/coap-client.c
new file mode 100644
index 000000000..2ec1f5ab1
--- /dev/null
+++ b/examples/nrf52dk/coap-demo/coap-client.c
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2014, Daniele Alessandrelli.
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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.
+ */
+
+/**
+ * \addtogroup nrf52dk-examples Demo projects for nRF52 DK
+ * @{
+ *
+ * \defgroup nrf52dk-coap-demo CoAP demo for nRF52 DK
+ * @{
+ *
+ * \file
+ *      Erbium (Er) CoAP observe client example.
+ * \author
+ *      Daniele Alessandrelli <daniele.alessandrelli@gmail.com>
+ * \author
+ *      Wojciech Bober <wojciech.bober@nordicsemi.no>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "contiki.h"
+#include "contiki-net.h"
+#include "er-coap-engine.h"
+#include "dev/button-sensor.h"
+#include "dev/leds.h"
+
+#define DEBUG 0
+#if DEBUG
+#include <stdio.h>
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+
+/*----------------------------------------------------------------------------*/
+#define REMOTE_PORT       UIP_HTONS(COAP_DEFAULT_PORT)
+#define OBS_RESOURCE_URI  "lights/led3"
+#define SUBS_LED          LEDS_4
+#define OBS_LED           LEDS_3
+
+/*----------------------------------------------------------------------------*/
+static uip_ipaddr_t server_ipaddr[1]; /* holds the server ip address */
+static coap_observee_t *obs;
+static struct ctimer ct;
+/*----------------------------------------------------------------------------*/
+PROCESS(er_example_observe_client, "nRF52 DK Coap Observer Client");
+AUTOSTART_PROCESSES(&er_example_observe_client);
+/*----------------------------------------------------------------------------*/
+static void
+observe_led_off(void *d)
+{
+  leds_off(SUBS_LED);
+}
+/*----------------------------------------------------------------------------*/
+/*
+ * Handle the response to the observe request and the following notifications
+ */
+static void
+notification_callback(coap_observee_t *obs, void *notification,
+                      coap_notification_flag_t flag)
+{
+  int len = 0;
+  const uint8_t *payload = NULL;
+
+
+  PRINTF("Notification handler\n");
+  PRINTF("Observee URI: %s\n", obs->url);
+
+  if (notification) {
+    len = coap_get_payload(notification, &payload);
+  }
+
+  (void)len;
+
+  switch (flag) {
+    case NOTIFICATION_OK:
+      PRINTF("NOTIFICATION OK: %*s\n", len, (char *)payload);
+      if (*payload == '1') {
+        leds_on(OBS_LED);
+      } else {
+        leds_off(OBS_LED);
+      }
+      break;
+    case OBSERVE_OK: /* server accepeted observation request */
+      PRINTF("OBSERVE_OK: %*s\n", len, (char *)payload);
+      if (*payload == '1') {
+        leds_on(OBS_LED);
+      } else {
+        leds_off(OBS_LED);
+      }
+      leds_on(SUBS_LED);
+      ctimer_set(&ct, CLOCK_SECOND, observe_led_off, NULL);
+      break;
+    case OBSERVE_NOT_SUPPORTED:
+      PRINTF("OBSERVE_NOT_SUPPORTED: %*s\n", len, (char *)payload);
+      obs = NULL;
+      break;
+    case ERROR_RESPONSE_CODE:
+      PRINTF("ERROR_RESPONSE_CODE: %*s\n", len, (char *)payload);
+      obs = NULL;
+      break;
+    case NO_REPLY_FROM_SERVER:
+      PRINTF("NO_REPLY_FROM_SERVER: "
+             "removing observe registration with token %x%x\n",
+             obs->token[0], obs->token[1]);
+      obs = NULL;
+      break;
+  }
+}
+/*----------------------------------------------------------------------------*/
+/*
+ * The main (proto-)thread. It starts/stops the observation of the remote
+ * resource every time the timer elapses or the button (if available) is
+ * pressed
+ */
+PROCESS_THREAD(er_example_observe_client, ev, data)
+{
+  PROCESS_BEGIN();
+
+  uiplib_ipaddrconv(SERVER_IPV6_ADDR, server_ipaddr);
+
+  /* receives all CoAP messages */
+  coap_init_engine();
+
+#if PLATFORM_HAS_BUTTON
+  SENSORS_ACTIVATE(button_1);
+  SENSORS_ACTIVATE(button_2);
+#endif
+
+  /* toggle observation every time the timer elapses or the button is pressed */
+  while (1) {
+    PROCESS_YIELD();
+#if PLATFORM_HAS_BUTTON
+    if (ev == sensors_event) {
+      if (data == &button_1 && button_1.value(BUTTON_SENSOR_VALUE_STATE) == 0) {
+        PRINTF("Starting observation\n");
+        obs = coap_obs_request_registration(server_ipaddr, REMOTE_PORT,
+                                            OBS_RESOURCE_URI, notification_callback,
+                                            NULL);
+      }
+      if (data == &button_2 && button_2.value(BUTTON_SENSOR_VALUE_STATE) == 0) {
+        PRINTF("Stopping observation\n");
+        coap_obs_remove_observee(obs);
+        obs = NULL;
+      }
+    }
+#endif
+  }
+  PROCESS_END();
+}
+
+/**
+ * @}
+ * @}
+ */
diff --git a/examples/nrf52dk/coap-demo/coap-server.c b/examples/nrf52dk/coap-demo/coap-server.c
new file mode 100644
index 000000000..9bab7e60d
--- /dev/null
+++ b/examples/nrf52dk/coap-demo/coap-server.c
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2013, Institute for Pervasive Computing, ETH Zurich
+ * Copyright (c) 2015, Nordic Semiconductor
+ *
+ * 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.
+ */
+
+/**
+ * \addtogroup nrf52dk-examples Demo projects for nRF52 DK
+ * @{
+ *
+ * \defgroup nrf52dk-coap-demo CoAP demo for nRF52dk
+ * @{
+ *
+ * \file
+ *      Erbium (Er) REST Engine example.
+ * \author
+ *      Matthias Kovatsch <kovatsch@inf.ethz.ch>
+ * \author
+ *      Wojciech Bober <wojciech.bober@nordicsemi.no>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "contiki.h"
+#include "contiki-net.h"
+#include "rest-engine.h"
+#include "uip.h"
+#include "dev/button-sensor.h"
+#include "dev/leds.h"
+
+#define DEBUG DEBUG_PRINT
+#include "net/ip/uip-debug.h"
+
+/*
+ * Resources to be activated need to be imported through the extern keyword.
+ * The build system automatically compiles the resources in the corresponding sub-directory.
+ */
+extern resource_t res_led3;
+
+static void
+print_local_addresses(void)
+{
+  int i;
+  uint8_t state;
+
+  PRINTF("Server IPv6 addresses:\n");
+  for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
+    state = uip_ds6_if.addr_list[i].state;
+    if(uip_ds6_if.addr_list[i].isused && (state == ADDR_TENTATIVE || state
+                                          == ADDR_PREFERRED)) {
+      PRINTF("  ");
+      PRINT6ADDR(&uip_ds6_if.addr_list[i].ipaddr);
+      PRINTF("\n");
+      if(state == ADDR_TENTATIVE) {
+        uip_ds6_if.addr_list[i].state = ADDR_PREFERRED;
+      }
+    }
+  }
+}
+
+PROCESS(er_example_server, "nRF52 DK Coap Server");
+AUTOSTART_PROCESSES(&er_example_server);
+
+PROCESS_THREAD(er_example_server, ev, data)
+{
+  PROCESS_BEGIN();
+  PROCESS_PAUSE();
+
+  PRINTF("Starting Erbium Example Server\n");
+
+  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
+  PRINTF("LL header: %u\n", UIP_LLH_LEN);
+  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
+  PRINTF("REST max chunk: %u\n", REST_MAX_CHUNK_SIZE);
+
+  print_local_addresses();
+
+  /* Initialize the REST engine. */
+  rest_init_engine();
+  rest_activate_resource(&res_led3, "lights/led3");
+
+  SENSORS_ACTIVATE(button_1);
+
+  /* Define application-specific events here. */
+  while (1) {
+    PROCESS_WAIT_EVENT();
+
+    if (ev == sensors_event) {
+      if (data == &button_1 && button_1.value(BUTTON_SENSOR_VALUE_STATE) == 0) {
+        leds_toggle(LEDS_3);
+        res_led3.trigger();
+      }
+    }
+  }
+
+  PROCESS_END();
+}
+
+/**
+ * @}
+ * @}
+ */
diff --git a/examples/nrf52dk/coap-demo/project-conf.h b/examples/nrf52dk/coap-demo/project-conf.h
new file mode 100644
index 000000000..2b097e8a8
--- /dev/null
+++ b/examples/nrf52dk/coap-demo/project-conf.h
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+/**
+ * \addtogroup nrf52dk-examples Demo projects for nRF52 DK
+ * @{
+ *
+ * \defgroup nrf52dk-coap-demo CoAP demo for nRF52dk
+ * @{
+ *
+ * \file
+ *      Erbium (Er) example project configuration.
+ * \author
+ *      Matthias Kovatsch <kovatsch@inf.ethz.ch>
+ */
+
+#ifndef __PROJECT_ERBIUM_CONF_H__
+#define __PROJECT_ERBIUM_CONF_H__
+
+/* Disabling TCP on CoAP nodes. */
+#undef UIP_CONF_TCP
+#define UIP_CONF_TCP                   0
+
+/* Increase rpl-border-router IP-buffer when using more than 64. */
+#undef REST_MAX_CHUNK_SIZE
+#define REST_MAX_CHUNK_SIZE            48
+
+/* Estimate your header size, especially when using Proxy-Uri. */
+/*
+   #undef COAP_MAX_HEADER_SIZE
+   #define COAP_MAX_HEADER_SIZE           70
+ */
+
+/* Multiplies with chunk size, be aware of memory constraints. */
+#undef COAP_MAX_OPEN_TRANSACTIONS
+#define COAP_MAX_OPEN_TRANSACTIONS     4
+
+/* Must be <= open transactions, 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
+#undef COAP_PROXY_OPTION_PROCESSING
+#define COAP_PROXY_OPTION_PROCESSING   0
+
+/* Enable client-side support for COAP observe */
+#define COAP_OBSERVE_CLIENT 1
+#endif /* __PROJECT_ERBIUM_CONF_H__ */
+
+/**
+ * @}
+ * @}
+ */
diff --git a/examples/nrf52dk/coap-demo/resources/res-leds.c b/examples/nrf52dk/coap-demo/resources/res-leds.c
new file mode 100644
index 000000000..468a165bf
--- /dev/null
+++ b/examples/nrf52dk/coap-demo/resources/res-leds.c
@@ -0,0 +1,106 @@
+/*
+ * 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
+ *      Example resource
+ * \author
+ *      Matthias Kovatsch <kovatsch@inf.ethz.ch>
+ * \author
+ *      Wojciech Bober <wojciech.bober@nordicsemi.no>
+ */
+
+#include <string.h>
+#include "contiki.h"
+#include "rest-engine.h"
+#include "dev/leds.h"
+
+#define DEBUG DEBUG_NONE
+#include "net/ip/uip-debug.h"
+
+static void
+res_post_put_handler(void *request, void *response, uint8_t *buffer,
+                     uint16_t preferred_size, int32_t *offset);
+
+static void
+res_get_handler(void *request, void *response, uint8_t *buffer,
+                     uint16_t preferred_size, int32_t *offset);
+
+static void
+res_event_handler();
+
+/*A simple actuator example, depending on the color query parameter and post variable mode, corresponding led is activated or deactivated*/
+EVENT_RESOURCE(res_led3,
+               "title=\"LED3\"; obs",
+               res_get_handler,
+               res_post_put_handler,
+               res_post_put_handler,
+               NULL,
+               res_event_handler
+               );
+
+static void
+res_post_put_handler(void *request, void *response, uint8_t *buffer,
+                     uint16_t preferred_size, int32_t *offset)
+{
+  const uint8_t *payload;
+  REST.get_request_payload(request, &payload);
+
+  if (*payload == '0' || *payload == '1') {
+    if (*payload == '1') {
+      leds_on(LEDS_3);
+    } else {
+      leds_off(LEDS_3);
+    }
+    REST.notify_subscribers(&res_led3);
+    REST.set_response_status(response, REST.status.CHANGED);
+  } else {
+    REST.set_response_status(response, REST.status.BAD_REQUEST);
+  }
+}
+
+static void
+res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
+{
+  REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
+  REST.set_response_payload(response, buffer, snprintf((char *)buffer, preferred_size, "%d", (leds_get() & LEDS_3) ? 1 : 0));
+}
+
+/*
+ * Additionally, res_event_handler must be implemented for each EVENT_RESOURCE.
+ * It is called through <res_name>.trigger(), usually from the server process.
+ */
+static void
+res_event_handler()
+{
+  /* Notify the registered observers which will trigger the res_get_handler to create the response. */
+  REST.notify_subscribers(&res_led3);
+}
diff --git a/examples/nrf52dk/mqtt-demo/Makefile b/examples/nrf52dk/mqtt-demo/Makefile
new file mode 100644
index 000000000..bfdeccfb7
--- /dev/null
+++ b/examples/nrf52dk/mqtt-demo/Makefile
@@ -0,0 +1,11 @@
+DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
+
+all: mqtt-demo
+
+CONTIKI_WITH_IPV6 = 1
+CONTIKI_WITH_RPL = 0
+
+APPS += mqtt
+
+CONTIKI=../../..
+include $(CONTIKI)/Makefile.include
diff --git a/examples/nrf52dk/mqtt-demo/README.md b/examples/nrf52dk/mqtt-demo/README.md
new file mode 100644
index 000000000..a4a9a6ff1
--- /dev/null
+++ b/examples/nrf52dk/mqtt-demo/README.md
@@ -0,0 +1,74 @@
+MQTT Demo
+=========
+The MQTT client can be used to:
+
+* Publish sensor readings to an MQTT broker.
+* Subscribe to a topic and receive commands from an MQTT broker
+
+The demo will give some visual feedback with the green LED:
+* Very fast blinking: Searching for a network
+* Fast blinking: Connecting to broker
+* Slow, long blinking: Sending a publish message
+
+Note that before any MQTT messages can be sent or received you'll 
+need to configure an IPv6 connection to the device and assign a routable
+IPv6 address.
+
+For details how to do this please refer to sections 'Establishing an IPv6 connection'
+and 'Distributing routable IPv6 prefix' in `platform/nrf52dk/README-BLE-6LoWPAN.md`.
+
+Broker setup
+------------
+By default the example will attempt to publish readings to an MQTT broker
+running on the IPv6 address specified as `MQTT_DEMO_BROKER_IP_ADDR` in
+`project-conf.h`. This functionality was tested successfully with
+[mosquitto](http://mosquitto.org/).
+
+On Ubuntu you can install and run mosquitto broker using the following
+commands:
+
+	apt-get install mosquitto mosquitto_clients
+	killall mosquitto
+	mosquitto -p 1883 -v
+
+Publishing
+----------
+The publish messages include sensor readings but also some other information,
+such as device uptime in seconds and a message sequence number. The demo will
+publish to topic `iot-2/evt/status/fmt/json`. The device will connect using
+client-id `d:quickstart:cc2538:<device-id>`, where `<device-id>` gets
+constructed from the device's IEEE address.
+
+Subscribing
+-----------
+You can also subscribe to topics and receive commands, but this will only
+work if you use "Org ID" != 'quickstart'. To achieve this, you will need to
+change 'Org ID' (`DEFAULT_ORG_ID`). In this scenario, the device will subscribe
+to:
+
+`iot-2/cmd/+/fmt/json`
+
+You can then use this to toggle LEDs. To do this, you can for example
+use mosquitto client to publish to `iot-2/cmd/leds/fmt/json`. So, to change
+the state of an LED, you would do this:
+
+`mosquitto_pub -h <broker IP> -m "1" -t iot-2/cmd/leds/fmt/json`
+
+Where `broker IP` should be replaced with the IP address of your mosquitto
+broker (the one where you device has subscribed). Replace `-m "1'` with `-m "0"`
+to turn the LED back off.
+
+Bear in mind that, even though the topic suggests that messages are of json
+format, they are in fact not. This was done in order to avoid linking a json
+parser into the firmware. This comment only applies to parsing incoming
+messages, outgoing publish messages use proper json payload.
+
+IBM Quickstart Service
+----------------------
+It is also possible to publish to IBM's quickstart service. To do so, you need
+to undefine `MQTT_DEMO_BROKER_IP_ADDR`.
+
+If you want to use IBM's cloud service with a registered device, change
+'Org ID' (`DEFAULT_ORG_ID`) and provide the 'Auth Token' (`DEFAULT_AUTH_TOKEN`),
+which acts as a 'password', but bear in mind that it gets transported in clear
+text.
\ No newline at end of file
diff --git a/examples/nrf52dk/mqtt-demo/mqtt-demo.c b/examples/nrf52dk/mqtt-demo/mqtt-demo.c
new file mode 100644
index 000000000..6a3482073
--- /dev/null
+++ b/examples/nrf52dk/mqtt-demo/mqtt-demo.c
@@ -0,0 +1,721 @@
+/*
+ * Copyright (c) 2014, Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright (c) 2015, Nordic Semiconductor
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup nrf52dk-examples Demo projects for nRF52 DK
+ * @{
+ *
+ * \defgroup nrf52dk-mqtt-demo nRF52 DK MQTT Demo Project
+ *
+ * Demonstrates MQTT functionality. Works with mosquitto.
+ * @{
+ *
+ * \file
+ * An MQTT example for the nrf52dk platform
+ */
+/*---------------------------------------------------------------------------*/
+#include "contiki-conf.h"
+#include "mqtt.h"
+#include "net/ip/uip.h"
+#include "net/ipv6/uip-icmp6.h"
+#include "net/ipv6/sicslowpan.h"
+#include "sys/etimer.h"
+#include "sys/ctimer.h"
+#include "lib/sensors.h"
+#include "dev/button-sensor.h"
+#include "dev/temperature-sensor.h"
+#include "dev/leds.h"
+
+#include <string.h>
+/*---------------------------------------------------------------------------*/
+/*
+ * IBM server: quickstart.messaging.internetofthings.ibmcloud.com
+ * (184.172.124.189) mapped in an NAT64 (prefix 64:ff9b::/96) IPv6 address
+ * Note: If not able to connect; lookup the IP address again as it may change.
+ *
+ * Alternatively, publish to a local MQTT broker (e.g. mosquitto) running on
+ * the node that hosts your border router
+ */
+#ifdef MQTT_DEMO_BROKER_IP_ADDR
+static const char *broker_ip = MQTT_DEMO_BROKER_IP_ADDR;
+#define DEFAULT_ORG_ID              "mqtt-demo"
+#else
+static const char *broker_ip = "0064:ff9b:0000:0000:0000:0000:b8ac:7cbd";
+#define DEFAULT_ORG_ID              "quickstart"
+#endif
+/*---------------------------------------------------------------------------*/
+/*
+ * A timeout used when waiting for something to happen (e.g. to connect or to
+ * disconnect)
+ */
+#define STATE_MACHINE_PERIODIC     (CLOCK_SECOND >> 1)
+/*---------------------------------------------------------------------------*/
+/* Provide visible feedback via LEDS during various states */
+/* When connecting to broker */
+#define CONNECTING_LED_DURATION    (CLOCK_SECOND >> 2)
+
+/* Each time we try to publish */
+#define PUBLISH_LED_ON_DURATION    (CLOCK_SECOND)
+/*---------------------------------------------------------------------------*/
+/* Connections and reconnections */
+#define RETRY_FOREVER              0xFF
+#define RECONNECT_INTERVAL         (CLOCK_SECOND * 2)
+
+/*
+ * Number of times to try reconnecting to the broker.
+ * Can be a limited number (e.g. 3, 10 etc) or can be set to RETRY_FOREVER
+ */
+#define RECONNECT_ATTEMPTS         RETRY_FOREVER
+#define CONNECTION_STABLE_TIME     (CLOCK_SECOND * 5)
+static struct timer connection_life;
+static uint8_t connect_attempt;
+/*---------------------------------------------------------------------------*/
+/* Various states */
+static uint8_t state;
+#define STATE_INIT            0
+#define STATE_REGISTERED      1
+#define STATE_CONNECTING      2
+#define STATE_CONNECTED       3
+#define STATE_PUBLISHING      4
+#define STATE_DISCONNECTED    5
+#define STATE_NEWCONFIG       6
+#define STATE_CONFIG_ERROR 0xFE
+#define STATE_ERROR        0xFF
+/*---------------------------------------------------------------------------*/
+#define CONFIG_ORG_ID_LEN        32
+#define CONFIG_TYPE_ID_LEN       32
+#define CONFIG_AUTH_TOKEN_LEN    32
+#define CONFIG_EVENT_TYPE_ID_LEN 32
+#define CONFIG_CMD_TYPE_LEN       8
+#define CONFIG_IP_ADDR_STR_LEN   64
+/*---------------------------------------------------------------------------*/
+#define RSSI_MEASURE_INTERVAL_MAX 86400 /* secs: 1 day */
+#define RSSI_MEASURE_INTERVAL_MIN     5 /* secs */
+#define PUBLISH_INTERVAL_MAX      86400 /* secs: 1 day */
+#define PUBLISH_INTERVAL_MIN          5 /* secs */
+/*---------------------------------------------------------------------------*/
+/* A timeout used when waiting to connect to a network */
+#define NET_CONNECT_PERIODIC        CLOCK_SECOND
+#define NO_NET_LED_DURATION         (NET_CONNECT_PERIODIC >> 1)
+/*---------------------------------------------------------------------------*/
+/* Default configuration values */
+#define DEFAULT_TYPE_ID             "nrf52dk"
+#define DEFAULT_AUTH_TOKEN          "AUTHZ"
+#define DEFAULT_EVENT_TYPE_ID       "status"
+#define DEFAULT_SUBSCRIBE_CMD_TYPE  "+"
+#define DEFAULT_BROKER_PORT         1883
+#define DEFAULT_PUBLISH_INTERVAL    (30 * CLOCK_SECOND)
+#define DEFAULT_KEEP_ALIVE_TIMER    60
+#define DEFAULT_RSSI_MEAS_INTERVAL  (CLOCK_SECOND * 30)
+/*---------------------------------------------------------------------------*/
+/* Take a sensor reading on button press */
+#define PUBLISH_TRIGGER (&button_sensor)
+
+/* Payload length of ICMPv6 echo requests used to measure RSSI with def rt */
+#define ECHO_REQ_PAYLOAD_LEN   20
+/*---------------------------------------------------------------------------*/
+PROCESS_NAME(mqtt_demo_process);
+AUTOSTART_PROCESSES(&mqtt_demo_process);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Data structure declaration for the MQTT client configuration
+ */
+typedef struct mqtt_client_config {
+  char org_id[CONFIG_ORG_ID_LEN];
+  char type_id[CONFIG_TYPE_ID_LEN];
+  char auth_token[CONFIG_AUTH_TOKEN_LEN];
+  char event_type_id[CONFIG_EVENT_TYPE_ID_LEN];
+  char broker_ip[CONFIG_IP_ADDR_STR_LEN];
+  char cmd_type[CONFIG_CMD_TYPE_LEN];
+  clock_time_t pub_interval;
+  int def_rt_ping_interval;
+  uint16_t broker_port;
+} mqtt_client_config_t;
+/*---------------------------------------------------------------------------*/
+/* Maximum TCP segment size for outgoing segments of our socket */
+#define MAX_TCP_SEGMENT_SIZE    32
+/*---------------------------------------------------------------------------*/
+#define STATUS_LED LEDS_GREEN
+/*---------------------------------------------------------------------------*/
+/*
+ * Buffers for Client ID and Topic.
+ * Make sure they are large enough to hold the entire respective string
+ *
+ * d:quickstart:status:EUI64 is 32 bytes long
+ * iot-2/evt/status/fmt/json is 25 bytes
+ * We also need space for the null termination
+ */
+#define BUFFER_SIZE 64
+static char client_id[BUFFER_SIZE];
+static char pub_topic[BUFFER_SIZE];
+static char sub_topic[BUFFER_SIZE];
+/*---------------------------------------------------------------------------*/
+/*
+ * The main MQTT buffers.
+ * We will need to increase if we start publishing more data.
+ */
+#define APP_BUFFER_SIZE 128
+static struct mqtt_connection conn;
+static char app_buffer[APP_BUFFER_SIZE];
+/*---------------------------------------------------------------------------*/
+#define QUICKSTART "quickstart"
+/*---------------------------------------------------------------------------*/
+static struct mqtt_message *msg_ptr = 0;
+static struct etimer publish_periodic_timer;
+static struct ctimer ct;
+static char *buf_ptr;
+static uint16_t seq_nr_value = 0;
+/*---------------------------------------------------------------------------*/
+/* Parent RSSI functionality */
+static struct uip_icmp6_echo_reply_notification echo_reply_notification;
+static struct etimer echo_request_timer;
+static int def_rt_rssi = 0;
+/*---------------------------------------------------------------------------*/
+static mqtt_client_config_t conf;
+/*---------------------------------------------------------------------------*/
+PROCESS(mqtt_demo_process, "MQTT Demo");
+/*---------------------------------------------------------------------------*/
+int
+ipaddr_sprintf(char *buf, uint8_t buf_len, const uip_ipaddr_t *addr)
+{
+  uint16_t a;
+  uint8_t len = 0;
+  int i, f;
+  for(i = 0, f = 0; i < sizeof(uip_ipaddr_t); i += 2) {
+    a = (addr->u8[i] << 8) + addr->u8[i + 1];
+    if(a == 0 && f >= 0) {
+      if(f++ == 0) {
+        len += snprintf(&buf[len], buf_len - len, "::");
+      }
+    } else {
+      if(f > 0) {
+        f = -1;
+      } else if(i > 0) {
+        len += snprintf(&buf[len], buf_len - len, ":");
+      }
+      len += snprintf(&buf[len], buf_len - len, "%x", a);
+    }
+  }
+
+  return len;
+}
+/*---------------------------------------------------------------------------*/
+static void
+echo_reply_handler(uip_ipaddr_t *source, uint8_t ttl, uint8_t *data,
+                   uint16_t datalen)
+{
+  if(uip_ip6addr_cmp(source, uip_ds6_defrt_choose())) {
+    def_rt_rssi = sicslowpan_get_last_rssi();
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+publish_led_off(void *d)
+{
+  leds_off(STATUS_LED);
+}
+/*---------------------------------------------------------------------------*/
+static void
+pub_handler(const char *topic, uint16_t topic_len, const uint8_t *chunk,
+            uint16_t chunk_len)
+{
+  DBG("Pub Handler: topic='%s' (len=%u), chunk_len=%u\n", topic, topic_len,
+      chunk_len);
+
+  /* If we don't like the length, ignore */
+  if(topic_len != 23 || chunk_len != 1) {
+    printf("Incorrect topic or chunk len. Ignored\n");
+    return;
+  }
+
+  /* If the format != json, ignore */
+  if(strncmp(&topic[topic_len - 4], "json", 4) != 0) {
+    printf("Incorrect format\n");
+  }
+
+  if(strncmp(&topic[10], "leds", 4) == 0) {
+    if(chunk[0] == '1') {
+      leds_on(LEDS_RED);
+    } else if(chunk[0] == '0') {
+      leds_off(LEDS_RED);
+    }
+    return;
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+mqtt_event(struct mqtt_connection *m, mqtt_event_t event, void *data)
+{
+  switch(event) {
+  case MQTT_EVENT_CONNECTED: {
+    DBG("APP - Application has a MQTT connection\n");
+    timer_set(&connection_life, CONNECTION_STABLE_TIME);
+    state = STATE_CONNECTED;
+    break;
+  }
+  case MQTT_EVENT_DISCONNECTED: {
+    DBG("APP - MQTT Disconnect. Reason %u\n", *((mqtt_event_t *)data));
+
+    state = STATE_DISCONNECTED;
+    process_poll(&mqtt_demo_process);
+    break;
+  }
+  case MQTT_EVENT_PUBLISH: {
+    msg_ptr = data;
+
+    /* Implement first_flag in publish message? */
+    if(msg_ptr->first_chunk) {
+      msg_ptr->first_chunk = 0;
+      DBG("APP - Application received a publish on topic '%s'. Payload "
+          "size is %i bytes. Content:\n\n",
+          msg_ptr->topic, msg_ptr->payload_length);
+    }
+
+    pub_handler(msg_ptr->topic, strlen(msg_ptr->topic), msg_ptr->payload_chunk,
+                msg_ptr->payload_length);
+    break;
+  }
+  case MQTT_EVENT_SUBACK: {
+    DBG("APP - Application is subscribed to topic successfully\n");
+    break;
+  }
+  case MQTT_EVENT_UNSUBACK: {
+    DBG("APP - Application is unsubscribed to topic successfully\n");
+    break;
+  }
+  case MQTT_EVENT_PUBACK: {
+    DBG("APP - Publishing complete\n");
+    break;
+  }
+  default:
+    DBG("APP - Application got a unhandled MQTT event: %i\n", event);
+    break;
+  }
+}
+/*---------------------------------------------------------------------------*/
+static int
+construct_pub_topic(void)
+{
+  int len = snprintf(pub_topic, BUFFER_SIZE, "iot-2/evt/%s/fmt/json",
+                     conf.event_type_id);
+
+  /* len < 0: Error. Len >= BUFFER_SIZE: Buffer too small */
+  if(len < 0 || len >= BUFFER_SIZE) {
+    printf("Pub Topic: %d, Buffer %d\n", len, BUFFER_SIZE);
+    return 0;
+  }
+
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+static int
+construct_sub_topic(void)
+{
+  int len = snprintf(sub_topic, BUFFER_SIZE, "iot-2/cmd/%s/fmt/json",
+                     conf.cmd_type);
+
+  /* len < 0: Error. Len >= BUFFER_SIZE: Buffer too small */
+  if(len < 0 || len >= BUFFER_SIZE) {
+    printf("Sub Topic: %d, Buffer %d\n", len, BUFFER_SIZE);
+    return 0;
+  }
+
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+static int
+construct_client_id(void)
+{
+  int len = snprintf(client_id, BUFFER_SIZE, "d:%s:%s:%02x%02x%02x%02x%02x%02x",
+                     conf.org_id, conf.type_id,
+                     linkaddr_node_addr.u8[0], linkaddr_node_addr.u8[1],
+                     linkaddr_node_addr.u8[2], linkaddr_node_addr.u8[5],
+                     linkaddr_node_addr.u8[6], linkaddr_node_addr.u8[7]);
+
+  /* len < 0: Error. Len >= BUFFER_SIZE: Buffer too small */
+  if(len < 0 || len >= BUFFER_SIZE) {
+    printf("Client ID: %d, Buffer %d\n", len, BUFFER_SIZE);
+    return 0;
+  }
+
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+static void
+update_config(void)
+{
+  if(construct_client_id() == 0) {
+    /* Fatal error. Client ID larger than the buffer */
+    state = STATE_CONFIG_ERROR;
+    return;
+  }
+
+  if(construct_sub_topic() == 0) {
+    /* Fatal error. Topic larger than the buffer */
+    state = STATE_CONFIG_ERROR;
+    return;
+  }
+
+  if(construct_pub_topic() == 0) {
+    /* Fatal error. Topic larger than the buffer */
+    state = STATE_CONFIG_ERROR;
+    return;
+  }
+
+  /* Reset the counter */
+  seq_nr_value = 0;
+
+  state = STATE_INIT;
+
+  /*
+   * Schedule next timer event ASAP
+   *
+   * If we entered an error state then we won't do anything when it fires.
+   *
+   * Since the error at this stage is a config error, we will only exit this
+   * error state if we get a new config.
+   */
+  etimer_set(&publish_periodic_timer, 0);
+
+  return;
+}
+/*---------------------------------------------------------------------------*/
+static int
+init_config()
+{
+  /* Populate configuration with default values */
+  memset(&conf, 0, sizeof(mqtt_client_config_t));
+
+  memcpy(conf.org_id, DEFAULT_ORG_ID, strlen(DEFAULT_ORG_ID));
+  memcpy(conf.type_id, DEFAULT_TYPE_ID, strlen(DEFAULT_TYPE_ID));
+  memcpy(conf.auth_token, DEFAULT_AUTH_TOKEN, strlen(DEFAULT_AUTH_TOKEN));
+  memcpy(conf.event_type_id, DEFAULT_EVENT_TYPE_ID,
+         strlen(DEFAULT_EVENT_TYPE_ID));
+  memcpy(conf.broker_ip, broker_ip, strlen(broker_ip));
+  memcpy(conf.cmd_type, DEFAULT_SUBSCRIBE_CMD_TYPE, 1);
+
+  conf.broker_port = DEFAULT_BROKER_PORT;
+  conf.pub_interval = DEFAULT_PUBLISH_INTERVAL;
+  conf.def_rt_ping_interval = DEFAULT_RSSI_MEAS_INTERVAL;
+
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+static void
+subscribe(void)
+{
+  /* Publish MQTT topic in IBM quickstart format */
+  mqtt_status_t status;
+
+  status = mqtt_subscribe(&conn, NULL, sub_topic, MQTT_QOS_LEVEL_0);
+
+  DBG("APP - Subscribing!\n");
+  if(status == MQTT_STATUS_OUT_QUEUE_FULL) {
+    DBG("APP - Tried to subscribe but command queue was full!\n");
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+publish(void)
+{
+  /* Publish MQTT topic in IBM quickstart format */
+  int len;
+  int remaining = APP_BUFFER_SIZE;
+
+  seq_nr_value++;
+
+  buf_ptr = app_buffer;
+
+  len = snprintf(buf_ptr, remaining,
+                 "{"
+                 "\"d\":{"
+                 "\"Seq #\":%d,"
+                 "\"Uptime (sec)\":%lu", seq_nr_value, clock_seconds());
+
+  if(len < 0 || len >= remaining) {
+    printf("Buffer too short. Have %d, need %d + \\0\n", remaining, len);
+    return;
+  }
+
+  remaining -= len;
+  buf_ptr += len;
+
+  /* Put our Default route's string representation in a buffer */
+  char def_rt_str[64];
+  memset(def_rt_str, 0, sizeof(def_rt_str));
+  ipaddr_sprintf(def_rt_str, sizeof(def_rt_str), uip_ds6_defrt_choose());
+
+  len = snprintf(buf_ptr, remaining, ",\"Def Route\":\"%s\",\"RSSI (dBm)\":%d",
+                 def_rt_str, def_rt_rssi);
+
+  if(len < 0 || len >= remaining) {
+    printf("Buffer too short. Have %d, need %d + \\0\n", remaining, len);
+    return;
+  }
+  remaining -= len;
+  buf_ptr += len;
+
+  len = snprintf(buf_ptr, remaining, ",\"On-Chip Temp (deg.C)\":%d",
+                 temperature_sensor.value(0));
+
+  if(len < 0 || len >= remaining) {
+    printf("Buffer too short. Have %d, need %d + \\0\n", remaining, len);
+    return;
+  }
+  remaining -= len;
+  buf_ptr += len;
+
+  len = snprintf(buf_ptr, remaining, "}}");
+
+  if(len < 0 || len >= remaining) {
+    printf("Buffer too short. Have %d, need %d + \\0\n", remaining, len);
+    return;
+  }
+
+  mqtt_publish(&conn, NULL, pub_topic, (uint8_t *)app_buffer,
+               strlen(app_buffer), MQTT_QOS_LEVEL_0, MQTT_RETAIN_OFF);
+
+  DBG("APP - Publish!\n");
+}
+/*---------------------------------------------------------------------------*/
+static void
+connect_to_broker(void)
+{
+  /* Connect to MQTT server */
+  mqtt_connect(&conn, conf.broker_ip, conf.broker_port,
+               conf.pub_interval * 3);
+
+  state = STATE_CONNECTING;
+}
+/*---------------------------------------------------------------------------*/
+static void
+ping_parent(void)
+{
+  if(uip_ds6_get_global(ADDR_PREFERRED) == NULL) {
+    return;
+  }
+
+  uip_icmp6_send(uip_ds6_defrt_choose(), ICMP6_ECHO_REQUEST, 0,
+                 ECHO_REQ_PAYLOAD_LEN);
+}
+/*---------------------------------------------------------------------------*/
+static void
+state_machine(void)
+{
+  switch(state) {
+  case STATE_INIT:
+    /* If we have just been configured register MQTT connection */
+    mqtt_register(&conn, &mqtt_demo_process, client_id, mqtt_event,
+                  MAX_TCP_SEGMENT_SIZE);
+
+    /*
+     * If we are not using the quickstart service (thus we are an IBM
+     * registered device), we need to provide user name and password
+     */
+    if(strncasecmp(conf.org_id, QUICKSTART, strlen(conf.org_id)) != 0) {
+      if(strlen(conf.auth_token) == 0) {
+        printf("User name set, but empty auth token\n");
+        state = STATE_ERROR;
+        break;
+      } else {
+        mqtt_set_username_password(&conn, "use-token-auth",
+                                   conf.auth_token);
+      }
+    }
+
+    /* _register() will set auto_reconnect. We don't want that. */
+    conn.auto_reconnect = 0;
+    connect_attempt = 1;
+
+    state = STATE_REGISTERED;
+    DBG("Init\n");
+    /* Continue */
+  case STATE_REGISTERED:
+    if(uip_ds6_get_global(ADDR_PREFERRED) != NULL) {
+      /* Registered and with a public IP. Connect */
+      DBG("Registered. Connect attempt %u\n", connect_attempt);
+      ping_parent();
+      connect_to_broker();
+    } else {
+      leds_on(STATUS_LED);
+      ctimer_set(&ct, NO_NET_LED_DURATION, publish_led_off, NULL);
+    }
+    etimer_set(&publish_periodic_timer, NET_CONNECT_PERIODIC);
+    return;
+    break;
+  case STATE_CONNECTING:
+    leds_on(STATUS_LED);
+    ctimer_set(&ct, CONNECTING_LED_DURATION, publish_led_off, NULL);
+    /* Not connected yet. Wait */
+    DBG("Connecting (%u)\n", connect_attempt);
+    break;
+  case STATE_CONNECTED:
+    /* Don't subscribe unless we are a registered device */
+    if(strncasecmp(conf.org_id, QUICKSTART, strlen(conf.org_id)) == 0) {
+      DBG("Using 'quickstart': Skipping subscribe\n");
+      state = STATE_PUBLISHING;
+    }
+    /* Continue */
+  case STATE_PUBLISHING:
+    /* If the timer expired, the connection is stable. */
+    if(timer_expired(&connection_life)) {
+      /*
+       * Intentionally using 0 here instead of 1: We want RECONNECT_ATTEMPTS
+       * attempts if we disconnect after a successful connect
+       */
+      connect_attempt = 0;
+    }
+
+    if(mqtt_ready(&conn) && conn.out_buffer_sent) {
+      /* Connected. Publish */
+      if(state == STATE_CONNECTED) {
+        subscribe();
+        state = STATE_PUBLISHING;
+      } else {
+        leds_on(STATUS_LED);
+        ctimer_set(&ct, PUBLISH_LED_ON_DURATION, publish_led_off, NULL);
+        publish();
+      }
+      etimer_set(&publish_periodic_timer, conf.pub_interval);
+
+      DBG("Publishing\n");
+      /* Return here so we don't end up rescheduling the timer */
+      return;
+    } else {
+      /*
+       * Our publish timer fired, but some MQTT packet is already in flight
+       * (either not sent at all, or sent but not fully ACKd).
+       *
+       * This can mean that we have lost connectivity to our broker or that
+       * simply there is some network delay. In both cases, we refuse to
+       * trigger a new message and we wait for TCP to either ACK the entire
+       * packet after retries, or to timeout and notify us.
+       */
+      DBG("Publishing... (MQTT state=%d, q=%u)\n", conn.state,
+          conn.out_queue_full);
+    }
+    break;
+  case STATE_DISCONNECTED:
+    DBG("Disconnected\n");
+    if(connect_attempt < RECONNECT_ATTEMPTS ||
+       RECONNECT_ATTEMPTS == RETRY_FOREVER) {
+      /* Disconnect and backoff */
+      clock_time_t interval;
+      mqtt_disconnect(&conn);
+      connect_attempt++;
+
+      interval = connect_attempt < 3 ? RECONNECT_INTERVAL << connect_attempt :
+        RECONNECT_INTERVAL << 3;
+
+      DBG("Disconnected. Attempt %u in %lu ticks\n", connect_attempt, interval);
+
+      etimer_set(&publish_periodic_timer, interval);
+
+      state = STATE_REGISTERED;
+      return;
+    } else {
+      /* Max reconnect attempts reached. Enter error state */
+      state = STATE_ERROR;
+      DBG("Aborting connection after %u attempts\n", connect_attempt - 1);
+    }
+    break;
+  case STATE_CONFIG_ERROR:
+    /* Idle away. The only way out is a new config */
+    printf("Bad configuration\n");
+    return;
+  case STATE_ERROR:
+  default:
+    leds_on(STATUS_LED);
+    /*
+     * 'default' should never happen.
+     *
+     * If we enter here it's because of some error. Stop timers. The only thing
+     * that can bring us out is a new config event
+     */
+    printf("Default case: State=0x%02x\n", state);
+    return;
+  }
+
+  /* If we didn't return so far, reschedule ourselves */
+  etimer_set(&publish_periodic_timer, STATE_MACHINE_PERIODIC);
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(mqtt_demo_process, ev, data)
+{
+
+  PROCESS_BEGIN();
+
+  printf("MQTT Demo Process\n");
+
+  if(init_config() != 1) {
+    PROCESS_EXIT();
+  }
+
+  update_config();
+
+  def_rt_rssi = 0x8000000;
+  uip_icmp6_echo_reply_callback_add(&echo_reply_notification,
+                                    echo_reply_handler);
+  etimer_set(&echo_request_timer, conf.def_rt_ping_interval);
+
+	PUBLISH_TRIGGER->configure(SENSORS_ACTIVE, 1);
+
+  /* Main loop */
+  while(1) {
+
+    PROCESS_YIELD();
+
+    if(ev == sensors_event && data == PUBLISH_TRIGGER) {
+      if(state == STATE_ERROR) {
+        connect_attempt = 1;
+        state = STATE_REGISTERED;
+      }
+    }
+
+    if((ev == PROCESS_EVENT_TIMER && data == &publish_periodic_timer) ||
+       ev == PROCESS_EVENT_POLL ||
+       (ev == sensors_event && data == PUBLISH_TRIGGER && PUBLISH_TRIGGER->value(BUTTON_SENSOR_VALUE_STATE) == 0)) {
+      state_machine();
+    }
+
+    if(ev == PROCESS_EVENT_TIMER && data == &echo_request_timer) {
+      ping_parent();
+      etimer_set(&echo_request_timer, conf.def_rt_ping_interval);
+    }
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/examples/nrf52dk/mqtt-demo/project-conf.h b/examples/nrf52dk/mqtt-demo/project-conf.h
new file mode 100644
index 000000000..b52e1a48f
--- /dev/null
+++ b/examples/nrf52dk/mqtt-demo/project-conf.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2012, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup cc2538-mqtt-demo
+ * @{
+ *
+ * \file
+ * Project specific configuration defines for the MQTT demo
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef PROJECT_CONF_H_
+#define PROJECT_CONF_H_
+/*---------------------------------------------------------------------------*/
+/* User configuration */
+#define MQTT_DEMO_STATUS_LED      LEDS_GREEN
+
+/* If undefined, the demo will attempt to connect to IBM's quickstart */
+#define MQTT_DEMO_BROKER_IP_ADDR "fd00::215:83ff:fed2:dbd7"
+/*---------------------------------------------------------------------------*/
+#endif /* PROJECT_CONF_H_ */
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/examples/nrf52dk/timer-test/Makefile b/examples/nrf52dk/timer-test/Makefile
new file mode 100644
index 000000000..ac89a34a4
--- /dev/null
+++ b/examples/nrf52dk/timer-test/Makefile
@@ -0,0 +1,9 @@
+CONTIKI_PROJECT = timer-test
+
+CONTIKI_WITH_RPL=0
+NRF52_WITHOUT_SOFTDEVICE=1
+
+all: $(CONTIKI_PROJECT) 
+
+CONTIKI = ../../..
+include $(CONTIKI)/Makefile.include
diff --git a/examples/nrf52dk/timer-test/README.md b/examples/nrf52dk/timer-test/README.md
new file mode 100644
index 000000000..9ce7cad94
--- /dev/null
+++ b/examples/nrf52dk/timer-test/README.md
@@ -0,0 +1,20 @@
+Timers test
+===========
+Timers test is an application allows for testing clocks implementation for nRF52 DK. 
+The results of different tests are output to the console.
+
+There are 4 tests performed:
+
+	1) TEST clock_delay_usec() - measures duration of a NOP delay using rtimer. It's expected
+	                             that difference is close to 0.
+	                             
+	2) TEST rtimer - schedules an rtimer callback after 1 second. Prints actual time difference
+	                 in rtimer and clock ticks. It's expected that both values are close to 0.
+	                 
+	3) TEST etimer - schedules an event timer and measures time difference. It is expected that
+	                 the value is close to 0.
+
+The example requires one DK and it doesn't use SoftDevice. To compile and flash the
+example run:
+
+	make TARGET=nrf52dk timer-test.flash
\ No newline at end of file
diff --git a/examples/nrf52dk/timer-test/timer-test.c b/examples/nrf52dk/timer-test/timer-test.c
new file mode 100644
index 000000000..e0ced7293
--- /dev/null
+++ b/examples/nrf52dk/timer-test/timer-test.c
@@ -0,0 +1,131 @@
+/**
+ * \file
+ *         Tests related to clocks and timers
+ *         This is based on clock_test.c from the original sensinode port
+ *
+ * \author
+ *         Zach Shelby <zach@sensinode.com> (Original)
+ *         George Oikonomou - <oikonomou@users.sourceforge.net> (rtimer code)
+ *         Wojciech Bober <wojciech.bober@nordicsemi.no> (nRF52 DK adaptation)
+ *
+ */
+
+/**
+ * \addtogroup nrf52dk-examples Demo projects for nRF52 DK
+ * @{
+ */
+#include "contiki.h"
+#include "sys/clock.h"
+#include "sys/rtimer.h"
+#include "dev/leds.h"
+
+#include "nrf_delay.h"
+
+#include <stdio.h>
+/*---------------------------------------------------------------------------*/
+#define TEST_CLOCK_DELAY_USEC 1
+#define TEST_RTIMER           1
+#define TEST_ETIMER           1
+/*---------------------------------------------------------------------------*/
+static struct etimer et;
+
+#if TEST_CLOCK_DELAY_USEC
+static rtimer_clock_t start_count, end_count, diff;
+#endif
+
+#if TEST_ETIMER
+static clock_time_t count;
+#endif
+
+#if TEST_RTIMER
+static struct rtimer rt;
+static clock_time_t ct_now;
+rtimer_clock_t rt_now, rt_until;
+
+static volatile rtimer_clock_t rt_now_cb;
+static volatile clock_time_t ct_cb;
+#endif
+
+static uint8_t i;
+/*---------------------------------------------------------------------------*/
+PROCESS(clock_test_process, "Clock test process");
+AUTOSTART_PROCESSES(&clock_test_process);
+/*---------------------------------------------------------------------------*/
+#if TEST_RTIMER
+void
+rt_callback(struct rtimer *t, void *ptr)
+{
+  rt_now_cb = RTIMER_NOW();
+  ct_cb = clock_time();
+}
+#endif
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(clock_test_process, ev, data)
+{
+
+  PROCESS_BEGIN();
+  etimer_set(&et, 2 * CLOCK_SECOND);
+  PROCESS_YIELD();
+
+  printf("RTIMER_SECOND=%d CLOCK_SECOND=%d\n", RTIMER_SECOND, CLOCK_SECOND);
+
+#if TEST_CLOCK_DELAY_USEC
+  printf("=======================\n");
+  printf("TEST clock_delay_usec()\n");
+  printf("=======================\n");
+  i = 1;
+  while(i < 7) {
+    start_count = RTIMER_NOW();
+    clock_delay_usec(10000 * i);
+    end_count = RTIMER_NOW();
+    diff = end_count - start_count;
+    printf("difference [usec]: %ld\n", 10000 * i - (diff*(1000000/RTIMER_SECOND)));
+    i++;
+  }
+#endif
+
+#if TEST_RTIMER
+  printf("=======================\n");
+  printf("TEST rtimer\n");
+  printf("=======================\n");
+  i = 0;
+  while(i < 5) {
+    etimer_set(&et, 2 * CLOCK_SECOND);
+    rt_now = RTIMER_NOW();
+    ct_now = clock_time();
+    rt_until = rt_now + RTIMER_SECOND;
+    printf("now [ticks]: %lu until[ticks]: %lu\n", rt_now, rt_until);
+    if (rtimer_set(&rt, rt_until, 1, rt_callback, NULL) != RTIMER_OK) {
+      printf("Error setting\n");
+    }
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+    printf("rtimer difference [ticks]: %ld\n", RTIMER_SECOND - (rt_now_cb - rt_now));
+    printf("clock difference [ticks]: %ld\n", CLOCK_SECOND - (ct_cb - ct_now));
+    i++;
+  }
+#endif
+
+#if TEST_ETIMER
+  printf("=======================\n");
+  printf("TEST etimer\n");
+  printf("=======================\n");
+  i = 0;
+  while(i < 5) {
+    etimer_set(&et, i*CLOCK_SECOND);
+    count = clock_time();
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+    etimer_reset(&et);
+    printf("difference [ticks]: %lu\n", i*CLOCK_SECOND - (clock_time() - count));
+    leds_toggle(LEDS_RED);
+    i++;
+  }
+#endif
+
+  printf("Done!\n");
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ */

From 2d45a4207a57c6a523436911cac65b192c75f127 Mon Sep 17 00:00:00 2001
From: Wojciech Bober <wojciech.bober@gmail.com>
Date: Fri, 22 Jan 2016 11:13:07 +0100
Subject: [PATCH 026/393] nrf52dk: regression tests

---
 .travis.yml                                   | 13 +++++++++++++
 .../23-compile-nrf52-ports/Makefile           | 19 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 regression-tests/23-compile-nrf52-ports/Makefile

diff --git a/.travis.yml b/.travis.yml
index 1814ee6fa..74ce552e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,6 +89,18 @@ before_script:
       rm -rf /tmp/ba-elf-gcc* /tmp/jn516x-sdk* &&
       ba-elf-gcc --version ;
     fi
+    
+  ## Install mainline ARM toolchain and download nRF52 SDK
+  - if [ ${BUILD_ARCH:-0} = nrf52dk ] ; then
+      sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded &&
+      sudo apt-get -qq update &&
+      sudo apt-get -qq install gcc-arm-none-eabi srecord &&
+      arm-none-eabi-gcc --version &&
+      $WGET https://developer.nordicsemi.com/nRF5_IoT_SDK/nRF5_IoT_SDK_v0.9.x/nrf5_iot_sdk_3288530.zip &&
+      mkdir /tmp/nrf52-sdk &&
+      unzip nrf5_iot_sdk_3288530.zip -d /tmp/nrf52-sdk &&
+      export NRF52_SDK_ROOT=/tmp/nrf52-sdk ;
+    fi
 
   ## Compile cooja.jar only when it's going to be needed
   - if [ ${BUILD_CATEGORY:-sim} = sim ] ; then
@@ -138,5 +150,6 @@ env:
   - BUILD_TYPE='compile-6502-ports' BUILD_CATEGORY='compile' BUILD_ARCH='6502'
   - BUILD_TYPE='compile-arm-ports' BUILD_CATEGORY='compile' BUILD_ARCH='arm-aapcs'
   - BUILD_TYPE='compile-nxp-ports' BUILD_CATEGORY='compile' BUILD_ARCH='jn516x'
+  - BUILD_TYPE='compile-nrf52-ports' BUILD_CATEGORY='compile' BUILD_ARCH='nrf52dk'
   - BUILD_TYPE='slip-radio' MAKE_TARGETS='cooja'
   - BUILD_TYPE='llsec' MAKE_TARGETS='cooja'
diff --git a/regression-tests/23-compile-nrf52-ports/Makefile b/regression-tests/23-compile-nrf52-ports/Makefile
new file mode 100644
index 000000000..5e9ee19de
--- /dev/null
+++ b/regression-tests/23-compile-nrf52-ports/Makefile
@@ -0,0 +1,19 @@
+EXAMPLESDIR=../../examples
+TOOLSDIR=../../tools
+
+# Note, that SERVER_IPV6_ADDR variable is set to ffff on purpose
+# even though it's not a valid IPV6 address. This is due to limitation
+# of the testing framework which splits compliation arguments using
+# a colon.
+ 
+EXAMPLES = \
+hello-world/nrf52dk \
+nrf52dk/blink-hello/nrf52dk \
+nrf52dk/coap-demo/nrf52dk:coap-server \
+nrf52dk/coap-demo/nrf52dk:coap-client:SERVER_IPV6_ADDR=ffff \
+nrf52dk/mqtt-demo/nrf52dk \
+nrf52dk/timer-test/nrf52dk
+
+TOOLS=
+
+include ../Makefile.compile-test

From 943e5268601e3efba24dd9a19412b2235145c5e1 Mon Sep 17 00:00:00 2001
From: Wojciech Bober <wojciech.bober@gmail.com>
Date: Fri, 22 Jan 2016 12:42:45 +0100
Subject: [PATCH 027/393] nrf52dk: added build artifacts to git ignore

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index c166681da..304d18b7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,3 +125,7 @@ platform/galileo/bsp/grub/bin/
 *.galileo.dll
 *.galileo.efi
 LOG_OPENOCD
+
+# nRF52 build artifacts
+*.jlink
+*.nrf52dk

From 66629ae58f7494eea0cc9f822ca38b7f20c29b5e Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Fri, 12 Feb 2016 13:49:19 -0800
Subject: [PATCH 028/393] galileo: build_newlib.sh: Exit on configuration error

This patch adds a check for the result of the newlib configure command
and immediately exits the build_newlib.sh script if configure fails.
---
 platform/galileo/bsp/libc/build_newlib.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/galileo/bsp/libc/build_newlib.sh b/platform/galileo/bsp/libc/build_newlib.sh
index cef167e14..d0a1926ef 100755
--- a/platform/galileo/bsp/libc/build_newlib.sh
+++ b/platform/galileo/bsp/libc/build_newlib.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 JOBS=5
 TARGET=i586-elf
 VERSION=2.2.0-1
@@ -99,7 +101,9 @@ cleanup() {
 
 
 # By default we always call prepare, build and setup.
-prepare && build && setup
+prepare
+build
+setup
 
 # But we only cleanup if -c is used.
 case $1 in

From c815fa451186b4bf06073dbb9b59d7b1e410e213 Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Wed, 6 Jan 2016 17:00:45 -0800
Subject: [PATCH 029/393] x86: Use shared ISR for I2C and GPIO

This patch permits interrupts to be generated by both the I2C and GPIO
controllers for simultaneously-executing applications. The controllers
share a single interrupt pin, INTC. Prior to this patch,
quarkX1000_gpio_init() routed INTA to PIRQC and IRQ 10 (due to an
incorrect assumption that INTA is connected to the GPIO controller),
and quarkX1000_i2c_init() routed INTC to PIRQC and IRQ 9. The I2C
controller initialization is a prerequisite for GPIO initialization,
so the final configuration was that INTA and INTC were both routed to
PIRQC and IRQ 10. Thus, only the GPIO ISR was being invoked, even if
the I2C controller was actually responsible for the interrupt.

This patch refactors the I2C and GPIO ISR setup and handler code so
that the shared portions are combined in
cpu/x86/drivers/legacy_pc/shared-isr.[ch].  The I2C and GPIO drivers
communicate their interrupt information to the shared component by
placing structures in a specific section of the binary.
---
 cpu/x86/Makefile.x86_quarkX1000        |   2 +-
 cpu/x86/drivers/legacy_pc/shared-isr.c | 107 +++++++++++++++++++++++++
 cpu/x86/drivers/legacy_pc/shared-isr.h |  67 ++++++++++++++++
 cpu/x86/drivers/quarkX1000/gpio.c      |  34 +++-----
 cpu/x86/drivers/quarkX1000/i2c.c       |  41 +++++-----
 cpu/x86/init/common/interrupt.h        |  25 +++---
 cpu/x86/quarkX1000.ld                  |   4 +
 platform/galileo/contiki-main.c        |   7 +-
 8 files changed, 229 insertions(+), 58 deletions(-)
 create mode 100644 cpu/x86/drivers/legacy_pc/shared-isr.c
 create mode 100644 cpu/x86/drivers/legacy_pc/shared-isr.h

diff --git a/cpu/x86/Makefile.x86_quarkX1000 b/cpu/x86/Makefile.x86_quarkX1000
index 00f352102..ec9da64be 100644
--- a/cpu/x86/Makefile.x86_quarkX1000
+++ b/cpu/x86/Makefile.x86_quarkX1000
@@ -2,7 +2,7 @@ include $(CONTIKI)/cpu/x86/Makefile.x86_common
 
 CONTIKI_CPU_DIRS += drivers/legacy_pc drivers/quarkX1000 init/legacy_pc
 
-CONTIKI_SOURCEFILES += bootstrap_quarkX1000.S rtc.c pit.c pic.c irq.c nmi.c pci.c uart-16x50.c uart.c gpio.c i2c.c eth.c
+CONTIKI_SOURCEFILES += bootstrap_quarkX1000.S rtc.c pit.c pic.c irq.c nmi.c pci.c uart-16x50.c uart.c gpio.c i2c.c eth.c shared-isr.c
 
 CFLAGS += -m32 -march=i586 -mtune=i586
 LDFLAGS += -m32 -Xlinker -T -Xlinker $(CONTIKI)/cpu/x86/quarkX1000.ld
diff --git a/cpu/x86/drivers/legacy_pc/shared-isr.c b/cpu/x86/drivers/legacy_pc/shared-isr.c
new file mode 100644
index 000000000..e13c7ab93
--- /dev/null
+++ b/cpu/x86/drivers/legacy_pc/shared-isr.c
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+#include <assert.h>
+#include "idt.h"
+#include "interrupt.h"
+#include "pic.h"
+#include "shared-isr.h"
+
+/* Defined in linker script */
+extern shared_isr_client_t _sdata_shared_isr, _edata_shared_isr;
+
+static void __attribute__((used))
+shared_handler(void)
+{
+  shared_isr_client_t *client;
+  for(client = &_sdata_shared_isr; client < &_edata_shared_isr; client++) {
+    if(client->handler()) {
+      pic_eoi(client->irq);
+      return;
+    }
+  }
+}
+
+/**
+ * \brief Initialize shared ISR by iterating through all of its clients and
+ *        configuring their interrupts to route to the shared ISR.
+ */
+void
+shared_isr_init(void)
+{
+  shared_isr_client_t *client = &_sdata_shared_isr;
+  shared_isr_client_t *consistency_check_client;
+  bool prev_conf;
+
+  void shared_isr_stub(void);
+  __asm__ __volatile__ (
+    ISR_STUB("shared_isr_stub", 0, "shared_handler")
+  );
+
+  while(client < &_edata_shared_isr) {
+    consistency_check_client = &_sdata_shared_isr;
+
+    prev_conf = false;
+
+    while(consistency_check_client < client) {
+      if((client->irq == consistency_check_client->irq) ||
+         (client->pin == consistency_check_client->pin) ||
+         (client->pirq == consistency_check_client->pirq)) {
+
+        prev_conf = true;
+
+        /* This interrupt was previously configured. */
+        break;
+      }
+
+      consistency_check_client++;
+    }
+
+    if(prev_conf) {
+      /* The requested configurations for each IRQ must be consistent. */
+      assert((client->irq == consistency_check_client->irq) &&
+             (client->agent == consistency_check_client->agent) &&
+             (client->pin == consistency_check_client->pin) &&
+             (client->pirq == consistency_check_client->pirq));
+    } else {
+      idt_set_intr_gate_desc(PIC_INT(client->irq), (uint32_t)shared_isr_stub);
+
+      assert(pci_irq_agent_set_pirq(client->agent,
+                                    client->pin,
+                                    client->pirq) == 0);
+
+      pci_pirq_set_irq(client->pirq, client->irq, 1);
+
+      pic_unmask_irq(client->irq);
+    }
+
+    client++;
+  }
+}
diff --git a/cpu/x86/drivers/legacy_pc/shared-isr.h b/cpu/x86/drivers/legacy_pc/shared-isr.h
new file mode 100644
index 000000000..e8a92e442
--- /dev/null
+++ b/cpu/x86/drivers/legacy_pc/shared-isr.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_DRIVERS_LEGACY_PC_SHARED_ISR_H_
+#define CPU_X86_DRIVERS_LEGACY_PC_SHARED_ISR_H_
+
+#include <stdbool.h>
+#include "pci.h"
+
+/**
+ * The handler function should return true if and only if it handled the
+ * interrupt.
+ */
+typedef bool (*shared_isr_handler_t)(void);
+
+typedef struct shared_isr_client {
+  uint8_t irq;
+  IRQAGENT agent;
+  INTR_PIN pin;
+  PIRQ pirq;
+  shared_isr_handler_t handler;
+} shared_isr_client_t;
+
+/* Unlike a non-shared interrupt handler function, an individual interrupt
+ * handler for a shared interrupt must not issue an EOI. The EOI is issued by
+ * the shared-isr subsystem.
+ */
+#define DEFINE_SHARED_IRQ(irq_, agent_, pin_, pirq_, handler_)                \
+static struct shared_isr_client                                               \
+  __attribute__((used, section(".shared_isr_data"))) _shared_irq_##irq_ = {   \
+  .irq = irq_,                                                                \
+  .agent = agent_,                                                            \
+  .pin = pin_,                                                                \
+  .pirq = pirq_,                                                              \
+  .handler = handler_                                                         \
+}
+
+void shared_isr_init(void);
+
+#endif /* CPU_X86_DRIVERS_LEGACY_PC_SHARED_ISR_H_ */
diff --git a/cpu/x86/drivers/quarkX1000/gpio.c b/cpu/x86/drivers/quarkX1000/gpio.c
index 92438b456..7d7d7dd64 100644
--- a/cpu/x86/drivers/quarkX1000/gpio.c
+++ b/cpu/x86/drivers/quarkX1000/gpio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, Intel Corporation. All rights reserved.
+ * Copyright (C) 2015-2016, Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,9 +29,9 @@
  */
 
 #include "gpio.h"
+
 #include "helpers.h"
-#include "interrupt.h"
-#include "pic.h"
+#include "shared-isr.h"
 
 /* GPIO Controler Registers */
 #define SWPORTA_DR    0x00
@@ -49,8 +49,7 @@
 
 #define PINS 8
 
-#define GPIO_IRQ 10
-#define GPIO_INT PIC_INT(GPIO_IRQ)
+#define GPIO_IRQ 9
 
 struct gpio_internal_data {
   pci_driver_t pci;
@@ -87,17 +86,23 @@ set_bit(uint32_t offset, uint32_t bit, uint32_t value)
   write(offset, reg);
 }
 
-static void
+static bool
 gpio_isr(void)
 {
   uint32_t int_status;
 
   int_status = read(INTSTATUS);
 
+  if(int_status == 0) {
+    return false;
+  }
+
   if (data.callback)
     data.callback(int_status);
 
   write(PORTA_EOI, -1);
+
+  return true;
 }
 
 static void
@@ -211,13 +216,7 @@ quarkX1000_gpio_clock_disable(void)
   set_bit(LS_SYNC, 0, 0);
 }
 
-static void
-gpio_handler(void)
-{
-  gpio_isr();
-
-  pic_eoi(GPIO_IRQ);
-}
+DEFINE_SHARED_IRQ(GPIO_IRQ, IRQAGENT3, INTC, PIRQC, gpio_isr);
 
 int
 quarkX1000_gpio_init(void)
@@ -232,13 +231,6 @@ quarkX1000_gpio_init(void)
 
   pci_command_enable(pci_addr, PCI_CMD_1_MEM_SPACE_EN);
 
-  SET_INTERRUPT_HANDLER(GPIO_INT, 0, gpio_handler);
-
-  if (pci_irq_agent_set_pirq(IRQAGENT3, INTA, PIRQC) < 0)
-    return -1;
-
-  pci_pirq_set_irq(PIRQC, GPIO_IRQ, 1);
-
   pci_init(&data.pci, pci_addr, 0);
 
   data.callback = 0;
@@ -250,7 +242,5 @@ quarkX1000_gpio_init(void)
   write(INTMASK, 0);
   write(PORTA_EOI, 0);
 
-  pic_unmask_irq(GPIO_IRQ);
-
   return 0;
 }
diff --git a/cpu/x86/drivers/quarkX1000/i2c.c b/cpu/x86/drivers/quarkX1000/i2c.c
index b781bcc35..b16a79205 100644
--- a/cpu/x86/drivers/quarkX1000/i2c.c
+++ b/cpu/x86/drivers/quarkX1000/i2c.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, Intel Corporation. All rights reserved.
+ * Copyright (C) 2015-2016, Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,9 +30,9 @@
 
 #include "contiki.h"
 #include "i2c.h"
+
 #include "i2c-registers.h"
-#include "interrupt.h"
-#include "pic.h"
+#include "shared-isr.h"
 
 #define I2C_CLOCK_SPEED 25 /* kHz */
 #define I2C_FIFO_DEPTH  16
@@ -48,7 +48,6 @@
 #define I2C_POLLING_TIMEOUT (CLOCK_SECOND / 10)
 
 #define I2C_IRQ 9
-#define I2C_INT PIC_INT(I2C_IRQ)
 
 typedef enum {
   I2C_DIRECTION_READ,
@@ -169,9 +168,11 @@ i2c_data_send(void)
   device.tx_buffer += i;
 }
 
-static void
+static bool
 i2c_isr(void)
 {
+  bool handled = false;
+
   if (read(QUARKX1000_IC_INTR_STAT) & QUARKX1000_IC_INTR_STAT_STOP_DET_MASK) {
     i2c_data_read();
 
@@ -185,6 +186,8 @@ i2c_isr(void)
       if (device.config.cb_rx)
         device.config.cb_rx();
     }
+
+    handled = true;
   }
 
   if (read(QUARKX1000_IC_INTR_STAT) & QUARKX1000_IC_INTR_STAT_TX_EMPTY_MASK) {
@@ -195,11 +198,16 @@ i2c_isr(void)
       set_value(QUARKX1000_IC_INTR_MASK,
         QUARKX1000_IC_INTR_STAT_STOP_DET_MASK, QUARKX1000_IC_INTR_STAT_STOP_DET_SHIFT, 1);
     }
+
+    handled = true;
   }
 
-  if (read(QUARKX1000_IC_INTR_STAT) & QUARKX1000_IC_INTR_STAT_RX_FULL_MASK)
+  if(read(QUARKX1000_IC_INTR_STAT) & QUARKX1000_IC_INTR_STAT_RX_FULL_MASK) {
     i2c_data_read();
 
+    handled = true;
+  }
+
   if (read(QUARKX1000_IC_INTR_STAT) & (QUARKX1000_IC_INTR_STAT_TX_ABRT_MASK
     | QUARKX1000_IC_INTR_STAT_TX_OVER_MASK | QUARKX1000_IC_INTR_STAT_RX_OVER_MASK
     | QUARKX1000_IC_INTR_STAT_RX_UNDER_MASK)) {
@@ -208,7 +216,11 @@ i2c_isr(void)
 
     if (device.config.cb_err)
       device.config.cb_err();
+
+    handled = true;
   }
+
+  return handled;
 }
 
 int
@@ -480,13 +492,7 @@ quarkX1000_i2c_is_available(void)
   return device.pci.mmio ? 1 : 0;
 }
 
-static void
-i2c_handler()
-{
-  i2c_isr();
-
-  pic_eoi(I2C_IRQ);
-}
+DEFINE_SHARED_IRQ(I2C_IRQ, IRQAGENT3, INTC, PIRQC, i2c_isr);
 
 int
 quarkX1000_i2c_init(void)
@@ -501,16 +507,7 @@ quarkX1000_i2c_init(void)
 
   pci_command_enable(pci_addr, PCI_CMD_1_MEM_SPACE_EN);
 
-  SET_INTERRUPT_HANDLER(I2C_INT, 0, i2c_handler);
-
-  if (pci_irq_agent_set_pirq(IRQAGENT3, INTC, PIRQC) < 0)
-    return -1;
-
-  pci_pirq_set_irq(PIRQC, I2C_IRQ, 1);
-
   pci_init(&device.pci, pci_addr, 0);
 
-  pic_unmask_irq(I2C_IRQ);
-
   return 0;
 }
diff --git a/cpu/x86/init/common/interrupt.h b/cpu/x86/init/common/interrupt.h
index 2ab228c72..601695bde 100644
--- a/cpu/x86/init/common/interrupt.h
+++ b/cpu/x86/init/common/interrupt.h
@@ -48,6 +48,19 @@ struct interrupt_context {
   uint32_t eip;
 };
 
+#define ISR_STUB(label_str, has_error_code, handler_str)         \
+  "jmp 2f\n\t"                                                   \
+  ".align 4\n\t"                                                 \
+  label_str ":\n\t"                                              \
+  "         pushal\n\t"                                          \
+  "         call " handler_str "\n\t"                            \
+  "         popal\n\t"                                           \
+  "         .if " #has_error_code "\n\t"                         \
+  "         add $4, %%esp\n\t"                                   \
+  "         .endif\n\t"                                          \
+  "         iret\n\t"                                            \
+  "2:\n\t"
+
 /* Helper macro to register interrupt handler function.
  *
  * num:             Interrupt number (0-255)
@@ -75,17 +88,7 @@ struct interrupt_context {
       "push %0\n\t"                                              \
       "call %P1\n\t"                                             \
       "add $8, %%esp\n\t"                                        \
-      "jmp 2f\n\t"                                               \
-      ".align 4\n\t"                                             \
-      "1:\n\t"                                                   \
-      "         pushal\n\t"                                      \
-      "         call %P2\n\t"                                    \
-      "         popal\n\t"                                       \
-      "         .if " #has_error_code "\n\t"                     \
-      "         add $4, %%esp\n\t"                               \
-      "         .endif\n\t"                                      \
-      "         iret\n\t"                                        \
-      "2:\n\t"                                                   \
+      ISR_STUB("1", has_error_code, "%P2")                       \
       :: "g" (num), "i" (idt_set_intr_gate_desc), "i" (handler)  \
       : "eax", "ecx", "edx"                                      \
     );                                                           \
diff --git a/cpu/x86/quarkX1000.ld b/cpu/x86/quarkX1000.ld
index b50c47bb8..ba437d540 100644
--- a/cpu/x86/quarkX1000.ld
+++ b/cpu/x86/quarkX1000.ld
@@ -61,6 +61,10 @@ SECTIONS {
     .rodata ALIGN (32) :
     {
         *(.rodata*)
+
+        _sdata_shared_isr = .;
+        KEEP(*(.shared_isr_data*))
+        _edata_shared_isr = .;
     }
 
     .data ALIGN (32) :
diff --git a/platform/galileo/contiki-main.c b/platform/galileo/contiki-main.c
index 943ac3174..bb6d0c5cb 100644
--- a/platform/galileo/contiki-main.c
+++ b/platform/galileo/contiki-main.c
@@ -33,9 +33,10 @@
 #include "contiki.h"
 #include "contiki-net.h"
 #include "cpu.h"
-#include "interrupt.h"
-#include "uart.h"
 #include "eth-conf.h"
+#include "interrupt.h"
+#include "shared-isr.h"
+#include "uart.h"
 
 PROCINIT(  &etimer_process
          , &tcpip_process
@@ -64,6 +65,8 @@ main(void)
 
   eth_init();
 
+  shared_isr_init();
+
   while(1) {
     process_run();
   }

From c9bffe6d5a7780f339ca76617502318d85c54eaa Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Wed, 6 Jan 2016 17:17:25 -0800
Subject: [PATCH 030/393] galileo: Convert README for examples into README.md

This patch renames and reformats examples/galileo/README to use
Markdown.
---
 examples/galileo/{README => README.md} | 33 ++++++++++++--------------
 1 file changed, 15 insertions(+), 18 deletions(-)
 rename examples/galileo/{README => README.md} (90%)

diff --git a/examples/galileo/README b/examples/galileo/README.md
similarity index 90%
rename from examples/galileo/README
rename to examples/galileo/README.md
index 643a2e418..4222ea076 100644
--- a/examples/galileo/README
+++ b/examples/galileo/README.md
@@ -1,5 +1,5 @@
 Galileo Specific Examples
-=======================
+=========================
 
 This directory contains galileo-specific example applications to illustrate
 how to use galileo APIs.
@@ -7,14 +7,15 @@ how to use galileo APIs.
 In order to build a application, you should set the EXAMPLE environment
 variable to the name of the application you want to build. For instance, if
 you want to build gpio-output application, run the following command:
+
+```
 $ make TARGET=galileo EXAMPLE=gpio-output
+```
 
-============
-=   GPIO   =
-============
+GPIO
+----
 
-GPIO Output
-===========
+### GPIO Output
 
 This application shows how to use the GPIO driver APIs to manipulate output
 pins. This application sets the GPIO 4 pin as output pin and toggles its
@@ -23,16 +24,14 @@ state at every half second.
 For a visual effect, you should wire shield pin IO1 to a led in a protoboard.
 Once the application is running, you should see a blinking LED.
 
-GPIO Input
-==========
+### GPIO Input
 
 This application shows how to use the GPIO driver APIs to manipulate input
 pins. This application uses default galileo pinmux initialization and sets
 the GPIO 5 (IO2) as output pin and GPIO 6 (IO3) as input. It toggles the
 output pin state at every half second and checks the value on input pin.
 
-GPIO Interrupt
-==============
+### GPIO Interrupt
 
 This application shows how to use the GPIO driver APIs to manipulate interrupt
 pins. This application uses default galileo pinmux initialization and sets
@@ -41,12 +40,11 @@ output pin stat at every half second in order to emulate an interrupt. This
 triggers an interrupt and the application callback is called. You can confirm
 that though the UART output.
 
-=======
-= I2C =
-=======
+I2C
+---
+
+### I2C LSM9DS0
 
-I2C LSM9DS0
-===========
 This application shows how to use I2C driver APIs to configure I2C Master
 controller and communicate with LSM9DS0 sensor. At every 5 seconds, the
 application reads the "who am I" register from gyroscope sensor and prints if
@@ -65,9 +63,8 @@ The wiring setup is as follows (left column from Galileo and right column from L
 - SDA  and SDA
 - SCL  and SCL
 
-==============
-= References =
-==============
+References
+----------
 
 [1] http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00087365.pdf
 

From 3e644476319d131782d0112905bc889d164d3af0 Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Wed, 6 Jan 2016 17:21:36 -0800
Subject: [PATCH 031/393] galileo: Expand README for examples

This patch expands the instructions in examples/galileo/README.md.
---
 examples/galileo/README.md | 44 ++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/examples/galileo/README.md b/examples/galileo/README.md
index 4222ea076..ce4cb03a9 100644
--- a/examples/galileo/README.md
+++ b/examples/galileo/README.md
@@ -12,10 +12,13 @@ you want to build gpio-output application, run the following command:
 $ make TARGET=galileo EXAMPLE=gpio-output
 ```
 
+The corresponding EXAMPLE variable setting for each application is
+listed to the right of its heading.
+
 GPIO
 ----
 
-### GPIO Output
+### GPIO Output (EXAMPLE=gpio-output)
 
 This application shows how to use the GPIO driver APIs to manipulate output
 pins. This application sets the GPIO 4 pin as output pin and toggles its
@@ -24,31 +27,36 @@ state at every half second.
 For a visual effect, you should wire shield pin IO1 to a led in a protoboard.
 Once the application is running, you should see a blinking LED.
 
-### GPIO Input
+### GPIO Input (EXAMPLE=gpio-input)
 
-This application shows how to use the GPIO driver APIs to manipulate input
-pins. This application uses default galileo pinmux initialization and sets
-the GPIO 5 (IO2) as output pin and GPIO 6 (IO3) as input. It toggles the
-output pin state at every half second and checks the value on input pin.
+This application shows how to use the GPIO driver APIs to manipulate
+input pins. This application uses default galileo pinmux
+initialization and sets the GPIO 5 (shield pin IO2) as output pin and
+GPIO 6 (shield pin IO3) as input. A jumper should be used to connect
+the two pins. The application toggles the output pin state at every
+half second and checks the value on input pin.
 
-### GPIO Interrupt
+### GPIO Interrupt (EXAMPLE=gpio-interrupt)
 
-This application shows how to use the GPIO driver APIs to manipulate interrupt
-pins. This application uses default galileo pinmux initialization and sets
-the GPIO 5 (IO2) as output pin and GPIO 6 (IO3) as interrupt. It toggles the
-output pin stat at every half second in order to emulate an interrupt. This
-triggers an interrupt and the application callback is called. You can confirm
-that though the UART output.
+This application shows how to use the GPIO driver APIs to manipulate
+interrupt pins. This application uses default galileo pinmux
+initialization and sets the GPIO 5 (shield pin IO2) as output pin and
+GPIO 6 (shield pin IO3) as interrupt. A jumper should be used to
+connect the two pins. It toggles the output pin stat at every half
+second in order to emulate an interrupt. This triggers an interrupt
+and the application callback is called. You can confirm that though
+the UART output.
 
 I2C
 ---
 
-### I2C LSM9DS0
+### I2C LSM9DS0 (EXAMPLE=i2c-LSM9DS0)
 
-This application shows how to use I2C driver APIs to configure I2C Master
-controller and communicate with LSM9DS0 sensor. At every 5 seconds, the
-application reads the "who am I" register from gyroscope sensor and prints if
-the register value matches the expected value described in the spec [1].
+This application shows how to use I2C driver APIs to configure I2C
+Master controller and communicate with an LSM9DS0 sensor if one has
+been connected as described below. At every 5 seconds, the application
+reads the "who am I" register from gyroscope sensor and prints if the
+register value matches the expected value described in the spec [1].
 
 According to the sensor spec, to read the value in "who am I" register, we
 should first perform an i2c write operation to select the register we want

From 58874ea25df3f5328a4429348a13b2451f9435de Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Tue, 5 Jan 2016 23:05:09 -0800
Subject: [PATCH 032/393] x86, galileo: Refactor I2C and GPIO initialization

This patch revises the I2C and GPIO initialization code to always be
run during platform boot rather than within each process that requires
it.

This patch also revises the gpio-output example to use a pin that is
set as an output by the default pinmux configuration.  Previously, it
used a pin that was set as an output by the pinmux configuration that
is in effect when the OS does not change the pinmux configuration.
---
 cpu/x86/drivers/quarkX1000/i2c.c          | 31 +++++++++++++++++------
 cpu/x86/drivers/quarkX1000/i2c.h          | 17 +++++--------
 examples/galileo/README.md                |  4 +--
 examples/galileo/gpio-input.c             | 15 +----------
 examples/galileo/gpio-interrupt.c         | 15 +----------
 examples/galileo/gpio-output.c            |  5 ++--
 examples/galileo/i2c-LSM9DS0.c            | 18 ++-----------
 platform/galileo/README.md                |  3 +++
 platform/galileo/contiki-main.c           | 14 +++++++++-
 platform/galileo/drivers/galileo-pinmux.c |  2 +-
 10 files changed, 54 insertions(+), 70 deletions(-)

diff --git a/cpu/x86/drivers/quarkX1000/i2c.c b/cpu/x86/drivers/quarkX1000/i2c.c
index b16a79205..4e5669079 100644
--- a/cpu/x86/drivers/quarkX1000/i2c.c
+++ b/cpu/x86/drivers/quarkX1000/i2c.c
@@ -54,6 +54,15 @@ typedef enum {
   I2C_DIRECTION_WRITE
 } I2C_DIRECTION;
 
+struct quarkX1000_i2c_config {
+  QUARKX1000_I2C_SPEED speed;
+  QUARKX1000_I2C_ADDR_MODE addressing_mode;
+
+  quarkX1000_i2c_callback cb_rx;
+  quarkX1000_i2c_callback cb_tx;
+  quarkX1000_i2c_callback cb_err;
+};
+
 struct i2c_internal_data {
   struct quarkX1000_i2c_config config;
 
@@ -223,17 +232,15 @@ i2c_isr(void)
   return handled;
 }
 
-int
-quarkX1000_i2c_configure(struct quarkX1000_i2c_config *config)
+void
+quarkX1000_i2c_configure(QUARKX1000_I2C_SPEED speed,
+                         QUARKX1000_I2C_ADDR_MODE addressing_mode)
 {
   uint32_t hcnt, lcnt;
   uint8_t ic_fs_spklen;
 
-  device.config.speed = config->speed;
-  device.config.addressing_mode = config->addressing_mode;
-  device.config.cb_rx = config->cb_rx;
-  device.config.cb_tx = config->cb_tx;
-  device.config.cb_err = config->cb_err;
+  device.config.speed = speed;
+  device.config.addressing_mode = addressing_mode;
 
   if (device.config.speed == QUARKX1000_I2C_SPEED_STANDARD) {
     lcnt = I2C_STD_LCNT;
@@ -252,8 +259,16 @@ quarkX1000_i2c_configure(struct quarkX1000_i2c_config *config)
 
   /* Clear interrupts. */
   read(QUARKX1000_IC_CLR_INTR);
+}
 
-  return 0;
+void
+quarkX1000_i2c_set_callbacks(quarkX1000_i2c_callback rx,
+                             quarkX1000_i2c_callback tx,
+                             quarkX1000_i2c_callback err)
+{
+  device.config.cb_rx = rx;
+  device.config.cb_tx = tx;
+  device.config.cb_err = err;
 }
 
 static int
diff --git a/cpu/x86/drivers/quarkX1000/i2c.h b/cpu/x86/drivers/quarkX1000/i2c.h
index b5292524f..ed2db18fb 100644
--- a/cpu/x86/drivers/quarkX1000/i2c.h
+++ b/cpu/x86/drivers/quarkX1000/i2c.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, Intel Corporation. All rights reserved.
+ * Copyright (C) 2015-2016, Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -45,17 +45,12 @@ typedef enum {
 
 typedef void (*quarkX1000_i2c_callback)(void);
 
-struct quarkX1000_i2c_config {
-  QUARKX1000_I2C_SPEED speed;
-  QUARKX1000_I2C_ADDR_MODE addressing_mode;
-
-  quarkX1000_i2c_callback cb_rx;
-  quarkX1000_i2c_callback cb_tx;
-  quarkX1000_i2c_callback cb_err;
-};
-
 int quarkX1000_i2c_init(void);
-int quarkX1000_i2c_configure(struct quarkX1000_i2c_config *config);
+void quarkX1000_i2c_configure(QUARKX1000_I2C_SPEED speed,
+                              QUARKX1000_I2C_ADDR_MODE addressing_mode);
+void quarkX1000_i2c_set_callbacks(quarkX1000_i2c_callback rx,
+                                  quarkX1000_i2c_callback tx,
+                                  quarkX1000_i2c_callback err);
 int quarkX1000_i2c_is_available(void);
 
 int quarkX1000_i2c_read(uint8_t *buf, uint8_t len, uint16_t addr);
diff --git a/examples/galileo/README.md b/examples/galileo/README.md
index ce4cb03a9..61e8ea713 100644
--- a/examples/galileo/README.md
+++ b/examples/galileo/README.md
@@ -21,10 +21,10 @@ GPIO
 ### GPIO Output (EXAMPLE=gpio-output)
 
 This application shows how to use the GPIO driver APIs to manipulate output
-pins. This application sets the GPIO 4 pin as output pin and toggles its
+pins. This application sets the GPIO 5 pin as output pin and toggles its
 state at every half second.
 
-For a visual effect, you should wire shield pin IO1 to a led in a protoboard.
+For a visual effect, you should wire shield pin IO2 to a led in a protoboard.
 Once the application is running, you should see a blinking LED.
 
 ### GPIO Input (EXAMPLE=gpio-input)
diff --git a/examples/galileo/gpio-input.c b/examples/galileo/gpio-input.c
index 8728d5088..196ea9193 100644
--- a/examples/galileo/gpio-input.c
+++ b/examples/galileo/gpio-input.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, Intel Corporation. All rights reserved.
+ * Copyright (C) 2015-2016, Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,16 +33,13 @@
 #include "contiki.h"
 #include "sys/ctimer.h"
 
-#include "galileo-pinmux.h"
 #include "gpio.h"
-#include "i2c.h"
 
 #define PIN_OUTPUT 5
 #define PIN_INPUT 6
 
 static uint32_t value;
 static struct ctimer timer;
-static struct quarkX1000_i2c_config i2c_config;
 
 PROCESS(gpio_input_process, "GPIO Input Process");
 AUTOSTART_PROCESSES(&gpio_input_process);
@@ -70,16 +67,6 @@ PROCESS_THREAD(gpio_input_process, ev, data)
 {
   PROCESS_BEGIN();
 
-  i2c_config.speed = QUARKX1000_I2C_SPEED_STANDARD;
-  i2c_config.addressing_mode = QUARKX1000_I2C_ADDR_MODE_7BIT;
-
-  quarkX1000_i2c_init();
-  quarkX1000_i2c_configure(&i2c_config);
-
-  /* use default pinmux configuration */
-  galileo_pinmux_initialize();
-
-  quarkX1000_gpio_init();
   quarkX1000_gpio_config(PIN_OUTPUT, QUARKX1000_GPIO_OUT);
   quarkX1000_gpio_config(PIN_INPUT, QUARKX1000_GPIO_IN);
 
diff --git a/examples/galileo/gpio-interrupt.c b/examples/galileo/gpio-interrupt.c
index 149279f6f..04fb4cc1b 100644
--- a/examples/galileo/gpio-interrupt.c
+++ b/examples/galileo/gpio-interrupt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, Intel Corporation. All rights reserved.
+ * Copyright (C) 2015-2016, Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -34,14 +34,11 @@
 #include "sys/ctimer.h"
 
 #include "gpio.h"
-#include "i2c.h"
-#include "galileo-pinmux.h"
 
 #define PIN_OUTPUT 5
 #define PIN_INTR 6
 
 static struct ctimer timer;
-static struct quarkX1000_i2c_config i2c_config;
 
 PROCESS(gpio_interrupt_process, "GPIO Interrupt Process");
 AUTOSTART_PROCESSES(&gpio_interrupt_process);
@@ -66,16 +63,6 @@ PROCESS_THREAD(gpio_interrupt_process, ev, data)
 {
   PROCESS_BEGIN();
 
-  i2c_config.speed = QUARKX1000_I2C_SPEED_STANDARD;
-  i2c_config.addressing_mode = QUARKX1000_I2C_ADDR_MODE_7BIT;
-
-  quarkX1000_i2c_init();
-  quarkX1000_i2c_configure(&i2c_config);
-
-  /* use default pinmux configuration */
-  galileo_pinmux_initialize();
-
-  quarkX1000_gpio_init();
   quarkX1000_gpio_config(PIN_OUTPUT, QUARKX1000_GPIO_OUT);
   quarkX1000_gpio_config(PIN_INTR, QUARKX1000_GPIO_INT | QUARKX1000_GPIO_ACTIVE_HIGH | QUARKX1000_GPIO_EDGE);
 
diff --git a/examples/galileo/gpio-output.c b/examples/galileo/gpio-output.c
index 39a92516f..4dad7d684 100644
--- a/examples/galileo/gpio-output.c
+++ b/examples/galileo/gpio-output.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, Intel Corporation. All rights reserved.
+ * Copyright (C) 2015-2016, Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -35,7 +35,7 @@
 
 #include "gpio.h"
 
-#define PIN 4 /* IO1 */
+#define PIN 5 /* IO2 */
 
 static uint32_t value;
 static struct ctimer timer;
@@ -57,7 +57,6 @@ PROCESS_THREAD(gpio_output_process, ev, data)
 {
   PROCESS_BEGIN();
 
-  quarkX1000_gpio_init();
   quarkX1000_gpio_config(PIN, QUARKX1000_GPIO_OUT);
 
   quarkX1000_gpio_clock_enable();
diff --git a/examples/galileo/i2c-LSM9DS0.c b/examples/galileo/i2c-LSM9DS0.c
index e5a47c458..03d61a2a4 100644
--- a/examples/galileo/i2c-LSM9DS0.c
+++ b/examples/galileo/i2c-LSM9DS0.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, Intel Corporation. All rights reserved.
+ * Copyright (C) 2015-2016, Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -34,7 +34,6 @@
 #include "contiki.h"
 #include "sys/ctimer.h"
 
-#include "galileo-pinmux.h"
 #include "i2c.h"
 
 #define LSM9DS0_I2C_ADDR 0x6A
@@ -44,7 +43,6 @@
 static uint8_t tx_data = WHO_AM_I_ADDR;
 static uint8_t rx_data = 0;
 static struct ctimer timer;
-static struct quarkX1000_i2c_config cfg;
 
 PROCESS(i2c_lsm9ds0_process, "I2C LSM9DS0 Who Am I Process");
 AUTOSTART_PROCESSES(&i2c_lsm9ds0_process);
@@ -84,19 +82,7 @@ PROCESS_THREAD(i2c_lsm9ds0_process, ev, data)
 {
   PROCESS_BEGIN();
 
-  cfg.speed = QUARKX1000_I2C_SPEED_STANDARD;
-  cfg.addressing_mode = QUARKX1000_I2C_ADDR_MODE_7BIT;
-
-  quarkX1000_i2c_init();
-  quarkX1000_i2c_configure(&cfg);
-
-  galileo_pinmux_initialize();
-
-  cfg.cb_rx = rx;
-  cfg.cb_tx = tx;
-  cfg.cb_err = err;
-
-  quarkX1000_i2c_configure(&cfg);
+  quarkX1000_i2c_set_callbacks(rx, tx, err);
 
   ctimer_set(&timer, CLOCK_SECOND * 5, timeout, NULL);
 
diff --git a/platform/galileo/README.md b/platform/galileo/README.md
index b99ad7d65..815b09011 100644
--- a/platform/galileo/README.md
+++ b/platform/galileo/README.md
@@ -30,6 +30,9 @@ Device drivers:
   * Real-Time Clock (RTC)
   * UART
   * Ethernet
+  * I2C
+  * GPIO (default pinmux configuration is listed in
+    platform/galileo/drivers/galileo-pinmux.c)
 
 Contiki APIs:
   * Clock module
diff --git a/platform/galileo/contiki-main.c b/platform/galileo/contiki-main.c
index bb6d0c5cb..141ad2a51 100644
--- a/platform/galileo/contiki-main.c
+++ b/platform/galileo/contiki-main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, Intel Corporation. All rights reserved.
+ * Copyright (C) 2015-2016, Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -34,6 +34,9 @@
 #include "contiki-net.h"
 #include "cpu.h"
 #include "eth-conf.h"
+#include "galileo-pinmux.h"
+#include "gpio.h"
+#include "i2c.h"
 #include "interrupt.h"
 #include "shared-isr.h"
 #include "uart.h"
@@ -56,6 +59,15 @@ main(void)
 
   printf("Starting Contiki\n");
 
+  quarkX1000_i2c_init();
+  quarkX1000_i2c_configure(QUARKX1000_I2C_SPEED_STANDARD,
+                           QUARKX1000_I2C_ADDR_MODE_7BIT);
+  /* use default pinmux configuration */
+  if(galileo_pinmux_initialize() < 0) {
+    fprintf(stderr, "Failed to initialize pinmux\n");
+  }
+  quarkX1000_gpio_init();
+
   ENABLE_IRQ();
 
   process_init();
diff --git a/platform/galileo/drivers/galileo-pinmux.c b/platform/galileo/drivers/galileo-pinmux.c
index c66036ea2..3059bdb36 100644
--- a/platform/galileo/drivers/galileo-pinmux.c
+++ b/platform/galileo/drivers/galileo-pinmux.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, Intel Corporation. All rights reserved.
+ * Copyright (C) 2015-2016, Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

From b82d92e3736b5635da0536deab628935bae9cecb Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Wed, 6 Jan 2016 17:25:55 -0800
Subject: [PATCH 033/393] galileo: Add I2C callbacks example

This patch adds an example for I2C callbacks that is very similar to
the i2c-LSM9DS0 example except that it uses a PWM device that is built
into the platform.
---
 examples/galileo/Makefile        |  2 +-
 examples/galileo/README.md       | 12 +++++
 examples/galileo/i2c-callbacks.c | 93 ++++++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 examples/galileo/i2c-callbacks.c

diff --git a/examples/galileo/Makefile b/examples/galileo/Makefile
index 19a29f78a..2954adc38 100644
--- a/examples/galileo/Makefile
+++ b/examples/galileo/Makefile
@@ -1,6 +1,6 @@
 TARGET=galileo
 
-KNOWN_EXAMPLES = gpio-input gpio-output gpio-interrupt i2c-LSM9DS0
+KNOWN_EXAMPLES = gpio-input gpio-output gpio-interrupt i2c-LSM9DS0 i2c-callbacks
 
 ifneq ($(filter $(EXAMPLE),$(KNOWN_EXAMPLES)),)
   CONTIKI_PROJECT = $(EXAMPLE)
diff --git a/examples/galileo/README.md b/examples/galileo/README.md
index 61e8ea713..b725ec867 100644
--- a/examples/galileo/README.md
+++ b/examples/galileo/README.md
@@ -71,6 +71,18 @@ The wiring setup is as follows (left column from Galileo and right column from L
 - SDA  and SDA
 - SCL  and SCL
 
+### I2C Callbacks (EXAMPLE=i2c-callbacks)
+
+This application is very similar to the previous one in that it also
+shows how to use I2C callback functionality, but it can be run without
+attaching any additional sensors to the platform since it simply
+communicates with a built-in PWM controller.
+
+Every five seconds, the application reads the current value of the
+MODE1 register, which should have previously been initialized to the
+value 0x20. The test verifies that this expected value is returned by
+the read.
+
 References
 ----------
 
diff --git a/examples/galileo/i2c-callbacks.c b/examples/galileo/i2c-callbacks.c
new file mode 100644
index 000000000..d97c6b448
--- /dev/null
+++ b/examples/galileo/i2c-callbacks.c
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2015-2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "contiki.h"
+#include "sys/ctimer.h"
+
+#include "i2c.h"
+
+#define PWM_PCA9685_0_I2C_ADDR 0x47
+#define MODE1_ADDR             0x00
+
+static uint8_t tx_data = MODE1_ADDR;
+static uint8_t rx_data = 0;
+static struct ctimer timer;
+
+PROCESS(i2c_callbacks_process, "I2C Callbacks Example Process");
+AUTOSTART_PROCESSES(&i2c_callbacks_process);
+/*---------------------------------------------------------------------------*/
+static void
+rx(void)
+{
+  /* The value below is programmed into this register in pwm_pca9685_init(). */
+  printf("%s expected value: %x\n",
+         (rx_data == (1 << 5)) ? "Received" : "Did not receive",
+         (unsigned)rx_data);
+}
+/*---------------------------------------------------------------------------*/
+static void
+tx(void)
+{
+  rx_data = 0;
+
+  quarkX1000_i2c_read(&rx_data, sizeof(rx_data), PWM_PCA9685_0_I2C_ADDR);
+}
+/*---------------------------------------------------------------------------*/
+static void
+err(void)
+{
+  printf("Something went wrong. err() callback has been called.\n");
+}
+/*---------------------------------------------------------------------------*/
+static void
+timeout(void *data)
+{
+  quarkX1000_i2c_write(&tx_data, sizeof(tx_data), PWM_PCA9685_0_I2C_ADDR);
+
+  ctimer_reset(&timer);
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(i2c_callbacks_process, ev, data)
+{
+  PROCESS_BEGIN();
+
+  quarkX1000_i2c_set_callbacks(rx, tx, err);
+
+  ctimer_set(&timer, CLOCK_SECOND * 5, timeout, NULL);
+
+  printf("I2C callbacks example is running\n");
+
+  PROCESS_YIELD();
+
+  PROCESS_END();
+}

From 1f445172ff06e30c8c0f82022817dd94417e6ec4 Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Wed, 6 Jan 2016 20:55:21 -0800
Subject: [PATCH 034/393] galileo: Fix build help message in examples

This patch fixes examples/galileo/Makefile so that it actually
displays the intended help message when an unrecognized EXAMPLE is
selected.
---
 examples/galileo/Makefile | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/examples/galileo/Makefile b/examples/galileo/Makefile
index 2954adc38..f925f565a 100644
--- a/examples/galileo/Makefile
+++ b/examples/galileo/Makefile
@@ -2,17 +2,15 @@ TARGET=galileo
 
 KNOWN_EXAMPLES = gpio-input gpio-output gpio-interrupt i2c-LSM9DS0 i2c-callbacks
 
-ifneq ($(filter $(EXAMPLE),$(KNOWN_EXAMPLES)),)
-  CONTIKI_PROJECT = $(EXAMPLE)
-else
-  CONTIKI_PROJECT = help
+ifeq ($(filter $(EXAMPLE),$(KNOWN_EXAMPLES)),)
+    $(info Set the variable EXAMPLE to one of the following Galileo-specific examples:)
+    $(foreach EXAMPLE,$(KNOWN_EXAMPLES),$(info - $(EXAMPLE)))
+    $(error Unable to proceed)
 endif
 
+CONTIKI_PROJECT = $(EXAMPLE)
+
 all: $(CONTIKI_PROJECT)
 
 CONTIKI = ../..
 include $(CONTIKI)/Makefile.include
-
-help:
-	@echo -e "\nSet the variable EXAMPLE to one of the following Galileo-specific examples:"
-	@for EXAMPLE in $(KNOWN_EXAMPLES); do echo $$EXAMPLE; done

From 151f532225d4ccf1d5618d2112b2b6555d5d144a Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Mon, 22 Feb 2016 10:34:48 +0100
Subject: [PATCH 035/393] Adapted the TMP102 sensor to Contiki's sensor API

---
 examples/zolertia/z1/test-tmp102.c |  11 +--
 platform/z1/dev/tmp102.c           | 137 +++++++++++++++--------------
 platform/z1/dev/tmp102.h           |  65 ++++----------
 3 files changed, 95 insertions(+), 118 deletions(-)

diff --git a/examples/zolertia/z1/test-tmp102.c b/examples/zolertia/z1/test-tmp102.c
index 5d8be7a08..ab5e7aca8 100644
--- a/examples/zolertia/z1/test-tmp102.c
+++ b/examples/zolertia/z1/test-tmp102.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Zolertia(TM) is a trademark of Advancare,SL
+ * Copyright (c) 2010-2016, Zolertia <http://www.zolertia.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,9 +32,10 @@
 /*---------------------------------------------------------------------------*/
 /**
  * \file
- *         A quick program for testing the tmp102 driver in the Z1 platform
+ *         A quick program for testing the tmp102 sensor in the Z1 platform
  * \author
  *         Enric M. Calvo <ecalvo@zolertia.com>
+ *         Antonio Lignan <alinan@zolertia.com>
  */
 /*---------------------------------------------------------------------------*/
 #include <stdio.h>
@@ -44,7 +45,7 @@
 /*---------------------------------------------------------------------------*/
 #define TMP102_READ_INTERVAL (CLOCK_SECOND / 2)
 /*---------------------------------------------------------------------------*/
-PROCESS(temp_process, "Test Temperature process");
+PROCESS(temp_process, "TMP102 Temperature sensor process");
 AUTOSTART_PROCESSES(&temp_process);
 /*---------------------------------------------------------------------------*/
 static struct etimer et;
@@ -55,12 +56,12 @@ PROCESS_THREAD(temp_process, ev, data)
 
   int16_t temp;
 
-  tmp102_init();
+  SENSORS_ACTIVATE(tmp102);
 
   while(1) {
     etimer_set(&et, TMP102_READ_INTERVAL);
     PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
-    temp = tmp102_read_temp_x100();
+    temp = tmp102.value(TMP102_READ);
     printf("Temp = %d\n", temp);
   }
   PROCESS_END();
diff --git a/platform/z1/dev/tmp102.c b/platform/z1/dev/tmp102.c
index cc9394b7b..4bf267246 100644
--- a/platform/z1/dev/tmp102.c
+++ b/platform/z1/dev/tmp102.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010, Swedish Institute of Computer Science.
+ * Copyright (c) 2016, Zolertia <http://www.zolertia.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,65 +30,55 @@
  * This file is part of the Contiki operating system.
  *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
  * \file
  *         Device drivers for tmp102 temperature sensor in Zolertia Z1.
  * \author
  *         Enric M. Calvo, Zolertia <ecalvo@zolertia.com>
  *         Marcus Lundén, SICS <mlunden@sics.se>
+ *         Antonio Lignan, Zolertia <alinan@zolertia.com>
  */
-
+/*---------------------------------------------------------------------------*/
 #include <stdio.h>
 #include "contiki.h"
 #include "i2cmaster.h"
 #include "tmp102.h"
-
-/* Bitmasks and bit flag variable for keeping track of tmp102 status. */
-enum TMP102_STATUSTYPES {
-  /* must be a bit and not more, not using 0x00. */
-  INITED = 0x01,
-  RUNNING = 0x02,
-  STOPPED = 0x04,
-  LOW_POWER = 0x08,
-  AAA = 0x10,     /* available to extend this... */
-  BBB = 0x20,     /* available to extend this... */
-  CCC = 0x40,     /* available to extend this... */
-  DDD = 0x80      /* available to extend this... */
-};
-static enum TMP102_STATUSTYPES _TMP102_STATUS = 0x00;
-
+#include "lib/sensors.h"
 /*---------------------------------------------------------------------------*/
-/* PROCESS(tmp102_process, "Temperature Sensor process"); */
-
+#define DEBUG 0
+#if DEBUG
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+/*---------------------------------------------------------------------------*/
+static uint8_t enabled;
 /*---------------------------------------------------------------------------*/
-/* Init the temperature sensor: ports, pins, registers, interrupts (none enabled), I2C,
-    default threshold values etc. */
-
 void
 tmp102_init(void)
 {
-  if(!(_TMP102_STATUS & INITED)) {
-    PRINTFDEBUG("TMP102 init\n");
-    _TMP102_STATUS |= INITED;
-    /* Power Up TMP102 via pin */
-    TMP102_PWR_DIR |= TMP102_PWR_PIN;
-    TMP102_PWR_SEL &= ~TMP102_PWR_SEL;
-    TMP102_PWR_SEL2 &= ~TMP102_PWR_SEL;
-    TMP102_PWR_REN &= ~TMP102_PWR_SEL;
-    TMP102_PWR_OUT |= TMP102_PWR_PIN;
+  /* Power Up TMP102 via pin */
+  TMP102_PWR_DIR |= TMP102_PWR_PIN;
+  TMP102_PWR_SEL &= ~TMP102_PWR_SEL;
+  TMP102_PWR_SEL2 &= ~TMP102_PWR_SEL;
+  TMP102_PWR_REN &= ~TMP102_PWR_SEL;
+  TMP102_PWR_OUT |= TMP102_PWR_PIN;
 
-    /* Set up ports and pins for I2C communication */
-    i2c_enable();
-  }
+  /* Set up ports and pins for I2C communication */
+  i2c_enable();
+
+  enabled = 1;
+}
+/*---------------------------------------------------------------------------*/
+void
+tmp102_stop(void)
+{
+  /* Power off */
+  TMP102_PWR_OUT &= ~TMP102_PWR_PIN;
+  enabled = 0;
 }
 /*---------------------------------------------------------------------------*/
-/* Write to a 16-bit register.
-    args:
-      reg       register to write to
-      val       value to write
- */
-
 void
 tmp102_write_reg(uint8_t reg, uint16_t val)
 {
@@ -98,26 +89,20 @@ tmp102_write_reg(uint8_t reg, uint16_t val)
 
   i2c_transmitinit(TMP102_ADDR);
   while(i2c_busy());
-  PRINTFDEBUG("I2C Ready to TX\n");
+  PRINTF("I2C Ready to TX\n");
 
   i2c_transmit_n(3, tx_buf);
   while(i2c_busy());
-  PRINTFDEBUG("WRITE_REG 0x%04X @ reg 0x%02X\n", val, reg);
+  PRINTF("WRITE_REG 0x%04X @ reg 0x%02X\n", val, reg);
 }
 /*---------------------------------------------------------------------------*/
-/* Read register.
-    args:
-      reg       what register to read
-    returns the value of the read register type uint16_t
- */
-
 uint16_t
 tmp102_read_reg(uint8_t reg)
 {
   uint8_t buf[] = { 0x00, 0x00 };
   uint16_t retVal = 0;
   uint8_t rtx = reg;
-  PRINTFDEBUG("READ_REG 0x%02X\n", reg);
+  PRINTF("READ_REG 0x%02X\n", reg);
 
   /* transmit the register to read */
   i2c_transmitinit(TMP102_ADDR);
@@ -136,19 +121,14 @@ tmp102_read_reg(uint8_t reg)
   return retVal;
 }
 /*---------------------------------------------------------------------------*/
-/* Read temperature in a raw format. Further processing will be needed
-   to make an interpretation of these 12 or 13-bit data, depending on configuration
- */
-
 uint16_t
 tmp102_read_temp_raw(void)
 {
   uint16_t rd = 0;
-
   rd = tmp102_read_reg(TMP102_TEMP);
-
   return rd;
 }
+/*---------------------------------------------------------------------------*/
 int16_t
 tmp102_read_temp_x100(void)
 {
@@ -167,24 +147,47 @@ tmp102_read_temp_x100(void)
   /* Integer part of the temperature value and percents*/
   temp_int = (abstemp >> 8) * sign * 100;
   temp_int += ((abstemp & 0xff) * 100) / 0x100;
-
-  /* See test-tmp102.c on how to print values of temperature with decimals
-     fractional part in 1/10000 of degree
-     temp_frac = ((abstemp >>4) % 16) * 625;
-     Data could be multiplied by 63 to have less bit-growth and 1/1000 precision
-     Data could be multiplied by 64 (<< 6) to trade-off precision for speed
-   */
-
   return temp_int;
 }
 /*---------------------------------------------------------------------------*/
-/* Simple Read temperature. Return is an integer with temperature in 1deg. precision
-   Return value is a signed 8 bit integer.
- */
-
 int8_t
 tmp102_read_temp_simple(void)
 {
   /* Casted to int8_t: We don't expect temperatures outside -128 to 127 C */
   return tmp102_read_temp_x100() / 100;
 }
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int value)
+{
+  if(type != SENSORS_ACTIVE) {
+    return TMP102_ERROR;
+  }
+  if(value) {
+    tmp102_init();
+  } else {
+    tmp102_stop();
+  }
+  enabled = value;
+  return TMP102_SUCCESS;
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+  case SENSORS_READY:
+    return enabled;
+  }
+  return TMP102_SUCCESS;
+}
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  return (int)tmp102_read_temp_x100();
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(tmp102, TMP102_SENSOR, value, configure, status);
+/*---------------------------------------------------------------------------*/
diff --git a/platform/z1/dev/tmp102.h b/platform/z1/dev/tmp102.h
index 777577747..cf7a71eb8 100644
--- a/platform/z1/dev/tmp102.h
+++ b/platform/z1/dev/tmp102.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010, Swedish Institute of Computer Science.
+ * Copyright (c) 2016, Zolertia <http://www.zolertia.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,75 +33,47 @@
 
 /**
  * \file
- *         Device drivers header file for tmp102 temperature sensor in Zolertia Z1 WSN Platform.
+ *         Device drivers header file for tmp102 temperature sensor in Zolertia
+ *         Z1 WSN Platform.
  * \author
  *         Enric M. Calvo, Zolertia <ecalvo@zolertia.com>
  *         Marcus Lundén, SICS <mlunden@sics.se>
+ *         Antonio Lignan, Zolertia <alinan@zolertia.com>
  */
-
+/* -------------------------------------------------------------------------- */
 #ifndef TMP102_H_
 #define TMP102_H_
 #include <stdio.h>
+#include "lib/sensors.h"
 #include "i2cmaster.h"
-
 /* -------------------------------------------------------------------------- */
-/* Init the temperature sensor: ports, pins, I2C, interrupts (XXX none so far),
-*/
-void  tmp102_init(void);
-
-/* Write to a register.
-    args:
-      reg       register to write to
-      val       value to write
-*/
-void    tmp102_write_reg(uint8_t reg, uint16_t val);
-
-/* Read one register.
-    args:
-      reg       what register to read
-    returns the value of the read register
-*/
+void tmp102_init(void);
+void tmp102_write_reg(uint8_t reg, uint16_t val);
 uint16_t tmp102_read_reg(uint8_t reg);
-
-/* Read temperature in raw format
-    no args needed
-*/
 uint16_t tmp102_read_temp_raw();
-
-/* Read only integer part of the temperature in 1deg. precision.
-    no args needed
-*/
 int8_t tmp102_read_temp_simple();
-
-/* Read only integer part of the temperature in 1deg. precision.
-    no args needed
-*/
 int16_t tmp102_read_temp_x100();
-
 /* -------------------------------------------------------------------------- */
-/* Reference definitions */
-/* TMP102 slave address */
 #define TMP102_ADDR           0x48
-
-/* TMP102 registers */
-#define TMP102_TEMP           0x00    // read only
+#define TMP102_TEMP           0x00
 #define TMP102_CONF           0x01    
 #define TMP102_TLOW           0x02    
 #define TMP102_THIGH          0x03   
 
-/* TMP102 Ports */
-/* Accelerometer hardware ports, pins and registers on the msp430 µC */
+/* TMP102 pin-out */
 #define TMP102_PWR_DIR        P5DIR
 #define TMP102_PWR_SEL        P5SEL
 #define TMP102_PWR_SEL2       P5SEL2
 #define TMP102_PWR_REN        P5REN
 #define TMP102_PWR_OUT        P5OUT
-#define TMP102_PWR_PIN        (1<<0)          // P5.0
-//#define TMP102_INT_PIN      (1<<7)          // P1.7
-
-
+#define TMP102_PWR_PIN        (1<<0) /* P5.0 */
+/* -------------------------------------------------------------------------- */
+#define TMP102_SUCCESS        0
+#define TMP102_ERROR          (-1)
+#define TMP102_READ           0x01
+/* -------------------------------------------------------------------------- */
+#define TMP102_SENSOR         "TMP102 sensor"
+/* -------------------------------------------------------------------------- */
+extern const struct sensors_sensor tmp102;
 /* -------------------------------------------------------------------------- */
 #endif /* ifndef TMP102_H_ */
-
-
-

From 1be30d52dc5ee2d377dcfdfcb3e8bbd946c9aeac Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Mon, 22 Feb 2016 11:24:50 +0100
Subject: [PATCH 036/393] Removed unused blocks and made functions static

---
 examples/zolertia/z1/test-adxl345.c |  18 +-
 platform/z1/dev/adxl345.c           | 240 ++++++++------------------
 platform/z1/dev/adxl345.h           | 259 +++++++++++-----------------
 3 files changed, 182 insertions(+), 335 deletions(-)

diff --git a/examples/zolertia/z1/test-adxl345.c b/examples/zolertia/z1/test-adxl345.c
index 259c46fde..e33981f76 100644
--- a/examples/zolertia/z1/test-adxl345.c
+++ b/examples/zolertia/z1/test-adxl345.c
@@ -42,10 +42,7 @@
 
 #include <stdio.h>
 #include "contiki.h"
-#include "serial-shell.h"
-#include "shell-ps.h"
-#include "shell-file.h"
-#include "shell-text.h"
+#include "dev/leds.h"
 #include "dev/adxl345.h"
 /*---------------------------------------------------------------------------*/
 #define LED_INT_ONTIME        (CLOCK_SECOND / 2)
@@ -91,7 +88,7 @@ print_int(uint16_t reg)
 void
 accm_ff_cb(uint8_t reg)
 {
-  L_ON(LEDS_B);
+  leds_on(LEDS_BLUE);
   process_post(&led_process, led_off_event, NULL);
   printf("~~[%u] Freefall detected! (0x%02X) -- ",
          ((uint16_t)clock_time()) / 128, reg);
@@ -105,11 +102,11 @@ accm_tap_cb(uint8_t reg)
 {
   process_post(&led_process, led_off_event, NULL);
   if(reg & ADXL345_INT_DOUBLETAP) {
-    L_ON(LEDS_G);
+    leds_on(LEDS_GREEN);
     printf("~~[%u] DoubleTap detected! (0x%02X) -- ",
            ((uint16_t)clock_time()) / 128, reg);
   } else {
-    L_ON(LEDS_R);
+    leds_on(LEDS_RED);
     printf("~~[%u] Tap detected! (0x%02X) -- ",
            ((uint16_t)clock_time()) / 128, reg);
   }
@@ -122,7 +119,7 @@ PROCESS_THREAD(led_process, ev, data) {
     PROCESS_WAIT_EVENT_UNTIL(ev == led_off_event);
     etimer_set(&led_etimer, LED_INT_ONTIME);
     PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&led_etimer));
-    L_OFF(LEDS_R + LEDS_G + LEDS_B);
+    leds_off(LEDS_RED + LEDS_GREEN + LEDS_BLUE);
   }
   PROCESS_END();
 }
@@ -133,11 +130,6 @@ PROCESS_THREAD(accel_process, ev, data) {
   {
     int16_t x, y, z;
 
-    serial_shell_init();
-    shell_ps_init();
-    shell_file_init();  /* for printing out files */
-    shell_text_init();  /* for binprint */
-
     /* Register the event used for lighting up an LED when interrupt strikes. */
     led_off_event = process_alloc_event();
 
diff --git a/platform/z1/dev/adxl345.c b/platform/z1/dev/adxl345.c
index df653d7f8..512881d59 100644
--- a/platform/z1/dev/adxl345.c
+++ b/platform/z1/dev/adxl345.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010, Swedish Institute of Computer Science.
+ * Copyright (c) 2016, Zolertia <http://www.zolertia.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,59 +30,42 @@
  * This file is part of the Contiki operating system.
  *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
  * \file
  *         Device drivers for adxl345 accelerometer in Zolertia Z1.
  * \author
  *         Marcus Lundén, SICS <mlunden@sics.se>
  *         Enric M. Calvo, Zolertia <ecalvo@zolertia.com>
+ *         Antonio Lignan, Zolertia <alinan@zolertia.com>
  */
-
-
+/*---------------------------------------------------------------------------*/
 #include <stdio.h>
 #include "contiki.h"
 #include "adxl345.h"
 #include "cc2420.h"
 #include "i2cmaster.h"
 #include "isr_compat.h"
-
+/*---------------------------------------------------------------------------*/
 /* Callback pointers when interrupt occurs */
 void (*accm_int1_cb)(uint8_t reg);
 void (*accm_int2_cb)(uint8_t reg);
-
-process_event_t int1_event, int2_event;
-
+/*---------------------------------------------------------------------------*/
 /* Bitmasks for the interrupts */
 static uint16_t int1_mask = 0, int2_mask = 0;
 
-/* Keep track of when the interrupt was last seen in order to reduce the amount
-  of interrupts. Kind of like button debouncing. This can't be per int-pin, as
-  there can be several very different int per pin (eg tap && freefall). */
-// XXX Not used now, only one global timer.
-//static volatile clock_time_t ints_lasttime[] = {0, 0, 0, 0, 0, 0, 0, 0};
+/* Default values for adxl345 at startup.
+ * This will be sent to the adxl345 in a
+ * stream at init to set it up in a default state
+ */
 
-/* Bitmasks and bit flag variable for keeping track of adxl345 status. */
-enum ADXL345_STATUSTYPES {
-    /* must be a bit and not more, not using 0x00. */
-    INITED = 0x01,
-    RUNNING = 0x02,
-    STOPPED = 0x04,
-    LOW_POWER = 0x08,
-    AAA = 0x10,   // available to extend this...
-    BBB = 0x20,   // available to extend this...
-    CCC = 0x40,   // available to extend this...
-    DDD = 0x80,   // available to extend this...
-};
-static enum ADXL345_STATUSTYPES _ADXL345_STATUS = 0x00;
-
-/* Default values for adxl345 at startup. This will be sent to the adxl345 in a
-    stream at init to set it up in a default state */
 static uint8_t adxl345_default_settings[] = {
   /* Note, as the two first two bulks are to be written in a stream, they contain
-    the register address as first byte in that section. */
-  /* 0--14 are in one stream, start at ADXL345_THRESH_TAP */
-  ADXL345_THRESH_TAP,         // XXX NB Register address, not register value!!
+   * the register address as first byte in that section.
+   * 0--14 are in one stream, start at ADXL345_THRESH_TAP
+   */
+  /* XXX NB Register address, not register value!! */
+  ADXL345_THRESH_TAP,
   ADXL345_THRESH_TAP_DEFAULT,
   ADXL345_OFSX_DEFAULT,
   ADXL345_OFSY_DEFAULT,
@@ -98,7 +82,8 @@ static uint8_t adxl345_default_settings[] = {
   ADXL345_TAP_AXES_DEFAULT,
 
   /* 15--19 start at ADXL345_BW_RATE */
-  ADXL345_BW_RATE,    // XXX NB Register address, not register value!!
+  /* XXX NB Register address, not register value!! */
+  ADXL345_BW_RATE,    
   ADXL345_BW_RATE_DEFAULT,
   ADXL345_POWER_CTL_DEFAULT,
   ADXL345_INT_ENABLE_DEFAULT,
@@ -108,18 +93,10 @@ static uint8_t adxl345_default_settings[] = {
   ADXL345_DATA_FORMAT_DEFAULT,
   ADXL345_FIFO_CTL_DEFAULT
 };
-
-
 /*---------------------------------------------------------------------------*/
 PROCESS(accmeter_process, "Accelerometer process");
 /*---------------------------------------------------------------------------*/
-/* Write to a register.
-    args:
-      reg       register to write to
-      val       value to write
-*/
-
-void
+static void
 accm_write_reg(uint8_t reg, uint8_t val) {
   uint8_t tx_buf[] = {reg, val};
 
@@ -132,15 +109,10 @@ accm_write_reg(uint8_t reg, uint8_t val) {
   PRINTFDEBUG("WRITE_REG 0x%02X @ reg 0x%02X\n", val, reg);
 }
 /*---------------------------------------------------------------------------*/
-/* Write several registers from a stream.
-    args:
-      len       number of bytes to read
-      data      pointer to where the data is read from
-
-  First byte in stream must be the register address to begin writing to.
-  The data is then written from second byte and increasing. */
-
-void
+/* First byte in stream must be the register address to begin writing to.
+ * The data is then written from second byte and increasing.
+ */
+static void
 accm_write_stream(uint8_t len, uint8_t *data) {
   i2c_transmitinit(ADXL345_ADDR);
   while (i2c_busy());
@@ -152,13 +124,7 @@ accm_write_stream(uint8_t len, uint8_t *data) {
 }
 
 /*---------------------------------------------------------------------------*/
-/* Read one register.
-    args:
-      reg       what register to read
-    returns the value of the read register
-*/
-
-uint8_t
+static uint8_t
 accm_read_reg(uint8_t reg) {
   uint8_t retVal = 0;
   uint8_t rtx = reg;
@@ -178,16 +144,8 @@ accm_read_reg(uint8_t reg) {
 
   return retVal;
 }
-
 /*---------------------------------------------------------------------------*/
-/* Read several registers in a stream.
-    args:
-      reg       what register to start reading from
-      len       number of bytes to read
-      whereto   pointer to where the data is saved
-*/
-
-void
+static void
 accm_read_stream(uint8_t reg, uint8_t len, uint8_t *whereto) {
   uint8_t rtx = reg;
   PRINTFDEBUG("READ_STR %u B from 0x%02X\n", len, reg);
@@ -206,11 +164,12 @@ accm_read_stream(uint8_t reg, uint8_t len, uint8_t *whereto) {
 }
 
 /*---------------------------------------------------------------------------*/
-/* Read an axis of the accelerometer (x, y or z). Return value is a signed 10 bit int.
-  The resolution of the acceleration measurement can be increased up to 13 bit, but
-  will change the data format of this read out. Refer to the data sheet if so is
-  wanted/needed. */
-
+/* Read an axis of the accelerometer (x, y or z). Return value is a signed
+ * 10 bit int.
+ * The resolution of the acceleration measurement can be increased up to 13 bit,
+ * but will change the data format of this read out. Refer to the data sheet if
+ * so is wanted/needed.
+ */
 int16_t
 accm_read_axis(enum ADXL345_AXIS axis){
   int16_t rd = 0;
@@ -224,73 +183,54 @@ accm_read_axis(enum ADXL345_AXIS axis){
 }
 
 /*---------------------------------------------------------------------------*/
-/* Sets the g-range, ie the range the accelerometer measures (ie 2g means -2 to +2 g
-    on every axis). Possible values:
-        ADXL345_RANGE_2G
-        ADXL345_RANGE_4G
-        ADXL345_RANGE_8G
-        ADXL345_RANGE_16G
-    Example:
-        accm_set_grange(ADXL345_RANGE_4G);
-    */
-
 void
 accm_set_grange(uint8_t grange){
   if(grange > ADXL345_RANGE_16G) {
-    // invalid g-range.
     PRINTFDEBUG("ADXL grange invalid: %u\n", grange);
     return;
   }
+
   uint8_t tempreg = 0;
 
-  /* preserve the previous contents of the register */
-  tempreg = (accm_read_reg(ADXL345_DATA_FORMAT) & 0xFC);  // zero out the last two bits (grange)
-  tempreg |= grange;                                      // set new range
+  /* Keep the previous contents of the register, zero out the last two bits */
+  tempreg = (accm_read_reg(ADXL345_DATA_FORMAT) & 0xFC);
+  tempreg |= grange;
   accm_write_reg(ADXL345_DATA_FORMAT, tempreg);
 }
 
 /*---------------------------------------------------------------------------*/
-/* Init the accelerometer: ports, pins, registers, interrupts (none enabled), I2C,
-    default threshold values etc. */
-
 void
 accm_init(void) {
-  if(!(_ADXL345_STATUS & INITED)){
-    PRINTFDEBUG("ADXL345 init\n");
-    _ADXL345_STATUS |= INITED;
-    accm_int1_cb = NULL;
-    accm_int2_cb = NULL;
-    int1_event = process_alloc_event();
-    int2_event = process_alloc_event();
+  PRINTFDEBUG("ADXL345 init\n");
+  accm_int1_cb = NULL;
+  accm_int2_cb = NULL;
 
-    /* Set up ports and pins for interrups. */
-    ADXL345_DIR  &=~ (ADXL345_INT1_PIN | ADXL345_INT2_PIN);
-    ADXL345_SEL  &=~ (ADXL345_INT1_PIN | ADXL345_INT2_PIN);
-    ADXL345_SEL2 &=~ (ADXL345_INT1_PIN | ADXL345_INT2_PIN);
+  /* Set up ports and pins for interrups. */
+  ADXL345_DIR  &=~ (ADXL345_INT1_PIN | ADXL345_INT2_PIN);
+  ADXL345_SEL  &=~ (ADXL345_INT1_PIN | ADXL345_INT2_PIN);
+  ADXL345_SEL2 &=~ (ADXL345_INT1_PIN | ADXL345_INT2_PIN);
 
-    /* Set up ports and pins for I2C communication */
-    i2c_enable();
+  /* Set up ports and pins for I2C communication */
+  i2c_enable();
 
-    /* set default register values. */
-    accm_write_stream(15, &adxl345_default_settings[0]);
-    accm_write_stream(5, &adxl345_default_settings[15]);
-    accm_write_reg(ADXL345_DATA_FORMAT, adxl345_default_settings[20]);
-    accm_write_reg(ADXL345_FIFO_CTL, adxl345_default_settings[21]);
+  /* set default register values. */
+  accm_write_stream(15, &adxl345_default_settings[0]);
+  accm_write_stream(5, &adxl345_default_settings[15]);
+  accm_write_reg(ADXL345_DATA_FORMAT, adxl345_default_settings[20]);
+  accm_write_reg(ADXL345_FIFO_CTL, adxl345_default_settings[21]);
 
-    process_start(&accmeter_process, NULL);
+  process_start(&accmeter_process, NULL);
 
-    /* Enable msp430 interrupts on the two interrupt pins. */
-    dint();
-    ADXL345_IES &=~ (ADXL345_INT1_PIN | ADXL345_INT2_PIN);   // low to high transition interrupts
-    ADXL345_IE |= (ADXL345_INT1_PIN | ADXL345_INT2_PIN);     // enable interrupts
-    eint();
-  }
+  /* Enable msp430 interrupts on the two interrupt pins. */
+  dint();
+  /* low to high transition interrupts */
+  ADXL345_IES &=~ (ADXL345_INT1_PIN | ADXL345_INT2_PIN);
+  /* enable interrupts */
+  ADXL345_IE |= (ADXL345_INT1_PIN | ADXL345_INT2_PIN);
+  eint();
 }
 
 /*---------------------------------------------------------------------------*/
-/* Map interrupt (FF, tap, dbltap etc) to interrupt pin (IRQ_INT1, IRQ_INT2).
-    This must come after accm_init() as the registers will otherwise be overwritten. */
-    
 void
 accm_set_irq(uint8_t int1, uint8_t int2){
   /* Set the corresponding interrupt mapping to INT1 or INT2 */
@@ -302,44 +242,16 @@ accm_set_irq(uint8_t int1, uint8_t int2){
   accm_write_reg(ADXL345_INT_ENABLE, (int1 | int2));
   accm_write_reg(ADXL345_INT_MAP, int2);  // int1 bits are zeroes in the map register so this is for both ints
 }
-
-/*---------------------------------------------------------------------------*/
-#if 0
-/* now unused code that is later supposed to be turned into keeping track of every
-    interrupt by themselves instead of only one per INT1/2 */
-
-/* XXX MUST HAVE some way of resetting the time so that we are not suppressing
-        erronous due to clock overflow.... XXX XXX XXX */
-/* Table with back off time periods */
-static volatile clock_time_t ints_backoffs[] = {ADXL345_INT_OVERRUN_BACKOFF, ADXL345_INT_WATERMARK_BACKOFF,
-                                                ADXL345_INT_FREEFALL_BACKOFF, ADXL345_INT_INACTIVITY_BACKOFF,
-                                                ADXL345_INT_ACTIVITY_BACKOFF, ADXL345_INT_DOUBLETAP_BACKOFF,
-                                                ADXL345_INT_TAP_BACKOFF, ADXL345_INT_DATAREADY_BACKOFF};
-
-/*---------------------------------------------------------------------------*/
-/* Checks to see if an event occurred after backoff period (returns time period
-    past since) or not (returns 0) */
-
-static clocktime_t
-backoff_passed(clocktime_t happenedAt, const clocktime_t backoff){
-  if(timenow-lasttime >= backoff) {
-    return 0;
-  } else {
-    return (timenow-lasttime);
-  }
-}
-#endif
 /*---------------------------------------------------------------------------*/
 /* Invoked after an interrupt happened. Reads the interrupt source reg at the
-  accelerometer, which resets the interrupts, and invokes the corresponding
-  callback. It passes the source register value so the callback can determine
-  what interrupt happened, if several interrupts are mapped to the same pin. */
-
+ * accelerometer, which resets the interrupts, and invokes the corresponding
+ * callback. It passes the source register value so the callback can determine
+ * what interrupt happened, if several interrupts are mapped to the same pin.
+ */
 static void
 poll_handler(void){
   uint8_t ireg = 0;
   ireg = accm_read_reg(ADXL345_INT_SOURCE);
-  //printf("0x%02X, 0x%02X, 0x%02X, 0x%02X\n", ireg, ireg2, int1_mask, int2_mask);
 
   /* Invoke callbacks for the corresponding interrupts */
   if(ireg & int1_mask){
@@ -354,33 +266,32 @@ poll_handler(void){
     }
   }
 }
-
 /*---------------------------------------------------------------------------*/
-/* This process is sleeping until an interrupt from the accelerometer occurs, which
-    polls this process from the interrupt service routine. */
-
+/* This process is sleeping until an interrupt from the accelerometer occurs,
+ * which polls this process from the interrupt service routine. */
 PROCESS_THREAD(accmeter_process, ev, data) {
   PROCESS_POLLHANDLER(poll_handler());
   PROCESS_EXITHANDLER();
   PROCESS_BEGIN();
   while(1){
-    PROCESS_WAIT_EVENT_UNTIL(0);    // should do nothing in while loop.
+    PROCESS_WAIT_EVENT_UNTIL(0);
   }
   PROCESS_END();
 }
-
 /*---------------------------------------------------------------------------*/
-/* XXX This interrupt vector is shared with the interrupts from CC2420, so that
-  was moved here but should find a better home. XXX */
-
-#if 1
+/* This interrupt vector is shared with the interrupts from CC2420, so that
+ * was moved here
+ */
 static struct timer suppressTimer1, suppressTimer2;
 
 ISR(PORT1, port1_isr)
 {
   ENERGEST_ON(ENERGEST_TYPE_IRQ);
-  /* ADXL345_IFG.x goes high when interrupt occurs, use to check what interrupted */
-  if ((ADXL345_IFG & ADXL345_INT1_PIN) && !(ADXL345_IFG & BV(CC2420_FIFOP_PIN))){
+
+  /* ADXL345_IFG.x goes high when interrupt occurs, use to check what
+   * interrupted
+   */
+  if((ADXL345_IFG & ADXL345_INT1_PIN) && !(ADXL345_IFG & BV(CC2420_FIFOP_PIN))){
     /* Check if this should be suppressed or not */
     if(timer_expired(&suppressTimer1)) {
       timer_set(&suppressTimer1, SUPPRESS_TIME_INT1);
@@ -388,11 +299,13 @@ ISR(PORT1, port1_isr)
       process_poll(&accmeter_process);
       LPM4_EXIT;
     }
-  } else if ((ADXL345_IFG & ADXL345_INT2_PIN) && !(ADXL345_IFG & BV(CC2420_FIFOP_PIN))){
+  } else if((ADXL345_IFG & ADXL345_INT2_PIN) &&
+           !(ADXL345_IFG & BV(CC2420_FIFOP_PIN))){
     /* Check if this should be suppressed or not */
     if(timer_expired(&suppressTimer2)) {
       timer_set(&suppressTimer2, SUPPRESS_TIME_INT2);
-      ADXL345_IFG &= ~ADXL345_INT2_PIN;   // clear interrupt flag
+      /* clear interrupt flag */
+      ADXL345_IFG &= ~ADXL345_INT2_PIN;
       process_poll(&accmeter_process);
       LPM4_EXIT;
     }
@@ -404,7 +317,4 @@ ISR(PORT1, port1_isr)
   }
   ENERGEST_OFF(ENERGEST_TYPE_IRQ);
 }
-
 /*---------------------------------------------------------------------------*/
-
-#endif
diff --git a/platform/z1/dev/adxl345.h b/platform/z1/dev/adxl345.h
index 082572715..29179b319 100644
--- a/platform/z1/dev/adxl345.h
+++ b/platform/z1/dev/adxl345.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010, Swedish Institute of Computer Science.
+ * Copyright (c) 2016, Zolertia <http://www.zolertia.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,158 +30,105 @@
  * This file is part of the Contiki operating system.
  *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
  * \file
  *         Device drivers header file for adxl345 accelerometer in Zolertia Z1.
  * \author
  *         Marcus Lundén, SICS <mlunden@sics.se>
  *         Enric Calvo, Zolertia <ecalvo@zolertia.com>
+ *         Antonio Lignan, Zolertia <alinan@zolertia.com>
  */
-
+/*---------------------------------------------------------------------------*/
 #ifndef ADXL345_H_
 #define ADXL345_H_
 #include <stdio.h>
 #include "dev/i2cmaster.h"
-
-#define DEBUGLEDS 0
-#if DEBUGLEDS
-  #undef LEDS_ON(x)
-  #undef LEDS_OFF(x)
-  #define LEDS_ON(x)    (LEDS_PxOUT &= ~x)
-  #define LEDS_OFF(x)   (LEDS_PxOUT |= x)
-#else
-  #undef LEDS_ON
-  #undef LEDS_OFF
-  #define LEDS_ON(x)
-  #define LEDS_OFF(x)
-#endif
-
-#define LEDS_R        0x10
-#define LEDS_G        0x40
-#define LEDS_B        0x20
-#define L_ON(x)    (LEDS_PxOUT &= ~x)
-#define L_OFF(x)   (LEDS_PxOUT |= x)
-
-/* Used in accm_read_axis(), eg accm_read_axis(X_AXIS);*/
+/*---------------------------------------------------------------------------*/
+/* Used in accm_read_axis(), eg accm_read_axis(X_AXIS) */
 enum ADXL345_AXIS {
   X_AXIS = 0,
   Y_AXIS = 2,
   Z_AXIS = 4,
 };
-
 /* -------------------------------------------------------------------------- */
-/* Init the accelerometer: ports, pins, registers, interrupts (none enabled), I2C,
-    default threshold values etc. */
-void    accm_init(void);
+/* Init the accelerometer: ports, pins, registers, interrupts (none enabled),
+ * I2C, default threshold values etc.
+ */
+void accm_init(void);
 
-/* Write to a register.
-    args:
-      reg       register to write to
-      val       value to write
-*/
-void    accm_write_reg(uint8_t reg, uint8_t val);
-
-/* Write several registers from a stream.
-    args:
-      len       number of bytes to read
-      data      pointer to where the data is read from
-  First byte in stream must be the register address to begin writing to.
-  The data is then written from the second byte and increasing. The address byte
-  is not included in length len. */
-void    accm_write_stream(uint8_t len, uint8_t *data);
-
-/* Read one register.
-    args:
-      reg       what register to read
-    returns the value of the read register
-*/
-uint8_t    accm_read_reg(uint8_t reg);
-
-/* Read several registers in a stream.
-    args:
-      reg       what register to start reading from
-      len       number of bytes to read
-      whereto   pointer to where the data is saved
-*/
-void    accm_read_stream(uint8_t reg, uint8_t len, uint8_t *whereto);
-
-/* Read an axis of the accelerometer (x, y or z). Return value is a signed 10 bit int.
-  The resolution of the acceleration measurement can be increased up to 13 bit, but
-  will change the data format of this read out. Refer to the data sheet if so is
-  wanted/needed. */
+/* Read an axis of the accelerometer (x, y or z). Return value is a signed 10
+ * bit int.
+ * The resolution of the acceleration measurement can be increased up to 13 bit,
+ * but will change the data format of this read out. Refer to the data sheet if
+ * so is wanted/needed.
+ */
 int16_t accm_read_axis(enum ADXL345_AXIS axis);
 
-/* Sets the g-range, ie the range the accelerometer measures (ie 2g means -2 to +2 g
-    on every axis). Possible values:
-        ADXL345_RANGE_2G
-        ADXL345_RANGE_4G
-        ADXL345_RANGE_8G
-        ADXL345_RANGE_16G
-    Example:
-        accm_set_grange(ADXL345_RANGE_4G);
-    */
-void    accm_set_grange(uint8_t grange);
+/* Sets the g-range, ie the range the accelerometer measures (ie 2g means -2 to
+ * +2 g on every axis). Possible values:
+ * - ADXL345_RANGE_2G
+ * - ADXL345_RANGE_4G
+ * - ADXL345_RANGE_8G
+ * - ADXL345_RANGE_16G
+ */
+void accm_set_grange(uint8_t grange);
 
 /* Map interrupt (FF, tap, dbltap etc) to interrupt pin (IRQ_INT1, IRQ_INT2).
-    This must come after accm_init() as the registers will otherwise be overwritten. */
-void    accm_set_irq(uint8_t int1, uint8_t int2);
+ * This must come after accm_init() as the registers will otherwise be
+ * overwritten.
+ */
+void accm_set_irq(uint8_t int1, uint8_t int2);
 
 /* Macros for setting the pointers to callback functions from the interrupts.
-  The function will be called with an uint8_t as parameter, containing the interrupt
-  flag register from the ADXL345. That way, several interrupts can be mapped to
-  the same pin and be read from the  */
+ * The function will be called with an uint8_t as parameter, containing the
+ * interrupt flag register from the ADXL345. That way, several interrupts can be
+ * mapped to the same pin and be read
+ */
 #define ACCM_REGISTER_INT1_CB(ptr)   accm_int1_cb = ptr;
 #define ACCM_REGISTER_INT2_CB(ptr)   accm_int2_cb = ptr;
 /* -------------------------------------------------------------------------- */
 /* Application definitions, change if required by application. */
 
-/* Interrupt suppress periods */
-/*
-// XXX Not used yet.
-#define ADXL345_INT_OVERRUN_BACKOFF     CLOCK_SECOND/8
-#define ADXL345_INT_WATERMARK_BACKOFF   CLOCK_SECOND/8
-#define ADXL345_INT_FREEFALL_BACKOFF    CLOCK_SECOND/8
-#define ADXL345_INT_INACTIVITY_BACKOFF  CLOCK_SECOND/8
-#define ADXL345_INT_ACTIVITY_BACKOFF    CLOCK_SECOND/8
-#define ADXL345_INT_DOUBLETAP_BACKOFF   CLOCK_SECOND/8
-#define ADXL345_INT_TAP_BACKOFF         CLOCK_SECOND/8
-#define ADXL345_INT_DATAREADY_BACKOFF   CLOCK_SECOND/8
-*/
-/* Time after an interrupt that subsequent interrupts are suppressed. Should later
-  be turned into one specific time per type of interrupt (tap, freefall etc) */
+/* Time after an interrupt that subsequent interrupts are suppressed. Should
+ * later be turned into one specific time per type of interrupt (tap, freefall.
+ * etc)
+ */
 #define SUPPRESS_TIME_INT1    CLOCK_SECOND/4
 #define SUPPRESS_TIME_INT2    CLOCK_SECOND/4
 
 /* Suggested defaults according to the data sheet etc */
-#define ADXL345_THRESH_TAP_DEFAULT      0x48    // 4.5g (0x30 == 3.0g) (datasheet: 3g++)
-#define ADXL345_OFSX_DEFAULT            0x00    // for individual units calibration purposes
+#define ADXL345_THRESH_TAP_DEFAULT      0x48  /* 4.5g (0x30 == 3.0g) */
+#define ADXL345_OFSX_DEFAULT            0x00  /* for calibration only */
 #define ADXL345_OFSY_DEFAULT            0x00
 #define ADXL345_OFSZ_DEFAULT            0x00
-#define ADXL345_DUR_DEFAULT             0x20    // 20 ms (datasheet: 10ms++)
-#define ADXL345_LATENT_DEFAULT          0x50    // 100 ms (datasheet: 20ms++)
-#define ADXL345_WINDOW_DEFAULT          0xFF    // 320 ms (datasheet: 80ms++)
-#define ADXL345_THRESH_ACT_DEFAULT      0x15    // 1.3g (62.5 mg/LSB)
-#define ADXL345_THRESH_INACT_DEFAULT    0x08    // 0.5g (62.5 mg/LSB)
-#define ADXL345_TIME_INACT_DEFAULT      0x02    // 2 s (1 s/LSB)
-#define ADXL345_ACT_INACT_CTL_DEFAULT   0xFF    // all axis involved, ac-coupled
-#define ADXL345_THRESH_FF_DEFAULT       0x09    // 563 mg
-#define ADXL345_TIME_FF_DEFAULT         0x20    // 160 ms
-#define ADXL345_TAP_AXES_DEFAULT        0x07    // all axis, no suppression
+#define ADXL345_DUR_DEFAULT             0x20  /* 20 ms (datasheet: 10ms++) */
+#define ADXL345_LATENT_DEFAULT          0x50  /* 100 ms (datasheet: 20ms++) */
+#define ADXL345_WINDOW_DEFAULT          0xFF  /* 320 ms (datasheet: 80ms++) */
+#define ADXL345_THRESH_ACT_DEFAULT      0x15  /* 1.3g (62.5 mg/LSB) */
+#define ADXL345_THRESH_INACT_DEFAULT    0x08  /* 0.5g (62.5 mg/LSB) */
+#define ADXL345_TIME_INACT_DEFAULT      0x02  /* 2 s (1 s/LSB) */
+#define ADXL345_ACT_INACT_CTL_DEFAULT   0xFF  /* all axis, ac-coupled */
+#define ADXL345_THRESH_FF_DEFAULT       0x09  /* 563 mg */
+#define ADXL345_TIME_FF_DEFAULT         0x20  /* 60 ms */
+#define ADXL345_TAP_AXES_DEFAULT        0x07  /* all axis, no suppression */
 
-#define ADXL345_BW_RATE_DEFAULT         (0x00|ADXL345_SRATE_100)   // 100 Hz, normal operation
-#define ADXL345_POWER_CTL_DEFAULT       0x28	  // link bit set, no autosleep, start normal measuring
-#define ADXL345_INT_ENABLE_DEFAULT      0x00    // no interrupts enabled
-#define ADXL345_INT_MAP_DEFAULT         0x00    // all mapped to int_1
+#define ADXL345_BW_RATE_DEFAULT         (0x00 | ADXL345_SRATE_100) /* 100 Hz */
+/* link bit set, no autosleep, start normal measuring */
+#define ADXL345_POWER_CTL_DEFAULT       0x28
+#define ADXL345_INT_ENABLE_DEFAULT      0x00    /* no interrupts enabled */
+#define ADXL345_INT_MAP_DEFAULT         0x00    /* all mapped to int_1 */
 
 /* XXX NB: In the data format register, data format of axis readings is chosen
-  between left or right justify. This affects the position of the MSB/LSB and is
-  different depending on g-range and resolution. If changed, make sure this is
-  reflected in the _read_axis() function. Also, the resolution can be increased
-  from 10 bit to at most 13 bit, but this also changes position of MSB etc on data
-  format so check this in read_axis() too. */
-#define ADXL345_DATA_FORMAT_DEFAULT     (0x00|ADXL345_RANGE_2G)    // right-justify, 2g, 10-bit mode, int is active high
-#define ADXL345_FIFO_CTL_DEFAULT        0x00    // FIFO bypass mode
+ * between left or right justify. This affects the position of the MSB/LSB and is
+ * different depending on g-range and resolution. If changed, make sure this is
+ * reflected in the _read_axis() function. Also, the resolution can be increased
+ * from 10 bit to at most 13 bit, but this also changes position of MSB etc on data
+ * format so check this in read_axis() too.
+ */
+/* right-justify, 2g, 10-bit mode, int is active high */
+#define ADXL345_DATA_FORMAT_DEFAULT     (0x00 | ADXL345_RANGE_2G)
+#define ADXL345_FIFO_CTL_DEFAULT        0x00    /* FIFO bypass mode */
 
 /* -------------------------------------------------------------------------- */
 /* Reference definitions, should not be changed */
@@ -188,7 +136,7 @@ void    accm_set_irq(uint8_t int1, uint8_t int2);
 #define ADXL345_ADDR            0x53
 
 /* ADXL345 registers */
-#define ADXL345_DEVID           0x00    // read only
+#define ADXL345_DEVID           0x00
 /* registers 0x01 to 0x1C are reserved, do not access */
 #define ADXL345_THRESH_TAP      0x1D
 #define ADXL345_OFSX            0x1E
@@ -204,24 +152,24 @@ void    accm_set_irq(uint8_t int1, uint8_t int2);
 #define ADXL345_THRESH_FF       0x28
 #define ADXL345_TIME_FF         0x29
 #define ADXL345_TAP_AXES        0x2A
-#define ADXL345_ACT_TAP_STATUS  0x2B    // read only
+#define ADXL345_ACT_TAP_STATUS  0x2B
 #define ADXL345_BW_RATE         0x2C
 #define ADXL345_POWER_CTL       0x2D
 #define ADXL345_INT_ENABLE      0x2E
 #define ADXL345_INT_MAP         0x2F
-#define ADXL345_INT_SOURCE      0x30    // read only
+#define ADXL345_INT_SOURCE      0x30
 #define ADXL345_DATA_FORMAT     0x31
-#define ADXL345_DATAX0          0x32    // read only, LSByte X, two's complement
-#define ADXL345_DATAX1          0x33    // read only, MSByte X
-#define ADXL345_DATAY0          0x34    // read only, LSByte Y
-#define ADXL345_DATAY1          0x35    // read only, MSByte X
-#define ADXL345_DATAZ0          0x36    // read only, LSByte Z
-#define ADXL345_DATAZ1          0x37    // read only, MSByte X
+#define ADXL345_DATAX0          0x32  /* read only, LSByte X, two's complement */
+#define ADXL345_DATAX1          0x33  /* read only, MSByte X */
+#define ADXL345_DATAY0          0x34  /* read only, LSByte Y */
+#define ADXL345_DATAY1          0x35  /* read only, MSByte X */
+#define ADXL345_DATAZ0          0x36  /* read only, LSByte Z */
+#define ADXL345_DATAZ1          0x37  /* read only, MSByte X */
 #define ADXL345_FIFO_CTL        0x38
-#define ADXL345_FIFO_STATUS     0x39    // read only
+#define ADXL345_FIFO_STATUS     0x39  /* read only */
 
 /* ADXL345 interrupts */
-#define ADXL345_INT_DISABLE     0X00    // used for disabling interrupts
+#define ADXL345_INT_DISABLE     0X00  /* used for disabling interrupts */
 #define ADXL345_INT_OVERRUN     0X01
 #define ADXL345_INT_WATERMARK   0X02
 #define ADXL345_INT_FREEFALL    0X04
@@ -237,8 +185,8 @@ void    accm_set_irq(uint8_t int1, uint8_t int2);
 #define ADXL345_REN        P1REN
 #define ADXL345_SEL        P1SEL
 #define ADXL345_SEL2       P1SEL2
-#define ADXL345_INT1_PIN   (1<<6)            // P1.6
-#define ADXL345_INT2_PIN   (1<<7)            // P1.7
+#define ADXL345_INT1_PIN   (1<<6)    /* P1.6 */
+#define ADXL345_INT2_PIN   (1<<7)    /* P1.7 */
 #define ADXL345_IES        P1IES
 #define ADXL345_IE         P1IE
 #define ADXL345_IFG        P1IFG
@@ -251,43 +199,40 @@ void    accm_set_irq(uint8_t int1, uint8_t int2);
 #define ADXL345_RANGE_16G   0x03
 
 
-/* The adxl345 has programmable sample rates, but unexpected results may occur if the wrong 
-  rate and I2C bus speed is used (see datasheet p 17). Sample rates in Hz. This
-  setting does not change the internal sampling rate, just how often it is piped
-  to the output registers (ie the interrupt features use the full sample rate
-  internally).
+/* The adxl345 has programmable sample rates, but unexpected results may occur
+ * if the wrong  rate and I2C bus speed is used (see datasheet p 17). Sample
+ * rates in Hz. This setting does not change the internal sampling rate, just
+ * how often it is piped to the output registers (ie the interrupt features use
+ * the full sample rate internally).
+ * Example use:
+ *   adxl345_set_reg(ADXL345_BW_RATE, ((_ADXL345_STATUS & LOW_POWER)
+ *                  | ADXL345_SRATE_50));
+ */
 
-  Example use:
-    adxl345_set_reg(ADXL345_BW_RATE, ((_ADXL345_STATUS & LOW_POWER) | ADXL345_SRATE_50));
-  */
-#define ADXL345_SRATE_3200      0x0F    // XXX NB don't use at all as I2C data rate<= 400kHz (see datasheet)
-#define ADXL345_SRATE_1600      0x0E    // XXX NB don't use at all as I2C data rate<= 400kHz (see datasheet)
-#define ADXL345_SRATE_800       0x0D    // when I2C data rate == 400 kHz
-#define ADXL345_SRATE_400       0x0C    // when I2C data rate == 400 kHz
-#define ADXL345_SRATE_200       0x0B    // when I2C data rate >= 100 kHz
-#define ADXL345_SRATE_100       0x0A    // when I2C data rate >= 100 kHz
-#define ADXL345_SRATE_50        0x09    // when I2C data rate >= 100 kHz
-#define ADXL345_SRATE_25        0x08    // when I2C data rate >= 100 kHz
-#define ADXL345_SRATE_12_5      0x07    // 12.5 Hz, when I2C data rate >= 100 kHz
-#define ADXL345_SRATE_6_25      0x06    // when I2C data rate >= 100 kHz
-#define ADXL345_SRATE_3_13      0x05    // when I2C data rate >= 100 kHz
-#define ADXL345_SRATE_1_56      0x04    // when I2C data rate >= 100 kHz
-#define ADXL345_SRATE_0_78      0x03    // when I2C data rate >= 100 kHz
-#define ADXL345_SRATE_0_39      0x02    // when I2C data rate >= 100 kHz
-#define ADXL345_SRATE_0_20      0x01    // when I2C data rate >= 100 kHz
-#define ADXL345_SRATE_0_10      0x00    // 0.10 Hz, when I2C data rate >= 100 kHz
+/* XXX NB don't use at all as I2C data rate<= 400kHz */
+#define ADXL345_SRATE_3200    0x0F
+/* XXX NB don't use at all as I2C data rate<= 400kHz */
+#define ADXL345_SRATE_1600    0x0E
+#define ADXL345_SRATE_800     0x0D  /* when I2C data rate == 400 kHz */
+#define ADXL345_SRATE_400     0x0C  /* when I2C data rate == 400 kHz */
+#define ADXL345_SRATE_200     0x0B  /* when I2C data rate >= 100 kHz */
+#define ADXL345_SRATE_100     0x0A  /* when I2C data rate >= 100 kHz */
+#define ADXL345_SRATE_50      0x09  /* when I2C data rate >= 100 kHz */
+#define ADXL345_SRATE_25      0x08  /* when I2C data rate >= 100 kHz */
+#define ADXL345_SRATE_12_5    0x07  /* 12.5 Hz, when I2C data rate >= 100 kHz */
+#define ADXL345_SRATE_6_25    0x06  /* when I2C data rate >= 100 kHz */
+#define ADXL345_SRATE_3_13    0x05  /* when I2C data rate >= 100 kHz */
+#define ADXL345_SRATE_1_56    0x04  /* when I2C data rate >= 100 kHz */
+#define ADXL345_SRATE_0_78    0x03  /* when I2C data rate >= 100 kHz */
+#define ADXL345_SRATE_0_39    0x02  /* when I2C data rate >= 100 kHz */
+#define ADXL345_SRATE_0_20    0x01  /* when I2C data rate >= 100 kHz */
+#define ADXL345_SRATE_0_10    0x00  /* 0.10 Hz, when I2C data rate >= 100 kHz */
 
 /* Callback pointers for the interrupts */
 extern void (*accm_int1_cb)(uint8_t reg);
 extern void (*accm_int2_cb)(uint8_t reg);
 
-/* Interrupt 1 and 2 events; ADXL345 signals interrupt on INT1 or INT2 pins,
-  ISR is invoked and polls the accelerometer process which invokes the callbacks. */
-extern process_event_t int1_event, int2_event;   // static ?
-
 #define ACCM_INT1    0x01
 #define ACCM_INT2    0x02
-
-
 /* -------------------------------------------------------------------------- */
 #endif /* ifndef ADXL345_H_ */

From 934cdbacca841e89535090a6c7fcf8c12efac921 Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Mon, 22 Feb 2016 12:06:38 +0100
Subject: [PATCH 037/393] Adapted the ADXL345 sensor to Contiki's sensor API

---
 examples/zolertia/z1/test-adxl345.c |  47 +++++----
 platform/z1/dev/adxl345.c           | 148 +++++++++++++++++++++++-----
 platform/z1/dev/adxl345.h           |  20 ++--
 3 files changed, 161 insertions(+), 54 deletions(-)

diff --git a/examples/zolertia/z1/test-adxl345.c b/examples/zolertia/z1/test-adxl345.c
index e33981f76..a5e199bef 100644
--- a/examples/zolertia/z1/test-adxl345.c
+++ b/examples/zolertia/z1/test-adxl345.c
@@ -125,35 +125,40 @@ PROCESS_THREAD(led_process, ev, data) {
 }
 /*---------------------------------------------------------------------------*/
 /* Main process, setups  */
-PROCESS_THREAD(accel_process, ev, data) {
+PROCESS_THREAD(accel_process, ev, data)
+{
   PROCESS_BEGIN();
-  {
-    int16_t x, y, z;
 
-    /* Register the event used for lighting up an LED when interrupt strikes. */
-    led_off_event = process_alloc_event();
+  int16_t x, y, z;
 
-    /* Start and setup the accelerometer with default values, eg no interrupts enabled. */
-    accm_init();
+  /* Register the event used for lighting up an LED when interrupt strikes. */
+  led_off_event = process_alloc_event();
 
-    /* Register the callback functions for each interrupt */
-    ACCM_REGISTER_INT1_CB(accm_ff_cb);
-    ACCM_REGISTER_INT2_CB(accm_tap_cb);
+  /* Start and setup the accelerometer with default values, eg no interrupts
+   * enabled.
+   */
+  SENSORS_ACTIVATE(adxl345);
 
-    /* Set what strikes the corresponding interrupts. Several interrupts per pin is
-       possible. For the eight possible interrupts, see adxl345.h and adxl345 datasheet. */
-    accm_set_irq(ADXL345_INT_FREEFALL, ADXL345_INT_TAP + ADXL345_INT_DOUBLETAP);
+  /* Register the callback functions for each interrupt */
+  ACCM_REGISTER_INT1_CB(accm_ff_cb);
+  ACCM_REGISTER_INT2_CB(accm_tap_cb);
 
-    while(1) {
-      x = accm_read_axis(X_AXIS);
-      y = accm_read_axis(Y_AXIS);
-      z = accm_read_axis(Z_AXIS);
-      printf("x: %d y: %d z: %d\n", x, y, z);
+  /* Set what strikes the corresponding interrupts. Several interrupts per
+   * pin is possible. For the eight possible interrupts, see adxl345.h and
+   * adxl345 datasheet.
+   */
+  accm_set_irq(ADXL345_INT_FREEFALL, ADXL345_INT_TAP + ADXL345_INT_DOUBLETAP);
 
-      etimer_set(&et, ACCM_READ_INTERVAL);
-      PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
-    }
+  while(1) {
+    x = adxl345.value(X_AXIS);
+    y = adxl345.value(Y_AXIS);
+    z = adxl345.value(Z_AXIS);
+    printf("x: %d y: %d z: %d\n", x, y, z);
+
+    etimer_set(&et, ACCM_READ_INTERVAL);
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
   }
+
   PROCESS_END();
 }
 /*---------------------------------------------------------------------------*/
diff --git a/platform/z1/dev/adxl345.c b/platform/z1/dev/adxl345.c
index 512881d59..49bf9b6e6 100644
--- a/platform/z1/dev/adxl345.c
+++ b/platform/z1/dev/adxl345.c
@@ -46,6 +46,16 @@
 #include "cc2420.h"
 #include "i2cmaster.h"
 #include "isr_compat.h"
+#include "lib/sensors.h"
+/*---------------------------------------------------------------------------*/
+#define DEBUG 0
+#if DEBUG
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+/*---------------------------------------------------------------------------*/
+static uint8_t enabled;
 /*---------------------------------------------------------------------------*/
 /* Callback pointers when interrupt occurs */
 void (*accm_int1_cb)(uint8_t reg);
@@ -97,38 +107,41 @@ static uint8_t adxl345_default_settings[] = {
 PROCESS(accmeter_process, "Accelerometer process");
 /*---------------------------------------------------------------------------*/
 static void
-accm_write_reg(uint8_t reg, uint8_t val) {
+accm_write_reg(uint8_t reg, uint8_t val)
+{
   uint8_t tx_buf[] = {reg, val};
 
   i2c_transmitinit(ADXL345_ADDR);
   while (i2c_busy());
-  PRINTFDEBUG("I2C Ready to TX\n");
+  PRINTF("ADXL345: I2C Ready to TX\n");
 
   i2c_transmit_n(2, tx_buf);
   while (i2c_busy());
-  PRINTFDEBUG("WRITE_REG 0x%02X @ reg 0x%02X\n", val, reg);
+  PRINTF("ADXL345: WRITE_REG 0x%02X @ reg 0x%02X\n", val, reg);
 }
 /*---------------------------------------------------------------------------*/
 /* First byte in stream must be the register address to begin writing to.
  * The data is then written from second byte and increasing.
  */
 static void
-accm_write_stream(uint8_t len, uint8_t *data) {
+accm_write_stream(uint8_t len, uint8_t *data)
+{
   i2c_transmitinit(ADXL345_ADDR);
   while (i2c_busy());
-  PRINTFDEBUG("I2C Ready to TX(stream)\n");
+  PRINTF("ADXL345: I2C Ready to TX(stream)\n");
 
   i2c_transmit_n(len, data);	// start tx and send conf reg 
   while (i2c_busy());
-  PRINTFDEBUG("WRITE_STR %u B to 0x%02X\n", len, data[0]);
+  PRINTF("ADXL345: WRITE_STR %u B to 0x%02X\n", len, data[0]);
 }
 
 /*---------------------------------------------------------------------------*/
 static uint8_t
-accm_read_reg(uint8_t reg) {
+accm_read_reg(uint8_t reg)
+{
   uint8_t retVal = 0;
   uint8_t rtx = reg;
-  PRINTFDEBUG("READ_REG 0x%02X\n", reg);
+  PRINTF("ADXL345: READ_REG 0x%02X\n", reg);
 
   /* transmit the register to read */
   i2c_transmitinit(ADXL345_ADDR);
@@ -146,9 +159,10 @@ accm_read_reg(uint8_t reg) {
 }
 /*---------------------------------------------------------------------------*/
 static void
-accm_read_stream(uint8_t reg, uint8_t len, uint8_t *whereto) {
+accm_read_stream(uint8_t reg, uint8_t len, uint8_t *whereto)
+{
   uint8_t rtx = reg;
-  PRINTFDEBUG("READ_STR %u B from 0x%02X\n", len, reg);
+  PRINTF("ADXL345: READ_STR %u B from 0x%02X\n", len, reg);
 
   /* transmit the register to start reading from */
   i2c_transmitinit(ADXL345_ADDR);
@@ -171,7 +185,8 @@ accm_read_stream(uint8_t reg, uint8_t len, uint8_t *whereto) {
  * so is wanted/needed.
  */
 int16_t
-accm_read_axis(enum ADXL345_AXIS axis){
+accm_read_axis(enum ADXL345_AXIS axis)
+{
   int16_t rd = 0;
   uint8_t tmp[2];
   if(axis > Z_AXIS){
@@ -181,27 +196,33 @@ accm_read_axis(enum ADXL345_AXIS axis){
   rd = (int16_t)(tmp[0] | (tmp[1]<<8));  
   return rd;
 }
-
 /*---------------------------------------------------------------------------*/
-void
-accm_set_grange(uint8_t grange){
+int
+accm_set_grange(uint8_t grange)
+{
+  uint8_t tempreg = 0;
+
   if(grange > ADXL345_RANGE_16G) {
-    PRINTFDEBUG("ADXL grange invalid: %u\n", grange);
-    return;
+    PRINTF("ADXL345: grange invalid: %u\n", grange);
+    return ADXL345_ERROR;
   }
 
-  uint8_t tempreg = 0;
+  if(!enabled) {
+    return ADXL345_ERROR;
+  }
 
   /* Keep the previous contents of the register, zero out the last two bits */
   tempreg = (accm_read_reg(ADXL345_DATA_FORMAT) & 0xFC);
   tempreg |= grange;
   accm_write_reg(ADXL345_DATA_FORMAT, tempreg);
+  return ADXL345_SUCCESS;
 }
 
 /*---------------------------------------------------------------------------*/
 void
-accm_init(void) {
-  PRINTFDEBUG("ADXL345 init\n");
+accm_init(void)
+{
+  PRINTF("ADXL345: init\n");
   accm_int1_cb = NULL;
   accm_int2_cb = NULL;
 
@@ -228,19 +249,38 @@ accm_init(void) {
   /* enable interrupts */
   ADXL345_IE |= (ADXL345_INT1_PIN | ADXL345_INT2_PIN);
   eint();
-}
 
+  enabled = 1;
+}
 /*---------------------------------------------------------------------------*/
 void
-accm_set_irq(uint8_t int1, uint8_t int2){
+accm_stop(void)
+{
+  dint();
+  ADXL345_IE &= ~(ADXL345_INT1_PIN | ADXL345_INT2_PIN);
+  accm_write_reg(ADXL345_INT_ENABLE, ~(int1_mask | int2_mask));
+  accm_write_reg(ADXL345_INT_MAP, ~int2_mask);
+  eint();
+  enabled = 0;
+}
+/*---------------------------------------------------------------------------*/
+int
+accm_set_irq(uint8_t int1, uint8_t int2)
+{
+  if(!enabled) {
+    return ADXL345_ERROR;
+  }
+
   /* Set the corresponding interrupt mapping to INT1 or INT2 */
-  PRINTFDEBUG("IRQs set to INT1: 0x%02X IRQ2: 0x%02X\n", int1, int2);
+  PRINTF("ADXL345: IRQs set to INT1: 0x%02X IRQ2: 0x%02X\n", int1, int2);
 
   int1_mask = int1;
   int2_mask = int2;
 
   accm_write_reg(ADXL345_INT_ENABLE, (int1 | int2));
-  accm_write_reg(ADXL345_INT_MAP, int2);  // int1 bits are zeroes in the map register so this is for both ints
+  /* int1 bits are zeroes in the map register so this is for both ints */
+  accm_write_reg(ADXL345_INT_MAP, int2);
+  return ADXL345_SUCCESS;
 }
 /*---------------------------------------------------------------------------*/
 /* Invoked after an interrupt happened. Reads the interrupt source reg at the
@@ -249,19 +289,20 @@ accm_set_irq(uint8_t int1, uint8_t int2){
  * what interrupt happened, if several interrupts are mapped to the same pin.
  */
 static void
-poll_handler(void){
+poll_handler(void)
+{
   uint8_t ireg = 0;
   ireg = accm_read_reg(ADXL345_INT_SOURCE);
 
   /* Invoke callbacks for the corresponding interrupts */
   if(ireg & int1_mask){
     if(accm_int1_cb != NULL){
-      PRINTFDEBUG("INT1 cb invoked\n");
+      PRINTF("ADXL345: INT1 cb invoked\n");
       accm_int1_cb(ireg);
     }
   } else if(ireg & int2_mask){
     if(accm_int2_cb != NULL){
-      PRINTFDEBUG("INT2 cb invoked\n");
+      PRINTF("ADXL345: INT2 cb invoked\n");
       accm_int2_cb(ireg);
     }
   }
@@ -269,7 +310,8 @@ poll_handler(void){
 /*---------------------------------------------------------------------------*/
 /* This process is sleeping until an interrupt from the accelerometer occurs,
  * which polls this process from the interrupt service routine. */
-PROCESS_THREAD(accmeter_process, ev, data) {
+PROCESS_THREAD(accmeter_process, ev, data)
+{
   PROCESS_POLLHANDLER(poll_handler());
   PROCESS_EXITHANDLER();
   PROCESS_BEGIN();
@@ -318,3 +360,55 @@ ISR(PORT1, port1_isr)
   ENERGEST_OFF(ENERGEST_TYPE_IRQ);
 }
 /*---------------------------------------------------------------------------*/
+static int
+configure(int type, int value)
+{
+  if(type != SENSORS_ACTIVE) {
+    return ADXL345_ERROR;
+  }
+
+  if(value) {
+    accm_init();
+  } else {
+    accm_stop();
+  }
+  enabled = value;
+  return ADXL345_SUCCESS;
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+  case SENSORS_READY:
+    return enabled;
+  }
+  return ADXL345_SUCCESS;
+}
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  if(!enabled) {
+    return ADXL345_ERROR;
+  }
+
+  if((type != X_AXIS) && (type != Y_AXIS) && (type != Z_AXIS)) {
+    return ADXL345_ERROR;
+  }
+
+  switch(type) {
+    case X_AXIS:
+      return accm_read_axis(X_AXIS);
+    case Y_AXIS:
+      return accm_read_axis(Y_AXIS);
+    case Z_AXIS:
+      return accm_read_axis(Z_AXIS);
+    default:
+      return ADXL345_ERROR;
+  }
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(adxl345, ADXL345_SENSOR, value, configure, status);
+/*---------------------------------------------------------------------------*/
diff --git a/platform/z1/dev/adxl345.h b/platform/z1/dev/adxl345.h
index 29179b319..a8d4789d8 100644
--- a/platform/z1/dev/adxl345.h
+++ b/platform/z1/dev/adxl345.h
@@ -44,6 +44,7 @@
 #define ADXL345_H_
 #include <stdio.h>
 #include "dev/i2cmaster.h"
+#include "lib/sensors.h"
 /*---------------------------------------------------------------------------*/
 /* Used in accm_read_axis(), eg accm_read_axis(X_AXIS) */
 enum ADXL345_AXIS {
@@ -72,13 +73,13 @@ int16_t accm_read_axis(enum ADXL345_AXIS axis);
  * - ADXL345_RANGE_8G
  * - ADXL345_RANGE_16G
  */
-void accm_set_grange(uint8_t grange);
+int accm_set_grange(uint8_t grange);
 
 /* Map interrupt (FF, tap, dbltap etc) to interrupt pin (IRQ_INT1, IRQ_INT2).
  * This must come after accm_init() as the registers will otherwise be
  * overwritten.
  */
-void accm_set_irq(uint8_t int1, uint8_t int2);
+int accm_set_irq(uint8_t int1, uint8_t int2);
 
 /* Macros for setting the pointers to callback functions from the interrupts.
  * The function will be called with an uint8_t as parameter, containing the
@@ -227,12 +228,19 @@ void accm_set_irq(uint8_t int1, uint8_t int2);
 #define ADXL345_SRATE_0_39    0x02  /* when I2C data rate >= 100 kHz */
 #define ADXL345_SRATE_0_20    0x01  /* when I2C data rate >= 100 kHz */
 #define ADXL345_SRATE_0_10    0x00  /* 0.10 Hz, when I2C data rate >= 100 kHz */
-
+/* -------------------------------------------------------------------------- */
 /* Callback pointers for the interrupts */
 extern void (*accm_int1_cb)(uint8_t reg);
 extern void (*accm_int2_cb)(uint8_t reg);
-
-#define ACCM_INT1    0x01
-#define ACCM_INT2    0x02
+/* -------------------------------------------------------------------------- */
+#define ACCM_INT1              0x01
+#define ACCM_INT2              0x02
+#define ADXL345_SUCCESS        0x00
+#define ADXL345_ERROR          (-1)
+/* -------------------------------------------------------------------------- */
+#define ADXL345_SENSOR         "ADXL345 sensor"
+/* -------------------------------------------------------------------------- */
+extern const struct sensors_sensor adxl345;
+/* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 #endif /* ifndef ADXL345_H_ */

From 4d4930921ea0c92a2da11a6669cc2d424b5d4e7f Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Mon, 22 Feb 2016 16:02:06 +0100
Subject: [PATCH 038/393] Fixes error when processes name are not used

---
 apps/shell/shell-exec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/shell/shell-exec.c b/apps/shell/shell-exec.c
index 1f5bbf383..8442f22ef 100644
--- a/apps/shell/shell-exec.c
+++ b/apps/shell/shell-exec.c
@@ -116,11 +116,13 @@ PROCESS_THREAD(shell_exec_process, ev, data)
     shell_output_str(&exec_command, print, symbol);
 
     if(ret == ELFLOADER_OK) {
+#if !PROCESS_CONF_NO_PROCESS_NAMES
       int i;
       for(i = 0; elfloader_autostart_processes[i] != NULL; ++i) {
 	shell_output_str(&exec_command, "exec: starting process ",
 			 elfloader_autostart_processes[i]->name);
       }
+#endif
       autostart_start(elfloader_autostart_processes);
     }
 

From 56aeb7cd7e91f7f343e178b44c91f818054656b0 Mon Sep 17 00:00:00 2001
From: Aitor Mejias <amejias@zolertia.com>
Date: Thu, 28 Jan 2016 10:12:19 +0100
Subject: [PATCH 039/393] Added Zolertia Zonik sound sensor test and drivers

---
 examples/zolertia/zoul/Makefile     |   3 +-
 examples/zolertia/zoul/test-zonik.c | 123 +++++++++++++++++++
 platform/zoul/dev/zonik.c           | 184 ++++++++++++++++++++++++++++
 platform/zoul/dev/zonik.h           | 113 +++++++++++++++++
 4 files changed, 422 insertions(+), 1 deletion(-)
 create mode 100644 examples/zolertia/zoul/test-zonik.c
 create mode 100644 platform/zoul/dev/zonik.c
 create mode 100644 platform/zoul/dev/zonik.h

diff --git a/examples/zolertia/zoul/Makefile b/examples/zolertia/zoul/Makefile
index c4ad2affb..2b70773d9 100644
--- a/examples/zolertia/zoul/Makefile
+++ b/examples/zolertia/zoul/Makefile
@@ -5,10 +5,11 @@ CONTIKI_PROJECT += test-bmp085-bmp180 test-motion test-rotation-sensor
 CONTIKI_PROJECT += test-grove-light-sensor test-grove-loudness-sensor
 CONTIKI_PROJECT += test-weather-meter test-grove-gyro test-lcd test-iaq
 CONTIKI_PROJECT += test-pm10-sensor test-vac-sensor test-aac-sensor
+CONTIKI_PROJECT += test-zonik
 
 CONTIKI_TARGET_SOURCEFILES += tsl2563.c sht25.c bmpx8x.c motion-sensor.c
 CONTIKI_TARGET_SOURCEFILES += adc-sensors.c weather-meter.c grove-gyro.c
-CONTIKI_TARGET_SOURCEFILES += rgb-bl-lcd.c pm10-sensor.c iaq.c
+CONTIKI_TARGET_SOURCEFILES += rgb-bl-lcd.c pm10-sensor.c iaq.c zonik.c
 
 all: $(CONTIKI_PROJECT)
 
diff --git a/examples/zolertia/zoul/test-zonik.c b/examples/zolertia/zoul/test-zonik.c
new file mode 100644
index 000000000..622b73291
--- /dev/null
+++ b/examples/zolertia/zoul/test-zonik.c
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2016, Zolertia - http://www.zolertia.com
+ *
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup remote-examples
+ * @{
+ * \defgroup remote-zonik-test Zolertia Zonik sonometer test application
+ *
+ *  Example of Zonik board implementation and simple operation: Infinite loop
+ *  enablinkg the sensor and rading few times, acquiring the dBA of sensor
+ *  The first value acquired is invalid, because it's in hw init state awaiting
+ *  a valid internal reading.Once the driver is initialized, posterior readings 
+ *  are valid.Finally in the loop disables the board with standard call and
+ *  shows the error, and loop again enabling it.
+ *
+ * @{
+ * \file
+ * RE-Mote test application of Zolertia Zonik sound sensor
+ * \author
+ * Aitor Mejias <amejias@zolertia.com>
+ */
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+#include "zonik.h"
+#include "dev/i2c.h"
+#include "dev/leds.h"
+#include <stdio.h>
+#include <stdlib.h>
+/*---------------------------------------------------------------------------*/
+#define MAX_VALID_READINGS    10L
+#define MAX_INVALID_READINGS  3L
+/*---------------------------------------------------------------------------*/
+PROCESS(test_remote_zonik_process, "Test Zonik driver process");
+AUTOSTART_PROCESSES(&test_remote_zonik_process);
+/*---------------------------------------------------------------------------*/
+static struct etimer et;
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(test_remote_zonik_process, ev, data)
+{
+  static int16_t zonik_val;
+  static uint8_t i;
+
+  PROCESS_BEGIN();
+
+  printf("Initial status of sensor is: 0x%04X\n",
+          zonik.status(SENSORS_ACTIVE));
+
+  while(1) {
+    /* Configure Zonik and activate the internal process readings */
+    SENSORS_ACTIVATE(zonik);
+
+    printf("Initialized. Sensor status: 0x%04X\n",
+            zonik.status(SENSORS_ACTIVE));
+
+    /* Read sensor value dBA multiple times */
+    for(i=0; i<MAX_VALID_READINGS; i++) {
+      /* Wait a bit */
+      etimer_set(&et, CLOCK_SECOND);
+      PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+
+      /* Get data from sensor */
+      zonik_val = zonik.value(ZONIK_DBA_LEQ_VALUE);
+      leds_toggle(LEDS_GREEN);
+      printf("Value (dBA): %d\n", zonik_val);
+    }
+
+    printf("Sensor status is: 0x%04X\n",
+            zonik.status(SENSORS_ACTIVE));
+
+    /* Disable Zonik sensor */
+    SENSORS_DEACTIVATE(zonik);
+    printf("Process Stopped: 0x%04X\n", zonik.status(SENSORS_ACTIVE));
+
+    for(i=0; i<MAX_INVALID_READINGS; i++) {
+      /* Wait a bit */
+      etimer_set(&et, CLOCK_SECOND);
+      PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+
+      /* Get data from sensor */
+      zonik_val = zonik.value(ZONIK_DBA_LEQ_VALUE);
+      leds_toggle(LEDS_GREEN);
+      printf("Value (dBA): %d\n", zonik_val);
+    }
+    
+    etimer_set(&et, CLOCK_SECOND);
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
+
diff --git a/platform/zoul/dev/zonik.c b/platform/zoul/dev/zonik.c
new file mode 100644
index 000000000..a087b620a
--- /dev/null
+++ b/platform/zoul/dev/zonik.c
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2016, Zolertia <http://www.zolertia.com>
+ * 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.
+ *
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup remote-zonik
+ * @{
+ * Driver for the RE-Mote Zonik sonometer board
+ * @{
+ * \file
+ * Driver for the RE-Mote Zonik sound sensor (ZONIK)
+ * \author
+ * Aitor Mejias <amejias@zolertia.com>
+ */
+/*---------------------------------------------------------------------------*/
+#include <stdio.h>
+#include "contiki.h"
+#include "dev/gpio.h"
+#include "dev/i2c.h"
+#include "zonik.h"
+#include "sys/timer.h"
+#include "sys/etimer.h"
+#include "lib/sensors.h"
+/*---------------------------------------------------------------------------*/
+#define DEBUG 0
+#if DEBUG
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+/*---------------------------------------------------------------------------*/
+#define ZONIK_INT1_PORT_BASE  GPIO_PORT_TO_BASE(ZONIK_INT_PORT)
+#define ZONIK_INT1_PIN_MASK   GPIO_PIN_MASK(ZONIK_INT_PIN)
+/*---------------------------------------------------------------------------*/
+static uint8_t zonik_buffer[ZONIK_FRAME_SIZE+1];
+static uint16_t zonik_status = ZONIK_DISABLED;
+/*---------------------------------------------------------------------------*/
+static struct etimer et;
+/*---------------------------------------------------------------------------*/
+PROCESS(zonik_stm_process, "Zonik process process handler");
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(zonik_stm_process, ev, data)
+{
+  #if DEBUG
+  static int i;
+  #endif
+  PROCESS_EXITHANDLER();
+  PROCESS_BEGIN();
+
+  while(1) {
+    /*  Wait a process  */
+    etimer_set(&et, ZONIK_SECOND_INTERVAL);
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+
+    /* Control the interrupt for activate the sensor */
+    GPIO_SET_OUTPUT(ZONIK_INT1_PORT_BASE, ZONIK_INT1_PIN_MASK);
+    GPIO_CLR_PIN(ZONIK_INT1_PORT_BASE, ZONIK_INT1_PIN_MASK);
+    clock_delay_usec(ZONIK_INITIAL_WAIT_DELAY);
+    i2c_master_enable();
+    if(i2c_single_send(ZONIK_ADDR, ZONIK_CMD_READ) != I2C_MASTER_ERR_NONE) {
+      zonik_status = ZONIK_ERROR;
+      PRINTF("Zonik: Error in I2C Communication\n");
+    }
+    GPIO_SET_PIN(ZONIK_INT1_PORT_BASE, ZONIK_INT1_PIN_MASK);
+    GPIO_SET_INPUT(ZONIK_INT1_PORT_BASE, ZONIK_INT1_PIN_MASK);
+    if(zonik_status != ZONIK_ERROR) {
+      etimer_set(&et, ZONIK_WAIT_ACQ);
+      PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+      clock_delay_usec(ZONIK_FINAL_WAIT_DELAY);
+      i2c_master_enable();
+      if(i2c_burst_receive(ZONIK_ADDR, &zonik_buffer[0], ZONIK_FRAME_SIZE) != 
+                           I2C_MASTER_ERR_NONE) {
+        zonik_status = ZONIK_ERROR;
+        PRINTF("Zonik: Error in I2C Burst Mode Receive");
+      }
+      #if DEBUG
+      PRINTF("\nZonik: ");
+      for(i=0; i<ZONIK_FRAME_SIZE; i++) {
+        PRINTF(" 0x%02x ", zonik_buffer[i]);	  
+      }
+      PRINTF("\n");
+      #endif
+      if(zonik_status != ZONIK_ERROR) {
+        zonik_status = ZONIK_ACTIVE;
+      }
+    }
+  }
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  switch(type) {
+    case SENSORS_ACTIVE:
+    case SENSORS_READY:
+      return zonik_status;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  /* If the system is enabling the sensor internally. Return the same state */
+  if(zonik_status == ZONIK_HW_INIT) {
+    return ZONIK_HW_INIT;
+  }
+  /* If no valid parameter, return error */
+  if(zonik_status != ZONIK_ACTIVE) {
+    return ZONIK_DISABLED;
+  }
+  /* Return the dBA received data */
+  if(type == ZONIK_DBA_LEQ_VALUE) {
+    return ((uint16_t)zonik_buffer[2] << 8) + zonik_buffer[3];
+  }
+  /* Return the internal counter loop received data */
+  if(type == ZONIK_COUNT_VALUE) {
+    return ((uint16_t)zonik_buffer[0] << 8) + zonik_buffer[1];
+  }
+  return ZONIK_ERROR;
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int value)
+{
+  if(type == ZONIK_ACTIVE) {
+    if(value == ZONIK_VALUE_DEACTIVATE) {
+      /* Disable the Zonik Sensor reading process */
+      process_exit(&zonik_stm_process);
+      zonik_status = ZONIK_DISABLED;
+      return zonik_status;
+    }
+    /* Enable the Zonik Sensor reading process */
+    i2c_init(I2C_SDA_PORT, I2C_SDA_PIN, I2C_SCL_PORT, I2C_SCL_PIN,
+             I2C_SCL_NORMAL_BUS_SPEED);
+
+    /* configuration of I2C interrupt control */
+    GPIO_SOFTWARE_CONTROL(ZONIK_INT1_PORT_BASE, ZONIK_INT1_PIN_MASK);
+    GPIO_SET_INPUT(ZONIK_INT1_PORT_BASE, ZONIK_INT1_PIN_MASK);
+    /* Launch the main process */
+    process_start(&zonik_stm_process, NULL);
+    zonik_status = ZONIK_HW_INIT;
+    return zonik_status;
+  }
+  /* Bad configuration */
+  return ZONIK_ERROR;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(zonik, ZONIK_SENSOR, value, configure, status);  
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
+
diff --git a/platform/zoul/dev/zonik.h b/platform/zoul/dev/zonik.h
new file mode 100644
index 000000000..11bdee998
--- /dev/null
+++ b/platform/zoul/dev/zonik.h
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2016, Zolertia <http://www.zolertia.com>
+ * 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.
+ *
+ */
+/* -------------------------------------------------------------------------- */
+/**
+ * \addtogroup zoul-sensors 
+ * @{
+ *
+ * \defgroup remote-zonik Zonik sound sensor
+ * @{
+ *
+ * \file
+ * Header file for the Zolertia Zonik sound sensor 
+ */
+/* -------------------------------------------------------------------------- */
+#ifndef ZONIK_H_
+#define ZONIK_H_
+/* -------------------------------------------------------------------------- */
+#include <stdio.h>
+#include "lib/sensors.h"
+#include "dev/zoul-sensors.h"
+#include "i2c.h"
+#include "sys/rtimer.h"
+/* -------------------------------------------------------------------------- */
+/** \name ZONIK address and definitions
+ * @{
+ */
+#define ZONIK_ADDR                 0x68
+#define ZONIK_SENSOR               "Zonik Sound Sensor"
+
+#define ZONIK_INITIAL_WAIT_DELAY   11000L
+#define ZONIK_FINAL_WAIT_DELAY     22000L
+
+#ifndef ZONIK_INT_CONF_PORT
+#define ZONIK_INT_PORT             I2C_INT_PORT
+#else
+#define ZONIK_INT_PORT             ZONIK_INT_CONF_PORT
+#endif
+
+#ifndef ZONIK_INT_CONF_PIN
+#define ZONIK_INT_PIN              I2C_INT_PIN
+#else
+#define ZONIK_INT_PIN              ZONIK_INT_CONF_PIN
+#endif
+
+#define ZONIK_FRAME_SIZE           4
+
+#define ZONIK_WAIT_ACQ             (CLOCK_SECOND / 5)
+
+/* Zonik wait sensor delay: ~800ms */
+#define ZONIK_SECOND_INTERVAL      106
+
+/** @} */
+/* -------------------------------------------------------------------------- */
+/** \name ZONIK error values and definitions
+ * @{
+ */
+#define ZONIK_ACTIVE                SENSORS_ACTIVE
+#define ZONIK_HW_INIT               SENSORS_HW_INIT
+#define ZONIK_ENABLED               1
+#define ZONIK_VALUE_DEACTIVATE      0
+#define ZONIK_DISABLED              0xD1ED
+#define ZONIK_ERROR                 (-1)
+#define ZONIK_DBA_LEQ_VALUE         0x00
+#define ZONIK_COUNT_VALUE           0x01
+/** @} */
+/* -------------------------------------------------------------------------- */
+/** \name ZONIK command definitions
+ * @{
+ */
+#define ZONIK_CMD_READ              0x01
+/** @} */
+/* -------------------------------------------------------------------------- */
+/** \name ZONIK sensor type
+ * @{
+ */
+extern const struct sensors_sensor zonik;
+/** @} */
+/* -------------------------------------------------------------------------- */
+#endif
+/* -------------------------------------------------------------------------- */
+/**
+ * @}
+ * @}
+ */

From d3980668eedfbb695e0b0fc772677161977cf40c Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Mon, 22 Feb 2016 20:14:06 +0100
Subject: [PATCH 040/393] Adding support for AtMega128RFR2 and AtMega256RFR2

---
 cpu/avr/dev/clock-avr.h                       |   2 +-
 cpu/avr/dev/rs232.c                           |   2 +-
 cpu/avr/dev/rs232.h                           |   4 +
 .../radio/rf230bb/atmega256rfr2_registermap.h | 398 ++++++++++++++++++
 cpu/avr/radio/rf230bb/hal.h                   |  12 +-
 cpu/avr/radio/rf230bb/halbb.c                 |  33 +-
 cpu/avr/radio/rf230bb/rf230bb.c               |  49 ++-
 cpu/avr/radio/rf230bb/rf230bb.h               |   6 +-
 cpu/avr/rtimer-arch.c                         |   2 +-
 9 files changed, 478 insertions(+), 30 deletions(-)
 create mode 100644 cpu/avr/radio/rf230bb/atmega256rfr2_registermap.h

diff --git a/cpu/avr/dev/clock-avr.h b/cpu/avr/dev/clock-avr.h
index 97a79ee23..662bd21d3 100644
--- a/cpu/avr/dev/clock-avr.h
+++ b/cpu/avr/dev/clock-avr.h
@@ -73,7 +73,7 @@
   TIMSK0 = _BV (OCIE0A);
 
   
-#elif defined (__AVR_ATmega1284P__) || (__AVR_AT90USB1287__) || (__AVR_ATmega1281__) || defined (__AVR_ATmega128RFA1__)
+#elif defined (__AVR_ATmega1284P__) || (__AVR_AT90USB1287__) || (__AVR_ATmega1281__) || defined (__AVR_ATmega128RFA1__) || defined (__AVR_ATmega128RFR2__) || defined (__AVR_ATmega256RFR2__)
 /*
   The Raven has a 32768Hz watch crystal that can be used to clock the timer
   while the 1284p is sleeping. The Jackdaw has pads for a crystal. The crystal
diff --git a/cpu/avr/dev/rs232.c b/cpu/avr/dev/rs232.c
index 94cf5035f..2df263491 100644
--- a/cpu/avr/dev/rs232.c
+++ b/cpu/avr/dev/rs232.c
@@ -83,7 +83,7 @@
 #define NUMPORTS RS232_CONF_NUMPORTS
 #endif
 
-#if defined (__AVR_ATmega128__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1281__) || defined(__AVR_ATmega128RFA1__)
+#if defined (__AVR_ATmega128__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1281__) || defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)
 #ifndef NUMPORTS
 #define NUMPORTS 2
 #elif NUMPORTS > 2
diff --git a/cpu/avr/dev/rs232.h b/cpu/avr/dev/rs232.h
index 08a3d4f9f..f7e962204 100644
--- a/cpu/avr/dev/rs232.h
+++ b/cpu/avr/dev/rs232.h
@@ -49,6 +49,10 @@
 #include "dev/rs232_at90usb1287.h"
 #elif defined (__AVR_ATmega128RFA1__)
 #include "dev/rs232_atmega128rfa1.h"
+#elif defined (__AVR_ATmega128RFR2__)
+#include "dev/rs232_atmega128rfa1.h"
+#elif defined (__AVR_ATmega256RFR2__)
+#include "dev/rs232_atmega128rfa1.h"
 #elif defined (__AVR_ATmega644__) || defined (__AVR_ATmega328P__)
 #include "dev/rs232_atmega644.h"
 #elif defined (__AVR_ATmega8__) || defined (__AVR_ATmega8515__) \
diff --git a/cpu/avr/radio/rf230bb/atmega256rfr2_registermap.h b/cpu/avr/radio/rf230bb/atmega256rfr2_registermap.h
new file mode 100644
index 000000000..bc737de9a
--- /dev/null
+++ b/cpu/avr/radio/rf230bb/atmega256rfr2_registermap.h
@@ -0,0 +1,398 @@
+/**
+ * @file
+ * @brief This file contains RF230-formatted register definitions for the atmega128rfa1
+ */
+/*   Copyright (c) 2008, 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:
+
+   * 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.
+*/
+
+#ifndef PHY256RFR2_REGISTERMAP_EXTERNAL_H
+#define PHY256RFR2_REGISTERMAP_EXTERNAL_H
+
+/* RF230 register access is through SPI which transfers 8 bits address/8 bits data.
+ * ATmega128rfa1 registers are defined in I/O space, e.g. in gcc /include/avr/iom128rfa1.h
+ * A typical definition is #define TRX_STATUS _SFR_MEM8(0x141)
+ * Registers can be read with a macro, but the args for subregisters don't expand properly so the actual address
+ * is used with explicit _SFR_MEM8 in the subregister read/write routines.
+ */
+#define RG_TRX_STATUS         TRX_STATUS
+#define SR_TRX_STATUS         0x141, 0x1f, 0
+#define SR_TRX_CMD            0x142, 0x1f, 0
+#define STATE_TRANSITION      (31)
+#define SR_TX_PWR             0x145, 0x0f, 0
+#define RG_VERSION_NUM        VERSION_NUM
+#define RG_MAN_ID_0           MAN_ID_0
+#define RG_IRQ_MASK           IRQ_MASK
+#define SR_MAX_FRAME_RETRIES  0x16C, 0xf0, 4
+#define SR_TX_AUTO_CRC_ON     0x144, 0x20, 5
+#define SR_TRAC_STATUS        0x142, 0xe0, 5
+#define SR_CHANNEL            0x148, 0x1f, 0
+#define SR_CCA_MODE           0x148, 0x60, 5
+#define SR_CCA_REQUEST        0x148, 0x80, 7
+#define RG_PAN_ID_0           PAN_ID_0
+#define RG_PAN_ID_1           PAN_ID_1
+#define RG_SHORT_ADDR_0       SHORT_ADDR_0
+#define RG_SHORT_ADDR_1       SHORT_ADDR_1
+#define RG_IEEE_ADDR_0        IEEE_ADDR_0
+#define RG_IEEE_ADDR_1        IEEE_ADDR_1
+#define RG_IEEE_ADDR_2        IEEE_ADDR_2
+#define RG_IEEE_ADDR_3        IEEE_ADDR_3
+#define RG_IEEE_ADDR_4        IEEE_ADDR_4
+#define RG_IEEE_ADDR_5        IEEE_ADDR_5
+#define RG_IEEE_ADDR_6        IEEE_ADDR_6
+#define RG_IEEE_ADDR_7        IEEE_ADDR_7
+//#define SR_ED_LEVEL           0x147, 0xff, 0
+#define RG_PHY_ED_LEVEL       PHY_ED_LEVEL
+#define RG_RX_SYN             RX_SYN
+#define SR_RSSI               0x146, 0x1f, 0
+#define SR_RX_SYN             0x155, 0xff, 0
+#define SR_TRX_RPC            0x156, 0xff, 0
+#define SR_XAH_CTRL_1         0x157, 0xf5, 2
+#define SR_PLL_CF_START       0x15a, 0x80, 7
+#define SR_PLL_DCU_START      0x15b, 0x80, 7
+#define SR_MAX_CSMA_RETRIES   0x16c, 0x0e, 1
+#define RG_CSMA_BE            CSMA_BE
+#define RG_CSMA_SEED_0        CSMA_SEED_0
+#define RG_PHY_RSSI           PHY_RSSI
+//#define SR_CCA_CS_THRES       0x149, 0xf0, 4
+#define SR_CCA_ED_THRES        0x149, 0x0f, 0
+#define SR_CCA_DONE            0x141, 0x80, 7
+#define SR_CCA_STATUS          0x141, 0x40, 6
+#define SR_AACK_SET_PD         0x16e, 0x20, 5
+#define SR_CSMA_SEED_1         0x16e, 0x10, 4
+
+/* RF230 register assignments, for reference */
+#if 1
+//#define HAVE_REGISTER_MAP (1)
+/** Offset for register TRX_STATUS */
+//#define RG_TRX_STATUS                    (0x01)
+/** Access parameters for sub-register CCA_DONE in register @ref RG_TRX_STATUS */
+//#define SR_CCA_DONE                  0x01, 0x80, 7
+/** Access parameters for sub-register CCA_STATUS in register @ref RG_TRX_STATUS */
+//#define SR_CCA_STATUS                0x01, 0x40, 6
+//#define SR_reserved_01_3             0x01, 0x20, 5
+/** Access parameters for sub-register TRX_STATUS in register @ref RG_TRX_STATUS */
+//#define SR_TRX_STATUS                0x01, 0x1f, 0
+/** Constant P_ON for sub-register @ref SR_TRX_STATUS */
+//#define P_ON                     (0)
+/** Constant BUSY_RX for sub-register @ref SR_TRX_STATUS */
+#define BUSY_RX                  (1)
+/** Constant BUSY_TX for sub-register @ref SR_TRX_STATUS */
+#define BUSY_TX                  (2)
+/** Constant RX_ON for sub-register @ref SR_TRX_STATUS */
+#define RX_ON                    (6)
+/** Constant TRX_OFF for sub-register @ref SR_TRX_STATUS */
+#define TRX_OFF                  (8)
+/** Constant PLL_ON for sub-register @ref SR_TRX_STATUS */
+#define PLL_ON                   (9)
+/** Constant SLEEP for sub-register @ref SR_TRX_STATUS */
+//#define SLEEP                    (15)
+/** Constant BUSY_RX_AACK for sub-register @ref SR_TRX_STATUS */
+#define BUSY_RX_AACK             (17)
+/** Constant BUSY_TX_ARET for sub-register @ref SR_TRX_STATUS */
+#define BUSY_TX_ARET             (18)
+/** Constant RX_AACK_ON for sub-register @ref SR_TRX_STATUS */
+#define RX_AACK_ON               (22)
+/** Constant TX_ARET_ON for sub-register @ref SR_TRX_STATUS */
+#define TX_ARET_ON               (25)
+/** Constant RX_ON_NOCLK for sub-register @ref SR_TRX_STATUS */
+//#define RX_ON_NOCLK              (28)
+/** Constant RX_AACK_ON_NOCLK for sub-register @ref SR_TRX_STATUS */
+//#define RX_AACK_ON_NOCLK         (29)
+/** Constant BUSY_RX_AACK_NOCLK for sub-register @ref SR_TRX_STATUS */
+//#define BUSY_RX_AACK_NOCLK       (30)
+/** Constant STATE_TRANSITION for sub-register @ref SR_TRX_STATUS */
+//#define STATE_TRANSITION         (31)
+
+/** Offset for register TRX_STATE */
+//#define RG_TRX_STATE                     (0x02)
+/** Access parameters for sub-register TRAC_STATUS in register @ref RG_TRX_STATE */
+//#define SR_TRAC_STATUS               0x02, 0xe0, 5
+/** Access parameters for sub-register TRX_CMD in register @ref RG_TRX_STATE */
+//#define SR_TRX_CMD                   0x02, 0x1f, 0
+/** Constant CMD_NOP for sub-register @ref SR_TRX_CMD */
+//#define CMD_NOP                  (0)
+/** Constant CMD_TX_START for sub-register @ref SR_TRX_CMD */
+//#define CMD_TX_START             (2)
+/** Constant CMD_FORCE_TRX_OFF for sub-register @ref SR_TRX_CMD */
+#define CMD_FORCE_TRX_OFF        (3)
+///** Constant CMD_RX_ON for sub-register @ref SR_TRX_CMD */
+//#define CMD_RX_ON                (6)
+///** Constant CMD_TRX_OFF for sub-register @ref SR_TRX_CMD */
+//#define CMD_TRX_OFF              (8)
+///** Constant CMD_PLL_ON for sub-register @ref SR_TRX_CMD */
+//#define CMD_PLL_ON               (9)
+///** Constant CMD_RX_AACK_ON for sub-register @ref SR_TRX_CMD */
+//#define CMD_RX_AACK_ON           (22)
+///** Constant CMD_TX_ARET_ON for sub-register @ref SR_TRX_CMD */
+//#define CMD_TX_ARET_ON           (25)
+///** Offset for register TRX_CTRL_0 */
+//#define RG_TRX_CTRL_0                    (0x03)
+///** Offset for register TRX_CTRL_1 */
+//#define RG_TRX_CTRL_1                    (0x04)
+///** Access parameters for sub-register PAD_IO in register @ref RG_TRX_CTRL_0 */
+//#define SR_PAD_IO                    0x03, 0xc0, 6
+///** Access parameters for sub-register PAD_IO_CLKM in register @ref RG_TRX_CTRL_0 */
+//#define SR_PAD_IO_CLKM               0x03, 0x30, 4
+///** Constant CLKM_2mA for sub-register @ref SR_PAD_IO_CLKM */
+//#define CLKM_2mA                 (0)
+///** Constant CLKM_4mA for sub-register @ref SR_PAD_IO_CLKM */
+//#define CLKM_4mA                 (1)
+///** Constant CLKM_6mA for sub-register @ref SR_PAD_IO_CLKM */
+//#define CLKM_6mA                 (2)
+///** Constant CLKM_8mA for sub-register @ref SR_PAD_IO_CLKM */
+//#define CLKM_8mA                 (3)
+///** Access parameters for sub-register CLKM_SHA_SEL in register @ref RG_TRX_CTRL_0 */
+//#define SR_CLKM_SHA_SEL              0x03, 0x08, 3
+///** Access parameters for sub-register CLKM_CTRL in register @ref RG_TRX_CTRL_0 */
+//#define SR_CLKM_CTRL                 0x03, 0x07, 0
+///** Constant CLKM_no_clock for sub-register @ref SR_CLKM_CTRL */
+//#define CLKM_no_clock            (0)
+///** Constant CLKM_1MHz for sub-register @ref SR_CLKM_CTRL */
+//#define CLKM_1MHz                (1)
+///** Constant CLKM_2MHz for sub-register @ref SR_CLKM_CTRL */
+//#define CLKM_2MHz                (2)
+///** Constant CLKM_4MHz for sub-register @ref SR_CLKM_CTRL */
+//#define CLKM_4MHz                (3)
+///** Constant CLKM_8MHz for sub-register @ref SR_CLKM_CTRL */
+//#define CLKM_8MHz                (4)
+///** Constant CLKM_16MHz for sub-register @ref SR_CLKM_CTRL */
+//#define CLKM_16MHz               (5)
+///** Offset for register PHY_TX_PWR */
+//#define RG_PHY_TX_PWR                    (0x05)
+///** Access parameters for sub-register TX_AUTO_CRC_ON in register @ref RG_PHY_TX_PWR */
+//#define SR_TX_AUTO_CRC_ON            0x05, 0x80, 7
+//#define SR_reserved_05_2             0x05, 0x70, 4
+///** Access parameters for sub-register TX_PWR in register @ref RG_PHY_TX_PWR */
+//#define SR_TX_PWR                    0x05, 0x0f, 0
+///** Offset for register PHY_RSSI */
+//#define RG_PHY_RSSI                      (0x06)
+//#define SR_reserved_06_1             0x06, 0xe0, 5
+///** Access parameters for sub-register RSSI in register @ref RG_PHY_RSSI */
+//#define SR_RSSI                      0x06, 0x1f, 0
+///** Offset for register PHY_ED_LEVEL */
+//#define RG_PHY_ED_LEVEL                  (0x07)
+///** Access parameters for sub-register ED_LEVEL in register @ref RG_PHY_ED_LEVEL */
+//#define SR_ED_LEVEL                  0x07, 0xff, 0
+///** Offset for register PHY_CC_CCA */
+//#define RG_PHY_CC_CCA                    (0x08)
+///** Access parameters for sub-register CCA_REQUEST in register @ref RG_PHY_CC_CCA */
+//#define SR_CCA_REQUEST               0x08, 0x80, 7
+///** Access parameters for sub-register CCA_MODE in register @ref RG_PHY_CC_CCA */
+//#define SR_CCA_MODE                  0x08, 0x60, 5
+///** Access parameters for sub-register CHANNEL in register @ref RG_PHY_CC_CCA */
+//#define SR_CHANNEL                   0x08, 0x1f, 0
+///** Offset for register CCA_THRES */
+//#define RG_CCA_THRES                     (0x09)
+///** Access parameters for sub-register CCA_CS_THRES in register @ref RG_CCA_THRES */
+//#define SR_CCA_CS_THRES              0x09, 0xf0, 4
+///** Access parameters for sub-register CCA_ED_THRES in register @ref RG_CCA_THRES */
+//#define SR_CCA_ED_THRES              0x09, 0x0f, 0
+///** Offset for register IRQ_MASK */
+//#define RG_IRQ_MASK                      (0x0e)
+///** Access parameters for sub-register IRQ_MASK in register @ref RG_IRQ_MASK */
+//#define SR_IRQ_MASK                  0x0e, 0xff, 0
+///** Offset for register IRQ_STATUS */
+//#define RG_IRQ_STATUS                    (0x0f)
+///** Access parameters for sub-register IRQ_7_BAT_LOW in register @ref RG_IRQ_STATUS */
+//#define SR_IRQ_7_BAT_LOW             0x0f, 0x80, 7
+///** Access parameters for sub-register IRQ_6_TRX_UR in register @ref RG_IRQ_STATUS */
+//#define SR_IRQ_6_TRX_UR              0x0f, 0x40, 6
+///** Access parameters for sub-register IRQ_5 in register @ref RG_IRQ_STATUS */
+//#define SR_IRQ_5                     0x0f, 0x20, 5
+///** Access parameters for sub-register IRQ_4 in register @ref RG_IRQ_STATUS */
+//#define SR_IRQ_4                     0x0f, 0x10, 4
+///** Access parameters for sub-register IRQ_3_TRX_END in register @ref RG_IRQ_STATUS */
+//#define SR_IRQ_3_TRX_END             0x0f, 0x08, 3
+///** Access parameters for sub-register IRQ_2_RX_START in register @ref RG_IRQ_STATUS */
+//#define SR_IRQ_2_RX_START            0x0f, 0x04, 2
+///** Access parameters for sub-register IRQ_1_PLL_UNLOCK in register @ref RG_IRQ_STATUS */
+//#define SR_IRQ_1_PLL_UNLOCK          0x0f, 0x02, 1
+///** Access parameters for sub-register IRQ_0_PLL_LOCK in register @ref RG_IRQ_STATUS */
+//#define SR_IRQ_0_PLL_LOCK            0x0f, 0x01, 0
+///** Offset for register VREG_CTRL */
+//#define RG_VREG_CTRL                     (0x10)
+///** Access parameters for sub-register AVREG_EXT in register @ref RG_VREG_CTRL */
+//#define SR_AVREG_EXT                 0x10, 0x80, 7
+///** Access parameters for sub-register AVDD_OK in register @ref RG_VREG_CTRL */
+//#define SR_AVDD_OK                   0x10, 0x40, 6
+///** Access parameters for sub-register AVREG_TRIM in register @ref RG_VREG_CTRL */
+//#define SR_AVREG_TRIM                0x10, 0x30, 4
+///** Constant AVREG_1_80V for sub-register @ref SR_AVREG_TRIM */
+//#define AVREG_1_80V              (0)
+///** Constant AVREG_1_75V for sub-register @ref SR_AVREG_TRIM */
+//#define AVREG_1_75V              (1)
+///** Constant AVREG_1_84V for sub-register @ref SR_AVREG_TRIM */
+//#define AVREG_1_84V              (2)
+///** Constant AVREG_1_88V for sub-register @ref SR_AVREG_TRIM */
+//#define AVREG_1_88V              (3)
+///** Access parameters for sub-register DVREG_EXT in register @ref RG_VREG_CTRL */
+//#define SR_DVREG_EXT                 0x10, 0x08, 3
+///** Access parameters for sub-register DVDD_OK in register @ref RG_VREG_CTRL */
+//#define SR_DVDD_OK                   0x10, 0x04, 2
+///** Access parameters for sub-register DVREG_TRIM in register @ref RG_VREG_CTRL */
+//#define SR_DVREG_TRIM                0x10, 0x03, 0
+///** Constant DVREG_1_80V for sub-register @ref SR_DVREG_TRIM */
+//#define DVREG_1_80V              (0)
+///** Constant DVREG_1_75V for sub-register @ref SR_DVREG_TRIM */
+//#define DVREG_1_75V              (1)
+///** Constant DVREG_1_84V for sub-register @ref SR_DVREG_TRIM */
+//#define DVREG_1_84V              (2)
+///** Constant DVREG_1_88V for sub-register @ref SR_DVREG_TRIM */
+//#define DVREG_1_88V              (3)
+///** Offset for register BATMON */
+//#define RG_BATMON                        (0x11)
+//#define SR_reserved_11_1             0x11, 0xc0, 6
+///** Access parameters for sub-register BATMON_OK in register @ref RG_BATMON */
+//#define SR_BATMON_OK                 0x11, 0x20, 5
+///** Access parameters for sub-register BATMON_HR in register @ref RG_BATMON */
+//#define SR_BATMON_HR                 0x11, 0x10, 4
+///** Access parameters for sub-register BATMON_VTH in register @ref RG_BATMON */
+//#define SR_BATMON_VTH                0x11, 0x0f, 0
+///** Offset for register XOSC_CTRL */
+//#define RG_XOSC_CTRL                     (0x12)
+///** Offset for register RX_SYN */
+//#define RG_RX_SYN                        0x15
+///** Offset for register XAH_CTRL_1 */
+//#define RG_XAH_CTRL_1                      0x17
+///** Access parameters for sub-register XTAL_MODE in register @ref RG_XOSC_CTRL */
+//#define SR_XTAL_MODE                 0x12, 0xf0, 4
+///** Access parameters for sub-register XTAL_TRIM in register @ref RG_XOSC_CTRL */
+//#define SR_XTAL_TRIM                 0x12, 0x0f, 0
+///** Offset for register FTN_CTRL */
+//#define RG_FTN_CTRL                      (0x18)
+///** Access parameters for sub-register FTN_START in register @ref RG_FTN_CTRL */
+//#define SR_FTN_START                 0x18, 0x80, 7
+//#define SR_reserved_18_2             0x18, 0x40, 6
+///** Access parameters for sub-register FTNV in register @ref RG_FTN_CTRL */
+//#define SR_FTNV                      0x18, 0x3f, 0
+///** Offset for register PLL_CF */
+//#define RG_PLL_CF                        (0x1a)
+///** Access parameters for sub-register PLL_CF_START in register @ref RG_PLL_CF */
+//#define SR_PLL_CF_START              0x1a, 0x80, 7
+//#define SR_reserved_1a_2             0x1a, 0x70, 4
+///** Access parameters for sub-register PLL_CF in register @ref RG_PLL_CF */
+//#define SR_PLL_CF                    0x1a, 0x0f, 0
+///** Offset for register PLL_DCU */
+//#define RG_PLL_DCU                       (0x1b)
+///** Access parameters for sub-register PLL_DCU_START in register @ref RG_PLL_DCU */
+//#define SR_PLL_DCU_START             0x1b, 0x80, 7
+//#define SR_reserved_1b_2             0x1b, 0x40, 6
+///** Access parameters for sub-register PLL_DCUW in register @ref RG_PLL_DCU */
+//#define SR_PLL_DCUW                  0x1b, 0x3f, 0
+///** Offset for register PART_NUM */
+//#define RG_PART_NUM                      (0x1c)
+///** Access parameters for sub-register PART_NUM in register @ref RG_PART_NUM */
+//#define SR_PART_NUM                  0x1c, 0xff, 0
+///** Constant RF230 for sub-register @ref SR_PART_NUM */
+//#define RF230                    (2)
+///** Offset for register VERSION_NUM */
+//#define RG_VERSION_NUM                   (0x1d)
+///** Access parameters for sub-register VERSION_NUM in register @ref RG_VERSION_NUM */
+//#define SR_VERSION_NUM               0x1d, 0xff, 0
+///** Offset for register MAN_ID_0 */
+//#define RG_MAN_ID_0                      (0x1e)
+///** Access parameters for sub-register MAN_ID_0 in register @ref RG_MAN_ID_0 */
+//#define SR_MAN_ID_0                  0x1e, 0xff, 0
+///** Offset for register MAN_ID_1 */
+//#define RG_MAN_ID_1                      (0x1f)
+///** Access parameters for sub-register MAN_ID_1 in register @ref RG_MAN_ID_1 */
+//#define SR_MAN_ID_1                  0x1f, 0xff, 0
+///** Offset for register SHORT_ADDR_0 */
+//#define RG_SHORT_ADDR_0                  (0x20)
+///** Access parameters for sub-register SHORT_ADDR_0 in register @ref RG_SHORT_ADDR_0 */
+//#define SR_SHORT_ADDR_0              0x20, 0xff, 0
+///** Offset for register SHORT_ADDR_1 */
+//#define RG_SHORT_ADDR_1                  (0x21)
+///** Access parameters for sub-register SHORT_ADDR_1 in register @ref RG_SHORT_ADDR_1 */
+//#define SR_SHORT_ADDR_1              0x21, 0xff, 0
+///** Offset for register PAN_ID_0 */
+//#define RG_PAN_ID_0                      (0x22)
+///** Access parameters for sub-register PAN_ID_0 in register @ref RG_PAN_ID_0 */
+//#define SR_PAN_ID_0                  0x22, 0xff, 0
+///** Offset for register PAN_ID_1 */
+//#define RG_PAN_ID_1                      (0x23)
+///** Access parameters for sub-register PAN_ID_1 in register @ref RG_PAN_ID_1 */
+//#define SR_PAN_ID_1                  0x23, 0xff, 0
+///** Offset for register IEEE_ADDR_0 */
+//#define RG_IEEE_ADDR_0                   (0x24)
+///** Access parameters for sub-register IEEE_ADDR_0 in register @ref RG_IEEE_ADDR_0 */
+//#define SR_IEEE_ADDR_0               0x24, 0xff, 0
+///** Offset for register IEEE_ADDR_1 */
+//#define RG_IEEE_ADDR_1                   (0x25)
+///** Access parameters for sub-register IEEE_ADDR_1 in register @ref RG_IEEE_ADDR_1 */
+//#define SR_IEEE_ADDR_1               0x25, 0xff, 0
+///** Offset for register IEEE_ADDR_2 */
+//#define RG_IEEE_ADDR_2                   (0x26)
+///** Access parameters for sub-register IEEE_ADDR_2 in register @ref RG_IEEE_ADDR_2 */
+//#define SR_IEEE_ADDR_2               0x26, 0xff, 0
+///** Offset for register IEEE_ADDR_3 */
+//#define RG_IEEE_ADDR_3                   (0x27)
+///** Access parameters for sub-register IEEE_ADDR_3 in register @ref RG_IEEE_ADDR_3 */
+//#define SR_IEEE_ADDR_3               0x27, 0xff, 0
+///** Offset for register IEEE_ADDR_4 */
+//#define RG_IEEE_ADDR_4                   (0x28)
+///** Access parameters for sub-register IEEE_ADDR_4 in register @ref RG_IEEE_ADDR_4 */
+//#define SR_IEEE_ADDR_4               0x28, 0xff, 0
+///** Offset for register IEEE_ADDR_5 */
+//#define RG_IEEE_ADDR_5                   (0x29)
+///** Access parameters for sub-register IEEE_ADDR_5 in register @ref RG_IEEE_ADDR_5 */
+//#define SR_IEEE_ADDR_5               0x29, 0xff, 0
+///** Offset for register IEEE_ADDR_6 */
+//#define RG_IEEE_ADDR_6                   (0x2a)
+///** Access parameters for sub-register IEEE_ADDR_6 in register @ref RG_IEEE_ADDR_6 */
+//#define SR_IEEE_ADDR_6               0x2a, 0xff, 0
+///** Offset for register IEEE_ADDR_7 */
+//#define RG_IEEE_ADDR_7                   (0x2b)
+///** Access parameters for sub-register IEEE_ADDR_7 in register @ref RG_IEEE_ADDR_7 */
+//#define SR_IEEE_ADDR_7               0x2b, 0xff, 0
+///** Offset for register XAH_CTRL */
+//#define RG_XAH_CTRL_0                     (0x2c)
+///** Access parameters for sub-register MAX_FRAME_RETRIES in register @ref RG_XAH_CTRL_0 */
+//#define SR_MAX_FRAME_RETRIES         0x2c, 0xf0, 4
+///** Access parameters for sub-register MAX_CSMA_RETRIES in register @ref RG_XAH_CTRL_0 */
+//#define SR_MAX_CSMA_RETRIES          0x2c, 0x0e, 1
+//#define SR_reserved_2c_3             0x2c, 0x01, 0
+///** Offset for register CSMA_SEED_0 */
+//#define RG_CSMA_SEED_0                   (0x2d)
+///** Access parameters for sub-register CSMA_SEED_0 in register @ref RG_CSMA_SEED_0 */
+//#define SR_CSMA_SEED_0               0x2d, 0xff, 0
+///** Offset for register CSMA_SEED_1 */
+//#define RG_CSMA_SEED_1                   (0x2e)
+///** Offset for register CSMA_BE */
+//#define RG_CSMA_BE                      0x2f
+///** Access parameters for sub-register MIN_BE in register @ref RG_CSMA_SEED_1 */
+//#define SR_MIN_BE                    0x2e, 0xc0, 6
+//#define SR_reserved_2e_2             0x2e, 0x30, 4
+///** Access parameters for sub-register I_AM_COORD in register @ref RG_CSMA_SEED_1 */
+//#define SR_I_AM_COORD                0x2e, 0x08, 3
+///** Access parameters for sub-register CSMA_SEED_1 in register @ref RG_CSMA_SEED_1 */
+//#define SR_CSMA_SEED_1               0x2e, 0x07, 0
+#endif
+#endif /* PHY256RFR2y_REGISTERMAP_EXTERNAL_H */
diff --git a/cpu/avr/radio/rf230bb/hal.h b/cpu/avr/radio/rf230bb/hal.h
index 737680d68..b28151a0c 100644
--- a/cpu/avr/radio/rf230bb/hal.h
+++ b/cpu/avr/radio/rf230bb/hal.h
@@ -78,6 +78,7 @@
 #define ZIGBIT			4
 #define IRIS			5
 #define ATMEGA128RFA1   6
+#define ATMEGA256RFR2   7
 
 #if PLATFORM_TYPE == RCB_B
 /* 1281 rcb */
@@ -145,6 +146,11 @@
 #   define SLPTRPORT  TRXPR
 #   define SLPTRPIN   1
 
+#elif PLATFORM_TYPE == ATMEGA256RFR2
+/* ATmega1281 with internal AT86RF231 radio */
+#   define SLPTRPORT  TRXPR
+#   define SLPTRPIN   1
+
 #elif CONTIKI_TARGET_MULLE
 /* mulle 5.2 (TODO: move to platform specific) */
 #   define SSPORT     3
@@ -233,7 +239,7 @@
  *       that the source code can directly use.
  * \{
  */
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__)  || defined(__AVR_ATmega256RFR2__) 
 
 #define hal_set_rst_low( )    ( TRXPR &= ~( 1 << TRXRST ) ) /**< This macro pulls the RST pin low. */
 #define hal_set_rst_high( )   ( TRXPR |= ( 1 << TRXRST ) ) /**< This macro pulls the RST pin high. */
@@ -274,7 +280,7 @@
 #define HAL_DD_SCK            SCKPIN              /**< Data Direction bit for SCK. */
 #define HAL_DD_MOSI           MOSIPIN             /**< Data Direction bit for MOSI. */
 #define HAL_DD_MISO           MISOPIN             /**< Data Direction bit for MISO. */
-#endif /* defined(__AVR_ATmega128RFA1__) */
+#endif /* defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__) */
 
 /** \} */
 
@@ -367,7 +373,7 @@ typedef struct{
 void hal_init( void );
 
 /* Hack for atmega128rfa1 with integrated radio. Access registers directly, not through SPI */
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)
 //#define hal_register_read(address) _SFR_MEM8((uint16_t)address)
 #define hal_register_read(address) address
 uint8_t hal_subregister_read( uint16_t address, uint8_t mask, uint8_t position );
diff --git a/cpu/avr/radio/rf230bb/halbb.c b/cpu/avr/radio/rf230bb/halbb.c
index 14ff57256..243e11c03 100644
--- a/cpu/avr/radio/rf230bb/halbb.c
+++ b/cpu/avr/radio/rf230bb/halbb.c
@@ -74,8 +74,9 @@ extern uint8_t debugflowsize,debugflow[DEBUGFLOWSIZE];
 #include "hal.h"
 
 #if defined(__AVR_ATmega128RFA1__)
-#include <avr/io.h>
 #include "atmega128rfa1_registermap.h"
+#elif defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)
+#include "atmega256rfr2_registermap.h"
 #else
 #include "at86rf230_registermap.h"
 #endif
@@ -88,7 +89,7 @@ volatile extern signed char rf230_last_rssi;
 
 
 /*============================ IMPLEMENTATION ================================*/
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)
 
 /* AVR1281 with internal RF231 radio */
 #include <avr/interrupt.h>
@@ -158,8 +159,7 @@ inline uint8_t spiWrite(uint8_t byte)
  
 /** \brief  This function initializes the Hardware Abstraction Layer.
  */
-#if defined(__AVR_ATmega128RFA1__)
-
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)
 void
 hal_init(void)
 {
@@ -241,8 +241,7 @@ hal_init(void)
 }
 #endif  /* !__AVR__ */
 
-
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)
 /* Hack for internal radio registers. hal_register_read and hal_register_write are
    handled through defines, but the preprocesser can't parse a macro containing
    another #define with multiple arguments, e.g. using
@@ -279,7 +278,7 @@ hal_subregister_write(uint16_t address, uint8_t mask, uint8_t position,
     HAL_LEAVE_CRITICAL_REGION();
 }
 
-#else /* defined(__AVR_ATmega128RFA1__) */
+#else /* defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__) */ 
 /*----------------------------------------------------------------------------*/
 /** \brief  This function reads data from one of the radio transceiver's registers.
  *
@@ -383,7 +382,7 @@ hal_subregister_write(uint8_t address, uint8_t mask, uint8_t position,
     /* Write the modified register value. */
     hal_register_write(address, value);
 }
-#endif /* defined(__AVR_ATmega128RFA1__) */
+#endif /* defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__) */ 
 /*----------------------------------------------------------------------------*/
 /** \brief  Transfer a frame from the radio transceiver to a RAM buffer
  *
@@ -399,7 +398,7 @@ hal_subregister_write(uint8_t address, uint8_t mask, uint8_t position,
 void
 hal_frame_read(hal_rx_frame_t *rx_frame)
 {
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)
 
     uint8_t frame_length,*rx_data,*rx_buffer;
  
@@ -432,7 +431,7 @@ hal_frame_read(hal_rx_frame_t *rx_frame)
      */
     rx_frame->crc   = true;
     
-#else /* defined(__AVR_ATmega128RFA1__) */
+#else /*  */
 
     uint8_t frame_length, *rx_data;
 
@@ -487,7 +486,7 @@ hal_frame_read(hal_rx_frame_t *rx_frame)
 
     HAL_SPI_TRANSFER_CLOSE();
 
-#endif /* defined(__AVR_ATmega128RFA1__) */
+#endif /* defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__) */ 
 }
 
 /*----------------------------------------------------------------------------*/
@@ -500,7 +499,7 @@ hal_frame_read(hal_rx_frame_t *rx_frame)
 void
 hal_frame_write(uint8_t *write_buffer, uint8_t length)
 {
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)
     uint8_t *tx_buffer;
     tx_buffer=(uint8_t *)0x180;  //start of fifo in i/o space
     /* Write frame length, including the two byte checksum */
@@ -518,7 +517,7 @@ hal_frame_write(uint8_t *write_buffer, uint8_t length)
 #endif
     do  _SFR_MEM8(tx_buffer++)= *write_buffer++; while (--length);
 
-#else /* defined(__AVR_ATmega128RFA1__) */
+#else /* defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__) */
     /* Optionally truncate length to maximum frame length.
      * Not doing this is a fast way to know when the application needs fixing!
      */
@@ -540,7 +539,7 @@ hal_frame_write(uint8_t *write_buffer, uint8_t length)
     do HAL_SPI_TRANSFER(*write_buffer++); while (--length);
 
     HAL_SPI_TRANSFER_CLOSE();
-#endif /* defined(__AVR_ATmega128RFA1__) */
+#endif /* defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__) */
 }
 
 /*----------------------------------------------------------------------------*/
@@ -632,7 +631,7 @@ volatile char rf230interruptflag;
 #define INTERRUPTDEBUG(arg)
 #endif
 
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)
 /* The atmega128rfa1 has individual interrupts for the integrated radio'
  * Whichever are enabled by the RF230 driver must be present even if not used!
  */
@@ -713,7 +712,7 @@ ISR(TRX24_CCA_ED_DONE_vect)
 	rf230_ccawait=0;
 }
 
-#else /* defined(__AVR_ATmega128RFA1__) */
+#else /* defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__) */
 /* Separate RF230 has a single radio interrupt and the source must be read from the IRQ_STATUS register */
 HAL_RF230_ISR()
 {
@@ -803,7 +802,7 @@ HAL_RF230_ISR()
         ;
     }
 }
-#endif /* defined(__AVR_ATmega128RFA1__) */ 
+#endif /* defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__) */ 
 #   endif /* defined(DOXYGEN) */
 
 /** @} */
diff --git a/cpu/avr/radio/rf230bb/rf230bb.c b/cpu/avr/radio/rf230bb/rf230bb.c
index d00a24d72..cbe8160ef 100644
--- a/cpu/avr/radio/rf230bb/rf230bb.c
+++ b/cpu/avr/radio/rf230bb/rf230bb.c
@@ -212,7 +212,7 @@ static unsigned long total_time_for_transmission, total_transmission_len;
 static int num_transmissions;
 #endif
 
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)
 volatile uint8_t rf230_wakewait, rf230_txendwait, rf230_ccawait;
 #endif
 
@@ -433,7 +433,21 @@ rf230_waitidle(void)
   }
 }
 
-/*----------------------------------------------------------------------------*/
+/* Set reduced power consumption for AtMegaXXXRFR2 MCU's. See AT02594 */
+
+static uint8_t rpc = 0xFF; /* Default max power save */
+void 
+rf230_set_rpc(uint8_t data)
+{
+  rpc = data;
+}
+
+uint8_t
+rf230_get_rpc(void)
+{
+  return rpc;
+}
+
 /** \brief  This function will change the current state of the radio
  *          transceiver's internal state machine.
  *
@@ -507,6 +521,10 @@ radio_set_trx_state(uint8_t new_state)
         /* When the PLL is active most states can be reached in 1us. However, from */
         /* TRX_OFF the PLL needs time to activate. */
         if (current_state == TRX_OFF){
+
+#if defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)  
+	  hal_subregister_write(SR_TRX_RPC, rpc);    /* Enable RPC features */
+#endif
             delay_us(TIME_TRX_OFF_TO_PLL_ACTIVE);
         } else {
             delay_us(TIME_STATE_TRANSITION_PLL_ACTIVE);
@@ -535,7 +553,7 @@ rf230_set_promiscuous_mode(bool isPromiscuous) {
 #if RF230_CONF_AUTOACK
     is_promiscuous = isPromiscuous;
 /* TODO: Figure out when to pass promisc state to 802.15.4 */
-//    radio_set_trx_state(is_promiscuous?RX_ON:RX_AACK_ON);
+    radio_set_trx_state(is_promiscuous?RX_ON:RX_AACK_ON);
 #endif
 }
 
@@ -585,7 +603,7 @@ radio_on(void)
 #if RF230BB_CONF_LEDONPORTE1
     PORTE|=(1<<PE1); //ledon
 #endif
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)
     /* Use the poweron interrupt for delay */
     rf230_wakewait=1;
     {
@@ -937,7 +955,7 @@ rf230_transmit(unsigned short payload_len)
   /* If radio is sleeping we have to turn it on first */
   /* This automatically does the PLL calibrations */
   if (hal_get_slptr()) {
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)
 	ENERGEST_ON(ENERGEST_TYPE_LED_RED);
 #if RF230BB_CONF_LEDONPORTE1
     PORTE|=(1<<PE1); //ledon
@@ -1383,6 +1401,25 @@ PROCESS_THREAD(rf230_process, ev, data)
     /* Restore interrupts. */
     HAL_LEAVE_CRITICAL_REGION();
     PRINTF("rf230_read: %u bytes lqi %u\n",len,rf230_last_correlation);
+
+    if(is_promiscuous) {
+      uint8_t i;
+      unsigned const char * rxdata = packetbuf_dataptr();
+      /* Print magic */
+      putchar(0xC1);
+      putchar(0x1F);
+      putchar(0xFE);
+      putchar(0x72);
+      /* Print version */
+      putchar(0x01);
+      /* Print CMD == frame */
+      putchar(0x00);
+      putchar(len+3);
+
+      for (i=0;i<len;i++)  putchar(rxdata[i]);
+      printf("\n");
+    }
+
 #if DEBUG>1
      {
         uint8_t i;
@@ -1658,7 +1695,7 @@ rf230_cca(void)
 
   /* Start the CCA, wait till done, return result */
   /* Note reading the TRX_STATUS register clears both CCA_STATUS and CCA_DONE bits */
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)
 #if 1  //interrupt method
     /* Disable rx transitions to busy (RX_PDT_BIT) */
     /* Note: for speed this resets rx threshold to the compiled default */
diff --git a/cpu/avr/radio/rf230bb/rf230bb.h b/cpu/avr/radio/rf230bb/rf230bb.h
index 30de9a1e5..c441e09ab 100644
--- a/cpu/avr/radio/rf230bb/rf230bb.h
+++ b/cpu/avr/radio/rf230bb/rf230bb.h
@@ -57,6 +57,8 @@
 #include "hal.h"
 #if defined(__AVR_ATmega128RFA1__)
 #include "atmega128rfa1_registermap.h"
+#elif defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)
+#include "atmega256rfr2_registermap.h"
 #else
 #include "at86rf230_registermap.h"
 #endif
@@ -68,7 +70,7 @@
 #define RF230_REVB                              ( 2 )
 #define SUPPORTED_MANUFACTURER_ID               ( 31 )
 
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)
 #define RF230_SUPPORTED_INTERRUPT_MASK          ( 0xFF )
 #else
 /* RF230 does not support RX_START interrupts in extended mode, but it seems harmless to always enable it. */
@@ -215,6 +217,8 @@ uint8_t rf230_get_channel(void);
 void rf230_set_pan_addr(unsigned pan,unsigned addr,const uint8_t ieee_addr[8]);
 void rf230_set_txpower(uint8_t power);
 uint8_t rf230_get_txpower(void);
+void rf230_set_rpc(uint8_t rpc);
+uint8_t rf230_get_rpc(void);
 
 void rf230_set_promiscuous_mode(bool isPromiscuous);
 bool rf230_is_ready_to_send();
diff --git a/cpu/avr/rtimer-arch.c b/cpu/avr/rtimer-arch.c
index d1d97af7e..3ef22377b 100644
--- a/cpu/avr/rtimer-arch.c
+++ b/cpu/avr/rtimer-arch.c
@@ -64,7 +64,7 @@
 #define OCF3C	OCF3B
 #endif
 
-#if defined(__AVR_ATmega1281__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega1281__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega128RFR2__) || defined(__AVR_ATmega256RFR2__)
 #define ETIMSK TIMSK3
 #define ETIFR TIFR3
 #define TICIE3 ICIE3

From ce8e87d60e32ea61f7a5b2de13d84a3d0b5136c7 Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Mon, 22 Feb 2016 20:46:07 +0100
Subject: [PATCH 041/393] Adding the avr-rss2 platform based on AtMega256RFR2

---
 platform/avr-rss2/Makefile.avr-rss2           |  61 ++
 platform/avr-rss2/README.md                   | 173 +++++
 platform/avr-rss2/apps/sniffer/Makefile       |  11 +
 platform/avr-rss2/apps/sniffer/README.md      |  25 +
 platform/avr-rss2/apps/sniffer/host/Makefile  |  17 +
 platform/avr-rss2/apps/sniffer/host/README.md |  38 ++
 .../avr-rss2/apps/sniffer/host/wsbridge.c     | 459 +++++++++++++
 platform/avr-rss2/apps/sniffer/project-conf.h |  51 ++
 .../avr-rss2/apps/sniffer/rf230-promisc.pat   |  39 ++
 .../apps/sniffer/sniffer-example-coap.pcapng  |   0
 platform/avr-rss2/apps/sniffer/sniffer.c      |  67 ++
 platform/avr-rss2/apps/sniffer/stub-rdc.c     | 100 +++
 platform/avr-rss2/contiki-conf.h              | 350 ++++++++++
 platform/avr-rss2/contiki-main.c              | 635 ++++++++++++++++++
 platform/avr-rss2/dev/adc.c                   |  76 +++
 platform/avr-rss2/dev/adc.h                   |  16 +
 platform/avr-rss2/dev/battery-sensor.c        |  87 +++
 platform/avr-rss2/dev/button-sensor.c         |  41 ++
 platform/avr-rss2/dev/co2_sa_kxx-sensor.c     | 131 ++++
 platform/avr-rss2/dev/co2_sa_kxx-sensor.h     |  51 ++
 platform/avr-rss2/dev/ds18b20.c               | 247 +++++++
 platform/avr-rss2/dev/enc28j60_avr.c          |  83 +++
 platform/avr-rss2/dev/enc28j60_avr.h          |  53 ++
 platform/avr-rss2/dev/i2c.c                   | 228 +++++++
 platform/avr-rss2/dev/i2c.h                   |  65 ++
 platform/avr-rss2/dev/leds.c                  |  45 ++
 platform/avr-rss2/dev/leds.h                  |  17 +
 platform/avr-rss2/dev/light-sensor.c          |  64 ++
 platform/avr-rss2/dev/light-sensor.h          |  45 ++
 platform/avr-rss2/dev/pulse-sensor.c          | 120 ++++
 platform/avr-rss2/dev/pulse-sensor.h          |  43 ++
 platform/avr-rss2/dev/temp-sensor.c           | 292 ++++++++
 platform/avr-rss2/dev/temp-sensor.h           |  71 ++
 platform/avr-rss2/dev/temp_mcu-sensor.c       |  90 +++
 platform/avr-rss2/dev/temp_mcu-sensor.h       |  47 ++
 .../AtMega256RFR2-summary-power.dat           |  25 +
 .../examples/avr_radio_power/Makefile         |   9 +
 .../examples/avr_radio_power/README.md        |  79 +++
 .../avr_radio_power/avr_radio_power.c         | 164 +++++
 .../examples/avr_radio_power/project-conf.h   |  51 ++
 .../avr-rss2/examples/hello-sensors/Makefile  |  19 +
 .../avr-rss2/examples/hello-sensors/README.md |  11 +
 .../examples/hello-sensors/hello-sensors.c    | 119 ++++
 .../examples/hello-sensors/project-conf.h     |  51 ++
 .../examples/ipv6/dc-rpl-coap/Makefile        |  49 ++
 .../examples/ipv6/dc-rpl-coap/README.md       |  67 ++
 .../ipv6/dc-rpl-coap/coap-client.avr-rss2     |   0
 .../examples/ipv6/dc-rpl-coap/coap-client.c   | 413 ++++++++++++
 .../ipv6/dc-rpl-coap/coap-server.avr-rss2     |   0
 .../examples/ipv6/dc-rpl-coap/coap-server.c   | 269 ++++++++
 .../examples/ipv6/dc-rpl-coap/dc-rpl-coap.csc | 168 +++++
 .../ipv6/dc-rpl-coap/dev/dc-hw-sensor.c       |  93 +++
 .../ipv6/dc-rpl-coap/dev/dc-hw-sensor.h       |  46 ++
 .../ipv6/dc-rpl-coap/dev/dc-status-sensor.c   |  84 +++
 .../ipv6/dc-rpl-coap/dev/dc-status-sensor.h   |  46 ++
 .../ipv6/dc-rpl-coap/dev/dc-vdc-sensor.c      |  97 +++
 .../ipv6/dc-rpl-coap/dev/dc-vdc-sensor.h      |  46 ++
 .../examples/ipv6/dc-rpl-coap/er-dc-test.h    |  62 ++
 .../examples/ipv6/dc-rpl-coap/project-conf.h  |  61 ++
 .../ipv6/dc-rpl-coap/resources/res-dc-co2.c   |  83 +++
 .../ipv6/dc-rpl-coap/resources/res-dc-hwcfg.c | 120 ++++
 .../dc-rpl-coap/resources/res-dc-status-obs.c | 113 ++++
 .../ipv6/dc-rpl-coap/resources/res-dc-vdc.c   | 129 ++++
 .../examples/ipv6/rpl-border-router/Makefile  |  55 ++
 .../ipv6/rpl-border-router/README.ETHERNET.md |  66 ++
 .../examples/ipv6/rpl-border-router/README.md |  17 +
 .../ipv6/rpl-border-router/border-router.c    | 388 +++++++++++
 .../rpl-border-router/enc28j60-ip64-driver.c  | 104 +++
 .../rpl-border-router/enc28j60-ip64-driver.h  |  38 ++
 .../ipv6/rpl-border-router/eth-bridge.c       |  33 +
 .../ipv6/rpl-border-router/httpd-simple.c     | 261 +++++++
 .../ipv6/rpl-border-router/httpd-simple.h     |  74 ++
 .../ipv6/rpl-border-router/project-conf.h     |  57 ++
 .../examples/ipv6/rpl-udp-report/Makefile     |  21 +
 .../examples/ipv6/rpl-udp-report/README.md    |  17 +
 .../ipv6/rpl-udp-report/project-conf.h        |  51 ++
 .../ipv6/rpl-udp-report/report.avr-rss2       |   0
 .../examples/ipv6/rpl-udp-report/report.c     | 240 +++++++
 .../ipv6/rpl-udp-report/rss2-rpl-udp.csc      | 167 +++++
 .../ipv6/rpl-udp-report/sink.avr-rss2         |   0
 .../examples/ipv6/rpl-udp-report/sink.c       | 184 +++++
 .../examples/ipv6/sensd_client/Makefile       |  12 +
 .../examples/ipv6/sensd_client/README.md      | 222 ++++++
 .../examples/ipv6/sensd_client/project-conf.h |  51 ++
 .../examples/ipv6/sensd_client/sensd_client.c | 188 ++++++
 .../examples/ipv6/sensd_client/server.c       | 128 ++++
 platform/avr-rss2/ip64-conf.h                 |  42 ++
 platform/avr-rss2/params.c                    | 284 ++++++++
 platform/avr-rss2/params.h                    | 108 +++
 platform/avr-rss2/rss2.h                      |  36 +
 platform/avr-rss2/slip_uart0.c                |  93 +++
 91 files changed, 9349 insertions(+)
 create mode 100644 platform/avr-rss2/Makefile.avr-rss2
 create mode 100644 platform/avr-rss2/README.md
 create mode 100644 platform/avr-rss2/apps/sniffer/Makefile
 create mode 100644 platform/avr-rss2/apps/sniffer/README.md
 create mode 100644 platform/avr-rss2/apps/sniffer/host/Makefile
 create mode 100644 platform/avr-rss2/apps/sniffer/host/README.md
 create mode 100644 platform/avr-rss2/apps/sniffer/host/wsbridge.c
 create mode 100644 platform/avr-rss2/apps/sniffer/project-conf.h
 create mode 100644 platform/avr-rss2/apps/sniffer/rf230-promisc.pat
 create mode 100644 platform/avr-rss2/apps/sniffer/sniffer-example-coap.pcapng
 create mode 100644 platform/avr-rss2/apps/sniffer/sniffer.c
 create mode 100644 platform/avr-rss2/apps/sniffer/stub-rdc.c
 create mode 100644 platform/avr-rss2/contiki-conf.h
 create mode 100644 platform/avr-rss2/contiki-main.c
 create mode 100644 platform/avr-rss2/dev/adc.c
 create mode 100644 platform/avr-rss2/dev/adc.h
 create mode 100644 platform/avr-rss2/dev/battery-sensor.c
 create mode 100644 platform/avr-rss2/dev/button-sensor.c
 create mode 100644 platform/avr-rss2/dev/co2_sa_kxx-sensor.c
 create mode 100644 platform/avr-rss2/dev/co2_sa_kxx-sensor.h
 create mode 100644 platform/avr-rss2/dev/ds18b20.c
 create mode 100644 platform/avr-rss2/dev/enc28j60_avr.c
 create mode 100644 platform/avr-rss2/dev/enc28j60_avr.h
 create mode 100644 platform/avr-rss2/dev/i2c.c
 create mode 100644 platform/avr-rss2/dev/i2c.h
 create mode 100644 platform/avr-rss2/dev/leds.c
 create mode 100644 platform/avr-rss2/dev/leds.h
 create mode 100644 platform/avr-rss2/dev/light-sensor.c
 create mode 100644 platform/avr-rss2/dev/light-sensor.h
 create mode 100644 platform/avr-rss2/dev/pulse-sensor.c
 create mode 100644 platform/avr-rss2/dev/pulse-sensor.h
 create mode 100644 platform/avr-rss2/dev/temp-sensor.c
 create mode 100644 platform/avr-rss2/dev/temp-sensor.h
 create mode 100644 platform/avr-rss2/dev/temp_mcu-sensor.c
 create mode 100644 platform/avr-rss2/dev/temp_mcu-sensor.h
 create mode 100644 platform/avr-rss2/examples/avr_radio_power/AtMega256RFR2-summary-power.dat
 create mode 100644 platform/avr-rss2/examples/avr_radio_power/Makefile
 create mode 100644 platform/avr-rss2/examples/avr_radio_power/README.md
 create mode 100644 platform/avr-rss2/examples/avr_radio_power/avr_radio_power.c
 create mode 100644 platform/avr-rss2/examples/avr_radio_power/project-conf.h
 create mode 100644 platform/avr-rss2/examples/hello-sensors/Makefile
 create mode 100644 platform/avr-rss2/examples/hello-sensors/README.md
 create mode 100644 platform/avr-rss2/examples/hello-sensors/hello-sensors.c
 create mode 100644 platform/avr-rss2/examples/hello-sensors/project-conf.h
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/Makefile
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/README.md
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-client.avr-rss2
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-client.c
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-server.avr-rss2
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-server.c
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/dc-rpl-coap.csc
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-hw-sensor.c
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-hw-sensor.h
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-status-sensor.c
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-status-sensor.h
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.c
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.h
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/er-dc-test.h
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/project-conf.h
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-co2.c
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-hwcfg.c
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-status-obs.c
 create mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-vdc.c
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-border-router/Makefile
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-border-router/README.ETHERNET.md
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-border-router/README.md
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-border-router/border-router.c
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-border-router/enc28j60-ip64-driver.c
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-border-router/enc28j60-ip64-driver.h
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-border-router/eth-bridge.c
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-border-router/httpd-simple.c
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-border-router/httpd-simple.h
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-border-router/project-conf.h
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-udp-report/Makefile
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-udp-report/README.md
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-udp-report/project-conf.h
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-udp-report/report.avr-rss2
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-udp-report/report.c
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-udp-report/rss2-rpl-udp.csc
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-udp-report/sink.avr-rss2
 create mode 100644 platform/avr-rss2/examples/ipv6/rpl-udp-report/sink.c
 create mode 100644 platform/avr-rss2/examples/ipv6/sensd_client/Makefile
 create mode 100644 platform/avr-rss2/examples/ipv6/sensd_client/README.md
 create mode 100644 platform/avr-rss2/examples/ipv6/sensd_client/project-conf.h
 create mode 100644 platform/avr-rss2/examples/ipv6/sensd_client/sensd_client.c
 create mode 100644 platform/avr-rss2/examples/ipv6/sensd_client/server.c
 create mode 100644 platform/avr-rss2/ip64-conf.h
 create mode 100644 platform/avr-rss2/params.c
 create mode 100644 platform/avr-rss2/params.h
 create mode 100644 platform/avr-rss2/rss2.h
 create mode 100644 platform/avr-rss2/slip_uart0.c

diff --git a/platform/avr-rss2/Makefile.avr-rss2 b/platform/avr-rss2/Makefile.avr-rss2
new file mode 100644
index 000000000..2655b8b4a
--- /dev/null
+++ b/platform/avr-rss2/Makefile.avr-rss2
@@ -0,0 +1,61 @@
+CONTIKI_TARGET_DIRS = . apps net loader dev
+
+CONTIKI_CORE=contiki-main
+CONTIKI_TARGET_MAIN = ${CONTIKI_CORE}.o
+CONTIKI_TARGET_SOURCEFILES += contiki-main.c params.c battery-sensor.c i2c.c
+
+CONTIKI_TARGET_SOURCEFILES += sensors.c button-sensor.c slip_uart0.c slip.c leds.c temp_mcu-sensor.c light-sensor.c adc.c cfs-eeprom.c eeprom.c pulse-sensor.c 
+
+CONTIKI_TARGET_SOURCEFILES += temp-sensor.c
+
+CONTIKI_TARGET_SOURCEFILES += enc28j60_avr.c
+CONTIKI_TARGET_SOURCEFILES += co2_sa_kxx-sensor.c
+
+CONTIKIAVR=$(CONTIKI)/cpu/avr
+CONTIKIBOARD=.
+
+
+ifdef $(MCU)
+MCU=$(MCU)
+else
+MCU=atmega256rfr2
+endif
+
+ifeq ($(MCU),atmega128rfa1)
+CONTIKI_PLAT_DEFS = -DF_CPU=8000000UL -DAUTO_CRC_PADDING=2
+BOOTLOADER_START = 0x1E000
+endif
+
+ifeq ($(MCU),atmega128rfr2)
+CONTIKI_PLAT_DEFS = -DF_CPU=8000000UL -DAUTO_CRC_PADDING=2
+BOOTLOADER_START = 0x1E000
+endif
+
+ifeq ($(MCU),atmega256rfr2)
+CONTIKI_PLAT_DEFS = -DF_CPU=16000000UL -DAUTO_CRC_PADDING=2
+BOOTLOADER_START = 0x3E000
+endif
+
+AVRDUDE_PROGRAMMER=jtag2
+
+# For usb devices, you may either use PORT=usb, or (e.g. if you have more than one
+# programmer connected) you can use the following trick to find out the serial number:
+#
+# The example is for an JTAGICE mkII used to program an ATmega128:
+# avrdude -v -P usb:xxxx -c jtag2 -p atmega128
+AVRDUDE_PORT=usb:00B000000D79
+
+# Additional avrdude options
+# Verify off
+AVRDUDE_OPTIONS=-V
+AVRDUDE_MCU=m256rfr2
+
+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/rime
+
+MODULES += core/net/mac core/net core/net/mac/sicslowmac core/net/mac/contikimac core/net/llsec 
+
+
+
diff --git a/platform/avr-rss2/README.md b/platform/avr-rss2/README.md
new file mode 100644
index 000000000..260a7d4bb
--- /dev/null
+++ b/platform/avr-rss2/README.md
@@ -0,0 +1,173 @@
+Getting Started with Contiki using avr-rss2
+===========================================
+This guide's aim is to help you start using Contiki for RSS2 boards
+The platform supports different AtMega-RF boards:
+
+* Based on MCU AtMega128RFR2
+* Based on MCU AtMega256RFR2
+* Based on MCU AtMega128RFA1 
+
+Boards looks the same. "Made in EU" labeled on the AtMega256RFR2 boards
+The platform and CPU code, are common for both boards, can be found under 
+`$(CONTIKI)/platfrom/avr-rssa. The port was developed and tested with RSS2.
+This guide assumes that you have basic understanding of how to use the 
+command line and perform basic admin tasks on UNIX family OSs. You should'
+also have understanding about the Contiki OS design as well have C 
+programming skills.
+
+Boards Features
+----------------
+* Chip Antenna. Supercardiod.
+* Robust radio performance. Up to 300 meter line-of-sight.
+* Unique EUI64 address via chip combined with EEPROM
+* Onboard temp sensor DS18B20, 
+* Light Sensor.
+* 32kHz RTC xtal
+* Comparator chip and input. 
+* SW FET, (relay) for power on/off of sensors.
+* DC input via LDO up to 25V.
+* Standard. 6-pin TTL-USB header for FTDI cable for UART.
+* PCB formfactor for cheap project box G.40X IP54
+* Power/current:
+  ** RX ~10mA (Full RPC AtMegaXXRFR2). 
+  ** Sleep ~45uA @ 16MHz XTAL
+  ** Sleep ~15uA @  8MHz using internal oscillator
+
+* Preprogammed bootloader. 
+* CE certified by test institute.
+
+UART 
+----
+The board has one UART via the 6-pin TTL-USB adapter, The recommended
+baudrate is 38400 bps. This speed gives the lowest error with respect 
+of the used clock frequency used internally. A possible hi-speed is 
+250000 bps wich gives 0% Error with 16MHz clock. 
+
+Port Features
+--------------
+The platform has the following key features:
+* Standard, E64 address from built-in chip.
+* First hooks for RPC (Reduced Power Consumption) for AtMegaXXXRFR2. 
+
+Toolchain needs
+---------------
+The Atmel toolcahin is available in most operating system. 
+Note. The native OS packages does not yet support the new 
+AtMega256RfR2 MCU. 
+
+We'll use toolchain from Atmels web-site. You might also consider 
+Instant Contiki
+
+
+* For Linux.
+See http://www.atmel.com/tools/ATMELAVRTOOLCHAINFORLINUX.aspx
+Download the proper 8-bit platform 32 or 64 bit.
+Unpack unpack under /usr/local
+Also add to your search PATH. For example .bashrc add:
+export PATH=$PATH:/usr/local/avr8-gnu-toolchain-linux_x86/bin
+or
+export PATH=$PATH:/usr/local/avr8-gnu-toolchain-linux_x86_64/bin
+
+For flash programming you'll need avrdude. For OS using apt-get
+apt-get install avrdude
+
+* For Windows.
+Goes here
+
+Contiki build TARGET
+--------------------
+make TARGET=avr-rss2
+
+For AtMega128RFR2 boards:
+make TARGET=avr-rss2 MCU=atmega128rfr2
+
+For AtMega128RFA1 boards:
+make TARGET=avr-rss2 MCU=atmega128rfa1
+
+Flashing
+--------
+Programming using avrdude using serial bootloader. (TTL-USB cable)
+Press the RESET button. The bootloader with wait for boot commands 
+for 3 seconds.
+
+Flashing commnad line example 256k MCU:
+avrdude -p m256rfr2 -c stk500v2 -P /dev/ttyUSB0 -b 38400 -e -U flash:w:hello-world.avr-rss2 
+
+Flashing commnad line example 128k MCU:
+avrdude -p m128rfa1 -c avr109 -P /dev/ttyUSB0 -b 38400 -e -U flash:w:hello-world.avr-rss2 
+
+Older boards may use the avr109 boot loader. The stk500v2 uses the yellow 
+lED while the avr109 uses the red LED.
+
+Tested applications and examples
+---------------------------------
+hello-world
+ipv6/rpl-udp
+ipv6/simple-udp-rpl
+rime
+ipv6/multicast
+example-shell  Needs symbol.c to be added to project also seems like
+in core/dev/serial-line.c process_poll must be replaced with 
+process_post.
+
+  /* Wake up consumer process */
+-  process_poll(&serial_line_process);
++  process_post(&serial_line_process, 0, 0);
+
+examples/powertrace
+
+Platform tutorial applications
+.-----------------------------
+Example to read out various sensors leds serial numbers etc.
+platform/avr-rss2/examples/hello-sensors/
+
+This example shows the sensd data encoding. But UDP using 6lowpan.
+platform/avr-rss2/examles/ipv6/rpl-udp-report/
+
+NAT ip64 ethernet GW based on Contiki core/net/ip64 code 
+platform/avr-rss2/examples/ipv6/rpl-border-router/
+
+Regressions tests
+-----------------
+Travis compile regression for platform: 
+regression-tests/23-compile-avr
+
+Port adds newer version of avr-gcc compiler (4.9.2), to support 
+testing of newwr Atmel MCU as Atmega256RFR2. Work by Atis Elsts 
+
+
+Board approvals
+---------------
+Summary: 
+* R&TTE 73/23/EEC, 89/336/EEC and 99/5/EC
+* Safety: EN 60950-1:2006 + A12: 2011
+* RF: ETSI EN 300 328 V1.7.1 (2006-10)
+* EMC: ETSI EN 301 489-1 V1.9.2 (2011-09), ETSI EN 301 489-17 V2.2.1 (2012-09)
+* EMF: EN 62479:2010
+* Human exposure to electromagnetic fields: EN 62479:2010 
+
+Commercial availability
+------------------------
+Through vendor and though resellers. Note board is will only available 
+were CE approval is covered. This may be further restricted by WEEE.
+Contact vendor. For research legislation is more relaxed in most 
+countries.
+
+References
+----------
+AtMega64/128/256/RFR2 chip documentation available via Atmel.
+Schematics and boards description. Available via Radio-Senors
+Smart Reduced Power Consumption Techniques. AT02594 available via Atmel.
+
+ToDo
+-----
+API for radio power saving settings introduced Atmels app note AT02594. 
+Also function for the desensitizing RPC resister.
+
+Vendor info
+-----------
+http://radio-sensors.com/
+
+Maintainer
+----------
+Robert Olsson <robert@radio-sensors.com>
diff --git a/platform/avr-rss2/apps/sniffer/Makefile b/platform/avr-rss2/apps/sniffer/Makefile
new file mode 100644
index 000000000..63412a817
--- /dev/null
+++ b/platform/avr-rss2/apps/sniffer/Makefile
@@ -0,0 +1,11 @@
+DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
+PROJECT_SOURCEFILES += stub-rdc.c
+
+CONTIKI_PROJECT = sniffer
+
+all: $(CONTIKI_PROJECT) 
+
+CONTIKI = ../../../..
+
+CONTIKI_WITH_RIME = 1
+include $(CONTIKI)/Makefile.include
diff --git a/platform/avr-rss2/apps/sniffer/README.md b/platform/avr-rss2/apps/sniffer/README.md
new file mode 100644
index 000000000..fa139878b
--- /dev/null
+++ b/platform/avr-rss2/apps/sniffer/README.md
@@ -0,0 +1,25 @@
+Sniffer application mote side
+=============================
+This put the radio in sniff mode and should capure all traffic used
+on the set channel. 
+
+Default channel
+---------------
+26
+
+Bulld
+-----
+make TARGET=avr-rss2
+
+Default serial port speed
+-------------------------
+38400 bps
+
+More info & uasage
+------------------
+Look in the host directory
+
+Contiki support
+---------------
+The code promisc for support is needed. This also adds the sensniff 
+format. See rf230-promisc.pat for the rf230bb radions.
diff --git a/platform/avr-rss2/apps/sniffer/host/Makefile b/platform/avr-rss2/apps/sniffer/host/Makefile
new file mode 100644
index 000000000..7308f66a5
--- /dev/null
+++ b/platform/avr-rss2/apps/sniffer/host/Makefile
@@ -0,0 +1,17 @@
+
+CC = gcc
+CFLAGS = -c
+SOURCES = wsbridge.c
+OBJECTS = $(SOURCES:.c=.o)
+EXE = wsbridge
+
+all: $(SOURCES) $(EXE)
+
+$(EXE): $(OBJECTS)
+	$(CC) $(OBJECTS) -o $@
+
+%.o:%.c
+	$(CC) $(CFLAGS) $< -o $@
+
+clean:
+	rm *.o
diff --git a/platform/avr-rss2/apps/sniffer/host/README.md b/platform/avr-rss2/apps/sniffer/host/README.md
new file mode 100644
index 000000000..cb7960d50
--- /dev/null
+++ b/platform/avr-rss2/apps/sniffer/host/README.md
@@ -0,0 +1,38 @@
+Sniffer application host side
+=============================
+This a Unix application to link between the serial port having the
+sensor node connected and Wireshark or tcpdump. Enclosed is a modified 
+wsbridge (See copyright i file) code to use the format used by sensniff. 
+
+You can also use sensniff which is a Python script. Author of senssniff 
+is George Oikonomou (oikonomou@users.sf.net)
+
+See: 
+https://github.com/g-oikonomou/sensniff
+
+
+Function
+--------
+The mote captures WSN data and formats according sensniff format sends
+over the serial line. The data is binary. The wsbridge reads reads serial 
+line (typically /dev/ttyUSB) on Linux systems decodes the sensnaiff and 
+create timestamp and adds the the PCAP farming and writes the result to 
+a FIFO or named pipe. /tmp/wireshark or /tmp/sensniff.
+
+Bulld
+-----
+Just use the Makefile. Put binary for convince in your path.
+
+Usage
+-----
+* wsbridge /dev/ttYUSB
+* wireshart -k -i /tmp/wireshark
+
+Default serial port speed
+-------------------------
+38400 bps
+
+References
+----------
+http://www.freaklabs.org/index.php/wsbridge.html
+https://github.com/g-oikonomou/sensniff
diff --git a/platform/avr-rss2/apps/sniffer/host/wsbridge.c b/platform/avr-rss2/apps/sniffer/host/wsbridge.c
new file mode 100644
index 000000000..6809f36a8
--- /dev/null
+++ b/platform/avr-rss2/apps/sniffer/host/wsbridge.c
@@ -0,0 +1,459 @@
+/*******************************************************************
+    Copyright (C) 2009 FreakLabs
+    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 the copyright holder 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 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 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.
+
+    Originally written by Christopher Wang aka Akiba.
+    Please post support questions to the FreakLabs forum.
+
+ *******************************************************************/
+/*!
+    FreakLabs Freakduino/Wireshark Bridge
+
+    This program allows data from the Freakduino to be piped into wireshark.
+    When the sniffer firmware is loaded into the Freakduino, then the Freakduino
+    will be in promiscuous mode and will just dump any frames it sees. This
+    program takes the frame dump and sends it into Wireshark for analysis. The
+    global header is already set up to inform wireshark that the link layer for
+    all frames will be in IEEE 802.15.4 format. After that, it is up to the user
+    to choose any higher layer protocols to decode above 802.15.4 via the
+    wireshark "enable protocols" menu.
+ */
+
+/*
+
+   Modified for sensniff format. Magic[4] + Vers[1] + CMD[1] + len[1]
+   Robert Olsson <roolss@kth.se> 2015-11-10
+
+ */
+
+/**************************************************************************/
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <time.h>
+#include <stdint.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <termios.h>
+
+#define PORTBUFSIZE     32
+#define BUFSIZE         1024
+#define PACKET_FCS      2
+#define DEBUG           1
+#define PIPENAME        "/tmp/wireshark"
+#define BAUDRATE        B38400
+
+enum FSM {
+  START_CAPTURE,
+  PACKET_CAPTURE
+};
+
+static int FD_pipe = -1;
+static int FD_com = -1;
+static uint8_t port_buf[PORTBUFSIZE];
+static uint8_t circ_buf[BUFSIZE];
+static uint16_t rd_idx = 0;
+static uint16_t wr_idx = 0;
+static uint8_t len;
+static uint8_t state = START_CAPTURE;
+static uint8_t file_write = 0;
+static fd_set fds;
+static const uint8_t magic[] = { 0xC1, 0x1F, 0xFE, 0x72 };
+
+/**************************************************************************/
+/*!
+    Open the serial port that we'll be communicating with the Freakduino (sniffer)
+    through.
+ */
+/**************************************************************************/
+
+int
+serial_open(char *portname)
+{
+  int baud = B38400;
+  int fd; /* file descriptor for the serial port */
+  struct termios tc, tp;
+
+  fd = open(portname, O_RDONLY | O_NOCTTY | O_NDELAY);
+
+  if(fd == -1) { /* if open is unsucessful */
+    printf("serial_open: Unable to open %s.\n", portname);
+    exit(-1);
+  }
+
+  fcntl(fd, F_GETFL);
+  fcntl(fd, F_SETFL, O_RDWR);
+
+  tp.c_cflag = baud | CS8 | CLOCAL | CREAD;
+  tp.c_oflag = 0; /* Raw Input */
+  tp.c_lflag = 0; /* No conoical */
+  tp.c_oflag &= ~(OLCUC | OCRNL | ONOCR | ONLRET | OFILL | OFDEL | NLDLY | CRDLY);
+
+  /* ignore CR, ignore parity */
+  tp.c_iflag = ~(IGNBRK | PARMRK | INPCK | INLCR | IUCLC | IXOFF) |
+    BRKINT | IGNPAR | ICRNL | IXON | ISIG | ICANON;
+
+  tp.c_lflag &= ~(ECHO | ECHONL);
+  tp.c_oflag = 0; /* Raw Input */
+  tp.c_iflag &= ~ISTRIP;
+
+  tcflush(fd, TCIFLUSH);
+
+  cfsetospeed(&tp, baud);
+  cfsetispeed(&tp, baud);
+
+  if(tcsetattr(fd, TCSANOW, &tp) < 0) {
+    perror("Couldn't set term attributes");
+    return -1;
+  }
+  return fd;
+}
+/**************************************************************************/
+/*!
+    Create the named pipe that we will be communicating with wireshark through.
+ */
+/**************************************************************************/
+static void
+named_pipe_create(char *name)
+{
+  int rv = 0;
+  rv = mkfifo(name, 0666);
+  if((rv == -1) && (errno != EEXIST)) {
+    perror("Error creating named pipe");
+    exit(1);
+  }
+
+  FD_pipe = open(name, O_WRONLY);
+
+  if(FD_pipe == -1) {
+    perror("Error connecting to named pipe");
+    exit(1);
+  }
+}
+/**************************************************************************/
+/*!
+    Write data to the pipe
+ */
+/**************************************************************************/
+size_t
+data_write(const void *ptr, size_t size)
+{
+  ssize_t bytes = 0;
+  if(FD_pipe != -1) {
+    bytes = write(FD_pipe, ptr, size);
+  }
+}
+/**************************************************************************/
+/*!
+    Write the global header to wireshark. This is only done once at the
+    beginning of the capture.
+ */
+/**************************************************************************/
+static void
+write_global_hdr()
+{
+  uint32_t magic_number = 0xa1b2c3d4;   /* magic number */
+  uint16_t version_major = 2;   /* major version number */
+  uint16_t version_minor = 4;   /* minor version number */
+  int32_t thiszone = 0;         /* GMT to local correction */
+  uint32_t sigfigs = 0;         /* accuracy of timestamps */
+  uint32_t snaplen = 65535;     /* max length of captured packets, in octets */
+  uint32_t network = 195;       /* data link type (DLT) - IEEE 802.15.4 */
+
+  data_write(&magic_number, sizeof(magic_number));
+  data_write(&version_major, sizeof(version_major));
+  data_write(&version_minor, sizeof(version_minor));
+  data_write(&thiszone, sizeof(thiszone));
+  data_write(&sigfigs, sizeof(sigfigs));
+  data_write(&snaplen, sizeof(snaplen));
+  data_write(&network, sizeof(network));
+}
+/**************************************************************************/
+/*!
+    Write the frame header into wireshark. This is required for the libpcap
+    format and informs wireshark that a new frame is coming.
+ */
+/**************************************************************************/
+static void
+write_frame_hdr(uint8_t len)
+{
+  uint32_t ts_sec;      /* timestamp seconds */
+  uint32_t ts_usec;     /* timestamp microseconds */
+  uint32_t incl_len;    /* number of octets of packet saved in file */
+  uint32_t orig_len;    /* actual length of packet */
+  struct timeval tv;
+
+  gettimeofday(&tv, NULL);
+  ts_sec = tv.tv_sec;
+  ts_usec = tv.tv_usec;
+  incl_len = len;
+  orig_len = len + PACKET_FCS;
+
+  data_write(&ts_sec, sizeof(ts_sec));
+  data_write(&ts_usec, sizeof(ts_usec));
+  data_write(&incl_len, sizeof(incl_len));
+  data_write(&orig_len, sizeof(orig_len));
+}
+/**************************************************************************/
+/*!
+    Write one frame into wireshark (via the pipe).
+ */
+/**************************************************************************/
+static void
+write_frame(uint8_t frame_len)
+{
+  uint8_t i;
+
+  /* actual frame length for wireshark should not include FCS */
+  frame_len -= PACKET_FCS;
+
+  /* write header to inform WS that new frame has arrived */
+  write_frame_hdr(frame_len);
+
+  /* bump rd_idx. we don't want to write the length byte */
+  rd_idx = (rd_idx + 1) % BUFSIZE;
+
+  /* write frame into wireshark */
+  for(i = 0; i < frame_len; i++) {
+    data_write(&circ_buf[rd_idx], 1);
+    rd_idx = (rd_idx + 1) % BUFSIZE;
+  }
+
+  /* bump rd_idx. we're not using the trailing FCS value */
+  rd_idx = (rd_idx + 1) % BUFSIZE;
+}
+/**************************************************************************/
+/*!
+    Calculate total number of bytes in buffer.
+ */
+/**************************************************************************/
+static uint16_t
+calc_bytes_in_buf()
+{
+  if(rd_idx > wr_idx) {
+    /* read index is greater than write. we must have wrapped around */
+    return BUFSIZE - (rd_idx - wr_idx);
+  } else {
+    return wr_idx - rd_idx;
+  }
+}
+/**************************************************************************/
+/*!
+    Deal with any received signals. This includes ctrl-C to stop the program.
+ */
+/**************************************************************************/
+static void
+sig_int(int signo)
+{
+  (void)signo;
+  if(FD_pipe != -1) {
+    printf("\nClosing pipe.\n");
+    close(FD_pipe);
+  }
+
+  if(FD_com != -1) {
+    printf("\nClosing serial port.\n");
+    close(FD_com);
+  }
+
+  printf("\nSignal captured and devices shut down.\n");
+
+  exit(0);
+}
+/**************************************************************************/
+/*!
+    Init the signals we'll be checking for.
+ */
+/**************************************************************************/
+static void
+signal_init(void)
+{
+  signal(SIGINT, sig_int);
+  signal(SIGHUP, sig_int);
+  signal(SIGTERM, sig_int);
+}
+int got;
+int debug;
+
+/**************************************************************************/
+/*!
+    Here's the meat of the code.
+ */
+/**************************************************************************/
+int
+main(int argc, char *argv[])
+{
+  int nbytes;
+  uint8_t i;
+
+  got = 0;
+
+  /* capture any signals that will terminate program */
+  signal_init();
+
+  /* make sure the COM port is specified */
+  if(argc == 2) {
+    /* open the COM port */
+    if((FD_com = serial_open(argv[1])) == -1) {
+      printf("Serial port not opened.\n");
+      return 0;
+    } else {
+      /* set up the select statement for the COM port. */
+      FD_ZERO(&fds);
+      FD_SET(FD_com, &fds);
+
+      printf("Serial port connected. Waiting for wireshark connection.\n");
+      printf("Open wireshark and connect to local interface: %s\n", PIPENAME);
+    }
+  } else {
+    printf("Usage: wsbridge <portname>.\n");
+    return 0;
+  }
+
+  /* create and open pipe for wireshark */
+  named_pipe_create(PIPENAME);
+
+  /* wait for wireshark to connect to pipe. Once wireshark */
+  /* connects, then the global header will be written to it. */
+  if(FD_pipe != -1) {
+    write_global_hdr();
+    printf("Client connected to pipe.\n");
+  }
+
+  for(;;) {
+    uint16_t bytes_in_buf;
+    uint8_t frame_len, byte_ctr;
+
+    /* block until there is data in the serial port */
+    select(FD_com + 1, &fds, NULL, NULL, NULL);
+    if(FD_ISSET(FD_com, &fds)) {
+      int ii;
+      /* wait for data to come in on the serial port */
+      if((nbytes = read(FD_com, port_buf, PORTBUFSIZE)) > 0) {
+
+        if(debug) {
+          uint8_t p;
+          printf("read nbytes=%d\n", nbytes);
+          for(i = 0; i < nbytes; i++) {
+            printf(" %02X", port_buf[i]);
+          }
+          printf("\n");
+        }
+        /* write data to circular buffer. loop through all received bytes */
+        for(i = 0; i < nbytes; i++) {
+          switch(state) {
+          case START_CAPTURE:
+            /* new frame starting */
+            if((got == 0) && (port_buf[i] == magic[0])) {
+              got = 1;
+            } else if((got == 1) && (port_buf[i] == magic[1])) {
+              got = 2;
+            } else if((got == 2) && (port_buf[i] == magic[2])) {
+              got = 3;
+            } else if((got == 3) && (port_buf[i] == magic[3])) {
+              got = 4;
+              if(debug) {
+                printf("GOT MAGIC i=%d\n", i);
+              }
+            } else if((got == 4) && (port_buf[i] == 1)) {
+              got = 5;
+              if(debug) {
+                printf("GOT VERSION i=%d\n", port_buf[i]);
+              }
+            } else if((got == 5) && (port_buf[i] == 0)) {
+              got = 6;
+              if(debug) {
+                printf("GOT COMMAND i=%d\n", port_buf[i]);
+              }
+            } else if(got == 6) {
+              len = port_buf[i];
+              byte_ctr = 0;
+              if(debug) {
+                printf("Len = %02X.\n", len);
+              }
+              circ_buf[wr_idx] = len;
+              wr_idx = (wr_idx + 1) % BUFSIZE;
+              state = PACKET_CAPTURE;
+            } else {
+              got = 0;
+            }
+            break;
+
+          case PACKET_CAPTURE:
+            /* continue capturing bytes until end of frame */
+            /* write data to circular buffer and increment index */
+
+            circ_buf[wr_idx] = port_buf[i];
+            /* ////printf("%02X ", circ_buf[wr_idx]); */
+
+            wr_idx = (wr_idx + 1) % BUFSIZE;
+            /* track number of received bytes. when received bytes */
+            /* equals frame length, then restart state machine and */
+            /* write bytes to wireshark */
+            byte_ctr++;
+            if(byte_ctr == (len - 1)) {
+              state = START_CAPTURE;
+              file_write = 1;
+              /* printf("\n"); */
+              got = 0;
+            }
+            break;
+          }
+          fflush(stdout);
+        }
+        /* at least one frame has been written. loop through circular buffer */
+        /* and write out all completed frames */
+        while(file_write) {
+          /* capture frame length and check buffer to see if one or more frames */
+          /* are available. */
+          frame_len = circ_buf[rd_idx];
+          bytes_in_buf = calc_bytes_in_buf();
+
+          if(bytes_in_buf > frame_len) {
+            /* if more than one frame is available, then write one frame to */
+            /* wireshark and then see if any more are available. */
+            write_frame(frame_len);
+          } else if(bytes_in_buf == frame_len) {
+            /* only one frame is available. write to wireshark and then quit */
+            /* the loop */
+            write_frame(frame_len);
+            file_write = 0;
+          } else {
+            /* less than one frame is available. quit the loop and collect more */
+            /* bytes. we normally should not get here. */
+            file_write = 0;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/platform/avr-rss2/apps/sniffer/project-conf.h b/platform/avr-rss2/apps/sniffer/project-conf.h
new file mode 100644
index 000000000..d56b19e7d
--- /dev/null
+++ b/platform/avr-rss2/apps/sniffer/project-conf.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, Loughborough University - 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.
+ *
+ * This file is part of the Contiki operating system.
+ */
+
+/**
+ * \file
+ *         Project specific configuration defines for the sniffer example.
+ *
+ * \author
+ *         George Oikonomou - <oikonomou@users.sourceforge.net>
+ *         Robert Olsson - <robert@radio.sensors.com>
+ */
+
+#ifndef PROJECT_CONF_H_
+#define PROJECT_CONF_H_
+
+
+#define NETSTACK_CONF_MAC      nullmac_driver
+/* Can see other channels. Interesting. */
+/* #define NETSTACK_CONF_MAC      csma_driver */
+#define NETSTACK_CONF_RDC      stub_rdc_driver
+
+
+#endif /* PROJECT_CONF_H_ */
diff --git a/platform/avr-rss2/apps/sniffer/rf230-promisc.pat b/platform/avr-rss2/apps/sniffer/rf230-promisc.pat
new file mode 100644
index 000000000..3e2c98e6f
--- /dev/null
+++ b/platform/avr-rss2/apps/sniffer/rf230-promisc.pat
@@ -0,0 +1,39 @@
+diff --git a/cpu/avr/radio/rf230bb/rf230bb.c b/cpu/avr/radio/rf230bb/rf230bb.c
+index 53959d1..b9f2262 100644
+--- a/cpu/avr/radio/rf230bb/rf230bb.c
++++ b/cpu/avr/radio/rf230bb/rf230bb.c
+@@ -544,7 +544,7 @@ rf230_set_promiscuous_mode(bool isPromiscuous) {
+ #if RF230_CONF_AUTOACK
+     is_promiscuous = isPromiscuous;
+ /* TODO: Figure out when to pass promisc state to 802.15.4 */
+-//    radio_set_trx_state(is_promiscuous?RX_ON:RX_AACK_ON);
++    radio_set_trx_state(is_promiscuous?RX_ON:RX_AACK_ON);
+ #endif
+ }
+ 
+@@ -1392,6 +1392,25 @@ PROCESS_THREAD(rf230_process, ev, data)
+     /* Restore interrupts. */
+     HAL_LEAVE_CRITICAL_REGION();
+     PRINTF("rf230_read: %u bytes lqi %u\n",len,rf230_last_correlation);
++
++    if(is_promiscuous) {
++      uint8_t i;
++      unsigned const char * rxdata = packetbuf_dataptr();
++      /* Print magic */
++      putchar(0xC1);
++      putchar(0x1F);
++      putchar(0xFE);
++      putchar(0x72);
++      /* Print version */
++      putchar(0x01);
++      /* Print CMD == frame */
++      putchar(0x00);
++      putchar(len+3);
++
++      for (i=0;i<len;i++)  putchar(rxdata[i]);
++      printf("\n");
++    }
++
+ #if DEBUG>1
+      {
+         uint8_t i;
diff --git a/platform/avr-rss2/apps/sniffer/sniffer-example-coap.pcapng b/platform/avr-rss2/apps/sniffer/sniffer-example-coap.pcapng
new file mode 100644
index 000000000..e69de29bb
diff --git a/platform/avr-rss2/apps/sniffer/sniffer.c b/platform/avr-rss2/apps/sniffer/sniffer.c
new file mode 100644
index 000000000..be572bce1
--- /dev/null
+++ b/platform/avr-rss2/apps/sniffer/sniffer.c
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ *
+ */
+
+/*
+  Author:  Robert Olsson <robert@radio-sensors.com>
+*/
+
+#include "contiki.h"
+#include "net/rime/rime.h"
+#include "random.h"
+#include "dev/button-sensor.h"
+#include "dev/leds.h"
+#include <stdio.h>
+/*---------------------------------------------------------------------------*/
+
+PROCESS(sniffer_process, "Sniffer process");
+AUTOSTART_PROCESSES(&sniffer_process);
+
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(sniffer_process, ev, data)
+{
+  PROCESS_BEGIN();
+
+  /*
+    To get rf230bb radio in sniff mode we need to have radio in RX_ON.
+    The promisc commands fixes this for us. No need to set PAN and 
+    address or MAC to zero is this case. Se Atmel datasheet. There is
+    a chance other radios works the same way.
+  */
+
+  rf230_set_promiscuous_mode(1);
+
+  printf("Sniffer started\n");
+
+  while(1) {
+    PROCESS_YIELD();
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
diff --git a/platform/avr-rss2/apps/sniffer/stub-rdc.c b/platform/avr-rss2/apps/sniffer/stub-rdc.c
new file mode 100644
index 000000000..a4db0710d
--- /dev/null
+++ b/platform/avr-rss2/apps/sniffer/stub-rdc.c
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2010, Loughborough University - 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.
+ *
+ * This file is part of the Contiki operating system.
+ */
+
+/**
+ * \file
+ *         Definition of a fake RDC driver to be used with passive
+ *         examples. The sniffer will never send packets and it will never
+ *         push incoming packets up the stack. We do this by defining this
+ *         driver as our RDC. We then drop everything
+ *
+ * \author
+ *         George Oikonomou - <oikonomou@users.sourceforge.net>
+ */
+
+#include "net/mac/mac.h"
+#include "net/mac/rdc.h"
+/*---------------------------------------------------------------------------*/
+static void
+send(mac_callback_t sent, void *ptr)
+{
+  if(sent) {
+    sent(ptr, MAC_TX_OK, 1);
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+send_list(mac_callback_t sent, void *ptr, struct rdc_buf_list *list)
+{
+  if(sent) {
+    sent(ptr, MAC_TX_OK, 1);
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+input(void)
+{
+}
+/*---------------------------------------------------------------------------*/
+static int
+on(void)
+{
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+static int
+off(int keep_radio_on)
+{
+  return keep_radio_on;
+}
+/*---------------------------------------------------------------------------*/
+static unsigned short
+cca(void)
+{
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static void
+init(void)
+{
+}
+/*---------------------------------------------------------------------------*/
+const struct rdc_driver stub_rdc_driver = {
+  "stub-rdc",
+  init,
+  send,
+  send_list,
+  input,
+  on,
+  off,
+  cca,
+};
+/*---------------------------------------------------------------------------*/
diff --git a/platform/avr-rss2/contiki-conf.h b/platform/avr-rss2/contiki-conf.h
new file mode 100644
index 000000000..3e1f5dfc2
--- /dev/null
+++ b/platform/avr-rss2/contiki-conf.h
@@ -0,0 +1,350 @@
+/*
+ * Copyright (c) 2006, Technical University of Munich
+ * 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
+ *         Configuration for RSS2 (radio-sensors.com) platform
+ */
+
+#ifndef CONTIKI_CONF_H_
+#define CONTIKI_CONF_H_
+
+/* include the project config */
+/* PROJECT_CONF_H might be defined in the project Makefile */
+#ifdef PROJECT_CONF_H
+#include PROJECT_CONF_H
+#endif
+
+/* Platform name, type, and MCU clock rate */
+#define PLATFORM_NAME  "rss2"
+#define PLATFORM_TYPE  ATMEGA256RFR2
+#ifndef F_CPU
+#define F_CPU          8000000UL
+#endif
+
+#include <stdint.h>
+
+#ifndef NETSTACK_CONF_MAC
+#define NETSTACK_CONF_MAC     csma_driver
+#endif
+
+#ifndef NETSTACK_CONF_RDC
+#define NETSTACK_CONF_RDC     contikimac_driver
+#endif
+
+#ifndef NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE
+#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
+#endif
+
+#ifndef NETSTACK_CONF_FRAMER
+#if NETSTACK_CONF_WITH_IPV6
+#define NETSTACK_CONF_FRAMER  contikimac_framer
+#else
+#define NETSTACK_CONF_FRAMER  framer_802154
+#endif
+#endif
+
+#ifndef NETSTACK_CONF_RADIO
+#define NETSTACK_CONF_RADIO   rf230_driver
+#endif
+
+#ifndef CHANNEL_802_15_4
+#define CHANNEL_802_15_4      26
+#endif
+
+/* AUTOACK receive mode gives better rssi measurements, even if ACK is never requested */
+#ifndef RF230_CONF_AUTOACK
+#define RF230_CONF_AUTOACK        1
+#endif
+
+#define MCUCSR  MCUSR
+
+/* The AVR tick interrupt usually is done with an 8 bit counter around 128 Hz.
+ * 125 Hz needs slightly more overhead during the interrupt, as does a 32 bit
+ * clock_time_t.
+ */
+/* Clock ticks per second */
+
+#define CLOCK_CONF_SECOND 128
+typedef unsigned long clock_time_t;
+#define CLOCK_LT(a, b)  ((signed long)((a) - (b)) < 0)
+#define INFINITE_TIME 0xffffffff
+/* These routines are not part of the contiki core but can be enabled in cpu/avr/clock.c */
+void clock_delay_msec(uint16_t howlong);
+void clock_adjust_ticks(clock_time_t howmany);
+
+/* The radio needs to interrupt during an rtimer interrupt */
+#define RTIMER_CONF_NESTED_INTERRUPTS 1
+
+/* RSS2 boards has a 32768Hz on TIMER2 */
+#define AVR_CONF_USE32KCRYSTAL 1
+#define SLIP_PORT RS232_PORT_0
+
+/* Pre-allocated memory for loadable modules heap space (in bytes)*/
+/* Default is 4096. Currently used only when elfloader is present. Not tested on Raven */
+/* #define MMEM_CONF_SIZE 256 */
+
+/* Starting address for code received via the codeprop facility. Not tested. */
+typedef unsigned long off_t;
+/* #define EEPROMFS_ADDR_CODEPROP 0x8000 */
+
+/* Logging adds 200 bytes to program size. RS232 output slows down webserver. */
+/* #define LOG_CONF_ENABLED         1 */
+
+/* RADIOSTATS is used in rf230bb, clock.c and the webserver cgi to report radio usage */
+/* It has less overhead than ENERGEST */
+#define RADIOSTATS                1
+
+/* More extensive stats, via main loop printfs or webserver status pages */
+#define ENERGEST_CONF_ON          1
+
+/* Packet statistics */
+typedef unsigned short uip_stats_t;
+#define UIP_STATISTICS            0
+
+/* Available watchdog timeouts depend on mcu. Default is WDTO_2S. -1 Disables the watchdog. */
+/* AVR Studio simulator tends to reboot due to clocking the WD 8 times too fast */
+/* #define WATCHDOG_CONF_TIMEOUT -1 */
+
+/* Debugflow macro, useful for tracing path through mac and radio interrupts */
+/* #define DEBUGFLOWSIZE 128 */
+
+/* Define MAX_*X_POWER to reduce tx power and ignore weak rx packets for testing a miniature multihop network.
+ * Leave undefined for full power and sensitivity.
+ * tx=0 (3dbm, default) to 15 (-17.2dbm)
+ * RF230_CONF_AUTOACK sets the extended mode using the energy-detect register with rx=0 (-91dBm) to 84 (-7dBm)
+ *   else the rssi register is used having range 0 (91dBm) to 28 (-10dBm)
+ *   For simplicity RF230_MIN_RX_POWER is based on the energy-detect value and divided by 3 when autoack is not set.
+ * On the RF230 a reduced rx power threshold will not prevent autoack if enabled and requested.
+ * These numbers applied to both Raven and Jackdaw give a maximum communication distance of about 15 cm
+ * and a 10 meter range to a full-sensitivity RF230 sniffer.
+ *#define RF230_MAX_TX_POWER 15
+ *#define RF230_MIN_RX_POWER 30
+ */
+/* The rf231 and atmega128rfa1 can use an rssi threshold for triggering rx_busy that saves 0.5ma in rx mode */
+/* 1 - 15 maps into -90 to -48 dBm; the register is written with RF230_MIN_RX_POWER/6 + 1. Undefine for -100dBm sensitivity */
+/* #define RF230_MIN_RX_POWER        0 */
+
+/* Network setup */
+/* TX routine passes the cca/ack result in the return parameter */
+#define RDC_CONF_HARDWARE_ACK    1
+/* TX routine does automatic cca and optional backoffs */
+#define RDC_CONF_HARDWARE_CSMA   1
+/* Allow MCU sleeping between channel checks */
+#define RDC_CONF_MCU_SLEEP         1
+
+#if NETSTACK_CONF_WITH_IPV6
+#define LINKADDR_CONF_SIZE        8
+#define UIP_CONF_ICMP6            1
+#define UIP_CONF_UDP              1
+#ifndef UIP_CONF_TCP
+#define UIP_CONF_TCP              1
+#endif
+#define NETSTACK_CONF_NETWORK     sicslowpan_driver
+#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
+#else
+/* ip4 should build but is largely untested */
+#define LINKADDR_CONF_SIZE        2
+#define NETSTACK_CONF_NETWORK     rime_driver
+#endif
+
+#define UIP_CONF_LL_802154        1
+#define UIP_CONF_LLH_LEN          0
+
+/* 10 bytes per stateful address context - see sicslowpan.c */
+/* Default is 1 context with prefix aaaa::/64 */
+/* These must agree with all the other nodes or there will be a failure to communicate! */
+#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 1
+#define SICSLOWPAN_CONF_ADDR_CONTEXT_0 { addr_contexts[0].prefix[0] = 0xaa; addr_contexts[0].prefix[1] = 0xaa; }
+#define SICSLOWPAN_CONF_ADDR_CONTEXT_1 { addr_contexts[1].prefix[0] = 0xbb; addr_contexts[1].prefix[1] = 0xbb; }
+#define SICSLOWPAN_CONF_ADDR_CONTEXT_2 { addr_contexts[2].prefix[0] = 0x20; addr_contexts[2].prefix[1] = 0x01; addr_contexts[2].prefix[2] = 0x49; addr_contexts[2].prefix[3] = 0x78, addr_contexts[2].prefix[4] = 0x1d; addr_contexts[2].prefix[5] = 0xb1; }
+
+/* Take the default TCP maximum segment size for efficiency and simpler wireshark captures */
+/* Use this to prevent 6LowPAN fragmentation (whether or not fragmentation is enabled) */
+/* #define UIP_CONF_TCP_MSS       48 */
+
+#define UIP_CONF_IP_FORWARD      0
+#define UIP_CONF_FWCACHE_SIZE    0
+
+#define UIP_CONF_IPV6_CHECKS     1
+#define UIP_CONF_IPV6_QUEUE_PKT  1
+#define UIP_CONF_IPV6_REASSEMBLY 0
+
+#define UIP_CONF_UDP_CHECKSUMS   1
+#define UIP_CONF_TCP_SPLIT       1
+#define UIP_CONF_DHCP_LIGHT      1
+
+#if 0 /* No radio cycling */
+
+#define NETSTACK_CONF_MAC         nullmac_driver
+#define NETSTACK_CONF_RDC         sicslowmac_driver
+#define NETSTACK_CONF_FRAMER      framer_802154
+/* 1 + Number of auto retry attempts 0-15 (0 implies don't use extended TX_ARET_ON mode) */
+#define RF230_CONF_FRAME_RETRIES    2
+/* Number of csma retry attempts 0-5 in extended tx mode (7 does immediate tx with no csma) */
+#define RF230_CONF_CSMA_RETRIES   5
+/* Default is one RAM buffer for received packets. More than one may benefit multiple TCP connections or ports */
+#define RF230_CONF_RX_BUFFERS     3
+#define SICSLOWPAN_CONF_FRAG      1
+/* Most browsers reissue GETs after 3 seconds which stops fragment reassembly so a longer MAXAGE does no good */
+#define SICSLOWPAN_CONF_MAXAGE    3
+/* How long to wait before terminating an idle TCP connection. Smaller to allow faster sleep. Default is 120 seconds */
+/* If wait is too short the connection can be reset as a result of multiple fragment reassembly timeouts */
+#define UIP_CONF_WAIT_TIMEOUT    20
+/* 54 bytes per queue ref buffer */
+#define QUEUEBUF_CONF_REF_NUM     2
+/* Allocate remaining RAM as desired */
+/* 30 bytes per TCP connection */
+/* 6LoWPAN does not do well with concurrent TCP streams, as new browser GETs collide with packets coming */
+/* from previous GETs, causing decreased throughput, retransmissions, and timeouts. Increase to study this. */
+/* ACKs to other ports become interleaved with computation-intensive GETs, so ACKs are particularly missed. */
+/* Increasing the number of packet receive buffers in RAM helps to keep ACKs from being lost */
+#define UIP_CONF_MAX_CONNECTIONS  4
+/* 2 bytes per TCP listening port */
+#define UIP_CONF_MAX_LISTENPORTS  4
+/* 25 bytes per UDP connection */
+#define UIP_CONF_UDP_CONNS       10
+/* See uip-ds6.h */
+#define NBR_TABLE_CONF_MAX_NEIGHBORS      20
+#define UIP_CONF_DS6_DEFRT_NBU    2
+#define UIP_CONF_DS6_PREFIX_NBU   3
+#define UIP_CONF_MAX_ROUTES    20
+#define UIP_CONF_DS6_ADDR_NBU     3
+#define UIP_CONF_DS6_MADDR_NBU    0
+#define UIP_CONF_DS6_AADDR_NBU    0
+
+#elif 1  /* Contiki-mac radio cycling */
+/* #define NETSTACK_CONF_MAC         nullmac_driver */
+/* csma needed for burst mode at present. Webserver won't work without it */
+/* #define NETSTACK_CONF_MAC         csma_driver */
+/* #define NETSTACK_CONF_RDC         contikimac_driver */
+/* Default is two CCA separated by 500 usec */
+
+/* So without the header this needed for RPL mesh to form */
+#define CONTIKIMAC_FRAMER_CONF_SHORTEST_PACKET_SIZE   (43 - 18)  /* multicast RPL DIS length */
+/* Not tested much yet */
+#define CONTIKIMAC_CONF_WITH_PHASE_OPTIMIZATION 0
+#define CONTIKIMAC_CONF_COMPOWER               1
+#define RIMESTATS_CONF_ENABLED                 0
+
+/* A 0 here means non-extended mode; 1 means extended mode with no retry, >1 for retrys */
+/* Contikimac strobes on its own, but hardware retries are faster */
+#define RF230_CONF_FRAME_RETRIES  1
+/* Long csma backoffs will compromise radio cycling; set to 0 for 1 csma */
+#define RF230_CONF_CSMA_RETRIES   0
+#define SICSLOWPAN_CONF_FRAG      1
+#define SICSLOWPAN_CONF_MAXAGE    3
+/* 54 bytes per queue ref buffer */
+#define QUEUEBUF_CONF_REF_NUM     2
+/* Allocate remaining RAM. Not much left due to queuebuf increase  */
+#define UIP_CONF_MAX_CONNECTIONS  2
+#define UIP_CONF_MAX_LISTENPORTS  4
+#define UIP_CONF_UDP_CONNS        5
+#define NBR_TABLE_CONF_MAX_NEIGHBORS      20
+#define UIP_CONF_DS6_DEFRT_NBU    2
+#define UIP_CONF_DS6_PREFIX_NBU   3
+#define UIP_CONF_MAX_ROUTES    4
+#define UIP_CONF_DS6_ADDR_NBU     3
+#define UIP_CONF_DS6_MADDR_NBU    0
+#define UIP_CONF_DS6_AADDR_NBU    0
+
+#elif 0  /* cx-mac radio cycling */
+/* RF230 does clear-channel assessment in extended mode (autoretries>0) */
+/* These values are guesses */
+#define RF230_CONF_FRAME_RETRIES  10
+#define RF230_CONF_CSMA_RETRIES   2
+#if RF230_CONF_CSMA_RETRIES
+#define NETSTACK_CONF_MAC         nullmac_driver
+#else
+#define NETSTACK_CONF_MAC         csma_driver
+#endif
+#define NETSTACK_CONF_RDC         cxmac_driver
+#define NETSTACK_CONF_FRAMER      framer_802154
+#define SICSLOWPAN_CONF_FRAG      1
+#define SICSLOWPAN_CONF_MAXAGE    3
+#define CXMAC_CONF_ANNOUNCEMENTS  0
+/* 54 bytes per queue ref buffer */
+#define QUEUEBUF_CONF_REF_NUM     2
+/* Allocate remaining RAM. Not much left due to queuebuf increase  */
+#define UIP_CONF_MAX_CONNECTIONS  2
+#define UIP_CONF_MAX_LISTENPORTS  4
+#define UIP_CONF_UDP_CONNS        5
+#define NBR_TABLE_CONF_MAX_NEIGHBORS      4
+#define UIP_CONF_DS6_DEFRT_NBU    2
+#define UIP_CONF_DS6_PREFIX_NBU   3
+#define UIP_CONF_MAX_ROUTES    4
+#define UIP_CONF_DS6_ADDR_NBU     3
+#define UIP_CONF_DS6_MADDR_NBU    0
+#define UIP_CONF_DS6_AADDR_NBU    0
+/* Below gives 10% duty cycle, undef for default 5% */
+/* #define CXMAC_CONF_ON_TIME (RTIMER_ARCH_SECOND / 80) */
+/* Below gives 50% duty cycle */
+/* #define CXMAC_CONF_ON_TIME (RTIMER_ARCH_SECOND / 16) */
+
+#else
+/* #error Network configuration not specified! */
+#endif /* Network setup */
+
+#ifndef QUEUEBUF_CONF_NUM
+#define QUEUEBUF_CONF_NUM         15
+#endif
+
+/* ************************************************************************** */
+/* #pragma mark RPL Settings */
+/* ************************************************************************** */
+#if UIP_CONF_IPV6_RPL
+
+#define UIP_CONF_ROUTER                 1
+#define UIP_CONF_ND6_SEND_RA        0
+#define UIP_CONF_ND6_REACHABLE_TIME     600000
+#define UIP_CONF_ND6_RETRANS_TIMER      10000
+
+/* For slow slip connections, to prevent buffer overruns */
+/* #define UIP_CONF_RECEIVE_WINDOW 300 */
+#undef UIP_CONF_FWCACHE_SIZE
+#define UIP_CONF_BUFFER_SIZE   600 /*  DHCPv4 packets by ip64 module */
+#define UIP_CONF_FWCACHE_SIZE    30
+#define UIP_CONF_BROADCAST       1
+#define UIP_ARCH_IPCHKSUM        1
+#define UIP_CONF_PINGADDRCONF    0
+#define UIP_CONF_LOGGING         0
+
+#endif /* RPL */
+
+#define CCIF
+#define CLIF
+#ifndef CC_CONF_INLINE
+#define CC_CONF_INLINE inline
+#endif
+
+#endif /* CONTIKI_CONF_H_ */
diff --git a/platform/avr-rss2/contiki-main.c b/platform/avr-rss2/contiki-main.c
new file mode 100644
index 000000000..172c6139f
--- /dev/null
+++ b/platform/avr-rss2/contiki-main.c
@@ -0,0 +1,635 @@
+/*
+ * Copyright (c) 2006, Technical University of Munich
+ * 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.
+ *
+ * Reworked for avr-rss2 platform.  Robert Olsson <robert@radio-sensors.com>
+ */
+
+#define PRINTF(FORMAT, args ...) printf_P(PSTR(FORMAT),##args)
+
+#define ANNOUNCE_BOOT 1    /* adds about 600 bytes to program size */
+#if ANNOUNCE_BOOT
+#define PRINTA(FORMAT, args ...) printf_P(PSTR(FORMAT),##args)
+#else
+#define PRINTA(...)
+#endif
+
+#define DEBUG 0
+#if DEBUG
+#define PRINTD(FORMAT, args ...) printf_P(PSTR(FORMAT),##args)
+#else
+#define PRINTD(...)
+#endif
+
+#include <avr/pgmspace.h>
+#include <avr/fuse.h>
+#include <avr/eeprom.h>
+#include <stdio.h>
+#include <string.h>
+#include <dev/watchdog.h>
+
+#include "loader/symbols-def.h"
+#include "loader/symtab.h"
+
+#include "params.h"
+#include "rss2.h"
+#include "leds.h"
+#include "i2c.h"
+#include "radio/rf230bb/rf230bb.h"
+#include "net/mac/frame802154.h"
+#include "net/mac/framer-802154.h"
+#include "net/ipv6/sicslowpan.h"
+
+#include "contiki.h"
+#include "contiki-net.h"
+#include "contiki-lib.h"
+
+#include "dev/rs232.h"
+#include "dev/serial-line.h"
+#include "dev/slip.h"
+
+#if AVR_WEBSERVER
+#include "httpd-fs.h"
+#include "httpd-cgi.h"
+#endif
+
+#ifdef COFFEE_FILES
+#include "cfs/cfs.h"
+#include "cfs/cfs-coffee.h"
+#endif
+
+#if UIP_CONF_ROUTER && 0
+#include "net/routing/rimeroute.h"
+#include "net/rime/rime-udp.h"
+#endif
+
+#include "net/rime/rime.h"
+
+/* Track interrupt flow through mac, rdc and radio driver */
+/* #define DEBUGFLOWSIZE 32 */
+#if DEBUGFLOWSIZE
+uint8_t debugflowsize, debugflow[DEBUGFLOWSIZE];
+#define DEBUGFLOW(c) if(debugflowsize < (DEBUGFLOWSIZE - 1)) debugflow[debugflowsize++] = c
+#else
+#define DEBUGFLOW(c)
+#endif
+
+/* Get periodic prints from idle loop, from clock seconds or rtimer interrupts */
+/* Use of rtimer will conflict with other rtimer interrupts such as contikimac radio cycling */
+/* STAMPS will print ENERGEST outputs if that is enabled. */
+#define PERIODICPRINTS 1
+#if PERIODICPRINTS
+/* #define PINGS 64 */
+#define ROUTES 600
+#define STAMPS 60
+#define STACKMONITOR 1024
+uint32_t clocktime;
+#define TESTRTIMER 0
+#if TESTRTIMER
+uint8_t rtimerflag = 1;
+struct rtimer rt;
+void
+rtimercycle(void)
+{
+  rtimerflag = 1;
+}
+#endif
+#endif
+
+uint16_t node_id; /* Can be set by cooja */
+
+uint16_t ledtimer_red, ledtimer_yellow;
+uint16_t i2c_probed; /* i2c devices we have probed */
+
+
+/*-------------------------------------------------------------------------*/
+/*----------------------Configuration of the .elf file---------------------*/
+#if 1
+/* The proper way to set the signature is */
+#include <avr/signature.h>
+#else
+/* Older avr-gcc's may not define the needed SIGNATURE bytes. Do it manually if you get an error */
+typedef struct {const unsigned char B2;
+                const unsigned char B1;
+                const unsigned char B0;
+} __signature_t;
+#define SIGNATURE __signature_t __signature __attribute__((section(".signature")))
+SIGNATURE = {
+  .B2 = 0x01, /* SIGNATURE_2, //ATMEGA128rfa1 */
+  .B1 = 0xA7, /* SIGNATURE_1, //128KB flash */
+  .B0 = 0x1E, /* SIGNATURE_0, //Atmel */
+};
+#endif
+
+#if 1
+/* JTAG, SPI enabled, Internal RC osc, Boot flash size 4K, 6CK+65msec delay, brownout disabled */
+FUSES = { .low = 0xe2, .high = 0x99, .extended = 0xff, };
+#else
+/* JTAG+SPI, Boot 4096 words @ $F000, Internal  oscillator, startup 6 CK +0 ms, Brownout 1.8 volts */
+FUSES = { .low = 0xC2, .high = 0x99, .extended = 0xfe, };
+#endif
+
+uint8_t
+rng_get_uint8(void)
+{
+#if 1
+  /* Upper two RSSI reg bits (RND_VALUE) are random in rf231 */
+  uint8_t j;
+  j = (PHY_RSSI & 0xc0) + ((PHY_RSSI >> 2) & 0x30) + ((PHY_RSSI >> 4) & 0x0c) + ((PHY_RSSI >> 6) & 0x03);
+#else
+/* Get a pseudo random number using the ADC */
+  uint8_t i, j;
+  ADCSRA = 1 << ADEN;             /* Enable ADC, not free running, interrupt disabled, fastest clock */
+  for(i = 0; i < 4; i++) {
+    ADMUX = 0;                /* toggle reference to increase noise */
+    ADMUX = 0x1E;              /* Select AREF as reference, measure 1.1 volt bandgap reference. */
+    ADCSRA |= 1 << ADSC;          /* Start conversion */
+    while(ADCSRA & (1 << ADSC)) ;  /* Wait till done */
+    j = (j << 2) + ADC;
+  }
+  ADCSRA = 0;                   /* Disable ADC */
+#endif
+  PRINTD("rng issues %d\n", j);
+  return j;
+}
+/*-------------------------Low level initialization------------------------*/
+/*------Done in a subroutine to keep main routine stack usage small--------*/
+void
+initialize(void)
+{
+  watchdog_init();
+  watchdog_start();
+  leds_init();
+  serial_line_init();
+
+  rs232_init(RS232_PORT_0, USART_BAUD_38400, USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
+  rs232_redirect_stdout(RS232_PORT_0);
+
+#if 0
+  /* Do it my way... */
+  UBRR0L = 25;
+  UBRR0H = 0;
+  UCSR0A = (1 << U2X0);  /*Double */
+#endif
+
+  rs232_set_input(RS232_PORT_0, serial_line_input_byte);
+
+  clock_init();
+
+  if(MCUSR & (1 << PORF)) {
+    PRINTD("Power-on reset.\n");
+  }
+  if(MCUSR & (1 << EXTRF)) {
+    PRINTD("External reset!\n");
+  }
+  if(MCUSR & (1 << BORF)) {
+    PRINTD("Brownout reset!\n");
+  }
+  if(MCUSR & (1 << WDRF)) {
+    PRINTD("Watchdog reset!\n");
+  }
+  if(MCUSR & (1 << JTRF)) {
+    PRINTD("JTAG reset!\n");
+  }
+
+  i2c_init(100000); /* 100 bit/s */
+
+#if STACKMONITOR
+  /* Simple stack pointer highwater monitor. Checks for magic numbers in the main
+   * loop. In conjuction with PERIODICPRINTS, never-used stack will be printed
+   * every STACKMONITOR seconds.
+   */
+  {
+    extern uint16_t __bss_end;
+    uint16_t p = (uint16_t)&__bss_end;
+    do {
+      *(uint16_t *)p = 0x4242;
+      p += 10;
+    } while(p < SP - 10); /* don't overwrite our own stack */
+  }
+#endif
+
+#define CONF_CALIBRATE_OSCCAL 0
+#if CONF_CALIBRATE_OSCCAL
+  void calibrate_rc_osc_32k();
+  {
+    extern uint8_t osccal_calibrated;
+    uint8_t i;
+    PRINTD("\nBefore calibration OSCCAL=%x\n", OSCCAL);
+    for(i = 0; i < 10; i++) {
+      calibrate_rc_osc_32k();
+      PRINTD("Calibrated=%x\n", osccal_calibrated);
+/* #include <util/delay_basic.h> */
+/* #define delay_us( us )   ( _delay_loop_2(1+(us*F_CPU)/4000000UL) ) */
+/*   delay_us(50000); */
+    }
+    clock_init();
+  }
+#endif
+
+  PRINTA("\n*******Booting %s*******\n", CONTIKI_VERSION_STRING);
+
+/* rtimers needed for radio cycling */
+  rtimer_init();
+
+  /* Initialize process subsystem */
+  process_init();
+
+  /* etimers must be started before ctimer_init */
+  process_start(&etimer_process, NULL);
+  ctimer_init();
+
+  /* Start radio and radio receive process */
+  NETSTACK_RADIO.init();
+
+/* Get a random seed for the 802.15.4 packet sequence number.
+ * Some layers will ignore duplicates found in a history (e.g. Contikimac)
+ * causing the initial packets to be ignored after a short-cycle restart.
+ */
+  random_init(rng_get_uint8());
+
+  /* Set addresses BEFORE starting tcpip process */
+
+  linkaddr_t addr;
+
+  printf("I2C: ");
+  i2c_probed = i2c_probe();
+  printf("\n");
+  
+  if( i2c_probed & I2C_AT24MAC ) {
+    i2c_at24mac_read((char *)&addr.u8, 1);
+    linkaddr_set_node_addr(&addr);
+  }
+  else {
+    char eui64[8];
+    printf("Random EUI64 address generated\n");
+    eui64[0] = 0xfc; /* Atmels OUI */
+    eui64[1] = 0xc2; 
+    eui64[2] = 0x3d;
+    eui64[3] = 0;
+    eui64[4] = 0;
+    eui64[5] = 0;
+    eui64[6] = node_id >> 8;
+    eui64[7] = node_id & 0xff;
+    linkaddr_set_node_addr(&eui64);
+  }
+
+  /* memcpy(&uip_lladdr.addr, &addr.u8, sizeof(linkaddr_t)); */
+
+#if NETSTACK_CONF_WITH_IPV6
+  memcpy(&uip_lladdr.addr, &addr.u8, sizeof(linkaddr_t));
+#endif
+
+  rf230_set_pan_addr(params_get_panid(), params_get_panaddr(), (uint8_t *)&addr.u8);
+  rf230_set_channel(params_get_channel());
+  rf230_set_txpower(params_get_txpower());
+
+#if NETSTACK_CONF_WITH_IPV6
+  PRINTA("EUI-64 MAC: %x-%x-%x-%x-%x-%x-%x-%x\n", addr.u8[0], addr.u8[1], addr.u8[2], addr.u8[3], addr.u8[4], addr.u8[5], addr.u8[6], addr.u8[7]);
+#else
+  PRINTA("MAC address ");
+  uint8_t i;
+  for(i = sizeof(linkaddr_t); i > 0; i--) {
+    PRINTA("%x:", addr.u8[i - 1]);
+  }
+  PRINTA("\n");
+#endif
+
+  /* Initialize stack protocols */
+  queuebuf_init();
+  NETSTACK_RDC.init();
+  NETSTACK_MAC.init();
+  NETSTACK_NETWORK.init();
+
+#if ANNOUNCE_BOOT
+  PRINTA("MAC=%s, RDC=%s, NETWORK=%s, channel=%-u, check-rate-Hz=%-u, tx-power=%-u\n", NETSTACK_MAC.name,
+         NETSTACK_RDC.name, NETSTACK_NETWORK.name, rf230_get_channel(),
+         CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1 : NETSTACK_RDC.channel_check_interval()),
+         rf230_get_txpower());
+#if UIP_CONF_IPV6_RPL
+  PRINTA("RPL Enabled\n");
+#endif
+#if UIP_CONF_ROUTER
+  PRINTA("Routing Enabled\n");
+#endif
+
+#endif /* ANNOUNCE_BOOT */
+
+#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
+  process_start(&tcpip_process, NULL);
+#endif
+
+  /* Autostart other processes */
+  autostart_start(autostart_processes);
+
+  /*---If using coffee file system create initial web content if necessary---*/
+#if COFFEE_FILES
+  int fa = cfs_open("/index.html", CFS_READ);
+  if(fa < 0) {     /* Make some default web content */
+    PRINTA("No index.html file found, creating upload.html!\n");
+    PRINTA("Formatting FLASH file system for coffee...");
+    cfs_coffee_format();
+    PRINTA("Done!\n");
+    fa = cfs_open("/index.html", CFS_WRITE);
+    int r = cfs_write(fa, &"It works!", 9);
+    if(r < 0) {
+      PRINTA("Can''t create /index.html!\n");
+    }
+    cfs_close(fa);
+/*  fa = cfs_open("upload.html"), CFW_WRITE); */
+/* <html><body><form action="upload.html" enctype="multipart/form-data" method="post"><input name="userfile" type="file" size="50" /><input value="Upload" type="submit" /></form></body></html> */
+  }
+#endif /* COFFEE_FILES */
+
+/* Add addresses for testing */
+#if 0
+  {
+    uip_ip6addr_t ipaddr;
+    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
+/*  uip_ds6_prefix_add(&ipaddr,64,0); */
+  }
+#endif
+/*--------------------------Announce the configuration---------------------*/
+#if ANNOUNCE_BOOT
+#if AVR_WEBSERVER
+  { uint8_t i;
+    char buf[80];
+    unsigned int size;
+
+    for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
+      if(uip_ds6_if.addr_list[i].isused) {
+        httpd_cgi_sprint_ip6(uip_ds6_if.addr_list[i].ipaddr, buf);
+        PRINTA("IPv6 Address: %s\n", buf);
+      }
+    }
+    cli();
+    eeprom_read_block(buf, eemem_server_name, sizeof(eemem_server_name));
+    sei();
+    buf[sizeof(eemem_server_name)] = 0;
+    PRINTA("%s", buf);
+    cli();
+    eeprom_read_block(buf, eemem_domain_name, sizeof(eemem_domain_name));
+    sei();
+    buf[sizeof(eemem_domain_name)] = 0;
+    size = httpd_fs_get_size();
+#ifndef COFFEE_FILES
+    PRINTA(".%s online with fixed %u byte web content\n", buf, size);
+#elif COFFEE_FILES == 1
+    PRINTA(".%s online with static %u byte EEPROM file system\n", buf, size);
+#elif COFFEE_FILES == 2
+    PRINTA(".%s online with dynamic %u KB EEPROM file system\n", buf, size >> 10);
+#elif COFFEE_FILES == 3
+    PRINTA(".%s online with static %u byte program memory file system\n", buf, size);
+#elif COFFEE_FILES == 4
+    PRINTA(".%s online with dynamic %u KB program memory file system\n", buf, size >> 10);
+#endif /* COFFEE_FILES */
+  }
+#else
+  PRINTA("Online\n");
+#endif
+#endif /* ANNOUNCE_BOOT */
+
+  ledtimer_red = 1000;
+  leds_on(LEDS_RED);
+}
+
+
+#if ROUTES && NETSTACK_CONF_WITH_IPV6
+static void
+ipaddr_add(const uip_ipaddr_t *addr)
+{
+  uint16_t a;
+  int8_t i, f;
+  for(i = 0, f = 0; i < sizeof(uip_ipaddr_t); i += 2) {
+    a = (addr->u8[i] << 8) + addr->u8[i + 1];
+    if(a == 0 && f >= 0) {
+      if(f++ == 0) {
+        PRINTF("::");
+      }
+    } else {
+      if(f > 0) {
+        f = -1;
+      } else if(i > 0) {
+        PRINTF(":");
+      }
+      PRINTF("%x", a);
+    }
+  }
+}
+#endif
+/*-------------------------------------------------------------------------*/
+/*------------------------- Main Scheduler loop----------------------------*/
+/*-------------------------------------------------------------------------*/
+int
+main(void)
+{
+#if NETSTACK_CONF_WITH_IPV6
+  uip_ds6_nbr_t *nbr;
+#endif /* NETSTACK_CONF_WITH_IPV6 */
+  initialize();
+
+  while(1) {
+    process_run();
+    watchdog_periodic();
+
+    /* Turn off LED's */
+    if(ledtimer_red) {
+      if(--ledtimer_red == 0) {
+        leds_off(LEDS_RED);
+      }
+    }
+    if(ledtimer_yellow) {
+      if(--ledtimer_yellow == 0) {
+        leds_off(LEDS_YELLOW);
+      }
+    }
+    leds_off(LEDS_RED);
+    leds_off(LEDS_YELLOW);
+
+#if 0
+/* Various entry points for debugging in the AVR Studio simulator.
+ * Set as next statement and step into the routine.
+ */
+    NETSTACK_RADIO.send(packetbuf_hdrptr(), 42);
+    process_poll(&rf230_process);
+    packetbuf_clear();
+    len = rf230_read(packetbuf_dataptr(), PACKETBUF_SIZE);
+    packetbuf_set_datalen(42);
+    NETSTACK_RDC.input();
+#endif
+
+#if 0
+/* Clock.c can trigger a periodic PLL calibration in the RF230BB driver.
+ * This can show when that happens.
+ */
+    extern uint8_t rf230_calibrated;
+    if(rf230_calibrated) {
+      PRINTD("\nRF230 calibrated!\n");
+      rf230_calibrated = 0;
+    }
+#endif
+
+/* Set DEBUGFLOWSIZE in contiki-conf.h to track path through MAC, RDC, and RADIO */
+#if DEBUGFLOWSIZE
+    if(debugflowsize) {
+      debugflow[debugflowsize] = 0;
+      PRINTF("%s", debugflow);
+      debugflowsize = 0;
+    }
+#endif
+
+#if PERIODICPRINTS
+#if TESTRTIMER
+/* Timeout can be increased up to 8 seconds maximum.
+ * A one second cycle is convenient for triggering the various debug printouts.
+ * The triggers are staggered to avoid printing everything at once.
+ */
+    if(rtimerflag) {
+      rtimer_set(&rt, RTIMER_NOW() + RTIMER_ARCH_SECOND * 1UL, 1, (void *)rtimercycle, NULL);
+      rtimerflag = 0;
+#else
+    if(clocktime != clock_seconds()) {
+      clocktime = clock_seconds();
+#endif
+
+#if STAMPS
+      if((clocktime % STAMPS) == 0) {
+#if ENERGEST_CONF_ON
+#include "lib/print-stats.h"
+        print_stats();
+#elif RADIOSTATS
+        extern volatile unsigned long radioontime;
+        PRINTF("%u(%u)s\n", clocktime, radioontime);
+#else
+        PRINTF("%us\n", clocktime);
+#endif
+      }
+#endif
+#if TESTRTIMER
+      clocktime += 1;
+#endif
+
+#if PINGS && NETSTACK_CONF_WITH_IPV6
+      extern void raven_ping6(void);
+      if((clocktime % PINGS) == 1) {
+        PRINTF("**Ping\n");
+        raven_ping6();
+      }
+#endif
+
+#if ROUTES && NETSTACK_CONF_WITH_IPV6
+      if((clocktime % ROUTES) == 2) {
+
+        extern uip_ds6_netif_t uip_ds6_if;
+
+        uint8_t i, j;
+        PRINTF("\nAddresses [%u max]\n", UIP_DS6_ADDR_NB);
+        for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
+          if(uip_ds6_if.addr_list[i].isused) {
+            ipaddr_add(&uip_ds6_if.addr_list[i].ipaddr);
+            PRINTF("\n");
+          }
+        }
+        PRINTF("\nNeighbors [%u max]\n", NBR_TABLE_MAX_NEIGHBORS);
+        j = 0;
+        for(nbr = nbr_table_head(ds6_neighbors);
+            nbr != NULL;
+            nbr = nbr_table_next(ds6_neighbors, nbr)) {
+          ipaddr_add(&nbr->ipaddr);
+          PRINTF("\n");
+          j++;
+        }
+        if(!j) {
+          PRINTF("  <none>");
+        }
+        PRINTF("\nRoutes [%u max]\n", UIP_DS6_ROUTE_NB);
+        {
+          uip_ds6_route_t *r;
+          j = 0;
+          for(r = uip_ds6_route_head();
+              r != NULL;
+              r = uip_ds6_route_next(r)) {
+            ipaddr_add(&r->ipaddr);
+            PRINTF("/%u (via ", r->length);
+            ipaddr_add(uip_ds6_route_nexthop(r));
+            PRINTF(") %lus\n", r->state.lifetime);
+            j++;
+          }
+        }
+        if(!j) {
+          PRINTF("  <none>");
+        }
+        PRINTF("\n---------\n");
+      }
+#endif
+
+#if STACKMONITOR
+      if((clocktime % STACKMONITOR) == 3) {
+        extern uint16_t __bss_end;
+        uint16_t p = (uint16_t)&__bss_end;
+        do {
+          if(*(uint16_t *)p != 0x4242) {
+            PRINTF("Never-used stack > %d bytes\n", p - (uint16_t)&__bss_end);
+            break;
+          }
+          p += 10;
+        } while(p < RAMEND - 10);
+      }
+#endif
+    }
+#endif /* PERIODICPRINTS */
+
+#if RF230BB && 0
+    extern uint8_t rf230processflag;
+    if(rf230processflag) {
+      PRINTF("rf230p%d", rf230processflag);
+      rf230processflag = 0;
+    }
+#endif
+
+#if RF230BB && 0
+    extern uint8_t rf230_interrupt_flag;
+    if(rf230_interrupt_flag) {
+      /*   if (rf230_interrupt_flag!=11) { */
+      PRINTF("**RI%u", rf230_interrupt_flag);
+      /*   } */
+      rf230_interrupt_flag = 0;
+    }
+#endif
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+
+void
+log_message(char *m1, char *m2)
+{
+  PRINTF("%s%s\n", m1, m2);
+}
diff --git a/platform/avr-rss2/dev/adc.c b/platform/avr-rss2/dev/adc.c
new file mode 100644
index 000000000..cb82d16b7
--- /dev/null
+++ b/platform/avr-rss2/dev/adc.c
@@ -0,0 +1,76 @@
+/* Copyright Robert Olsson */
+
+#include <avr/pgmspace.h>
+#include <avr/fuse.h>
+#include <avr/eeprom.h>
+#include <stdio.h>
+#include <string.h>
+#include <dev/watchdog.h>
+#include "params.h"
+#include "rss2.h"
+#include "contiki.h"
+#include "adc.h"
+#include "rss2.h"
+
+uint16_t
+adc_read(uint8_t pin)
+{
+  uint16_t volt = 0;
+  int i;
+
+  ADMUX = pin; /* ADC pin PA0-PA7 ->  0-7 */
+  ADCSRB &= ~(1 << MUX5); /* Needs to write before ADMUX pp 418 */
+  ADMUX |= (1 << REFS1) | (1 << REFS0); /* 1.6 */
+
+  /* Maximal Track and Hold time */
+
+  ADCSRA = (1 << ADPS2) | (0 << ADPS1) | (1 << ADPS0);  /* Prescaler /32 */
+  ADCSRA |= (1 << ADEN);  /* Enable the ADC */
+
+  while(!(ADCSRB & (1 << AVDDOK))) ;  /* Wait for AVDD ok */
+  while(!(ADCSRB & (1 << REFOK))) ;  /* Wait for ref ok  */
+
+  /* Ignore first result */
+
+  ADCSRA |= (1 << ADSC);
+  while(ADCSRA & _BV(ADSC)) {
+  }
+
+  ADCW = 0;
+#define RES 4
+
+  for(i = 0; i < RES; i++) {
+
+    /* Start the conversion */
+    ADCSRA |= (1 << ADSC);
+
+    /* Wait for conversion */
+    while(ADCSRA & (1 << ADSC)) {
+    }
+
+    volt += ADCW;
+  }
+  ADMUX = 0;                /* turn off internal vref */
+  volt = volt / RES;
+
+  /* Disable the ADC to save power */
+  ADCSRA &= ~_BV(ADEN);
+
+  return volt;
+}
+double
+adc_read_v_in(void)
+{
+  /* Special treatment for v_in. Schottky voltage drop add */
+  return ((double)adc_read(AV_IN)) * V_IN_FACTOR_SCHOTTKY + SCHOTTKY_DROP;
+}
+double
+adc_read_a1(void)
+{
+  return ((double)adc_read(A1)) * V_IN_FACTOR;
+}
+double
+adc_read_a2(void)
+{
+  return ((double)adc_read(A2)) * V_IN_FACTOR;
+}
diff --git a/platform/avr-rss2/dev/adc.h b/platform/avr-rss2/dev/adc.h
new file mode 100644
index 000000000..9e9473e31
--- /dev/null
+++ b/platform/avr-rss2/dev/adc.h
@@ -0,0 +1,16 @@
+/* Copyright Robert Olsson */
+
+#define V_IN_FACTOR              0.006256  /* 6.4/1023 */
+#define V_IN_FACTOR_NONE         0.001564  /* 1.6/1023 */
+#define SCHOTTKY_DROP   0.29
+#define V_IN_FACTOR_SCHOTTKY     0.0292 /* 30.19-SCHOTTKY_DROP/1023 schottky corr */
+
+uint16_t
+adc_read(uint8_t pin);
+double
+adc_read_v_in(void);
+double
+adc_read_a1(void);
+double
+adc_read_a2(void);
+
diff --git a/platform/avr-rss2/dev/battery-sensor.c b/platform/avr-rss2/dev/battery-sensor.c
new file mode 100644
index 000000000..b81db95f6
--- /dev/null
+++ b/platform/avr-rss2/dev/battery-sensor.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2006, 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 ADVISE OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * -----------------------------------------------------------------
+ *
+ * Author  : Dag Björklund, Robert Olsson
+ * Created : 2005-11-01
+ * Updated : $Date: 2010/08/25 19:30:52 $
+ *           $Revision: 1.11 $
+ */
+
+#include "contiki.h"
+#include "dev/battery-sensor.h"
+#include <util/delay_basic.h>
+#define delay_us(us)   (_delay_loop_2(1 + (us * F_CPU) / 4000000UL))
+
+const struct sensors_sensor battery_sensor;
+
+/* Returns the MCU voltage in mV read from the BATMON MCU register
+ * See AtMega chip docs for BATMON details.
+ */
+
+static int
+value(int type)
+{
+  uint16_t mv;
+  int i;
+  /*  Resolution is 75mV if V>=2.55V; and 50mV if V<=2.45V */
+  mv = 3675;
+
+  for(i = 0x1f; 1; i--) {
+
+    BATMON = i;
+    delay_us(100);
+    if(BATMON & 0x20) {
+      break;
+    }
+
+    if(i == 0x10) { /* Range hi or lo */
+      mv = 2500;
+    }
+    if(i > 0x10) {
+      mv -= 75;
+    } else {
+      mv -= 50;
+    }
+  }
+  return (int)((float)mv);
+}
+static int
+configure(int type, int c)
+{
+  return 0;
+}
+static int
+status(int type)
+{
+  return 1;
+}
+SENSORS_SENSOR(battery_sensor, BATTERY_SENSOR, value, configure, status);
+
diff --git a/platform/avr-rss2/dev/button-sensor.c b/platform/avr-rss2/dev/button-sensor.c
new file mode 100644
index 000000000..664278993
--- /dev/null
+++ b/platform/avr-rss2/dev/button-sensor.c
@@ -0,0 +1,41 @@
+/* Dummy sensor routine */
+
+#include "lib/sensors.h"
+#include "dev/button-sensor.h"
+const struct sensors_sensor button_sensor;
+static int status(int type);
+struct sensors_sensor *sensors[1];
+unsigned char sensors_flags[1];
+
+static int
+value(int type)
+{
+  return 0;
+}
+static int
+configure(int type, int c)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+    if(c) {
+      if(!status(SENSORS_ACTIVE)) {
+      }
+    } else {
+    }
+    return 1;
+  }
+  return 0;
+}
+static int
+status(int type)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+  case SENSORS_READY:
+    return 1;
+  }
+  return 0;
+}
+SENSORS_SENSOR(button_sensor, BUTTON_SENSOR,
+               value, configure, status);
+
diff --git a/platform/avr-rss2/dev/co2_sa_kxx-sensor.c b/platform/avr-rss2/dev/co2_sa_kxx-sensor.c
new file mode 100644
index 000000000..1866c0f2f
--- /dev/null
+++ b/platform/avr-rss2/dev/co2_sa_kxx-sensor.c
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2015, Copyright Markus Hidell, Robert Olsson
+ * 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.
+ *
+ *
+ * Authors  : Markus Hidell, Robert Olsson  {mahidell, roolss} @kth.se
+ * Created : 2015-10-27
+ * Updated : $Date: 2010/01/14 20:23:02 $
+ *           $Revision: 1.2 $
+ */
+
+#include "contiki.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <i2c.h>
+#include <avr/pgmspace.h>
+#include <avr/sleep.h>
+#include <avr/wdt.h>
+#include <avr/boot.h>
+#include <avr/eeprom.h>
+#include "dev/watchdog.h"
+#include "lib/list.h"
+#include "lib/memb.h"
+#include "co2_sa_kxx-sensor.h"
+
+static int
+status(int type)
+{
+  return 0;
+}
+static int
+configure(int type, int c)
+{
+  return 0;
+}
+static int
+value(int var)
+{
+  int val, status;
+  uint8_t buf[2], csum;
+  int16_t res;
+  (void) status;
+  (void) csum;
+
+  res = 0;
+  i2c_start_wait(I2C_CO2SA_ADDR | I2C_WRITE);
+  if(res) {
+    goto err;
+  }
+
+  i2c_write(0x22);
+  i2c_write(0x00);
+
+  if(var == CO2_SA_KXX_CO2) {
+    i2c_write(0x08);
+    i2c_write(0x2A);
+  }
+
+  if(var == CO2_SA_KXX_TEMP) {
+    i2c_write(0x12);
+    i2c_write(0x34);
+  }
+
+  if(var == CO2_SA_KXX_RH) {
+    i2c_write(0x14);
+    i2c_write(0x36);
+  }
+
+  i2c_stop();
+
+  if(res) {
+    goto err;
+  }
+
+  clock_delay_msec(20);
+
+  res = 0;
+  i2c_start(I2C_CO2SA_ADDR | I2C_READ);
+
+  if(res) {
+    goto err;
+  }
+
+
+  status = i2c_readAck();
+
+  if(status & 0x01 == 0) 
+    goto err;
+
+  buf[0] = i2c_readAck();
+  buf[1] = i2c_readAck();
+  csum = i2c_readNak();
+  i2c_stop();
+
+  val = ((int16_t)(buf[0] << 8)) | buf[1];
+
+  return val;
+
+err:
+  i2c_stop();
+  return 0;
+}
+SENSORS_SENSOR(co2_sa_kxx_sensor, "CO2", value, configure, status);
diff --git a/platform/avr-rss2/dev/co2_sa_kxx-sensor.h b/platform/avr-rss2/dev/co2_sa_kxx-sensor.h
new file mode 100644
index 000000000..bdb366fea
--- /dev/null
+++ b/platform/avr-rss2/dev/co2_sa_kxx-sensor.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2015, Copyright Markus Hidell, Robert Olsson
+ * 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.
+ *
+ *
+ * Authors  : Markus Hidell, Robert Olsson  {mahidell, roolss} @kth.se
+ * Created : 2015-10-27
+ * Updated : $Date: 2010/01/14 20:23:02 $
+ *           $Revision: 1.2 $
+ */
+
+#ifndef CO2_SA_KXX_SENSOR_H_
+#define CO2_SA_KXX_SENSOR_H_
+
+#define CO2_SA_KXX_CO2  0
+#define CO2_SA_KXX_TEMP 1
+#define CO2_SA_KXX_RH   3
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor co2_sa_kxx_sensor;
+
+#define I2C_CO2SA_ADDR (0x68 << 1)
+
+#endif /* CO2_SA_KXX-SENSOR_H_ */
diff --git a/platform/avr-rss2/dev/ds18b20.c b/platform/avr-rss2/dev/ds18b20.c
new file mode 100644
index 000000000..6044ad91e
--- /dev/null
+++ b/platform/avr-rss2/dev/ds18b20.c
@@ -0,0 +1,247 @@
+/*
+
+   Contiki library for DS18B20 temperature sensor -
+   For more details see http://xxx
+
+   Author -
+   Author -
+
+   License - GPLv3
+
+ */
+
+#include "ds18b20.h"
+
+/* probe_for_ds18b20 probes for the sensor. Returns 0 on failure, 1 on success */
+/* Assumptions: only one sensor on the "1-wire bus", on port WSN_DS18B20_PORT */
+/* BUG: THIS CODE DOES NOT WORK AS INTENDED! IT RETURNS "1" EVEN WHEN THERE IS NO */
+/*      SENSOR CONNECTED. */
+
+uint8_t
+ds18b20_probe(void)
+{
+  uint8_t result = 0;
+
+  /* Reset 1W-bus */
+
+  /* Pull PIN low for 480 microseconds (us) */
+  /* Start with setting bit DS18B20_1_PIN to 0 */
+  OW_SET_PIN_LOW();
+  /* then set direction to OUT by setting DS18B20_1_DDR bit to 1 */
+  OW_SET_OUTPUT();
+  /* Delay 480 us */
+  clock_delay_usec(480);
+  /* See if sensor responds. First release the bus and switch to INput mode */
+  /* by setting DS18B20_1_DDR bit to 0 */
+  OW_SET_INPUT();
+  /* Activate internal pull-up by  setting pin to HIGH (when in INput mode) */
+  /*  OW_SET_PIN_HIGH(); */
+  /* Wait for the pin to go HIGH for 64 us */
+  clock_delay_usec(64);
+  /* Now the sensor, if present, pulls the pin LOW for 60-240 us */
+  /* Detect 0 on PIND bit DS18B20_1_PIN. Invert the result so a presence (aka a 0) */
+  /* sets "result" to 1 (for success) */
+  result = !OW_GET_PIN_STATE();
+
+  /* The sensor releases the pin so it goes HIGH after 240 us, add some */
+  /* for the signal to stabilize, say 300 usecs to be on the safe side? */
+  if(result) {
+    clock_delay_usec(300);
+    /* Now the bus should be HIGH again */
+    result = OW_GET_PIN_STATE();
+  }
+
+  return result;
+}
+/* Write 1 or 0 on the bus */
+
+void
+write_bit(uint8_t bit)
+{
+  /* Set pin to 0 */
+  OW_SET_OUTPUT();
+  OW_SET_PIN_LOW();
+
+  /* Pin should be 0 for at least 1 us */
+  clock_delay_usec(2);
+
+  /* If we're writing a 1, let interna pull-up pull the bus high */
+  /* within 15 us of setting the bus to low */
+  if(bit) {
+    /* Internal pull-up is activated by setting direction to IN and the */
+    /* setting the pin to HIGH */
+    OW_SET_INPUT();
+    OW_SET_PIN_HIGH();
+  }
+  /* OK, now the bus is either LOW, or pulled HIGH by the internal pull-up */
+  /* Let this state remain for 60 us, then release the bus */
+  clock_delay_usec(60);
+
+  /* Release the bus */
+  OW_SET_PIN_HIGH();
+  OW_SET_INPUT();
+
+  /* Allow > 1 us between read/write operations */
+  clock_delay_usec(2);
+}
+/*  */
+/* Read one bit of information from the bus, and return it as 1 or 0 */
+/*  */
+
+uint8_t
+read_bit(void)
+{
+  uint8_t bit = 0;
+
+  /* Set pin to 0 */
+  OW_SET_OUTPUT();
+  OW_SET_PIN_LOW();
+
+  /* Pin should be 0 for at least 1 us */
+  clock_delay_usec(2);
+
+  /* Now read the bus, start by setting in/out direction and activating internal */
+  /* pull-up resistor */
+  OW_SET_INPUT();
+  OW_SET_PIN_HIGH();
+
+  /* ds18b20 either keeps the pin down or releases the bus and the */
+  /* bus then goes high because of the interna pull-up resistor */
+  /* Check whichever happens before 15 us has passed */
+  clock_delay_usec(15 - 2 - 1);
+  bit = OW_GET_PIN_STATE();
+
+  /* The complete read cycle must last at least 60 us. We have now spent */
+  /* about 14-15 us in delays, so add another delay to reach >= 60 us */
+  clock_delay_usec(50);
+
+  /* Release bus */
+  OW_SET_PIN_HIGH();
+  OW_SET_INPUT();
+
+  /* Allow > 1 us between read/write operations */
+  clock_delay_usec(2);
+
+  return bit ? 1 : 0;
+}
+/*  */
+/* Read one byte of information. A byte is read least significant bit first */
+/*  */
+
+uint8_t
+read_byte(void)
+{
+  uint8_t result = 0;
+  uint8_t bit;
+  int i;
+
+  for(i = 0; i < 8; i++) {
+    bit = read_bit();
+    result += (bit << i);
+  }
+  return result;
+}
+/*  */
+/* Write one byte of information. A byte is written least significant bit first */
+/*  */
+
+void
+write_byte(uint8_t byte)
+{
+  int i;
+
+  for(i = 0; i < 8; i++) {
+    write_bit((byte >> i) & 1);
+  }
+}
+/*  */
+/* ds18b20_get_temp returns the temperature in "temp" (in degrees celsius) */
+/* Returns 0 on failure (and then "temp" is left unchanged */
+/* Returns 1 on success, and sets temp */
+/*  */
+
+uint8_t
+ds18b20_get_temp(float *temp)
+{
+  uint8_t result = 0;
+
+  /* Reset bus by probing. Probe returns 1 on success/presence of sensor */
+  if(ds18b20_probe()) {
+    /* write command "skip rom" since we only have one sensor on the wire! */
+    write_byte(DS18B20_COMMAND_SKIP_ROM);
+
+    /* write command to start measurement */
+    write_byte(DS18B20_COMMAND_START_CONVERSION);
+
+    /* Wait for conversion to complete */
+    /* Conversion is 12-bit by default. */
+    /* Since we have external power to the sensor (ie not in "parasitic power" mode) */
+    /* the bus is held LOW by the sensor while the conversion is going on, and then HIGH */
+    /* when conversion is finished. */
+    OW_SET_INPUT();
+    int count = 0;
+    while(!OW_GET_PIN_STATE()) {
+      clock_delay_msec(10);
+      count++;
+      /* Longest conversion time is 750 ms (12-bit resolution) */
+      /* So if count > 80 (for a little margin!), we return -274.0 */
+      /* which indicates failure to read the temperature. */
+      if(count > 80) {
+        return 0;
+      }
+    }
+
+    /* The result is stored in the "scratch pad", a 9 byte memory block. */
+    /* The first two bytes are the conversion result. Reading the scratch pad */
+    /* can be terminated by sending a reset signal (but we read all 9 bytes) */
+    (void)ds18b20_probe();
+    write_byte(DS18B20_COMMAND_SKIP_ROM);
+    write_byte(DS18B20_COMMAND_READ_SCRATCH_PAD);
+    uint8_t i, sp_arr[9];
+    for(i = 0; i < 9; i++) {
+      sp_arr[i] = read_byte();
+    }
+
+    /* Check CRC, if mismatch, return 0 (failure to read temperature) */
+    uint8_t crc_cal = crc8_ds18b20(sp_arr, 8);
+
+    if(crc_cal != sp_arr[8]) {
+      return 0;
+    }
+
+    /* OK, now decode what the temperature reading is. This code assumes 12-bit resolution, */
+    /* so this must be modified if the code is modified to use any other resolution! */
+    int16_t temp_res;
+    uint8_t temp_lsb = sp_arr[0];
+    uint8_t temp_msb = sp_arr[1];
+
+    temp_res = (int16_t)temp_msb << 8 | temp_lsb;
+    *temp = (float)temp_res * 0.0625;
+
+    result = 1;
+  }
+  return result;
+}
+/*  */
+/* crc8 algorithm for ds18b20 */
+/* http://www.miscel.dk/MiscEl/CRCcalculations.html */
+/*  */
+
+uint8_t
+crc8_ds18b20(uint8_t *buf, uint8_t buf_len)
+{
+  uint8_t result = 0;
+  uint8_t i, b;
+
+  for(i = 0; i < buf_len; i++) {
+    result = result ^ buf[i];
+    for(b = 1; b < 9; b++) {
+      if(result & 0x1) {
+        result = (result >> 1) ^ 0x8C;
+      } else {
+        result = result >> 1;
+      }
+    }
+  }
+  return result;
+}
diff --git a/platform/avr-rss2/dev/enc28j60_avr.c b/platform/avr-rss2/dev/enc28j60_avr.c
new file mode 100644
index 000000000..2bfb49562
--- /dev/null
+++ b/platform/avr-rss2/dev/enc28j60_avr.c
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2012-2013, Robert Olsson <robert@radio-sensors.com>
+ * 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 copyright holder 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 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 HOLDER 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.
+ *
+ */
+
+#include <avr/pgmspace.h>
+#include <avr/pgmspace.h>
+#include <avr/sleep.h>
+#include "dev/watchdog.h"
+#include "contiki.h"
+#include "i2c.h"
+#include <compat/twi.h>
+#include <stdio.h>
+#include <string.h>
+#include "enc28j60_avr.h"
+
+#include <util/delay_basic.h>
+#define delay_us(us)   (_delay_loop_2(1 + (us * F_CPU) / 4000000UL))
+
+void
+enc28j60_arch_spi_init(void)
+{
+  CS_SPI_DDR |= (1 << SPI_CS);
+  CS_SPI_PORT |= (1 << SPI_CS);
+
+  SPI_DDR |= (1 << SPI_MOSI) | (1 << SPI_SCK);
+  SPI_DDR &= ~(1 << SPI_MISO);
+  SPI_PORT &= ~(1 << SPI_MOSI);
+  SPI_PORT &= ~(1 << SPI_SCK);
+  SPCR = (1 << SPE) | (1 << MSTR);
+  /* SPSR |= (1<<SPI2X); */
+}
+uint8_t
+enc28j60_arch_spi_write(uint8_t data)
+{
+  SPDR = data;
+  while(!(SPSR & (1 << SPIF))) ;
+  return SPDR;
+}
+uint8_t
+enc28j60_arch_spi_read(void)
+{
+  SPDR = 0xAA; /* dummy */
+  while(!(SPSR & (1 << SPIF))) ;
+  return SPDR;
+}
+void
+enc28j60_arch_spi_select(void)
+{
+  CS_SPI_PORT &= ~(1 << SPI_CS);
+  delay_us(1000);
+}
+void
+enc28j60_arch_spi_deselect(void)
+{
+  CS_SPI_PORT |= (1 << SPI_CS);
+}
diff --git a/platform/avr-rss2/dev/enc28j60_avr.h b/platform/avr-rss2/dev/enc28j60_avr.h
new file mode 100644
index 000000000..47b5abf87
--- /dev/null
+++ b/platform/avr-rss2/dev/enc28j60_avr.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2012-2013, Robert Olsson <robert@radio-sensors.com>
+ * 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 copyright holder 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 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 HOLDER 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 ENC28J60_AVR_H
+#define ENC28J60_AVR_H
+
+#define SPI_DDR  DDRB   /* Data Direction Register: Port B */
+#define SPI_PORT PORTB  /* Serial Peripheral Interface */
+#define SPI_MOSI 2      /* PB2: Master Out Slave In */
+#define SPI_MISO 3      /* PB3: Master In Slave out */
+#define SPI_SCK  1      /* PB1: Serial Clock */
+
+#define CS_SPI_DDR  DDRD   /* Data Direction Register: Port B */
+#define CS_SPI_PORT PORTD  /* Serial Peripheral Interface */
+#define SPI_CS   6      /* PD6: OW2_PIN, Chip Select */
+
+/* AVR specific's for enc28j60 */
+
+void enc28j60_arch_spi_init(void);
+uint8_t enc28j60_arch_spi_write(uint8_t data);
+uint8_t enc28j60_arch_spi_read(void);
+void enc28j60_arch_spi_select(void);
+void enc28j60_arch_spi_deselect(void);
+
+#endif /* ENC28J60_AVR_H */
diff --git a/platform/avr-rss2/dev/i2c.c b/platform/avr-rss2/dev/i2c.c
new file mode 100644
index 000000000..2668aad58
--- /dev/null
+++ b/platform/avr-rss2/dev/i2c.c
@@ -0,0 +1,228 @@
+/*
+ * 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.
+ *
+ */
+
+/**
+ * \file
+ *         i2c core functions
+ * \author
+ *         Robert Olsson <robert@radio-sensors.com>
+ */
+
+#include <avr/pgmspace.h>
+#include <avr/pgmspace.h>
+#include <avr/sleep.h>
+#include <avr/wdt.h>
+#include "dev/watchdog.h"
+#include "contiki.h"
+#include "i2c.h"
+#include <compat/twi.h>
+#include <stdio.h>
+#include <string.h>
+#include "dev/co2_sa_kxx-sensor.h"
+
+void
+i2c_init(uint32_t speed)
+{
+  /* initialize TWI clock: 100 kHz clock, TWPS = 0 => prescaler = 1 */
+
+  TWSR = 0;                         /* no prescaler */
+  TWBR = ((F_CPU / speed) - 16) / 2;  /* must be > 10 for stable operation */
+}
+uint8_t
+i2c_start(uint8_t addr)
+{
+  uint8_t twst;
+  uint32_t n;
+
+  /* Send START condition */
+  TWCR = (1 << TWINT) | (1 << TWSTA) | (1 << TWEN);
+
+  /* Wait until transmission completed */
+  for(n = 0; n < 100000 && !(TWCR & (1 << TWINT)); n++) {
+  }
+  if(n >= 100000) {
+    return 1;
+  }
+
+  /* check value of TWI Status Register. Mask prescaler bits. */
+  twst = TW_STATUS & 0xF8;
+  if((twst != TW_START) && (twst != TW_REP_START)) {
+    return 1;
+  }
+
+  /* send device address */
+  TWDR = addr;
+  TWCR = (1 << TWINT) | (1 << TWEN);
+
+  /* wail until transmission completed and ACK/NACK has been received */
+  for(n = 0; n < 100000 && !(TWCR & (1 << TWINT)); n++) {
+  }
+  if(n >= 100000) {
+    return 1;
+  }
+
+  /* check value of TWI Status Register. Mask prescaler bits. */
+  twst = TW_STATUS & 0xF8;
+  if((twst != TW_MT_SLA_ACK) && (twst != TW_MR_SLA_ACK)) {
+    return 1;
+  }
+
+  return 0;
+}
+void 
+i2c_start_wait(uint8_t addr)
+{
+    uint8_t   twst;
+    while ( 1 )
+    {
+            // send START condition
+            TWCR = (1<<TWINT) | (1<<TWSTA) | (1<<TWEN);
+        // wait until transmission completed
+        while(!(TWCR & (1<<TWINT)));
+        // check value of TWI Status Register. Mask prescaler bits.
+        twst = TW_STATUS & 0xF8;
+        if ( (twst != TW_START) && (twst != TW_REP_START)) continue;
+        // send device address
+        TWDR = addr;
+        TWCR = (1<<TWINT) | (1<<TWEN);
+        // wail until transmission completed
+        while(!(TWCR & (1<<TWINT)));
+        // check value of TWI Status Register. Mask prescaler bits.
+        twst = TW_STATUS & 0xF8;
+        if ( (twst == TW_MT_SLA_NACK )||(twst ==TW_MR_DATA_NACK) )
+        {
+            /* device busy, send stop condition to terminate write operation */
+                TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO);
+                // wait until stop condition is executed and bus released
+                while(TWCR & (1<<TWSTO));
+            continue;
+        }
+        //if( twst != TW_MT_SLA_ACK) return 1;
+        break;
+     }
+}
+void
+i2c_stop(void)
+{
+  TWCR = (1 << TWINT) | (1 << TWSTO) | (1 << TWEN);
+  /* wait until ready */
+  while(TWCR & (1<<TWSTO));
+}
+void
+i2c_write(uint8_t u8data)
+{
+  TWDR = u8data;
+  TWCR = (1 << TWINT) | (1 << TWEN);
+  while((TWCR & (1 << TWINT)) == 0) ;
+}
+uint8_t
+i2c_readAck(void)
+{
+  TWCR = (1 << TWINT) | (1 << TWEN) | (1 << TWEA);
+  while((TWCR & (1 << TWINT)) == 0) ;
+  return TWDR;
+}
+uint8_t
+i2c_readNak(void)
+{
+  TWCR = (1 << TWINT) | (1 << TWEN);
+  while((TWCR & (1 << TWINT)) == 0) ;
+  return TWDR;
+}
+static void
+print_delim(int p, char *s, const char *d)
+{
+  if(p) {
+    printf("%s", d);
+  }
+  printf("%s", s);
+}
+void
+i2c_write_mem(uint8_t addr, uint8_t reg, uint8_t value)
+{
+  i2c_start(addr | I2C_WRITE);
+  i2c_write(reg);
+  i2c_write(value);
+  i2c_stop();
+}
+void
+i2c_read_mem(uint8_t addr, uint8_t reg, uint8_t buf[], uint8_t bytes)
+{
+  uint8_t i = 0;
+  i2c_start(addr | I2C_WRITE);
+  i2c_write(reg);
+  i2c_start(addr | I2C_READ);
+  for(i = 0; i < bytes; i++) {
+    if(i == bytes - 1) {
+      buf[i] = i2c_readNak();
+    } else {
+      buf[i] = i2c_readAck();
+    }
+  }
+  i2c_stop();
+}
+void
+i2c_at24mac_read(char *buf, uint8_t eui64)
+{
+  if(eui64) {
+    i2c_read_mem(I2C_AT24MAC_ADDR, 0x98, (uint8_t *)buf, 8);
+  }
+  /* 128bit unique serial number */
+  else {
+    i2c_read_mem(I2C_AT24MAC_ADDR, 0x80, (uint8_t *)buf, 16);
+  }
+}
+
+uint16_t
+i2c_probe(void)
+{
+  int p = 0;
+  const char *del = ",";
+  uint16_t probed = 0;
+  watchdog_periodic();
+  if(!i2c_start(I2C_AT24MAC_ADDR)) {
+    i2c_stop();
+    probed |= I2C_AT24MAC;
+    print_delim(p++, "AT24MAC", del);
+  }
+  watchdog_periodic();
+  if(!i2c_start(I2C_SHT2X_ADDR)) {
+    i2c_stop();
+    probed |= I2C_SHT2X;
+    print_delim(p++, "SHT2X", del);
+  }
+  watchdog_periodic();
+  if(!i2c_start(I2C_CO2SA_ADDR)) {
+    i2c_stop();
+    probed |= I2C_CO2SA;
+    print_delim(p++, "CO2SA", del);
+  }
+  return probed;
+}
diff --git a/platform/avr-rss2/dev/i2c.h b/platform/avr-rss2/dev/i2c.h
new file mode 100644
index 000000000..3aa124953
--- /dev/null
+++ b/platform/avr-rss2/dev/i2c.h
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ *
+ */
+
+/**
+ * \file
+ *         includes for i2c core functions
+ * \author
+ *         Robert Olsson <robert@radio-sensors.com>
+ */
+
+#include "contiki.h"
+
+/* Here we define the i2c address for dev we support */
+#define I2C_AT24MAC_ADDR  0xB0 /* EUI64 ADDR */
+#define I2C_SHT2X_ADDR    (0x40 << 1) /* SHT2X ADDR */
+
+
+/* Here we define a enumration for devices */
+#define I2C_AT24MAC       (1<<0)
+#define I2C_SHT2X         (1<<1)
+#define I2C_CO2SA         (1<<2)  /* Sense-Air CO2 */
+
+#define I2C_READ    1
+#define I2C_WRITE   0
+
+void i2c_init(uint32_t speed);
+uint8_t i2c_start(uint8_t addr);
+void i2c_start_wait(uint8_t addr);
+void i2c_stop(void);
+void i2c_write(uint8_t u8data);
+uint8_t i2c_readAck(void);
+uint8_t i2c_readNak(void);
+uint8_t i2c_getstatus(void);
+uint16_t i2c_probe(void);
+void i2c_read_mem(uint8_t addr, uint8_t reg, uint8_t buf[], uint8_t bytes);
+void i2c_write_mem(uint8_t addr, uint8_t reg, uint8_t value);
+void i2c_at24mac_read(char *buf, uint8_t eui64);
+extern uint16_t i2c_probed; /* i2c devices we have probed */
diff --git a/platform/avr-rss2/dev/leds.c b/platform/avr-rss2/dev/leds.c
new file mode 100644
index 000000000..c59f9d09f
--- /dev/null
+++ b/platform/avr-rss2/dev/leds.c
@@ -0,0 +1,45 @@
+#include <avr/pgmspace.h>
+#include "rss2.h"
+#include "leds.h"
+
+void
+leds_init(void)
+{
+  DDRE |= (1 << LED_RED);
+  DDRE |= (1 << LED_YELLOW);
+  /* Off */
+  leds_off(LEDS_ALL);
+}
+void
+leds_on(unsigned char ledv)
+{
+  if(ledv & LEDS_YELLOW) {
+    PORTE &= ~(1 << LED_YELLOW);
+  }
+  if(ledv & LEDS_RED) {
+    PORTE &= ~(1 << LED_RED);
+  }
+}
+void
+leds_off(unsigned char ledv)
+{
+  if(ledv & LEDS_YELLOW) {
+    PORTE |= (1 << LED_YELLOW);
+  }
+  if(ledv & LEDS_RED) {
+    PORTE |= (1 << LED_RED);
+  }
+}
+void
+leds_toggle(unsigned char ledv)
+{
+}
+void
+leds_invert(unsigned char ledv)
+{
+}
+unsigned char
+leds_get(void)
+{
+  return 0;
+}
diff --git a/platform/avr-rss2/dev/leds.h b/platform/avr-rss2/dev/leds.h
new file mode 100644
index 000000000..6dee358c8
--- /dev/null
+++ b/platform/avr-rss2/dev/leds.h
@@ -0,0 +1,17 @@
+
+#ifndef CONTIKI_LED_H_
+#define CONTIKI_LED_H_
+
+#define LEDS_GREEN                    1
+#define LEDS_YELLOW                   2
+#define LEDS_RED                      4
+#define LEDS_ALL                      7
+
+void leds_init(void); /* Initialize the LEDs driver. */
+unsigned char leds_get(void); /* Get the status of a LED. */
+void leds_on(unsigned char ledv); /* Turn on a set of LEDs. */
+void leds_off(unsigned char ledv); /* Turn off a set of LEDs. */
+void leds_toggle(unsigned char ledv); /* Toggle a set of LEDs. */
+void leds_invert(unsigned char ledv); /* Toggle a set of LEDs. */
+
+#endif /* CONTIKI_LED_H_ */
diff --git a/platform/avr-rss2/dev/light-sensor.c b/platform/avr-rss2/dev/light-sensor.c
new file mode 100644
index 000000000..cbb0a93f7
--- /dev/null
+++ b/platform/avr-rss2/dev/light-sensor.c
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2015, Copyright Robert Olsson
+ * 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.
+ *
+ */
+
+#include "contiki.h"
+#include "lib/sensors.h"
+#include "dev/light-sensor.h"
+#include "rss2.h"
+#include "adc.h"
+
+const struct sensors_sensor light_sensor;
+
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  return adc_read(A3);
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int c)
+{
+  DDRF &= ~(1 << A3); /* Light sensor */
+  DDRF &= ~(1 << A3_PWR);
+
+  PORTF |= (1 << A3_PWR); /* Light sensor */
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(light_sensor, "Light", value, configure, status);
diff --git a/platform/avr-rss2/dev/light-sensor.h b/platform/avr-rss2/dev/light-sensor.h
new file mode 100644
index 000000000..da26c724e
--- /dev/null
+++ b/platform/avr-rss2/dev/light-sensor.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2015, Copyright Robert Olsson
+ * 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.
+ *
+ *
+ * Author  : Robert Olsson
+ * Created : 2015-10-27
+ * Updated : $Date: 2010/01/14 20:23:02 $
+ *           $Revision: 1.2 $
+ */
+
+#ifndef LIGHT_SENSOR_H_
+#define LIGHT_SENSOR_H_
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor light_sensor;
+
+#endif /* LIGHT-SENSOR_H_ */
diff --git a/platform/avr-rss2/dev/pulse-sensor.c b/platform/avr-rss2/dev/pulse-sensor.c
new file mode 100644
index 000000000..eb0f3a842
--- /dev/null
+++ b/platform/avr-rss2/dev/pulse-sensor.c
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2015, Copyright Robert Olsson / Radio Sensors AB
+ * 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.
+ *
+ *
+ * Author  : Robert Olsson robert@radio-sensors.com
+ * Created : 2015-11-22
+ */
+
+#include "contiki.h"
+#include "lib/sensors.h"
+#include "dev/pulse-sensor.h"
+#include "rss2.h"
+
+const struct sensors_sensor pulse_sensor;
+
+#define NP 2
+
+uint32_t volatile pc[NP];
+
+/*
+ * Note interrupt sources can be woken up from sleep mode PWR_SAVE
+ * Two interrupt ports, #0 green terminal block. #1 pin header via
+ * a comparator.
+ */
+
+static void
+port_irq_ctrl(uint8_t on)
+{
+  if(on) {
+
+    DDRD &= ~(1 << PD2);
+    PORTD &= ~(1 << PD2);
+    EIMSK = 0;
+    EICRA |= 0x20;    /* Falling edge INT2 */
+    EIMSK |= (1 << PD2);  /* Enable interrupt for pin */
+
+    /* p1 port */
+    DDRD &= ~(1 << PD3);
+    PORTD &= ~(1 << PD3);
+    EIMSK |= (1 << PD3);  /* Enable interrupt for pin */
+    EICRA |= 0x80;        /* Falling edge */
+    PCICR |= (1 << PCIE0);  /* And enable irq PCINT 7:0 */
+  } else {
+    EICRA = 0;
+    PORTD |= (1 << PD2);
+    EIMSK &= ~(1 << PD2);    /* Disable interrupt for pin */
+
+    PORTD |= (1 << PD3);
+    EIMSK &= ~(1 << PD3);    /* Disable interrupt for pin */
+  }
+}
+ISR(INT2_vect)
+{
+  if(!(PCICR & (1 << PCIE0))) {
+    return;
+  }
+  pc[0]++;
+}
+
+ISR(INT3_vect)
+{
+  if(!(PCICR & (1 << PCIE0))) {
+    return;
+  }
+  pc[1]++;
+}
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  if(type == 0) {
+    return (int)pc[0];
+  }
+  if(type == 1) {
+    return (int)pc[1];
+  }
+  return -1;
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int c)
+{
+  port_irq_ctrl(1);  /* Enable pulse counts */
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(pulse_sensor, "Pulse", value, configure, status);
diff --git a/platform/avr-rss2/dev/pulse-sensor.h b/platform/avr-rss2/dev/pulse-sensor.h
new file mode 100644
index 000000000..03a09cd1b
--- /dev/null
+++ b/platform/avr-rss2/dev/pulse-sensor.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2015, Copyright Robert Olsson / Radio Sensors AB
+ * 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.
+ *
+ *
+ * Author  : Robert Olsson robert@radio-sensors.com
+ * Created : 2015-11-22
+ */
+
+#ifndef PULSE_SENSOR_H_
+#define PULSE_SENSOR_H_
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor pulse_sensor;
+
+#endif /* PULSE-SENSOR_H_ */
diff --git a/platform/avr-rss2/dev/temp-sensor.c b/platform/avr-rss2/dev/temp-sensor.c
new file mode 100644
index 000000000..5bc108c7e
--- /dev/null
+++ b/platform/avr-rss2/dev/temp-sensor.c
@@ -0,0 +1,292 @@
+/*
+ * Copyright (c) 2015, Copyright Per Lindgren <per.o.lindgren@gmail.com>
+ * 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.
+ *
+ *
+ * Author   : Per Lindgren <per.o.lindgren@gmail.com>
+ * Hacked by: Robert Olsson robert@radio-sensors.com
+ * Created : 2015-11-22
+ */
+
+#include "contiki.h"
+#include "dev/temp-sensor.h"
+#include <util/delay_basic.h>
+#define delay_us(us)   (_delay_loop_2(1 + (us * F_CPU) / 4000000UL))
+
+const struct sensors_sensor temp_mcu_sensor;
+
+/* probe_for_ds18b20 probes for the sensor. Returns 0 on failure, 1 on success
+ * Assumptions: only one sensor on the "1-wire bus", on port WSN_DS18B20_PORT
+ * BUG: THIS CODE DOES NOT WORK AS INTENDED! IT RETURNS "1" EVEN WHEN THERE
+ * IS NO SENSOR CONNECTED.
+ */
+
+uint8_t
+ds18b20_probe(void)
+{
+  uint8_t result = 0;
+
+  /* Reset 1W-bus */
+
+  /* Pull PIN low for 480 microseconds (us)
+   * Start with setting bit DS18B20_1_PIN to 0 */
+  OW_SET_PIN_LOW();
+  /* then set direction to OUT by setting DS18B20_1_DDR bit to 1 */
+  OW_SET_OUTPUT();
+  /* Delay 480 us */
+  clock_delay_usec(480);
+  /* See if sensor responds. First release the bus and switch to INput mode
+   * by setting DS18B20_1_DDR bit to 0 */
+  OW_SET_INPUT();
+  /* Activate internal pull-up by  setting pin to HIGH (when in INput mode)
+   * OW_SET_PIN_HIGH();
+   * Wait for the pin to go HIGH for 64 us */
+  clock_delay_usec(64);
+  /* Now the sensor, if present, pulls the pin LOW for 60-240 us
+   * Detect 0 on PIND bit DS18B20_1_PIN. Invert the result so a presence
+   * (aka * a 0)  sets "result" to 1 (for success) */
+  result = !OW_GET_PIN_STATE();
+
+  /* The sensor releases the pin so it goes HIGH after 240 us, add some
+     for the signal to stabilize, say 300 usecs to be on the safe side? */
+  if(result) {
+    clock_delay_usec(300);
+    /* Now the bus should be HIGH again */
+    result = OW_GET_PIN_STATE();
+  }
+  return result;
+}
+/* Write 1 or 0 on the bus */
+
+void
+write_bit(uint8_t bit)
+{
+  /* Set pin to 0 */
+  OW_SET_OUTPUT();
+  OW_SET_PIN_LOW();
+
+  /* Pin should be 0 for at least 1 us */
+  clock_delay_usec(2);
+
+  /* If we're writing a 1, let interna pull-up pull the bus high
+   * within 15 us of setting the bus to low */
+  if(bit) {
+    /* Internal pull-up is activated by setting direction to IN and the
+     * setting the pin to HIGH */
+    OW_SET_INPUT();
+    OW_SET_PIN_HIGH();
+  }
+  /* OK, now the bus is either LOW, or pulled HIGH by the internal pull-up
+   * Let this state remain for 60 us, then release the bus */
+  clock_delay_usec(60);
+
+  /* Release the bus */
+  OW_SET_PIN_HIGH();
+  OW_SET_INPUT();
+
+  /* Allow > 1 us between read/write operations */
+  clock_delay_usec(2);
+}
+/* Read one bit of information from the bus, and return it as 1 or 0 */
+
+uint8_t
+read_bit(void)
+{
+  uint8_t bit = 0;
+
+  /* Set pin to 0 */
+  OW_SET_OUTPUT();
+  OW_SET_PIN_LOW();
+
+  /* Pin should be 0 for at least 1 us */
+  clock_delay_usec(2);
+
+  /* Now read the bus, start by setting in/out direction and activating
+   * internal pull-up resistor */
+  OW_SET_INPUT();
+  OW_SET_PIN_HIGH();
+
+  /* ds18b20 either keeps the pin down or releases the bus and the
+   * bus then goes high because of the interna pull-up resistor
+   * Check whichever happens before 15 us has passed */
+  clock_delay_usec(15 - 2 - 1);
+  bit = OW_GET_PIN_STATE();
+
+  /* The complete read cycle must last at least 60 us. We have now spent
+   * about 14-15 us in delays, so add another delay to reach >= 60 us */
+  clock_delay_usec(50);
+
+  /* Release bus */
+  OW_SET_PIN_HIGH();
+  OW_SET_INPUT();
+
+  /* Allow > 1 us between read/write operations */
+  clock_delay_usec(2);
+
+  return bit ? 1 : 0;
+}
+/* Read one byte of information. A byte is read least significant bit first */
+
+uint8_t
+read_byte(void)
+{
+  uint8_t result = 0;
+  uint8_t bit;
+  int i;
+
+  for(i = 0; i < 8; i++) {
+    bit = read_bit();
+    result += (bit << i);
+  }
+  return result;
+}
+/* Write one byte of information. A byte is written least significant bit first */
+
+void
+write_byte(uint8_t byte)
+{
+  int i;
+
+  for(i = 0; i < 8; i++) {
+    write_bit((byte >> i) & 1);
+  }
+}
+/* ds18b20_get_temp returns the temperature in "temp" (in degrees celsius)
+ * Returns 0 on failure (and then "temp" is left unchanged
+ * Returns 1 on success, and sets temp */
+
+uint8_t
+ds18b20_get_temp(double *temp)
+{
+  uint8_t result = 0;
+
+  /* Reset bus by probing. Probe returns 1 on success/presence of sensor */
+  if(ds18b20_probe()) {
+    /* write command "skip rom" since we only have one sensor on the wire! */
+    write_byte(DS18B20_COMMAND_SKIP_ROM);
+
+    /* write command to start measurement */
+    write_byte(DS18B20_COMMAND_START_CONVERSION);
+
+    /* Wait for conversion to complete. Conversion is 12-bit by default.
+     * Since we have external power to the sensor (ie not in "parasitic power"
+     * mode) the bus is held LOW by the sensor while the conversion is going
+     * on, and then HIGH when conversion is finished. */
+    OW_SET_INPUT();
+    int count = 0;
+    while(!OW_GET_PIN_STATE()) {
+      clock_delay_msec(10);
+      count++;
+      /* Longest conversion time is 750 ms (12-bit resolution)
+       * So if count > 80 (for a little margin!), we return -274.0
+       * which indicates failure to read the temperature. */
+      if(count > 80) {
+        return 0;
+      }
+    }
+
+    /* The result is stored in the "scratch pad", a 9 byte memory block.
+     * The first two bytes are the conversion result. Reading the scratch pad
+     * can be terminated by sending a reset signal (but we read all 9 bytes) */
+    (void)ds18b20_probe();
+    write_byte(DS18B20_COMMAND_SKIP_ROM);
+    write_byte(DS18B20_COMMAND_READ_SCRATCH_PAD);
+    uint8_t i, sp_arr[9];
+    for(i = 0; i < 9; i++) {
+      sp_arr[i] = read_byte();
+    }
+
+    /* Check CRC, if mismatch, return 0 (failure to read temperature) */
+    uint8_t crc_cal = crc8_ds18b20(sp_arr, 8);
+
+    if(crc_cal != sp_arr[8]) {
+      return 0;
+    }
+
+    /* OK, now decode what the temperature reading is. This code assumes
+     * 12-bit resolution, so this must be modified if the code is modified
+     * to use any other resolution! */
+    int16_t temp_res;
+    uint8_t temp_lsb = sp_arr[0];
+    uint8_t temp_msb = sp_arr[1];
+
+    temp_res = (int16_t)temp_msb << 8 | temp_lsb;
+    *temp = (double)temp_res * 0.0625;
+
+    result = 1;
+  }
+  return result;
+}
+/* crc8 algorithm for ds18b20 */
+/* http://www.miscel.dk/MiscEl/CRCcalculations.html */
+
+uint8_t
+crc8_ds18b20(uint8_t *buf, uint8_t buf_len)
+{
+  uint8_t result = 0;
+  uint8_t i, b;
+
+  for(i = 0; i < buf_len; i++) {
+    result = result ^ buf[i];
+    for(b = 1; b < 9; b++) {
+      if(result & 0x1) {
+        result = (result >> 1) ^ 0x8C;
+      } else {
+        result = result >> 1;
+      }
+    }
+  }
+  return result;
+}
+static int
+value(int type)
+{
+  double t;
+  int ret;
+  ret = ds18b20_get_temp(&t);
+  
+  /* Return temp multiplied by 100 for two decimals */
+  if(ret) 
+    return (int) (t * 100);
+
+  /* Error return largest negative value */
+  return 0x8000;
+}
+static int
+configure(int type, int c)
+{
+  ds18b20_probe();
+  return 0;
+}
+static int
+status(int type)
+{
+  return 1;
+}
+SENSORS_SENSOR(temp_sensor, TEMP_SENSOR, value, configure, status);
diff --git a/platform/avr-rss2/dev/temp-sensor.h b/platform/avr-rss2/dev/temp-sensor.h
new file mode 100644
index 000000000..b5ab53659
--- /dev/null
+++ b/platform/avr-rss2/dev/temp-sensor.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015, Copyright Per Lindgren <per.o.lindgren@gmail.com>
+ * 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.
+ *
+ *
+ * Author   : Per Lindgren <per.o.lindgren@gmail.com>
+ * Hacked by: Robert Olsson robert@radio-sensors.com
+ * Created : 2015-11-22
+ */
+
+#ifndef TEMP_SENSOR_H_
+#define TEMP_SENSOR_H_
+
+#include "lib/sensors.h"
+#include <sys/clock.h>
+#include "contiki.h"
+#include "rss2.h"
+
+#define DS18B20_1_PIN OW_BUS_0
+#define DS18B20_1_IN  PIND
+#define DS18B20_1_OUT PORTD
+#define DS18B20_1_DDR DDRD
+
+#define OW_SET_PIN_LOW()   (DS18B20_1_OUT &= ~(1 << DS18B20_1_PIN))
+#define OW_SET_PIN_HIGH()  (DS18B20_1_OUT |= (1 << DS18B20_1_PIN))
+#define OW_SET_OUTPUT()    (DS18B20_1_DDR |= (1 << DS18B20_1_PIN))
+#define OW_SET_INPUT()     (DS18B20_1_DDR &= ~(1 << DS18B20_1_PIN))
+#define OW_GET_PIN_STATE() ((DS18B20_1_IN & (1 << DS18B20_1_PIN)) ? 1 : 0)
+
+#define DS18B20_COMMAND_READ_SCRATCH_PAD 0xBE
+#define DS18B20_COMMAND_START_CONVERSION 0x44
+#define DS18B20_COMMAND_SKIP_ROM 0xCC
+
+/* probe_for_ds18b20 probes for the sensor. Returns 0 on failure, 1 on success
+ * Assumption: only one sensor on the "1-wire bus", on port DS18B20_1_PIN */
+
+extern uint8_t ds18b20_probe(void);
+extern uint8_t  ds18b20_get_temp(double *temp);
+extern uint8_t crc8_ds18b20(uint8_t *buf, uint8_t buf_len);
+
+extern const struct sensors_sensor temp_sensor;
+
+#define TEMP_SENSOR "temp"
+
+#endif /* TEMP_SENSOR_H_ */
diff --git a/platform/avr-rss2/dev/temp_mcu-sensor.c b/platform/avr-rss2/dev/temp_mcu-sensor.c
new file mode 100644
index 000000000..cfa21707d
--- /dev/null
+++ b/platform/avr-rss2/dev/temp_mcu-sensor.c
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2006, 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 ADVISE OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * -----------------------------------------------------------------
+ *
+ * Author  : Robert Olsson
+ * Created : 2015-10-27
+ * Updated : $Date: 2010/08/25 19:30:52 $
+ *           $Revision: 1.11 $
+ */
+
+#include "contiki.h"
+#include "dev/temp_mcu-sensor.h"
+#include <util/delay_basic.h>
+#define delay_us(us)   (_delay_loop_2(1 + (us * F_CPU) / 4000000UL))
+
+const struct sensors_sensor temp_mcu_sensor;
+
+/* Returns the MCU temp in C*10 read from the BATMON MCU register
+ * See AtMega chip docs for BATMON details.
+ */
+
+static int
+value(int type)
+{
+  uint16_t v;
+
+  ADCSRB |= (1 << MUX5); /* this bit buffered till ADMUX written to! */
+  ADMUX = 0xc9;
+
+  /* ADC on /32 ADC start */
+  ADCSRA = (1 << ADPS2) | (0 << ADPS1) | (1 << ADPS0);
+  ADCSRA |= (1 << ADEN); /* Enable the ADC */
+
+  while(!(ADCSRB & (1 << AVDDOK))) ;  /* Wait for AVDD ok */
+  while(!(ADCSRB & (1 << REFOK))) ;  /* Wait for ref ok  */
+
+  ADCSRA |= (1 << ADSC);      /* Throwaway conversion */
+  while
+  (ADCSRA & (1 << ADSC)) ;
+
+  ADCSRA |= (1 << ADSC);       /* Start conversion */
+  while
+  (ADCSRA & (1 << ADSC)) ;
+
+  v = ADC;
+
+  /* Disable the ADC to save power */
+  ADCSRA &= ~_BV(ADEN);
+  /* ADMUX = 0;                //turn off internal vref */
+  return (int)((double)(v * 1.13 - 272.8) * 10);
+}
+static int
+configure(int type, int c)
+{
+  return 0;
+}
+static int
+status(int type)
+{
+  return 1;
+}
+SENSORS_SENSOR(temp_mcu_sensor, TEMP_MCU_SENSOR, value, configure, status);
+
diff --git a/platform/avr-rss2/dev/temp_mcu-sensor.h b/platform/avr-rss2/dev/temp_mcu-sensor.h
new file mode 100644
index 000000000..c311fdb16
--- /dev/null
+++ b/platform/avr-rss2/dev/temp_mcu-sensor.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2006, 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.
+ *
+ *
+ * -----------------------------------------------------------------
+ *
+ * Author  : Robert Olsson
+ * Created : 2015-10-27
+ * Updated : $Date: 2007/11/13 20:36:40 $
+ *           $Revision: 1.1 $
+ */
+
+#ifndef TEMP_MCU_SENSOR_H_
+#define TEMP_MCU_SENSOR_H_
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor temp_mcu_sensor;
+
+#define TEMP_MCU_SENSOR "temp_mcu"
+
+#endif /* TEMP_MCU_SENSOR_H_ */
diff --git a/platform/avr-rss2/examples/avr_radio_power/AtMega256RFR2-summary-power.dat b/platform/avr-rss2/examples/avr_radio_power/AtMega256RFR2-summary-power.dat
new file mode 100644
index 000000000..bc4e1f0cc
--- /dev/null
+++ b/platform/avr-rss2/examples/avr_radio_power/AtMega256RFR2-summary-power.dat
@@ -0,0 +1,25 @@
+
+# Atmega256RFR2 @ 20C, UNT-61E, RSS2 Mote 2015-12-30
+# TX-PWR RPC=0x0 vs RPC=0xFF. Current mA
+#
+15 14.6  11.8
+14 15.0  12.1
+13 15.3  12.5
+12 15.6  12.8
+11 15.9  13.1
+10 16.1  13.4
+ 9 16.3  13.7
+ 8 16.5  13.8
+ 7 16.7  13.9
+ 6 16.9  14.0
+ 5 17.0  14.2
+ 4 17.2  14.3
+ 3 17.2  14.5
+ 2 17.2  14.6
+ 1 17.3  14.6
+ 0 17.4  14.5
+RX 13.7   7.3
+IDLE  0     0
+
+
+
diff --git a/platform/avr-rss2/examples/avr_radio_power/Makefile b/platform/avr-rss2/examples/avr_radio_power/Makefile
new file mode 100644
index 000000000..fb9b062a1
--- /dev/null
+++ b/platform/avr-rss2/examples/avr_radio_power/Makefile
@@ -0,0 +1,9 @@
+CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
+
+CONTIKI_PROJECT = avr_radio_power
+APPS+=powertrace
+all: $(CONTIKI_PROJECT)
+
+CONTIKI = ../../../..
+CONTIKI_WITH_RIME = 1
+include $(CONTIKI)/Makefile.include
diff --git a/platform/avr-rss2/examples/avr_radio_power/README.md b/platform/avr-rss2/examples/avr_radio_power/README.md
new file mode 100644
index 000000000..745a31790
--- /dev/null
+++ b/platform/avr-rss2/examples/avr_radio_power/README.md
@@ -0,0 +1,79 @@
+avr_radio_power
+===============
+
+Motivation
+-----------
+Spins over different radio seting for the Atmel radio. The motivation is to 
+get understanding and also to get correct data for avrora and Contiki
+ simulations. Program loops over different TX-power setting and measures 
+RX consumption also radio off and idle power use in SLEEP_MODE_PWR_SAVE is 
+measured. Program disables radio duty cycling (RDC) and sets MCU in deep 
+sleep mode to only get radio consumption.
+
+Usage
+-----
+The different setting is printed on the terminal. You need a way to measure 
+the current consumption and relate to the tests.
+ 
+Example
+-------
+Program printout with added measurements. The used board was RSS2 mote 
+with a AtMega256RFR2 CPU. Max is when 0xFF is written to the RPC register.
+
+
+Run/setup                Current use  
+------------------------------------------------ 
+TX with PWR=0 RPC=0x00   17.80 mA   (MAX TX-pwr) 
+TX with PWR=1 RPC=0x00   17.74  
+TX with PWR=2 RPC=0x00  
+TX with PWR=3 RPC=0x00  
+TX with PWR=4 RPC=0x00  
+TX with PWR=5 RPC=0x00   17.43  
+TX with PWR=6 RPC=0x00  
+TX with PWR=7 RPC=0x00  
+TX with PWR=8 RPC=0x00  
+TX with PWR=9 RPC=0x00   17.68  
+TX with PWR=10 RPC=0x00  
+TX with PWR=11 RPC=0x00  
+TX with PWR=12 RPC=0x00  
+TX with PWR=13 RPC=0x00  
+TX with PWR=14 RPC=0x00  
+TX with PWR=15 RPC=0x00  
+RX with RPC=0x00 -------------------- 13.43   (RX)  
+  
+-------------------------------------------------  
+TX with PWR=0 RPC=0xff   14.63 mA  (MAX TX-pwr)  
+TX with PWR=1 RPC=0xff  
+TX with PWR=2 RPC=0xff  
+TX with PWR=3 RPC=0xff  
+TX with PWR=4 RPC=0xff  
+TX with PWR=5 RPC=0xff  
+TX with PWR=6 RPC=0xff   14.45  
+TX with PWR=7 RPC=0xff  
+TX with PWR=8 RPC=0xff  
+TX with PWR=9 RPC=0xff  
+TX with PWR=10 RPC=0xff  
+TX with PWR=11 RPC=0xff  
+TX with PWR=12 RPC=0xff  
+TX with PWR=13 RPC=0xff  
+TX with PWR=14 RPC=0xff  
+TX with PWR=15 RPC=0xff  
+RX with RPC=0xFF -------------------- 7.11   (RX)  
+  
+RX radio off               0.001 mA  
+
+  
+Comments
+--------
+We see TX consumption decreases from 17.80 to 14.63 mA using Max RPC (0xFF).
+NOTE! For RX 13.43 to 7.11 mA. Nice. This actual measurements. 
+The avr-rss2 port adds support for the AtMegaXXXRFR2 including the new RPC 
+function.
+
+
+References
+----------
+Atmel application note. AT02594: Smart Reduced Power Consumption  Techniques   
+[Here] (http://www.atmel.com/images/atmel-42356-smart-reduced-power-consumption-techniques_applicationnote_at02594.pdf)
+
+Multimeter UNI-T UT61E with USB-logging.
\ No newline at end of file
diff --git a/platform/avr-rss2/examples/avr_radio_power/avr_radio_power.c b/platform/avr-rss2/examples/avr_radio_power/avr_radio_power.c
new file mode 100644
index 000000000..5be61d8bd
--- /dev/null
+++ b/platform/avr-rss2/examples/avr_radio_power/avr_radio_power.c
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2015, Copyright Robert Olsson / Radio Sensors AB  
+ * 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.
+ *
+ *
+ * Author  : Robert Olsson robert@radio-sensors.com
+ * Created : 2015-12-30
+ */
+
+/**
+ * \file
+ *         An application for monitoring current use on Atmel 
+ *         radios also supporting the RPC function on RFR2 chips.
+ *         Current needs to be measured with amp-meter.
+ */
+
+#include "contiki.h"
+#include "net/rime/rime.h"
+#include "powertrace.h"
+#include <stdio.h>
+#include "dev/leds.h"
+#include "rf230bb.h"
+#include "net/packetbuf.h"
+#include "net/rime/rimestats.h"
+#include "net/netstack.h"
+#include <avr/sleep.h>
+#include <dev/watchdog.h>
+
+#define TEST_PERIOD 6
+
+static int ps = 0;      /* Power-save false */
+static char buf[110];
+static struct etimer et;
+
+PROCESS(power_use_process, "Power use test");
+PROCESS(sleep_process,   "Sleep process");
+AUTOSTART_PROCESSES(&power_use_process, &sleep_process);
+
+static void
+broadcast_recv(struct broadcast_conn *c, const linkaddr_t *from)
+{
+  printf("broadcast message received from %d.%d: '%s'\n",
+         from->u8[0], from->u8[1], (char *)packetbuf_dataptr());
+}
+
+static const struct broadcast_callbacks broadcast_call = {broadcast_recv};
+static struct broadcast_conn broadcast;
+
+
+PROCESS_THREAD(power_use_process, ev, data)
+{
+  static int i, j;
+  PROCESS_EXITHANDLER(broadcast_close(&broadcast);)
+    PROCESS_BEGIN();
+
+  /* powertrace_start(CLOCK_SECOND * 2); */
+  broadcast_open(&broadcast, 129, &broadcast_call);
+  leds_init();
+  rf230_set_channel(25);  
+
+  for(i=0; i < 2; i++) {   /* Loop over min and max rpc settings  */
+
+    NETSTACK_RADIO.off(); /* Radio off for rpc change */
+    NETSTACK_RADIO.off();
+    etimer_set(&et, CLOCK_SECOND * 8);
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+    if(i == 0) 
+      rf230_set_rpc(0x0); /* Disbable all RPC features */
+    else 
+      rf230_set_rpc(0xFF); /* Enable all RPC features. Only XRFR2 radios */
+    NETSTACK_RADIO.on();
+
+    /*  Loop over the different TX power settings 0-15  */
+    
+    for(j=15; j >= 0; j--) {
+      NETSTACK_RADIO.on();
+      rf230_set_txpower(j);
+      ps = 0;
+      printf("TX with PWR=%d RPC=0x%02x\n", rf230_get_txpower(), rf230_get_rpc());
+      ps = 1;
+      
+      etimer_set(&et, CLOCK_SECOND * TEST_PERIOD);
+      
+      while(1) {
+	if(etimer_expired(&et))
+	  break;
+	packetbuf_copyfrom(buf, sizeof(buf)); /* Dummy data */
+	broadcast_send(&broadcast);
+	PROCESS_PAUSE();
+	//leds_on(LEDS_RED);
+	}
+      /* Barrier so we can see next run */
+      NETSTACK_RADIO.off();
+      etimer_set(&et, CLOCK_SECOND * TEST_PERIOD);
+      PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+    }
+
+    /*  RX */
+    NETSTACK_RADIO.on();
+    ps = 0;
+    printf("RX radio on RPC=0x%02x\n",  rf230_get_rpc());
+    ps = 1;
+    etimer_set(&et, CLOCK_SECOND * TEST_PERIOD);
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+    NETSTACK_RADIO.off();
+  }
+
+  /* Last just RX OFF*/
+  ps = 0;
+  printf("RX radio off\n");
+  ps = 1;
+  etimer_set(&et, CLOCK_SECOND * TEST_PERIOD);
+  PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+
+  PROCESS_END();
+}
+
+/* Sleep process is just put MCU in sleep so we minimiza MCU impact */
+PROCESS_THREAD(sleep_process, ev, data)
+{
+  PROCESS_BEGIN();
+  while(1) {
+    watchdog_periodic();
+    if(ps) 
+      set_sleep_mode(SLEEP_MODE_PWR_SAVE);
+    else
+      set_sleep_mode(SLEEP_MODE_IDLE);
+    cli();
+    sleep_enable();
+    sei();  
+    sleep_cpu();
+    sleep_disable();
+    sei();
+    PROCESS_PAUSE();
+  }
+  PROCESS_END();
+}
+
diff --git a/platform/avr-rss2/examples/avr_radio_power/project-conf.h b/platform/avr-rss2/examples/avr_radio_power/project-conf.h
new file mode 100644
index 000000000..8d1bc434f
--- /dev/null
+++ b/platform/avr-rss2/examples/avr_radio_power/project-conf.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2015, Copyright Robert Olsson / Radio Sensors AB  
+ * 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.
+ *
+ *
+ * Author  : Robert Olsson robert@radio-sensors.com
+ * Created : 2015-11-22
+ */
+
+/**
+ * \file
+ *         Project specific configuration defines for example
+ *
+ */
+
+#ifndef PROJECT_CONF_H_
+#define PROJECT_CONF_H_
+
+#define NETSTACK_CONF_RDC nullrdc_driver
+#define NETSTACK_CONF_MAC nullmac_driver
+
+//#define NETSTACK_CONF_MAC         csma_driver
+//#define NETSTACK_CONF_RDC         contikimac_driver
+
+#endif /* PROJECT_CONF_H_ */
diff --git a/platform/avr-rss2/examples/hello-sensors/Makefile b/platform/avr-rss2/examples/hello-sensors/Makefile
new file mode 100644
index 000000000..c6e0da805
--- /dev/null
+++ b/platform/avr-rss2/examples/hello-sensors/Makefile
@@ -0,0 +1,19 @@
+CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
+CONTIKI_PROJECT = hello-sensors
+all: $(CONTIKI_PROJECT)
+
+# We use floating vars. Add library.
+PRINTF_LIB_FLT  = -Wl,-u,vfprintf -lprintf_flt -lm
+PRINTF_LIB_MIN  = -Wl,-u,vfprintf -lprintf_min
+PRINTF_LIB      = $(PRINTF_LIB_FLT)
+CLIBS           = $(PRINTF_LIB) 
+
+
+CUSTOM_RULE_LINK = 1
+%.$(TARGET): %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a 
+	$(LD) $(LDFLAGS) $(TARGET_STARTFILES) ${filter-out %.a,$^} ${filter %.a,$^} $(TARGET_LIBFILES) -o $@ $(CLIBS)
+
+
+
+CONTIKI = ../../../..
+include $(CONTIKI)/Makefile.include
diff --git a/platform/avr-rss2/examples/hello-sensors/README.md b/platform/avr-rss2/examples/hello-sensors/README.md
new file mode 100644
index 000000000..9b204a2a6
--- /dev/null
+++ b/platform/avr-rss2/examples/hello-sensors/README.md
@@ -0,0 +1,11 @@
+Hello-sensors
+=============
+
+Simple demo to read out sensors from the RSS2 mote.
+
+Demo uses double which has the same size as float on Atmel. We sacrifice 
+some bytes for this.
+
+Build
+-----
+make TARGET=avr-rss2
diff --git a/platform/avr-rss2/examples/hello-sensors/hello-sensors.c b/platform/avr-rss2/examples/hello-sensors/hello-sensors.c
new file mode 100644
index 000000000..42be6109e
--- /dev/null
+++ b/platform/avr-rss2/examples/hello-sensors/hello-sensors.c
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2015, Copyright Robert Olsson / Radio Sensors AB  
+ * 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.
+ *
+ *
+ * Author  : Robert Olsson robert@radio-sensors.com
+ * Created : 2015-11-22
+ */
+
+/**
+ * \file
+ *         A simple application showing sensor reading on RSS2 mote
+ */
+
+#include "contiki.h"
+#include "sys/etimer.h"
+#include <stdio.h>
+#include "adc.h"
+#include "i2c.h"
+#include "dev/leds.h"
+#include "dev/battery-sensor.h"
+#include "dev/temp-sensor.h"
+#include "dev/temp_mcu-sensor.h"
+#include "dev/light-sensor.h"
+#include "dev/pulse-sensor.h"
+#ifdef CO2
+#include "dev/co2_sa_kxx-sensor.h"
+#endif
+/*---------------------------------------------------------------------------*/
+PROCESS(hello_sensors_process, "Hello sensor process");
+AUTOSTART_PROCESSES(&hello_sensors_process);
+
+static struct etimer et;
+
+static void
+read_values(void)
+{
+  char serial[16];
+
+  int i;
+ 
+ /* Read out mote unique 128 bit ID */
+  i2c_at24mac_read((char *) &serial, 0);
+  printf("128_bit_ID=");
+  for(i=0; i < 15; i++)
+    printf("%02x", serial[i]);
+  printf("%02x\n", serial[15]);
+  printf("T=%-5.2f", ((double) temp_sensor.value(0)/100.));
+  printf(" V_MCU=%-3.1f", ((double) battery_sensor.value(0))/1000.);
+  printf(" V_IN=%-4.2f", adc_read_v_in());
+  printf(" V_AD1=%-4.2f", adc_read_a1());
+  printf(" V_AD2=%-4.2f", adc_read_a2());
+  printf(" T_MCU=%-4.1f", ((double) temp_mcu_sensor.value(0)/10.));
+  printf(" LIGHT=%-d", light_sensor.value(0));
+  printf(" PULSE_0=%-d", pulse_sensor.value(0));
+  printf(" PULSE_1=%-d", pulse_sensor.value(1));
+#ifdef CO2
+  printf(" CO2=%-d", co2_sa_kxx_sensor.value( CO2_SA_KXX_CO2));
+#endif
+  printf("\n");
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(hello_sensors_process, ev, data)
+{
+  PROCESS_BEGIN();
+
+  SENSORS_ACTIVATE(temp_sensor);
+  SENSORS_ACTIVATE(battery_sensor);
+  SENSORS_ACTIVATE(temp_mcu_sensor);
+  SENSORS_ACTIVATE(light_sensor);
+  SENSORS_ACTIVATE(pulse_sensor);
+#ifdef CO2
+  SENSORS_ACTIVATE(co2_sa_kxx_sensor);
+#endif
+  leds_init(); 
+  leds_on(LEDS_RED);
+  leds_on(LEDS_YELLOW);
+
+  /* 
+   * Delay 5 sec 
+   * Gives a chance to trigger some pulses
+   */
+
+    etimer_set(&et, CLOCK_SECOND * 5);
+  while(1) {
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+    read_values();
+    etimer_reset(&et);
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
diff --git a/platform/avr-rss2/examples/hello-sensors/project-conf.h b/platform/avr-rss2/examples/hello-sensors/project-conf.h
new file mode 100644
index 000000000..8d1bc434f
--- /dev/null
+++ b/platform/avr-rss2/examples/hello-sensors/project-conf.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2015, Copyright Robert Olsson / Radio Sensors AB  
+ * 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.
+ *
+ *
+ * Author  : Robert Olsson robert@radio-sensors.com
+ * Created : 2015-11-22
+ */
+
+/**
+ * \file
+ *         Project specific configuration defines for example
+ *
+ */
+
+#ifndef PROJECT_CONF_H_
+#define PROJECT_CONF_H_
+
+#define NETSTACK_CONF_RDC nullrdc_driver
+#define NETSTACK_CONF_MAC nullmac_driver
+
+//#define NETSTACK_CONF_MAC         csma_driver
+//#define NETSTACK_CONF_RDC         contikimac_driver
+
+#endif /* PROJECT_CONF_H_ */
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/Makefile b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/Makefile
new file mode 100644
index 000000000..9d8bccece
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/Makefile
@@ -0,0 +1,49 @@
+CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
+
+all: coap-client coap-server
+APPS=servreg-hack
+CONTIKI=../../../../..
+
+ifdef WITH_COMPOWER
+APPS+=powertrace
+CFLAGS+= -DCONTIKIMAC_CONF_COMPOWER=1 -DWITH_COMPOWER=1 -DQUEUEBUF_CONF_NUM=4
+endif
+
+ifdef SERVER_REPLY
+CFLAGS+=-DSERVER_REPLY=$(SERVER_REPLY)
+endif
+ifdef PERIOD
+CFLAGS+=-DPERIOD=$(PERIOD)
+endif
+
+### -------------------------------------------------------- ###
+
+#CONTIKI_TARGET_SOURCEFILES += control.c vdc.c
+
+# automatically build RESTful resources
+REST_RESOURCES_DIR = ./resources
+REST_RESOURCES_FILES = $(notdir $(shell find $(REST_RESOURCES_DIR) -name '*.c'))
+
+DC_SENSOR_DIR = ./dev
+DC_SENSOR_FILES = $(notdir $(shell find $(DC_SENSOR_DIR) -name '*.c'))
+
+PROJECTDIRS += $(REST_RESOURCES_DIR) $(DC_SENSOR_DIR)
+PROJECT_SOURCEFILES += $(REST_RESOURCES_FILES) $(DC_SENSOR_FILES)
+
+# linker optimizations
+SMALL=1
+
+# REST Engine shall use Erbium CoAP implementation
+APPS += er-coap
+APPS += rest-engine
+
+#CFLAGS += -DUIP_CONF_BUFFER_SIZE=384
+CFLAGS += -DREST_MAX_CHUNK_SIZE=128
+CFLAGS += -DCOAP_MAX_HEADER_SIZE=64
+
+CFLAGS += -DUIP_CONF_TCP=0
+
+### -------------------------------------------------------- ###
+
+CONTIKI_WITH_IPV6 = 1
+include $(CONTIKI)/Makefile.include
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/README.md b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/README.md
new file mode 100644
index 000000000..ba14cb756
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/README.md
@@ -0,0 +1,67 @@
+Example: mockup of DC converter functionality for IoT-grid.
+===========================================
+This example imitates DC converter functionality for IoT-grid.
+We use standard IoT protocol stack with CoAP application-level protocol. 
+The settings are as follows.
+
+* APPLICATION:		CoAP
+* TRANSPORT:		UDP
+* NETWORK:		IPv6/RPL
+* ADAPTATION:		6LoWPAN
+* MAC:			nullmac_driver
+* RADIO DUTY CYCLE:	nullrdc_driver
+* PHYSICAL:		IEEE 802.15.4
+
+CoAP resources
+----------------
+We define a CoAP resource for each functionality of DC converter.
+Since each functionality may have several parameters, we define each resource
+as a vector of parameters as follows.
+
+* /dcdc/status	read-only parameters for power monitoring.
+It also support periodic monitoring through CoAP observe option.
+  ** 0	VOUT	Output voltage 
+  ** 1	VIN	Input voltage
+  ** 2	IOUT	Output current
+  ** 3	IIN	Input current
+
+* /dcdc/vdc	configurable parameters for voltage droop control function.
+  ** 0	VGRID	Desired grid output voltage
+  ** 1	SLOPE	Slope of voltage droop control function
+  ** 2	PMAX	Maximum output power allowed
+
+* /dcdc/hwcfg	configurable parameters for DC converter hardware.
+  ** 0	VMAX	Maximum output voltage allowed
+  ** 1	IMAX	Maximum output current allowed
+
+Each functionality is implemented as a sensor type device.
+They are located in "dev" folder.
+* dc-status-sensor	for /dcdc/status
+* dc-vdc-sensor		for /dcdc/vdc
+* dc-hw-sensor		for /dcdc/hwcfg
+
+The corresponding CoAP handler for each resource is defined in "resources" folder.
+* res-dc-status-obs	for /dcdc/status
+* res-dc-vdc		for /dcdc/vdc
+* res-dc-hwcfg		for /dcdc/hwcfg
+
+coap-server.c
+----------------
+The server acts as the RPL root node.
+It has 3 CoAP resources as described above.
+
+coap-client.c
+----------------
+The client periodically send a CoAP command (either GET or PUT) to monitor/update 
+values of parameters of a resource. 
+
+project-conf.h
+----------------
+This file contains definitions needed for this IoT-grid example as follows.
+* Enable IPv6 network stack
+* Set nullrdc_driver
+* Set nullmac_driver
+* Activate CoAP observe client library (COAP_OBSERVE_CLIENT = 1)
+* Increase the maximum number of observee and maximum number of open transaction to 10
+(COAP_MAX_OPEN_TRANSACTIONS and COAP_MAX_OBSERVEES = 10)
+
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-client.avr-rss2 b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-client.avr-rss2
new file mode 100644
index 000000000..e69de29bb
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-client.c b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-client.c
new file mode 100644
index 000000000..691b48e40
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-client.c
@@ -0,0 +1,413 @@
+/*
+ * 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.
+ *
+ */
+
+#include "contiki.h"
+#include "contiki-net.h"
+#include "lib/random.h"
+#include "sys/ctimer.h"
+#include "net/ip/uip.h"
+#include "net/ipv6/uip-ds6.h"
+#include "net/ip/uip-udp-packet.h"
+#ifdef WITH_COMPOWER
+#include "powertrace.h"
+#endif
+#include <stdio.h>
+#include <string.h>
+
+/**************************************************************************/
+/* from er-rest-example/er-rexample-client.c */
+#include <stdlib.h>
+#include "er-coap-engine.h"
+#include "er-coap.h"
+#include "er-coap-observe-client.h"
+/* #include "dev/button-sensor.h" */
+
+#if PLATFORM_HAS_LEDS
+#include "dev/leds.h"
+#endif
+
+#define DEBUG 1
+#if DEBUG
+#include <stdio.h>
+#define PRINTF(...) printf(__VA_ARGS__)
+#define PRINT6ADDR(addr) PRINTF("[%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
+#define PRINTLLADDR(lladdr) PRINTF("[%02x:%02x:%02x:%02x:%02x:%02x]", (lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3], (lladdr)->addr[4], (lladdr)->addr[5])
+#else
+#define PRINTF(...)
+#define PRINT6ADDR(addr)
+#define PRINTLLADDR(addr)
+#endif
+
+/* FIXME: This server address is hard-coded for Cooja and link-local for unconnected border router. */
+/* #define SERVER_NODE(ipaddr)   uip_ip6addr(ipaddr, 0xfe80, 0, 0, 0, 0x0212, 0x7402, 0x0002, 0x0202)      / * cooja2 * / */
+/* #define SERVER_NODE(ipaddr)   uip_ip6addr(ipaddr, 0xbbbb, 0, 0, 0, 0, 0, 0, 0x1) */
+
+/* #define SERVER_NODE(ipaddr)   uip_ip6addr(ipaddr, 0x2000, 0, 0, 0, 0, 0, 0, 0x0001) */
+#define LOCAL_PORT      UIP_HTONS(COAP_DEFAULT_PORT + 1)
+#define REMOTE_PORT     UIP_HTONS(COAP_DEFAULT_PORT)
+
+#define GET_INTERVAL 10
+/* #define OBSERVE_INTERVAL 10 */
+
+/**************************************************************************/
+
+#define UDP_CLIENT_PORT 8765
+#define UDP_SERVER_PORT 5678
+
+#define UDP_EXAMPLE_ID  190
+
+/* #define DEBUG DEBUG_PRINT */
+/* #include "net/ip/uip-debug.h" */
+
+#ifndef PERIOD
+/* #define PERIOD 60 */
+#define PERIOD 10
+#endif
+
+#define START_INTERVAL    (15 * CLOCK_SECOND)
+#define SEND_INTERVAL   (PERIOD * CLOCK_SECOND)
+#define SEND_TIME   (random_rand() % (SEND_INTERVAL))
+
+/* static struct uip_udp_conn *client_conn; */
+static uip_ipaddr_t server_ipaddr;
+static coap_observee_t *obs;
+static int count_notify = 0;
+
+/**************************************************************************/
+static struct etimer et;
+
+/* Example URIs that can be queried. */
+#define NUMBER_OF_URLS 4
+/* leading and ending slashes only for demo purposes, get cropped automatically when setting the Uri-Path */
+char *service_urls[NUMBER_OF_URLS] =
+{ ".well-known/core", "/dcdc/status", "/dcdc/vdc", "/dcdc/hwcfg" };
+/*
+   #if PLATFORM_HAS_BUTTON
+   static int uri_switch = 0;
+   #endif
+ */
+/* This function is will be passed to COAP_BLOCKING_REQUEST() to handle responses. */
+void
+client_chunk_handler(void *response)
+{
+  const uint8_t *chunk;
+
+  int len = coap_get_payload(response, &chunk);
+
+#if PLATFORM_HAS_LEDS
+  /* set red led when receiving a packet */
+  leds_on(LEDS_RED);
+#endif
+
+/*  printf("|%.*s", len, (char *)chunk); */
+  printf("RX: %d\n%s\n", len, (char *)chunk);
+}
+/**************************************************************************/
+
+/*---------------------------------------------------------------------------*/
+PROCESS(coap_client_process, "CoAP client process");
+AUTOSTART_PROCESSES(&coap_client_process);
+/*---------------------------------------------------------------------------*/
+static void
+tcpip_handler(void)
+{
+  char *str;
+
+  if(uip_newdata()) {
+    str = uip_appdata;
+    str[uip_datalen()] = '\0';
+    printf("DATA recv '%s'\n", str);
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+print_local_addresses(void)
+{
+  int i;
+  uint8_t state;
+
+  PRINTF("Client IPv6 addresses: ");
+  for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
+    state = uip_ds6_if.addr_list[i].state;
+    if(uip_ds6_if.addr_list[i].isused &&
+       (state == ADDR_TENTATIVE || state == ADDR_PREFERRED)) {
+      PRINT6ADDR(&uip_ds6_if.addr_list[i].ipaddr);
+      PRINTF("\n");
+      /* hack to make address "final" */
+      if(state == ADDR_TENTATIVE) {
+        uip_ds6_if.addr_list[i].state = ADDR_PREFERRED;
+      }
+    }
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+set_global_address(void)
+{
+  uip_ipaddr_t ipaddr;
+
+  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
+  uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
+
+/* The choice of server address determines its 6LoPAN header compression.
+ * (Our address will be compressed Mode 3 since it is derived from our link-local address)
+ * Obviously the choice made here must also be selected in udp-server.c.
+ *
+ * For correct Wireshark decoding using a sniffer, add the /64 prefix to the 6LowPAN protocol preferences,
+ * e.g. set Context 0 to aaaa::.  At present Wireshark copies Context/128 and then overwrites it.
+ * (Setting Context 0 to aaaa::1111:2222:3333:4444 will report a 16 bit compressed address of aaaa::1111:22ff:fe33:xxxx)
+ *
+ * Note the IPCMV6 checksum verification depends on the correct uncompressed addresses.
+ */
+
+#if 0
+/* Mode 1 - 64 bits inline */
+  uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1);
+#elif 1
+/* Mode 2 - 16 bits inline */
+  uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
+#else
+/* Mode 3 - derived from server link-local (MAC) address */
+  uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0x0250, 0xc2ff, 0xfea8, 0xcd1a); /* redbee-econotag */
+#endif
+/* Voravit Added */
+/*      PRINTF("VORAVIT CLIENT: SERVER IPv6 addresses: \n"); */
+/*      PRINT6ADDR(&server_ipaddr); */
+}
+/*---------------------------------------------------------------------------*/
+
+static void
+generate_random_payload(int type, char *msg)
+{
+  if(type == 2) {   /* /dcdc/vdc */
+    snprintf((char *)msg, 64, "&VG=%d&SL=%d&PMX=%d", (random_rand() % 25) + 1, (random_rand() % 10) + 1, (random_rand() % 100) + 1);
+  } else if(type == 3) {  /* /dcdc/hwcfg */
+    snprintf((char *)msg, 64, "&VMX=%d&IMX=%d", (random_rand() % 25) + 1, (random_rand() % 6) + 1);
+  }
+}
+/*----------------------------------------------------------------------------*/
+/*
+ * Handle the response to the observe request and the following notifications
+ */
+static void
+notification_callback(coap_observee_t *obs, void *notification, coap_notification_flag_t flag)
+{
+  int len = 0;
+  const uint8_t *payload = NULL;
+
+/*  printf("Notification handler\n"); */
+/*  printf("Observee URI: %s\n", obs->url); */
+  if(notification) {
+    len = coap_get_payload(notification, &payload);
+  }
+  switch(flag) {
+  case NOTIFICATION_OK:
+    count_notify++;
+    printf("NOTIFICATION OK: %d\n%*s\n", count_notify, len, (char *)payload);
+    break;
+  case OBSERVE_OK: /* server accepeted observation request */
+    printf("OBSERVE_OK: \n%*s\n", len, (char *)payload);
+    break;
+  case OBSERVE_NOT_SUPPORTED:
+    printf("OBSERVE_NOT_SUPPORTED: \n%*s\n", len, (char *)payload);
+    obs = NULL;
+    break;
+  case ERROR_RESPONSE_CODE:
+    printf("ERROR_RESPONSE_CODE: \n%*s\n", len, (char *)payload);
+    obs = NULL;
+    break;
+  case NO_REPLY_FROM_SERVER:
+    printf("NO_REPLY_FROM_SERVER: "
+           "removing observe registration with token %x%x\n",
+           obs->token[0], obs->token[1]);
+    obs = NULL;
+    break;
+  }
+}
+/*---------------------------------------------------------------------------*/
+/*
+ * Toggle the observation of the remote resource
+ */
+void
+toggle_observation(void)
+{
+  if(obs) {
+    printf("Stopping observation\n");
+    coap_obs_remove_observee(obs);
+    obs = NULL;
+  } else {
+    printf("Starting observation\n");
+    obs = coap_obs_request_registration(&server_ipaddr, REMOTE_PORT, service_urls[1], notification_callback, NULL);
+  }
+}
+/*---------------------------------------------------------------------------*/
+static int count_get = 0;
+static int count_put = 0;
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(coap_client_process, ev, data)
+{
+/*
+   #if WITH_COMPOWER
+   static int print = 0;
+   #endif
+ */
+  PROCESS_BEGIN();
+
+  PROCESS_PAUSE();
+
+  set_global_address();
+
+  PRINTF("CoAP client process started\n");
+
+  print_local_addresses();
+
+/**************************************************************************/
+  static coap_packet_t request[1];      /* This way the packet can be treated as pointer as usual. */
+
+  /* receives all CoAP messages */
+  coap_init_engine();
+
+  etimer_set(&et, GET_INTERVAL * CLOCK_SECOND);
+
+  while(1) {
+    PROCESS_YIELD();
+
+    if(ev == tcpip_event) {
+      printf("TCPIP_HANDLER\n");
+      tcpip_handler();
+    }
+
+    if(etimer_expired(&et)) {
+      count_get++;
+
+/*---------------------------------------------------------------------------*/
+      if(count_get < 10) { /* we do normal GET 3 times for each resource */
+        /* TEST GET: looping through the 3 resources: status, vdc, hwcfg */
+        /* Also CoAP GET doesn't need to have a payload */
+        coap_init_message(request, COAP_TYPE_CON, COAP_GET, 0);
+        if(count_get % 3 == 1) {
+          coap_set_header_uri_path(request, service_urls[1]);
+          PRINTF("GET %d: %s\n", count_get, service_urls[1]);
+        } else if(count_get % 3 == 2) {
+          coap_set_header_uri_path(request, service_urls[2]);
+          PRINTF("GET %d: %s\n", count_get, service_urls[2]);
+        } else {
+          coap_set_header_uri_path(request, service_urls[3]);
+          PRINTF("GET %d: %s\n", count_get, service_urls[3]);
+        }
+
+#if PLATFORM_HAS_LEDS
+        /* set yellow led when sending packet */
+        leds_on(LEDS_YELLOW);
+#endif
+        COAP_BLOCKING_REQUEST(&server_ipaddr, REMOTE_PORT, request,
+                              client_chunk_handler);
+      } /* if (count_get < 10) */
+/*---------------------------------------------------------------------------*/
+      /* test PUT: vdc and hwcfg on odd and even packet */
+      /* every 10th timer we PUT a resource: vdc and hwcfg alternately */
+      if(count_get % 10 == 0) {
+        /* static char msg[64] = ""; */
+        char msg[64] = "";
+
+	/*---------------------------------------------------------------------------*/
+	/* We read CO2 sensor if it is enable */
+	#ifdef CO2
+       	  coap_init_message(request, COAP_TYPE_CON, COAP_GET, 0);
+          coap_set_header_uri_path(request, "/dcdc/co2");
+          PRINTF("GET %d: %s\n", count_get, "/dcdc/co2");
+	  #if PLATFORM_HAS_LEDS
+            leds_on(LEDS_YELLOW);
+	  #endif
+            COAP_BLOCKING_REQUEST(&server_ipaddr, REMOTE_PORT, request,
+                              client_chunk_handler);
+	#endif
+	/*---------------------------------------------------------------------------*/
+
+        count_put++;
+        coap_init_message(request, COAP_TYPE_CON, COAP_PUT, 0);
+
+        if(count_put % 2 == 0) {
+          coap_set_header_uri_path(request, service_urls[3]);
+          generate_random_payload(3, msg);
+          coap_set_payload(request, (uint8_t *)msg, sizeof(msg) - 1);
+          PRINTF("PUT %d: %s PAYLOAD: %s\n", count_get, service_urls[3], msg);
+        } else {
+          coap_set_header_uri_path(request, service_urls[2]);
+          generate_random_payload(2, msg);
+          coap_set_payload(request, (uint8_t *)msg, sizeof(msg) - 1);
+          PRINTF("PUT %d: %s PAYLOAD: %s\n", count_get, service_urls[2], msg);
+        }
+
+#if PLATFORM_HAS_LEDS
+        /* set yellow led when sending packet */
+        leds_on(LEDS_YELLOW);
+#endif
+        COAP_BLOCKING_REQUEST(&server_ipaddr, REMOTE_PORT, request,
+                              client_chunk_handler);
+
+
+      }
+
+      /* after 2 more timeout we do GET to check the resource new value */
+      if((count_get > 10) && ((count_get - 2) % 10 == 0)) {
+        coap_init_message(request, COAP_TYPE_CON, COAP_GET, 0);
+
+        if(count_put % 2 == 0) {
+          coap_set_header_uri_path(request, service_urls[3]);
+          PRINTF("GET %d: %s\n", count_get, service_urls[3]);
+        } else {
+          coap_set_header_uri_path(request, service_urls[2]);
+          PRINTF("GET %d: %s\n", count_get, service_urls[2]);
+        }
+
+#if PLATFORM_HAS_LEDS
+        /* set yellow led when sending packet */
+        leds_on(LEDS_YELLOW);
+#endif
+        COAP_BLOCKING_REQUEST(&server_ipaddr, REMOTE_PORT, request,
+                              client_chunk_handler);
+      }
+
+/*---------------------------------------------------------------------------*/
+
+      /* test GET with observe option when timer expires the 15th time */
+      if(count_get == 15) {
+        /* PRINTF("GET %d: OBSERVE: %s\n", count_get, service_urls[2]); */
+        toggle_observation();
+      }
+
+      etimer_reset(&et);
+    }
+  } /* END_WHILE(1) */
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-server.avr-rss2 b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-server.avr-rss2
new file mode 100644
index 000000000..e69de29bb
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-server.c b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-server.c
new file mode 100644
index 000000000..8e1ee552d
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-server.c
@@ -0,0 +1,269 @@
+/*
+ * 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.
+ *
+ */
+
+#include "contiki.h"
+#include "contiki-lib.h"
+#include "contiki-net.h"
+#include "net/ip/uip.h"
+#include "net/rpl/rpl.h"
+
+#include "net/netstack.h"
+/* #include "dev/leds.h" */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+/*
+   #define DEBUG DEBUG_PRINT
+   #include "net/ip/uip-debug.h"
+ */
+/**************************************************************************/
+/* add mock-up code for DC-DC converter */
+/* #include "control.h" */
+/* #include "vdc.h" */
+#ifdef CO2
+#include "dev/co2_sa_kxx-sensor.h"
+#endif
+#include "dev/dc-status-sensor.h"
+#include "dev/dc-vdc-sensor.h"
+#include "dev/dc-hw-sensor.h"
+
+/* from er-rest-example/er-rexample-server.c */
+#include "rest-engine.h"
+/* #include "er-coap.h" */
+
+#if PLATFORM_HAS_LEDS
+#include "dev/leds.h"
+#endif
+
+/*
+   #if PLATFORM_HAS_BUTTON
+   #include "dev/button-sensor.h"
+   #endif
+ */
+#define DEBUG 1
+#if DEBUG
+/* #include <stdio.h> */
+#define PRINTF(...) printf(__VA_ARGS__)
+#define PRINT6ADDR(addr) PRINTF("[%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
+#define PRINTLLADDR(lladdr) PRINTF("[%02x:%02x:%02x:%02x:%02x:%02x]", (lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3], (lladdr)->addr[4], (lladdr)->addr[5])
+#else
+#define PRINTF(...)
+#define PRINT6ADDR(addr)
+#define PRINTLLADDR(addr)
+#endif
+
+/* #define TOGGLE_INTERVAL 10 */
+/* #define OBSERVE_INTERVAL 10 */
+
+/*
+ * Resources to be activated need to be imported through the extern keyword.
+ * The build system automatically compiles the resources in the corresponding sub-directory.
+ */
+extern resource_t
+/*  res_hello, */
+/*  res_push, */
+/*  res_event, */
+/*  res_sub; */
+/*  res_dc_status_obs; */
+/*  res_dc_status, */
+#ifdef CO2
+  res_dc_co2,
+#endif
+  res_dc_status_obs,
+  res_dc_vdc,
+  res_dc_hwcfg;
+/*
+   #if PLATFORM_HAS_LEDS
+   extern resource_t
+   //  res_leds,
+   res_toggle;
+   #endif
+ */
+/* #if PLATFORM_HAS_LIGHT */
+/* #include "dev/light-sensor.h" */
+/* extern resource_t res_light; */
+/* #endif */
+
+/**************************************************************************/
+
+PROCESS(coap_server_process, "CoAP server process");
+AUTOSTART_PROCESSES(&coap_server_process);
+/*---------------------------------------------------------------------------*/
+static void
+print_local_addresses(void)
+{
+  int i;
+  uint8_t state;
+
+  PRINTF("Server IPv6 addresses: ");
+  for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
+    state = uip_ds6_if.addr_list[i].state;
+    if(state == ADDR_TENTATIVE || state == ADDR_PREFERRED) {
+      PRINT6ADDR(&uip_ds6_if.addr_list[i].ipaddr);
+      PRINTF("\n");
+      /* hack to make address "final" */
+      if(state == ADDR_TENTATIVE) {
+        uip_ds6_if.addr_list[i].state = ADDR_PREFERRED;
+      }
+    }
+  }
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(coap_server_process, ev, data)
+{
+  uip_ipaddr_t ipaddr;
+  struct uip_ds6_addr *root_if;
+
+  PROCESS_BEGIN();
+
+  PROCESS_PAUSE();
+
+/*  SENSORS_ACTIVATE(button_sensor); */
+#ifdef CO2
+  SENSORS_ACTIVATE(co2_sa_kxx_sensor);
+#endif
+  SENSORS_ACTIVATE(dc_status_sensor);
+  SENSORS_ACTIVATE(dc_vdc_sensor);
+  SENSORS_ACTIVATE(dc_hw_sensor);
+
+/**************************************************************************/
+
+#if PLATFORM_HAS_LEDS
+/* initialize leds */
+  leds_init();
+  leds_on(LEDS_RED);
+  leds_on(LEDS_YELLOW);
+#endif
+
+/* Initilize DC-DC converter parameters */
+/*  ValueInit(); */
+/*  VDCInit(); */
+/*
+   #ifdef PARAMS_CHANNEL
+   PRINTF("PARAMs channel: %u\n", PARAMS_CHANNEL);
+   #endif
+ */
+#ifdef RF_CHANNEL
+  PRINTF("RF channel: %u\n", RF_CHANNEL);
+#endif
+#ifdef IEEE802154_PANID
+  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
+#endif
+
+  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
+  PRINTF("LL header: %u\n", UIP_LLH_LEN);
+  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
+  PRINTF("REST max chunk: %u\n", REST_MAX_CHUNK_SIZE);
+
+  /* Initialize the REST engine. */
+  rest_init_engine();
+
+  /*
+   * Bind the resources to their Uri-Path.
+   * WARNING: Activating twice only means alternate path, not two instances!
+   * All static variables are the same for each URI path.
+   */
+/*  rest_activate_resource(&res_hello, "test/hello"); */
+/*  rest_activate_resource(&res_mirror, "debug/mirror"); */
+/*  rest_activate_resource(&res_chunks, "test/chunks"); */
+/*  rest_activate_resource(&res_separate, "test/separate"); */
+/*  rest_activate_resource(&res_push, "test/push"); */
+/*  rest_activate_resource(&res_event, "sensors/button"); */
+/*  rest_activate_resource(&res_sub, "test/sub"); */
+/*  rest_activate_resource(&res_b1_sep_b2, "test/b1sepb2"); */
+#ifdef CO2
+  rest_activate_resource(&res_dc_co2, "dcdc/co2");
+#endif
+  rest_activate_resource(&res_dc_status_obs, "dcdc/status");
+/*  rest_activate_resource(&res_dc_status, "dcdc/status"); */
+  rest_activate_resource(&res_dc_vdc, "dcdc/vdc");
+  rest_activate_resource(&res_dc_hwcfg, "dcdc/hwcfg");
+/* #if PLATFORM_HAS_LEDS */
+/* / *  rest_activate_resource(&res_leds, "actuators/leds"); * / */
+/*  rest_activate_resource(&res_toggle, "actuators/toggle"); */
+/* #endif */
+/* #if PLATFORM_HAS_LIGHT */
+/*  rest_activate_resource(&res_light, "sensors/light"); */
+/*  SENSORS_ACTIVATE(light_sensor); */
+/* #endif */
+
+/**************************************************************************/
+
+  PRINTF("CoAP server started\n");
+
+#if UIP_CONF_ROUTER
+/* The choice of server address determines its 6LoPAN header compression.
+ * Obviously the choice made here must also be selected in udp-client.c.
+ *
+ * For correct Wireshark decoding using a sniffer, add the /64 prefix to the 6LowPAN protocol preferences,
+ * e.g. set Context 0 to aaaa::.  At present Wireshark copies Context/128 and then overwrites it.
+ * (Setting Context 0 to aaaa::1111:2222:3333:4444 will report a 16 bit compressed address of aaaa::1111:22ff:fe33:xxxx)
+ * Note Wireshark's IPCMV6 checksum verification depends on the correct uncompressed addresses.
+ */
+
+#if 0
+/* Mode 1 - 64 bits inline */
+  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1);
+#elif 1
+/* Mode 2 - 16 bits inline */
+  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
+#else
+/* Mode 3 - derived from link local (MAC) address */
+  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
+#endif
+
+  uip_ds6_addr_add(&ipaddr, 0, ADDR_MANUAL);
+  root_if = uip_ds6_addr_lookup(&ipaddr);
+  if(root_if != NULL) {
+    rpl_dag_t *dag;
+    dag = rpl_set_root(RPL_DEFAULT_INSTANCE, (uip_ip6addr_t *)&ipaddr);
+    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    rpl_set_prefix(dag, &ipaddr, 64);
+    PRINTF("created a new RPL dag\n");
+  } else {
+    PRINTF("failed to create a new RPL DAG\n");
+  }
+#endif /* UIP_CONF_ROUTER */
+
+  print_local_addresses();
+
+  /* The data sink runs with a 100% duty cycle in order to ensure high
+     packet reception rates. */
+  NETSTACK_MAC.off(1);
+
+  while(1) {
+    PROCESS_WAIT_EVENT();
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dc-rpl-coap.csc b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dc-rpl-coap.csc
new file mode 100644
index 000000000..40faff223
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dc-rpl-coap.csc
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mrm</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mspsim</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/avrora</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/native_gateway</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/serial_socket</project>
+  <project EXPORT="discard">/home/user/contikiprojects/sics.se/mobility</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/collect-view</project>
+  <project EXPORT="discard">/home/user/contikiprojects/sics.se/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      se.sics.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>100.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      se.sics.cooja.avrmote.RSS2MoteType
+      <identifier>mote1</identifier>
+      <description>Mote1</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-server.c</source>
+      <commands EXPORT="discard">make coap-server.avr-rss2 TARGET=avr-rss2 MCU=atmega128rfr2</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-server.avr-rss2</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraClock</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraUsart0</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraUsart1</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.RFR2Radio</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraADC</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraLED</moteinterface>
+    </motetype>
+    <motetype>
+      se.sics.cooja.avrmote.RSS2MoteType
+      <identifier>mote2</identifier>
+      <description>Mote2</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-client.c</source>
+      <commands EXPORT="discard">make coap-client.avr-rss2 TARGET=avr-rss2 MCU=atmega128rfr2</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-client.avr-rss2</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraClock</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraUsart0</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraUsart1</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.RFR2Radio</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraADC</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraLED</moteinterface>
+    </motetype>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>100.0</x>
+        <y>100.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.avrmote.interfaces.AvroraMoteID
+        <id>1</id>
+      </interface_config>
+      <motetype_identifier>mote1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>110.0</x>
+        <y>100.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.avrmote.interfaces.AvroraMoteID
+        <id>2</id>
+      </interface_config>
+      <motetype_identifier>mote2</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>280</width>
+    <z>9</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.Visualizer
+    <plugin_config>
+      <moterelations>true</moterelations>
+      <skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <viewport>3.908924509090908 0.0 0.0 3.908924509090908 -216.43707345454544 -217.89245090909074</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>5</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>1269</width>
+    <z>8</z>
+    <height>240</height>
+    <location_x>400</location_x>
+    <location_y>160</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>989</width>
+    <z>6</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.MoteInterfaceViewer
+    <mote_arg>0</mote_arg>
+    <plugin_config>
+      <interface>Serial port</interface>
+      <scrollpos>0,0</scrollpos>
+    </plugin_config>
+    <width>508</width>
+    <z>4</z>
+    <height>389</height>
+    <location_x>13</location_x>
+    <location_y>413</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.MoteInterfaceViewer
+    <mote_arg>1</mote_arg>
+    <plugin_config>
+      <interface>Serial port</interface>
+      <scrollpos>0,0</scrollpos>
+    </plugin_config>
+    <width>545</width>
+    <z>3</z>
+    <height>392</height>
+    <location_x>531</location_x>
+    <location_y>413</location_y>
+  </plugin>
+</simconf>
+
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-hw-sensor.c b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-hw-sensor.c
new file mode 100644
index 000000000..d5715b820
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-hw-sensor.c
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2015, ICT/COS/NSLab, KTH Royal Institute of Technology
+ * 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
+ *      dcdc/hwcfg for DC-DC converter hardware configuration
+ * \author
+ *      Voravit Tanyingyong <voravit@kth.se>
+ */
+
+#include "contiki.h"
+/* #include "lib/sensors.h" */
+#include "dev/dc-hw-sensor.h"
+
+const struct sensors_sensor dc_hw_sensor;
+
+/*
+ * hw contains 2 parameters
+ * hw[0] VMAX
+ * hw[1] IMAX
+ */
+
+uint32_t volatile hw[2] = { 25, 6 };
+
+static int
+value(int type)
+{
+  switch(type) {
+  case 0:
+    return hw[0];
+
+  case 1:
+    return hw[1];
+  }
+  return -1;
+}
+static int
+configure(int type, int c)
+{
+  switch(type) {
+  case 0:
+    if((c >= 0) && (c <= 25)) {
+      hw[0] = c;
+      return 0;
+    } else {
+      return 1;
+    }
+
+  case 1:
+    if((c >= 0) && (c <= 6)) {
+      hw[1] = c;
+      return 0;
+    } else {
+      return 0;
+    }
+  }
+  return 1;
+}
+static int
+status(int type)
+{
+  return 1;
+}
+SENSORS_SENSOR(dc_hw_sensor, "hw sensors", value, configure, status);
+
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-hw-sensor.h b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-hw-sensor.h
new file mode 100644
index 000000000..538dd2be3
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-hw-sensor.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2015, ICT/COS/NSLab, KTH Royal Institute of Technology
+ * 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
+ *      dcdc/hwcfg header file
+ * \author
+ *      Voravit Tanyingyong <voravit@kth.se>
+ */
+
+#ifndef DC_HW_SENSOR_H
+#define DC_HW_SENSOR_H
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor dc_hw_sensor;
+
+#endif /* DC_HW_SENSOR_H */
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-status-sensor.c b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-status-sensor.c
new file mode 100644
index 000000000..c4998e61c
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-status-sensor.c
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2015, ICT/COS/NSLab, KTH Royal Institute of Technology
+ * 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
+ *      dcdc/status read-only parameters for power monitoring
+ * \author
+ *      Voravit Tanyingyong <voravit@kth.se>
+ */
+
+#include "contiki.h"
+/* #include "lib/sensors.h" */
+#include "dev/dc-status-sensor.h"
+
+const struct sensors_sensor dc_status_sensor;
+
+/*
+ * Status contains 4 parameters
+ * status[0] VOUT
+ * status[1] VIN
+ * status[2] IOUT
+ * status[3] IIN
+ */
+
+uint32_t volatile s[4] = { 18, 20, 1, 2 };
+
+static int
+value(int type)
+{
+  switch(type) {
+  case 0:
+    return s[0];
+
+  case 1:
+    return s[1];
+
+  case 2:
+    return s[2];
+
+  case 3:
+    return s[3];
+  }
+  return -1;
+}
+static int
+configure(int type, int c)
+{
+  return 0;
+}
+static int
+status(int type)
+{
+  return 1;
+}
+SENSORS_SENSOR(dc_status_sensor, "DC status sensors", value, configure, status);
+
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-status-sensor.h b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-status-sensor.h
new file mode 100644
index 000000000..97bb7c0c2
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-status-sensor.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2015, ICT/COS/NSLab, KTH Royal Institute of Technology
+ * 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
+ *      dcdc/status header file
+ * \author
+ *      Voravit Tanyingyong <voravit@kth.se>
+ */
+
+#ifndef DC_STATUS_SENSOR_H
+#define DC_STATUS_SENSOR_H
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor dc_status_sensor;
+
+#endif /* DC_STATUS_SENSOR_H */
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.c b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.c
new file mode 100644
index 000000000..bdec4df70
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.c
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2015, ICT/COS/NSLab, KTH Royal Institute of Technology
+ * 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
+ *      dcdc/vdc for voltage droop control function
+ * \author
+ *      Voravit Tanyingyong <voravit@kth.se>
+ */
+
+#include "contiki.h"
+/* #include "lib/sensors.h" */
+#include "dev/dc-vdc-sensor.h"
+
+const struct sensors_sensor dc_vdc_sensor;
+
+/*
+ * vdc contains 3 parameters
+ * vdc[0] VGRID
+ * vdc[1] SLOPE
+ * vdc[2] PMAX
+ */
+
+uint32_t volatile vdc[3] = { 18, 1, 100 };
+
+static int
+value(int type)
+{
+  switch(type) {
+  case 0:
+    return vdc[0];
+
+  case 1:
+    return vdc[1];
+
+  case 2:
+    return vdc[2];
+  }
+  return -1;
+}
+static int
+configure(int type, int c)
+{
+  switch(type) {
+  case 0:
+    if((c >= 0) && (c <= 25)) {
+      vdc[0] = c;
+      return 0;
+    } else {
+      return 1;
+    }
+
+  case 1:
+    vdc[1] = c;
+    return 0;
+
+  case 2:
+    vdc[2] = c;
+    return 0;
+  }
+  return 1;
+}
+static int
+status(int type)
+{
+  return 1;
+}
+SENSORS_SENSOR(dc_vdc_sensor, "vdc sensors", value, configure, status);
+
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.h b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.h
new file mode 100644
index 000000000..72749c1c6
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2015, ICT/COS/NSLab, KTH Royal Institute of Technology
+ * 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
+ *      dcdc/vdc sensor header file
+ * \author
+ *      Voravit Tanyingyong <voravit@kth.se>
+ */
+
+#ifndef DC_VDC_SENSOR_H
+#define DC_VDC_SENSOR_H
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor dc_vdc_sensor;
+
+#endif /* DC_VDC_SENSOR_H */
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/er-dc-test.h b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/er-dc-test.h
new file mode 100644
index 000000000..5c34cb847
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/er-dc-test.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2015, ICT/COS/NSLab, KTH Royal Institute of Technology
+ * 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
+ *      header file for resources
+ * \author
+ *      Voravit Tanyingyong <voravit@kth.se>
+ */
+
+#ifndef __ER_DC_TEST_H__
+#define __ER_DC_TEST_H__
+
+#define DEBUG 1
+#if DEBUG
+#include <stdio.h>
+#define PRINTF(...) printf(__VA_ARGS__)
+#define PRINT6ADDR(addr) PRINTF("[%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
+#define PRINTLLADDR(lladdr) PRINTF("[%02x:%02x:%02x:%02x:%02x:%02x]", (lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3], (lladdr)->addr[4], (lladdr)->addr[5])
+#else
+#define PRINTF(...)
+#define PRINT6ADDR(addr)
+#define PRINTLLADDR(addr)
+#endif
+
+/* double expansion */
+#define TO_STRING2(x)  # x
+#define TO_STRING(x)  TO_STRING2(x)
+
+#define MAX_COAP_PAYLOAD 64 + 1       /* +1 for the terminating zero, which is not transmitted */
+/* #define MAX_PLUGFEST_BODY    2048 */
+/* #define CHUNKS_TOTAL         2012 */
+
+#endif /* __ER_DC_TEST_H__ */
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/project-conf.h b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/project-conf.h
new file mode 100644
index 000000000..8193c1ee0
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/project-conf.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2015, ICT/COS/NSLab, KTH Royal Institute of Technology
+ * 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
+ *      test rpl configuration.
+ * \author
+ *      Voravit Tanyingyong <voravit@kth.se>
+ */
+
+#ifndef PROJECT_CONF_H_
+#define PROJECT_CONF_H_
+
+/* enable IPv6 */
+/* #ifndef NETSTACK_CONF_WITH_IPV6 */
+#define NETSTACK_CONF_WITH_IPV6   1
+/* #endif / * NETSTACK_CONF_WITH_IPV6 * / */
+
+#define NETSTACK_CONF_RDC nullrdc_driver
+#define NETSTACK_CONF_MAC nullmac_driver
+
+#define COAP_OBSERVE_CLIENT 1
+#define COAP_MAX_OBSERVEES  10
+#define COAP_MAX_OPEN_TRANSACTIONS  10
+
+/* enable debug to activate PRINT6ADDR macro */
+/* #undef DEBUG_PRINT */
+/* #define DEBUG_PRINT 1 */
+
+/* #define PRINTF(...) printf(__VA_ARGS__) */
+/* #define PRINT6ADDR(addr) PRINTF(" %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x ", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15]) */
+
+#endif /* PROJECT_CONF_H_ */
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-co2.c b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-co2.c
new file mode 100644
index 000000000..45860653a
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-co2.c
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2015, ICT/COS/NSLab, KTH Royal Institute of Technology
+ * 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
+ *      dcdc/co2 testing coap with CO2 sensor from SenseAir
+ * \author
+ *      Voravit Tanyingyong <voravit@kth.se>
+ */
+
+/* #include <math.h> */
+#include <stdio.h>
+#include <string.h>
+#include "rest-engine.h"
+#include "er-coap.h"
+#include "er-dc-test.h"
+#if PLATFORM_HAS_LEDS
+#include "dev/leds.h"
+#endif
+#include "dev/co2_sa_kxx-sensor.h"
+
+static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
+
+RESOURCE(res_dc_co2, "title=\"co2 reading\"", 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)
+{
+  coap_packet_t *const coap_req = (coap_packet_t *)request;
+
+  int co2 = co2_sa_kxx_sensor.value(CO2_SA_KXX_CO2); // 0 is CO2_SA_KXX_CO2
+
+#if PLATFORM_HAS_LEDS
+  /* set red led when receiving a packet */
+  leds_on(LEDS_RED);
+#endif
+
+  PRINTF("dcdc/co2 GET (%s %u)\n", coap_req->type == COAP_TYPE_CON ? "CON" : "NON", coap_req->mid);
+
+  /* Code 2.05 CONTENT is default. */
+  REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
+  /* REST.set_header_max_age(response, 30); */
+  REST.set_response_payload(
+    response,
+    buffer,
+/*    snprintf((char *)buffer, MAX_COAP_PAYLOAD, "VMX\t%d.000\nIMX\t%d.000\nINT\t%d\n", v_max, i_max, interval)); */
+    snprintf((char *)buffer, MAX_COAP_PAYLOAD, "CO2\t%d\n", co2));
+
+#if PLATFORM_HAS_LEDS
+  /* set yellow led when sending packet */
+  leds_on(LEDS_YELLOW);
+#endif
+}
+
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-hwcfg.c b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-hwcfg.c
new file mode 100644
index 000000000..6c8091774
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-hwcfg.c
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2015, ICT/COS/NSLab, KTH Royal Institute of Technology
+ * 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
+ *      dcdc/vdc configurable parameters for voltage droop control function
+ * \author
+ *      Voravit Tanyingyong <voravit@kth.se>
+ */
+
+/* #include <math.h> */
+#include <stdio.h>
+#include <string.h>
+#include "rest-engine.h"
+#include "er-coap.h"
+#include "er-dc-test.h"
+#if PLATFORM_HAS_LEDS
+#include "dev/leds.h"
+#endif
+#include "dev/dc-hw-sensor.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);
+
+RESOURCE(res_dc_hwcfg, "title=\"hwcfg parameters\"", 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)
+{
+  coap_packet_t *const coap_req = (coap_packet_t *)request;
+
+  int v_max = dc_hw_sensor.value(0);
+  int i_max = dc_hw_sensor.value(1);
+
+#if PLATFORM_HAS_LEDS
+  /* set red led when receiving a packet */
+  leds_on(LEDS_RED);
+#endif
+
+  PRINTF("dcdc/hwcfg GET (%s %u)\n", coap_req->type == COAP_TYPE_CON ? "CON" : "NON", coap_req->mid);
+
+  /* Code 2.05 CONTENT is default. */
+  REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
+  /* REST.set_header_max_age(response, 30); */
+  REST.set_response_payload(
+    response,
+    buffer,
+/*    snprintf((char *)buffer, MAX_COAP_PAYLOAD, "VMX\t%d.000\nIMX\t%d.000\nINT\t%d\n", v_max, i_max, interval)); */
+    snprintf((char *)buffer, MAX_COAP_PAYLOAD, "VMX\t%d.000\nIMX\t%d.000\n", v_max, i_max));
+
+#if PLATFORM_HAS_LEDS
+  /* set yellow led when sending packet */
+  leds_on(LEDS_YELLOW);
+#endif
+}
+/*---------------------------------------------------------------------------*/
+static void
+res_post_put_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
+{
+  coap_packet_t *const coap_req = (coap_packet_t *)request;
+
+#if PLATFORM_HAS_LEDS
+  /* set red led when receiving a packet */
+  leds_on(LEDS_RED);
+#endif
+
+  PRINTF("dcdc/hwcfg PUT (%s %u)\n", coap_req->type == COAP_TYPE_CON ? "CON" : "NON", coap_req->mid);
+
+  const char *variable = NULL;
+
+  if(REST.get_post_variable(request, "VMX", &variable) > 0) {
+    int v_max = atoi(variable);
+    if(dc_hw_sensor.configure(0, v_max)) {
+      PRINTF("Value out of range: must be 0 <= VMX <= 30");
+    }
+  }
+
+  if(REST.get_post_variable(request, "IMX", &variable) > 0) {
+    int i_max = atoi(variable);
+    if(dc_hw_sensor.configure(1, i_max)) {
+      PRINTF("Value out of range: must be 0 <= Imax <= 6");
+    }
+  }
+
+  REST.set_response_status(response, REST.status.CHANGED);
+
+#if PLATFORM_HAS_LEDS
+  /* set yellow led when sending packet */
+  leds_on(LEDS_YELLOW);
+#endif
+}
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-status-obs.c b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-status-obs.c
new file mode 100644
index 000000000..75d992fe2
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-status-obs.c
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2015, ICT/COS/NSLab, KTH Royal Institute of Technology
+ * 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
+ *      dcdc/status read-only parameters for power monitoring
+ * \author
+ *      Voravit Tanyingyong <voravit@kth.se>
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "rest-engine.h"
+#include "er-coap.h"
+#include "er-coap-observe.h"
+#include "../er-dc-test.h"
+#if PLATFORM_HAS_LEDS
+#include "dev/leds.h"
+#endif
+#include "dev/dc-status-sensor.h"
+
+static void res_dc_status_obs_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
+static void res_dc_status_obs_periodic_handler(void);
+
+PERIODIC_RESOURCE(res_dc_status_obs, "title=\"status parameters\"", res_dc_status_obs_get_handler, NULL, NULL, NULL, 10 * CLOCK_SECOND, res_dc_status_obs_periodic_handler);
+
+static uint32_t observe = 0;
+static count = 0;
+/*---------------------------------------------------------------------------*/
+static void
+res_dc_status_obs_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
+{
+
+  int vout_value = dc_status_sensor.value(0);
+  int vin_value = dc_status_sensor.value(1);
+  int iout_value = dc_status_sensor.value(2);
+  int iin_value = dc_status_sensor.value(3);
+
+  /* a request comes from a remote host */
+  if(request != NULL) {
+
+#if PLATFORM_HAS_LEDS
+    /* set red led when receiving a packet */
+    leds_on(LEDS_RED);
+#endif
+
+    coap_packet_t *const coap_req = (coap_packet_t *)request;
+
+    PRINTF("dcdc/status  GET (%s %u)\n", coap_req->type == COAP_TYPE_CON ? "CON" : "NON", coap_req->mid);
+
+    /* if comes with observe then register it */
+    if(coap_get_header_observe(request, &observe)) {
+/* PRINTF("OBSERVE set\n"); */
+      /* respond with empty ack */
+      REST.set_header_content_type(response, observe);
+      REST.set_response_payload(response, 0, 0);
+    } else { /* if no observe option, then answer to GET request as normal */
+/* PRINTF("OBSERVE NOT set\n"); */
+      REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
+      REST.set_response_payload(
+        response,
+        buffer,
+        snprintf((char *)buffer, MAX_COAP_PAYLOAD, "ST\tON\nVO\t%d.000\nIO\t%d.000\nVI\t%d.000\nII\t%d.000\n", vout_value, iout_value, vin_value, iin_value));
+    }
+  } else {  /* this is a notification: need to set payload */
+/* PRINTF("NULL REQUEST = PERIODIC\n"); */
+    REST.set_response_payload(
+      response,
+      buffer,
+      snprintf((char *)buffer, MAX_COAP_PAYLOAD, "ST\tON\nVO\t%d.000\nIO\t%d.000\nVI\t%d.000\nII\t%d.000\n", vout_value, iout_value, vin_value, iin_value));
+  }
+  count++;
+  printf("PERIODIC %d: ST:ON VO:%d IO:%d VI:%d II:%d\n", count, vout_value, iout_value, vin_value, iin_value);
+#if PLATFORM_HAS_LEDS
+  /* set yellow led when sending packet */
+  leds_on(LEDS_YELLOW);
+#endif
+}
+/*---------------------------------------------------------------------------*/
+static void
+res_dc_status_obs_periodic_handler()
+{
+  /* send periodic notification to the observers */
+  REST.notify_subscribers(&res_dc_status_obs);
+}
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-vdc.c b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-vdc.c
new file mode 100644
index 000000000..8157fbf90
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-vdc.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2015, ICT/COS/NSLab, KTH Royal Institute of Technology
+ * 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
+ *      dcdc/vdc configurable parameters for voltage droop control function
+ * \author
+ *      Voravit Tanyingyong <voravit@kth.se>
+ */
+
+/* #include <math.h> */
+#include <stdio.h>
+#include <string.h>
+#include "rest-engine.h"
+#include "er-coap.h"
+#include "er-dc-test.h"
+#if PLATFORM_HAS_LEDS
+#include "dev/leds.h"
+#endif
+#include "dev/dc-vdc-sensor.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);
+
+RESOURCE(res_dc_vdc, "title=\"vdc parameters\"", 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)
+{
+  coap_packet_t *const coap_req = (coap_packet_t *)request;
+
+  int vdc_grid = dc_vdc_sensor.value(0);
+  int vdc_slope = dc_vdc_sensor.value(1);
+  int vdc_pmax = dc_vdc_sensor.value(2);
+
+#if PLATFORM_HAS_LEDS
+  /* set red led when receiving a packet */
+  leds_on(LEDS_RED);
+#endif
+
+  PRINTF("dcdc/vdc GET (%s %u)\n", coap_req->type == COAP_TYPE_CON ? "CON" : "NON", coap_req->mid);
+
+  /* Code 2.05 CONTENT is default. */
+  REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
+  /* REST.set_header_max_age(response, 30); */
+  REST.set_response_payload(
+    response,
+    buffer,
+    snprintf((char *)buffer, MAX_COAP_PAYLOAD, "VG\t%d.000\nSL\t%d.000\nPMAX\t%d.000\n", vdc_grid, vdc_slope, vdc_pmax));
+
+#if PLATFORM_HAS_LEDS
+  /* set yellow led when sending packet */
+  leds_on(LEDS_YELLOW);
+#endif
+}
+/*---------------------------------------------------------------------------*/
+static void
+res_post_put_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
+{
+  coap_packet_t *const coap_req = (coap_packet_t *)request;
+
+#if PLATFORM_HAS_LEDS
+  /* set red led when receiving a packet */
+  leds_on(LEDS_RED);
+#endif
+
+  PRINTF("dcdc/vdc PUT (%s %u)\n", coap_req->type == COAP_TYPE_CON ? "CON" : "NON", coap_req->mid);
+
+  const char *variable = NULL;
+
+  if(REST.get_post_variable(request, "VG", &variable) > 0) {
+    int vdc_grid = atoi(variable);
+    /* PRINTF("VG: %d\n",vdc_grid); */
+    if(dc_vdc_sensor.configure(0, vdc_grid)) {
+      PRINTF("Value out of range: must be 0 <= Vgrid <= Vmax");
+    }
+  }
+
+  if(REST.get_post_variable(request, "SL", &variable) > 0) {
+    int vdc_slope = atoi(variable);
+    /* PRINTF("SL: %d\n",vdc_slope); */
+    if(dc_vdc_sensor.configure(1, vdc_slope)) {
+      PRINTF("Error: SLOPE is not set!");
+    }
+  }
+
+  if(REST.get_post_variable(request, "PMX", &variable) > 0) {
+    int vdc_pmax = atoi(variable);
+    /* PRINTF("PMAX: %d\n",vdc_pmax); */
+    if(dc_vdc_sensor.configure(2, vdc_pmax)) {
+      PRINTF("Error: PMAX is not set!");
+    }
+  }
+
+  REST.set_response_status(response, REST.status.CHANGED);
+#if PLATFORM_HAS_LEDS
+  /* set yellow led when sending packet */
+  leds_on(LEDS_YELLOW);
+#endif
+}
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/Makefile b/platform/avr-rss2/examples/ipv6/rpl-border-router/Makefile
new file mode 100644
index 000000000..ba3f16af6
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/rpl-border-router/Makefile
@@ -0,0 +1,55 @@
+CONTIKI_PROJECT=border-router
+all: $(CONTIKI_PROJECT) 
+
+CONTIKI=../../../../..
+
+#linker optimizations
+SMALL=1
+
+CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
+PROJECT_SOURCEFILES += eth-bridge.c
+#PROJECT_SOURCEFILES += enc28j60.c
+PROJECT_SOURCEFILES += enc28j60-ip64-driver.c
+
+APPS += ping6
+
+MODULES += dev/enc28j60 core/net/ip64
+
+#Simple built-in webserver is the default.
+#Override with make WITH_WEBSERVER=0 for no webserver.
+#WITH_WEBSERVER=webserver-name will use /apps/webserver-name if it can be
+#found in the /apps, /platform/$(TARGET)/apps/, or current directory (in that order).
+# WITH_WEBSERVER=webserver for /apps/webserver
+# WITH_WEBSERVER=raven-webserver for /platform/avr-raven/apps/raven-webserver/
+#make clean before changing webservers!
+
+#Note /apps/webserver contains a 2500 byte style sheet which is a severe test
+#of the slip connection. Large MSS together with low baud rates without flow
+#control will overrun the transmit buffer when the style sheet is requested.
+
+WITH_WEBSERVER=1
+ifeq ($(WITH_WEBSERVER),1)
+CFLAGS += -DUIP_CONF_TCP=1
+CFLAGS += -DWEBSERVER=1
+PROJECT_SOURCEFILES += httpd-simple.c
+else ifneq ($(WITH_WEBSERVER), 0)
+APPS += $(WITH_WEBSERVER)
+CFLAGS += -DUIP_CONF_TCP=1
+CFLAGS += -DWEBSERVER=2
+endif
+
+ifeq ($(PREFIX),)
+ PREFIX = aaaa::1/64
+endif
+
+CONTIKI_WITH_IPV6 = 1
+include $(CONTIKI)/Makefile.include
+
+$(CONTIKI)/tools/tunslip6:	$(CONTIKI)/tools/tunslip6.c
+	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
+
+connect-router:	$(CONTIKI)/tools/tunslip6
+	sudo $(CONTIKI)/tools/tunslip6 $(PREFIX)
+
+connect-router-cooja:	$(CONTIKI)/tools/tunslip6
+	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 $(PREFIX)
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/README.ETHERNET.md b/platform/avr-rss2/examples/ipv6/rpl-border-router/README.ETHERNET.md
new file mode 100644
index 000000000..ab63e9ae3
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/rpl-border-router/README.ETHERNET.md
@@ -0,0 +1,66 @@
+Document version: 2015-12-29
+
+HOWTO connect the Microchip enc28j60 module
+===========================================
+
+It's possible to to add Ethernet to most microcontrollers having a SPI inter-
+face. In the Atmel world the SPI pins are used for the ISP programming. Usually 
+a 6-pin header. Named MOSI, MISO, SCK, CS (Chup Select), Vcc, GND
+
+One popular Ethernet chip is Microchip ENC28J60. It been used for quite some 
+time and is easy to program and are also supported by many platforms and 
+projects. Contiki has files under:
+
+Most focus fon AVR platforms. The SPI is used by Atmel ISP-progammings
+interface. In addition to those pins you to selects a pin for chip
+select (CS).
+
+dev/enc28j60/
+The low-level SPI drives is platform or rather CPU-specific. The avr-rss2
+platform adds the low-level drivers for Atmel.
+
+platform/avr-rss2/enc28j60_avr.[ch]
+This should be usable on most 8-bit avr platforms.
+
+The power consumption might be a problem. The enc28j60 consumes 160mA at 3.3V 
+when transmitting. The LDO (voltage reg. LP2950) on the mote can only handle 
+100mA. So external power is needed. Below is a description of a prototype.
+ 
+Used components:
+----------------
+Externel power supply 5V.
+Small breadboard
+DC-jack 
+Voltage Reg. LCP1700 3.3V
+Capacitor 4.7uF
+enc28j60 (From Ebay)
+Pin-headers
+Cables   2x5 (enc28j60)  2x3 SPI (AtMega node) 
+
+Used colors:
+Black GND
+Red VCC 3.3V
+Yellow SCK
+Green MISO
+White MOSI
+Blue CS (Chip select)
+
+SPI (Connector view)
+--------------------
+GREEN  YELLOW   NC     
+RED    WHITE    BLACK  
+
+CS is connected to external temp sensor middle pin. Consequently the
+external temp sensor can not be used in this application.
+ 
+Pictures
+--------
+![Module] ( http://www.radio-sensors.com/pictures/enc28j60.jpg)
+![Connector] (http://www.radio-sensors.com/pictures/enc28c60-cable.jpg)
+
+
+References
+-----------
+
+
+
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/README.md b/platform/avr-rss2/examples/ipv6/rpl-border-router/README.md
new file mode 100644
index 000000000..fa3019c2d
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/rpl-border-router/README.md
@@ -0,0 +1,17 @@
+Document version: 2016-02-22
+
+An ethernet-to-802.15.4 NAT/GW IP64
+===================================
+
+This project is heavily based on the rpl-border-router in the example directory
+using the IP64 framework. This work is done Contiki/Thingsquare as the driver 
+for enc28j60.
+
+But rather than using slip as in the original example an ethernet interface 
+the Microchip enc28j60 is used. The needed SPI-glue for AtMega's is added by 
+this platform. (avr-rss2)
+
+See the README.ETHERNET.md for ethernet module info.
+
+
+
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/border-router.c b/platform/avr-rss2/examples/ipv6/rpl-border-router/border-router.c
new file mode 100644
index 000000000..6a992982f
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/rpl-border-router/border-router.c
@@ -0,0 +1,388 @@
+/*
+ * 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
+ *         border-router
+ * \author
+ *         Niclas Finne <nfi@sics.se>
+ *         Joakim Eriksson <joakime@sics.se>
+ *         Nicolas Tsiftes <nvt@sics.se>
+ */
+
+#include "contiki.h"
+#include "contiki-lib.h"
+#include "contiki-net.h"
+#include "net/ip/uip.h"
+#include "net/ipv6/uip-ds6.h"
+#include "ip64.h"
+#include "net/rpl/rpl.h"
+#include "enc28j60.h"
+#include "enc28j60-ip64-driver.h"
+#include "net/netstack.h"
+#include "dev/button-sensor.h"
+#include "dev/slip.h"
+#include "dev/leds.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#define DEBUG DEBUG_PRINT
+#include "net/ip/uip-debug.h"
+
+static uip_ipaddr_t prefix;
+static uint8_t prefix_set;
+
+PROCESS(border_router_process, "Border router process");
+
+#if WEBSERVER==0
+/* No webserver */
+AUTOSTART_PROCESSES(&border_router_process);
+#elif WEBSERVER>1
+/* Use an external webserver application */
+#include "webserver-nogui.h"
+AUTOSTART_PROCESSES(&border_router_process,&webserver_nogui_process);
+#else
+/* Use simple webserver with only one page for minimum footprint.
+ * Multiple connections can result in interleaved tcp segments since
+ * a single static buffer is used for all segments.
+ */
+#include "httpd-simple.h"
+/* The internal webserver can provide additional information if
+ * enough program flash is available.
+ */
+#define WEBSERVER_CONF_LOADTIME 1
+#define WEBSERVER_CONF_FILESTATS 1
+#define WEBSERVER_CONF_NEIGHBOR_STATUS 1
+/* Adding links requires a larger RAM buffer. To avoid static allocation
+ * the stack can be used for formatting; however tcp retransmissions
+ * and multiple connections can result in garbled segments.
+ * TODO:use PSOCk_GENERATOR_SEND and tcp state storage to fix this.
+ */
+#define WEBSERVER_CONF_ROUTE_LINKS 1
+#if WEBSERVER_CONF_ROUTE_LINKS
+#define BUF_USES_STACK 1
+#endif
+
+PROCESS(webserver_nogui_process, "Web server");
+PROCESS_THREAD(webserver_nogui_process, ev, data)
+{
+  PROCESS_BEGIN();
+
+  httpd_init();
+
+  while(1) {
+    PROCESS_WAIT_EVENT_UNTIL(ev == tcpip_event);
+    httpd_appcall(data);
+  }
+
+  PROCESS_END();
+}
+AUTOSTART_PROCESSES(&border_router_process,&webserver_nogui_process);
+
+static const char *TOP = "<html><head><title>ContikiRPL</title></head><body>\n";
+static const char *BOTTOM = "</body></html>\n";
+#if BUF_USES_STACK
+static char *bufptr, *bufend;
+#define ADD(...) do {                                                   \
+    bufptr += snprintf(bufptr, bufend - bufptr, __VA_ARGS__);      \
+  } while(0)
+#else
+static char buf[256];
+static int blen;
+#define ADD(...) do {                                                   \
+    blen += snprintf(&buf[blen], sizeof(buf) - blen, __VA_ARGS__);      \
+  } while(0)
+#endif
+
+/*---------------------------------------------------------------------------*/
+static void
+ipaddr_add(const uip_ipaddr_t *addr)
+{
+  uint16_t a;
+  int i, f;
+  for(i = 0, f = 0; i < sizeof(uip_ipaddr_t); i += 2) {
+    a = (addr->u8[i] << 8) + addr->u8[i + 1];
+    if(a == 0 && f >= 0) {
+      if(f++ == 0) ADD("::");
+    } else {
+      if(f > 0) {
+        f = -1;
+      } else if(i > 0) {
+        ADD(":");
+      }
+      ADD("%x", a);
+    }
+  }
+}
+/*---------------------------------------------------------------------------*/
+static
+PT_THREAD(generate_routes(struct httpd_state *s))
+{
+  static uip_ds6_route_t *r;
+  static uip_ds6_nbr_t *nbr;
+#if BUF_USES_STACK
+  char buf[256];
+#endif
+#if WEBSERVER_CONF_LOADTIME
+  static clock_time_t numticks;
+  numticks = clock_time();
+#endif
+
+  PSOCK_BEGIN(&s->sout);
+
+  SEND_STRING(&s->sout, TOP);
+#if BUF_USES_STACK
+  bufptr = buf;bufend=bufptr+sizeof(buf);
+#else
+  blen = 0;
+#endif
+  ADD("Neighbors<pre>");
+
+  for(nbr = nbr_table_head(ds6_neighbors);
+      nbr != NULL;
+      nbr = nbr_table_next(ds6_neighbors, nbr)) {
+
+#if WEBSERVER_CONF_NEIGHBOR_STATUS
+#if BUF_USES_STACK
+{char* j=bufptr+25;
+      ipaddr_add(&nbr->ipaddr);
+      while (bufptr < j) ADD(" ");
+      switch (nbr->state) {
+      case NBR_INCOMPLETE: ADD(" INCOMPLETE");break;
+      case NBR_REACHABLE: ADD(" REACHABLE");break;
+      case NBR_STALE: ADD(" STALE");break;
+      case NBR_DELAY: ADD(" DELAY");break;
+      case NBR_PROBE: ADD(" NBR_PROBE");break;
+      }
+}
+#else
+{uint8_t j=blen+25;
+      ipaddr_add(&nbr->ipaddr);
+      while (blen < j) ADD(" ");
+      switch (nbr->state) {
+      case NBR_INCOMPLETE: ADD(" INCOMPLETE");break;
+      case NBR_REACHABLE: ADD(" REACHABLE");break;
+      case NBR_STALE: ADD(" STALE");break;
+      case NBR_DELAY: ADD(" DELAY");break;
+      case NBR_PROBE: ADD(" NBR_PROBE");break;
+      }
+}
+#endif
+#else
+      ipaddr_add(&nbr->ipaddr);
+#endif
+
+      ADD("\n");
+#if BUF_USES_STACK
+      if(bufptr > bufend - 45) {
+        SEND_STRING(&s->sout, buf);
+        bufptr = buf; bufend = bufptr + sizeof(buf);
+      }
+#else
+      if(blen > sizeof(buf) - 45) {
+        SEND_STRING(&s->sout, buf);
+        blen = 0;
+      }
+#endif
+  }
+  ADD("</pre>Routes<pre>");
+  SEND_STRING(&s->sout, buf);
+#if BUF_USES_STACK
+  bufptr = buf; bufend = bufptr + sizeof(buf);
+#else
+  blen = 0;
+#endif
+
+  for(r = uip_ds6_route_head(); r != NULL; r = uip_ds6_route_next(r)) {
+
+#if BUF_USES_STACK
+#if WEBSERVER_CONF_ROUTE_LINKS
+    ADD("<a href=http://[");
+    ipaddr_add(&r->ipaddr);
+    ADD("]/status.shtml>");
+    ipaddr_add(&r->ipaddr);
+    ADD("</a>");
+#else
+    ipaddr_add(&r->ipaddr);
+#endif
+#else
+#if WEBSERVER_CONF_ROUTE_LINKS
+    ADD("<a href=http://[");
+    ipaddr_add(&r->ipaddr);
+    ADD("]/status.shtml>");
+    SEND_STRING(&s->sout, buf); //TODO: why tunslip6 needs an output here, wpcapslip does not
+    blen = 0;
+    ipaddr_add(&r->ipaddr);
+    ADD("</a>");
+#else
+    ipaddr_add(&r->ipaddr);
+#endif
+#endif
+    ADD("/%u (via ", r->length);
+    ipaddr_add(uip_ds6_route_nexthop(r));
+    if(1 || (r->state.lifetime < 600)) {
+      ADD(") %lus\n", (unsigned long)r->state.lifetime);
+    } else {
+      ADD(")\n");
+    }
+    SEND_STRING(&s->sout, buf);
+#if BUF_USES_STACK
+    bufptr = buf; bufend = bufptr + sizeof(buf);
+#else
+    blen = 0;
+#endif
+  }
+  ADD("</pre>");
+
+#if WEBSERVER_CONF_FILESTATS
+  static uint16_t numtimes;
+  ADD("<br><i>This page sent %u times</i>",++numtimes);
+#endif
+
+#if WEBSERVER_CONF_LOADTIME
+  numticks = clock_time() - numticks + 1;
+  ADD(" <i>(%lu.%02lu sec)</i>",numticks/CLOCK_SECOND,((100*(numticks%CLOCK_SECOND))/CLOCK_SECOND));
+#endif
+
+
+  SEND_STRING(&s->sout, buf);
+  SEND_STRING(&s->sout, BOTTOM);
+
+  PSOCK_END(&s->sout);
+}
+/*---------------------------------------------------------------------------*/
+httpd_simple_script_t
+httpd_simple_get_script(const char *name)
+{
+  return generate_routes;
+}
+
+#endif /* WEBSERVER */
+
+/*---------------------------------------------------------------------------*/
+static void
+print_local_addresses(void)
+{
+  int i;
+  uint8_t state;
+
+  PRINTA("Server IPv6 addresses:\n");
+  for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
+    state = uip_ds6_if.addr_list[i].state;
+    if(uip_ds6_if.addr_list[i].isused &&
+       (state == ADDR_TENTATIVE || state == ADDR_PREFERRED)) {
+      PRINTA(" ");
+      uip_debug_ipaddr_print(&uip_ds6_if.addr_list[i].ipaddr);
+      PRINTA("\n");
+    }
+  }
+}
+/*---------------------------------------------------------------------------*/
+void
+request_prefix(void)
+{
+  /* mess up uip_buf with a dirty request... */
+  uip_buf[0] = '?';
+  uip_buf[1] = 'P';
+  uip_len = 2;
+  //slip_send();
+  uip_clear_buf();
+}
+/*---------------------------------------------------------------------------*/
+void
+set_prefix_64(uip_ipaddr_t *prefix_64)
+{
+  rpl_dag_t *dag;
+  uip_ipaddr_t ipaddr;
+  memcpy(&prefix, prefix_64, 16);
+  memcpy(&ipaddr, prefix_64, 16);
+  prefix_set = 1;
+  uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
+  uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
+
+  dag = rpl_set_root(RPL_DEFAULT_INSTANCE, &ipaddr);
+  if(dag != NULL) {
+    rpl_set_prefix(dag, &prefix, 64);
+    PRINTF("created a new RPL dag\n");
+  }
+}
+
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(border_router_process, ev, data)
+{
+  PROCESS_BEGIN();
+  uip_ipaddr_t ipaddr;
+
+/* While waiting for the prefix to be sent through the SLIP connection, the future
+ * border router can join an existing DAG as a parent or child, or acquire a default
+ * router that will later take precedence over the SLIP fallback interface.
+ * Prevent that by turning the radio off until we are initialized as a DAG root.
+ */
+  prefix_set = 0;
+  NETSTACK_MAC.off(0);
+
+  PROCESS_PAUSE();
+
+  SENSORS_ACTIVATE(button_sensor);
+  leds_init();
+  ip64_init();
+
+  PRINTF("RPL-Border router started\n");
+#if 0
+   /* The border router runs with a 100% duty cycle in order to ensure high
+     packet reception rates.
+     Note if the MAC RDC is not turned off now, aggressive power management of the
+     cpu will interfere with establishing the SLIP connection */
+  NETSTACK_MAC.off(1);
+#endif
+
+  /* Now turn the radio on, but disable radio duty cycling.
+   * Since we are the DAG root, reception delays would constrain mesh throughbut.
+   */
+  NETSTACK_MAC.off(1);
+
+/* Derived from link local (MAC) address */
+  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  set_prefix_64(&ipaddr);
+  print_local_addresses();
+
+  while(1) {
+    PROCESS_YIELD();
+    leds_on(LEDS_YELLOW);
+    if (ev == sensors_event && data == &button_sensor) {
+      PRINTF("Initiating global repair\n");
+      rpl_repair_root(RPL_DEFAULT_INSTANCE);
+    }
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/enc28j60-ip64-driver.c b/platform/avr-rss2/examples/ipv6/rpl-border-router/enc28j60-ip64-driver.c
new file mode 100644
index 000000000..6bc4122a4
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/rpl-border-router/enc28j60-ip64-driver.c
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2012-2013, Thingsquare, http://www.thingsquare.com/.
+ * 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 copyright holder 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 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 HOLDER 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.
+ *
+ */
+
+#include "contiki.h"
+#include "enc28j60.h"
+#include "enc28j60-ip64-driver.h"
+#include "net/linkaddr.h"
+
+#include "ip64.h"
+#include "ip64-eth.h"
+
+#include <string.h>
+#include <stdio.h>
+
+PROCESS(enc28j60_ip64_driver_process, "ENC28J60 IP64 driver");
+
+/*---------------------------------------------------------------------------*/
+static void
+init(void)
+{
+  uint8_t eui64[8];
+  uint8_t macaddr[6];
+
+  /* Assume that linkaddr_node_addr holds the EUI64 of this device. */
+  memcpy(eui64, &linkaddr_node_addr, sizeof(eui64));
+
+  /* Mangle the EUI64 into a 48-bit Ethernet address. */
+  memcpy(&macaddr[0], &eui64[0], 3);
+  memcpy(&macaddr[3], &eui64[5], 3);
+
+  /* In case the OUI happens to contain a broadcast bit, we mask that
+     out here. */
+  macaddr[0] = (macaddr[0] & 0xfe);
+
+  /* Set the U/L bit, in order to create a locally administered MAC address */
+  macaddr[0] = (macaddr[0] | 0x02);
+
+  memcpy(ip64_eth_addr.addr, macaddr, sizeof(macaddr));
+
+  printf("MAC addr %02x:%02x:%02x:%02x:%02x:%02x\n",
+         macaddr[0], macaddr[1], macaddr[2],
+         macaddr[3], macaddr[4], macaddr[5]);
+  enc28j60_init(macaddr);
+  process_start(&enc28j60_ip64_driver_process, NULL);
+}
+/*---------------------------------------------------------------------------*/
+static int
+output(uint8_t *packet, uint16_t len)
+{
+  enc28j60_send(packet, len);
+  return len;
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(enc28j60_ip64_driver_process, ev, data)
+{
+  static int len;
+  static struct etimer e;
+  PROCESS_BEGIN();
+
+  while(1) {
+    etimer_set(&e, 1);
+    PROCESS_WAIT_EVENT();
+    len = enc28j60_read(ip64_packet_buffer, ip64_packet_buffer_maxlen);
+    if(len > 0) {
+      IP64_INPUT(ip64_packet_buffer, len);
+    }
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+const struct ip64_driver enc28j60_ip64_driver = {
+  init,
+  output
+};
+/*---------------------------------------------------------------------------*/
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/enc28j60-ip64-driver.h b/platform/avr-rss2/examples/ipv6/rpl-border-router/enc28j60-ip64-driver.h
new file mode 100644
index 000000000..29d3ed5a4
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/rpl-border-router/enc28j60-ip64-driver.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2012-2013, Thingsquare, http://www.thingsquare.com/.
+ * 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 copyright holder 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 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 HOLDER 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 ENC28J60_IP64_DRIVER_H
+#define ENC28J60_IP64_DRIVER_H
+
+#include "ip64-driver.h"
+extern const struct ip64_driver enc28j60_ip64_driver;
+
+#endif /* ENC28J60_IP64_DRIVER_H */
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/eth-bridge.c b/platform/avr-rss2/examples/ipv6/rpl-border-router/eth-bridge.c
new file mode 100644
index 000000000..b5d9ec498
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/rpl-border-router/eth-bridge.c
@@ -0,0 +1,33 @@
+#include "net/ip/uip.h"
+#include "net/ipv6/uip-ds6.h"
+#include <string.h>
+#include "ip64-eth-interface.h"
+
+#define UIP_IP_BUF        ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
+
+#define DEBUG DEBUG_NONE
+#include "net/ip/uip-debug.h"
+
+static void
+init(void)
+{
+  PRINTF("eth-bridge: init\n");
+  ip64_eth_interface.init();
+}
+/*---------------------------------------------------------------------------*/
+static int
+output()
+{
+  PRINTF("eth-bridge: src=");
+  PRINT6ADDR(&UIP_IP_BUF->srcipaddr);
+  PRINTF(" dst=");
+  PRINT6ADDR(&UIP_IP_BUF->destipaddr);
+  PRINTF("\n");
+  ip64_eth_interface.output();
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+const struct uip_fallback_interface rpl_interface = {
+  init, output
+};
+/*---------------------------------------------------------------------------*/
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/httpd-simple.c b/platform/avr-rss2/examples/ipv6/rpl-border-router/httpd-simple.c
new file mode 100644
index 000000000..115e54d45
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/rpl-border-router/httpd-simple.c
@@ -0,0 +1,261 @@
+/*
+ * 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.
+ *
+ */
+
+/**
+ * \file
+ *         A simple web server forwarding page generation to a protothread
+ * \author
+ *         Adam Dunkels <adam@sics.se>
+ *         Niclas Finne <nfi@sics.se>
+ *         Joakim Eriksson <joakime@sics.se>
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "contiki-net.h"
+
+//#include "urlconv.h"
+
+#include "httpd-simple.h"
+#define webserver_log_file(...)
+#define webserver_log(...)
+
+#ifndef WEBSERVER_CONF_CFS_CONNS
+#define CONNS UIP_CONNS
+#else /* WEBSERVER_CONF_CFS_CONNS */
+#define CONNS WEBSERVER_CONF_CFS_CONNS
+#endif /* WEBSERVER_CONF_CFS_CONNS */
+
+#ifndef WEBSERVER_CONF_CFS_URLCONV
+#define URLCONV 0
+#else /* WEBSERVER_CONF_CFS_URLCONV */
+#define URLCONV WEBSERVER_CONF_CFS_URLCONV
+#endif /* WEBSERVER_CONF_CFS_URLCONV */
+
+#define STATE_WAITING 0
+#define STATE_OUTPUT  1
+
+MEMB(conns, struct httpd_state, CONNS);
+
+#define ISO_nl      0x0a
+#define ISO_space   0x20
+#define ISO_period  0x2e
+#define ISO_slash   0x2f
+
+/*---------------------------------------------------------------------------*/
+static const char *NOT_FOUND = "<html><body bgcolor=\"white\">"
+"<center>"
+"<h1>404 - file not found</h1>"
+"</center>"
+"</body>"
+"</html>";
+/*---------------------------------------------------------------------------*/
+static
+PT_THREAD(send_string(struct httpd_state *s, const char *str))
+{
+  PSOCK_BEGIN(&s->sout);
+
+  SEND_STRING(&s->sout, str);
+
+  PSOCK_END(&s->sout);
+}
+/*---------------------------------------------------------------------------*/
+const char http_content_type_html[] = "Content-type: text/html\r\n\r\n";
+static
+PT_THREAD(send_headers(struct httpd_state *s, const char *statushdr))
+{
+  /* char *ptr; */
+
+  PSOCK_BEGIN(&s->sout);
+
+  SEND_STRING(&s->sout, statushdr);
+
+  /* ptr = strrchr(s->filename, ISO_period); */
+  /* if(ptr == NULL) { */
+  /*   s->ptr = http_content_type_plain; */
+  /* } else if(strcmp(http_html, ptr) == 0) { */
+  /*   s->ptr = http_content_type_html; */
+  /* } else if(strcmp(http_css, ptr) == 0) { */
+  /*   s->ptr = http_content_type_css; */
+  /* } else if(strcmp(http_png, ptr) == 0) { */
+  /*   s->ptr = http_content_type_png; */
+  /* } else if(strcmp(http_gif, ptr) == 0) { */
+  /*   s->ptr = http_content_type_gif; */
+  /* } else if(strcmp(http_jpg, ptr) == 0) { */
+  /*   s->ptr = http_content_type_jpg; */
+  /* } else { */
+  /*   s->ptr = http_content_type_binary; */
+  /* } */
+  /* SEND_STRING(&s->sout, s->ptr); */
+  SEND_STRING(&s->sout, http_content_type_html);
+  PSOCK_END(&s->sout);
+}
+/*---------------------------------------------------------------------------*/
+const char http_header_200[] = "HTTP/1.0 200 OK\r\nServer: Contiki/2.4 http://www.sics.se/contiki/\r\nConnection: close\r\n";
+const char http_header_404[] = "HTTP/1.0 404 Not found\r\nServer: Contiki/2.4 http://www.sics.se/contiki/\r\nConnection: close\r\n";
+static
+PT_THREAD(handle_output(struct httpd_state *s))
+{
+  PT_BEGIN(&s->outputpt);
+
+  s->script = NULL;
+  s->script = httpd_simple_get_script(&s->filename[1]);
+  if(s->script == NULL) {
+    strncpy(s->filename, "/notfound.html", sizeof(s->filename));
+    PT_WAIT_THREAD(&s->outputpt,
+                   send_headers(s, http_header_404));
+    PT_WAIT_THREAD(&s->outputpt,
+                   send_string(s, NOT_FOUND));
+    uip_close();
+    webserver_log_file(&uip_conn->ripaddr, "404 - not found");
+    PT_EXIT(&s->outputpt);
+  } else {
+    PT_WAIT_THREAD(&s->outputpt,
+                   send_headers(s, http_header_200));
+    PT_WAIT_THREAD(&s->outputpt, s->script(s));
+  }
+  s->script = NULL;
+  PSOCK_CLOSE(&s->sout);
+  PT_END(&s->outputpt);
+}
+/*---------------------------------------------------------------------------*/
+const char http_get[] = "GET ";
+const char http_index_html[] = "/index.html";
+//const char http_referer[] = "Referer:"
+static
+PT_THREAD(handle_input(struct httpd_state *s))
+{
+  PSOCK_BEGIN(&s->sin);
+
+  PSOCK_READTO(&s->sin, ISO_space);
+
+  if(strncmp(s->inputbuf, http_get, 4) != 0) {
+    PSOCK_CLOSE_EXIT(&s->sin);
+  }
+  PSOCK_READTO(&s->sin, ISO_space);
+
+  if(s->inputbuf[0] != ISO_slash) {
+    PSOCK_CLOSE_EXIT(&s->sin);
+  }
+
+#if URLCONV
+  s->inputbuf[PSOCK_DATALEN(&s->sin) - 1] = 0;
+  urlconv_tofilename(s->filename, s->inputbuf, sizeof(s->filename));
+#else /* URLCONV */
+  if(s->inputbuf[1] == ISO_space) {
+    strncpy(s->filename, http_index_html, sizeof(s->filename));
+  } else {
+    s->inputbuf[PSOCK_DATALEN(&s->sin) - 1] = 0;
+    strncpy(s->filename, s->inputbuf, sizeof(s->filename));
+  }
+#endif /* URLCONV */
+
+  webserver_log_file(&uip_conn->ripaddr, s->filename);
+
+  s->state = STATE_OUTPUT;
+
+  while(1) {
+    PSOCK_READTO(&s->sin, ISO_nl);
+#if 0
+    if(strncmp(s->inputbuf, http_referer, 8) == 0) {
+      s->inputbuf[PSOCK_DATALEN(&s->sin) - 2] = 0;
+      webserver_log(s->inputbuf);
+    }
+#endif
+  }
+
+  PSOCK_END(&s->sin);
+}
+/*---------------------------------------------------------------------------*/
+static void
+handle_connection(struct httpd_state *s)
+{
+  handle_input(s);
+  if(s->state == STATE_OUTPUT) {
+    handle_output(s);
+  }
+}
+
+/*---------------------------------------------------------------------------*/
+void
+httpd_appcall(void *state)
+{
+  struct httpd_state *s = (struct httpd_state *)state;
+
+  if(uip_closed() || uip_aborted() || uip_timedout()) {
+    if(s != NULL) {
+      s->script = NULL;
+      memb_free(&conns, s);
+    }
+  } else if(uip_connected()) {
+    s = (struct httpd_state *)memb_alloc(&conns);
+    if(s == NULL) {
+      uip_abort();
+      webserver_log_file(&uip_conn->ripaddr, "reset (no memory block)");
+      return;
+    }
+    tcp_markconn(uip_conn, s);
+    PSOCK_INIT(&s->sin, (uint8_t *)s->inputbuf, sizeof(s->inputbuf) - 1);
+    PSOCK_INIT(&s->sout, (uint8_t *)s->inputbuf, sizeof(s->inputbuf) - 1);
+    PT_INIT(&s->outputpt);
+    s->script = NULL;
+    s->state = STATE_WAITING;
+    timer_set(&s->timer, CLOCK_SECOND * 10);
+    handle_connection(s);
+  } else if(s != NULL) {
+    if(uip_poll()) {
+      if(timer_expired(&s->timer)) {
+        uip_abort();
+        s->script = NULL;
+        memb_free(&conns, s);
+        webserver_log_file(&uip_conn->ripaddr, "reset (timeout)");
+      }
+    } else {
+      timer_restart(&s->timer);
+    }
+    handle_connection(s);
+  } else {
+    uip_abort();
+  }
+}
+
+/*---------------------------------------------------------------------------*/
+void
+httpd_init(void)
+{
+
+  tcp_listen(UIP_HTONS(80));
+  memb_init(&conns);
+#if URLCONV
+  urlconv_init();
+#endif /* URLCONV */
+}
+/*---------------------------------------------------------------------------*/
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/httpd-simple.h b/platform/avr-rss2/examples/ipv6/rpl-border-router/httpd-simple.h
new file mode 100644
index 000000000..a16dbd99e
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/rpl-border-router/httpd-simple.h
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ *
+ */
+
+/**
+ * \file
+ *         A simple webserver
+ * \author
+ *         Adam Dunkels <adam@sics.se>
+ *         Niclas Finne <nfi@sics.se>
+ *         Joakim Eriksson <joakime@sics.se>
+ */
+
+#ifndef HTTPD_SIMPLE_H_
+#define HTTPD_SIMPLE_H_
+
+#include "contiki-net.h"
+
+/* The current internal border router webserver ignores the requested file name */
+/* and needs no per-connection output buffer, so save some RAM */
+#ifndef WEBSERVER_CONF_CFS_PATHLEN
+#define HTTPD_PATHLEN 2
+#else /* WEBSERVER_CONF_CFS_CONNS */
+#define HTTPD_PATHLEN WEBSERVER_CONF_CFS_PATHLEN
+#endif /* WEBSERVER_CONF_CFS_CONNS */
+
+struct httpd_state;
+typedef char (* httpd_simple_script_t)(struct httpd_state *s);
+
+struct httpd_state {
+  struct timer timer;
+  struct psock sin, sout;
+  struct pt outputpt;
+  char inputbuf[HTTPD_PATHLEN + 24];
+/*char outputbuf[UIP_TCP_MSS]; */
+  char filename[HTTPD_PATHLEN];
+  httpd_simple_script_t script;
+  char state;
+};
+
+void httpd_init(void);
+void httpd_appcall(void *state);
+
+httpd_simple_script_t httpd_simple_get_script(const char *name);
+
+#define SEND_STRING(s, str) PSOCK_SEND(s, (uint8_t *)str, strlen(str))
+
+#endif /* HTTPD_SIMPLE_H_ */
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/project-conf.h b/platform/avr-rss2/examples/ipv6/rpl-border-router/project-conf.h
new file mode 100644
index 000000000..f1d9e8cda
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/rpl-border-router/project-conf.h
@@ -0,0 +1,57 @@
+/*
+ * 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_ROUTER_CONF_H_
+#define PROJECT_ROUTER_CONF_H_
+
+#define NETSTACK_CONF_RDC nullrdc_driver
+#define NETSTACK_CONF_MAC nullmac_driver
+
+#ifndef UIP_FALLBACK_INTERFACE
+#define UIP_FALLBACK_INTERFACE rpl_interface
+#endif
+
+#ifndef QUEUEBUF_CONF_NUM
+#define QUEUEBUF_CONF_NUM          4
+#endif
+
+#ifndef UIP_CONF_BUFFER_SIZE
+#define UIP_CONF_BUFFER_SIZE    600
+#endif
+
+#ifndef UIP_CONF_RECEIVE_WINDOW
+#define UIP_CONF_RECEIVE_WINDOW  60
+#endif
+
+#ifndef WEBSERVER_CONF_CFS_CONNS
+#define WEBSERVER_CONF_CFS_CONNS 2
+#endif
+
+#endif /* PROJECT_ROUTER_CONF_H_ */
diff --git a/platform/avr-rss2/examples/ipv6/rpl-udp-report/Makefile b/platform/avr-rss2/examples/ipv6/rpl-udp-report/Makefile
new file mode 100644
index 000000000..770ad3749
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/rpl-udp-report/Makefile
@@ -0,0 +1,21 @@
+
+CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
+
+all: report sink
+APPS=servreg-hack
+CONTIKI=../../../../..
+
+ifdef WITH_COMPOWER
+APPS+=powertrace
+CFLAGS+= -DCONTIKIMAC_CONF_COMPOWER=1 -DWITH_COMPOWER=1 -DQUEUEBUF_CONF_NUM=4
+endif
+
+ifdef SERVER_REPLY
+CFLAGS+=-DSERVER_REPLY=$(SERVER_REPLY)
+endif
+ifdef PERIOD
+CFLAGS+=-DPERIOD=$(PERIOD)
+endif
+
+CONTIKI_WITH_IPV6 = 1
+include $(CONTIKI)/Makefile.include
diff --git a/platform/avr-rss2/examples/ipv6/rpl-udp-report/README.md b/platform/avr-rss2/examples/ipv6/rpl-udp-report/README.md
new file mode 100644
index 000000000..1f10ff7e5
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/rpl-udp-report/README.md
@@ -0,0 +1,17 @@
+
+This application is derived form rpl-udp.
+
+It's modified to show:
+
+* Reading out sensors from the avr-rss2 platform. Which should follow the
+  Contiki conventions.
+
+* Encode the data according to the sensd TAG format. In effect the sensd 
+  GW and rest of "eco-system" as Mobile apps etc can be used for a simple
+  and flexible data collection, Sink mote will be connected to sensd GW.
+
+References and code:
+https://github.com/herjulf/sensd
+https://github.com/herjulf/Read-Sensors   (Android app. Also at Google Play)
+
+  
diff --git a/platform/avr-rss2/examples/ipv6/rpl-udp-report/project-conf.h b/platform/avr-rss2/examples/ipv6/rpl-udp-report/project-conf.h
new file mode 100644
index 000000000..b004c6335
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/rpl-udp-report/project-conf.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2015, RAdio Sensors AB, Uppsala Sweden
+ * 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
+ *         Project specific configuration defines for example
+ *
+ * \author
+ *         Robert Olsson <robert@radio-sensors.com>
+ */
+
+#ifndef PROJECT_CONF_H_
+#define PROJECT_CONF_H_
+
+#define NETSTACK_CONF_RDC nullrdc_driver
+#define NETSTACK_CONF_MAC nullmac_driver
+
+//#define NETSTACK_CONF_MAC         csma_driver
+//#define NETSTACK_CONF_RDC         contikimac_driver
+//#define NETSTACK_CONF_FRAMER      framer_802154
+//#define NETSTACK_CONF_RADIO       rf230_driver
+
+#endif /* PROJECT_CONF_H_ */
diff --git a/platform/avr-rss2/examples/ipv6/rpl-udp-report/report.avr-rss2 b/platform/avr-rss2/examples/ipv6/rpl-udp-report/report.avr-rss2
new file mode 100644
index 000000000..e69de29bb
diff --git a/platform/avr-rss2/examples/ipv6/rpl-udp-report/report.c b/platform/avr-rss2/examples/ipv6/rpl-udp-report/report.c
new file mode 100644
index 000000000..7915dff2f
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/rpl-udp-report/report.c
@@ -0,0 +1,240 @@
+/*
+ * 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.
+ *
+ */
+
+#include "contiki.h"
+#include "lib/random.h"
+#include "sys/ctimer.h"
+#include "net/ip/uip.h"
+#include "net/ipv6/uip-ds6.h"
+#include "net/ip/uip-udp-packet.h"
+#include "sys/ctimer.h"
+#include "dev/leds.h"
+#include "dev/battery-sensor.h"
+#include "dev/temp_mcu-sensor.h"
+#include "dev/light-sensor.h"
+#ifdef CO2
+#include "dev/co2_sa_kxx-sensor.h"
+#endif
+#ifdef WITH_COMPOWER
+#include "powertrace.h"
+#endif
+#include <stdio.h>
+#include <string.h>
+
+#define UDP_CLIENT_PORT 8765
+#define UDP_SERVER_PORT 5678
+
+#define UDP_EXAMPLE_ID  190
+
+#define DEBUG DEBUG_PRINT
+#include "net/ip/uip-debug.h"
+
+#ifndef PERIOD
+#define PERIOD 10
+#endif
+
+#define START_INTERVAL		(15 * CLOCK_SECOND)
+#define SEND_INTERVAL		(PERIOD * CLOCK_SECOND)
+#define SEND_TIME		(random_rand() % (SEND_INTERVAL))
+#define MAX_PAYLOAD_LEN		50
+
+static struct uip_udp_conn *client_conn;
+static uip_ipaddr_t server_ipaddr;
+
+extern uint16_t node_id; /* Can be set by cooja */
+
+/*---------------------------------------------------------------------------*/
+PROCESS(udp_client_process, "UDP client process");
+AUTOSTART_PROCESSES(&udp_client_process);
+/*---------------------------------------------------------------------------*/
+static void
+tcpip_handler(void)
+{
+  char *str;
+  
+  if(uip_newdata()) {
+    str = uip_appdata;
+    str[uip_datalen()] = '\0';
+    printf("DATA recv '%s'\n", str);
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+send_packet(void *ptr)
+{
+  static int seq_id;
+  char buf[MAX_PAYLOAD_LEN];
+  int len = 0;
+  
+  seq_id++;
+
+  len += snprintf((char *) &buf[len], sizeof(buf), "&: ");
+  len += snprintf((char *) &buf[len], sizeof(buf), "V_MCU=%-d ", battery_sensor.value(0));
+
+  /* 
+   * Cooja needs to set a node_id. So we can skip sensor reading in case of simulation.
+   */
+
+  if(node_id == 0) {
+    len += snprintf((char *) &buf[len], sizeof(buf), "T_MCU=%-d ", temp_mcu_sensor.value(0));
+    len += snprintf((char *) &buf[len], sizeof(buf), "LIGHT=%-d ", light_sensor.value(0));
+#ifdef CO2
+    len += snprintf((char *) &buf[len], sizeof(buf), "CO2=%-d ", co2_sa_kxx_sensor.value(value));
+#endif
+  }
+  PRINTF("TX %d to %d %s\n",
+         server_ipaddr.u8[sizeof(server_ipaddr.u8) - 1], seq_id, buf);
+
+  leds_on(LEDS_YELLOW);
+
+  uip_udp_packet_sendto(client_conn, buf, strlen(buf),
+                        &server_ipaddr, UIP_HTONS(UDP_SERVER_PORT));
+}
+/*---------------------------------------------------------------------------*/
+static void
+print_local_addresses(void)
+{
+  int i;
+  uint8_t state;
+
+  PRINTF("Client IPv6 addresses: ");
+  for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
+    state = uip_ds6_if.addr_list[i].state;
+    if(uip_ds6_if.addr_list[i].isused &&
+       (state == ADDR_TENTATIVE || state == ADDR_PREFERRED)) {
+      PRINT6ADDR(&uip_ds6_if.addr_list[i].ipaddr);
+      PRINTF("\n");
+      /* hack to make address "final" */
+      if (state == ADDR_TENTATIVE) {
+	uip_ds6_if.addr_list[i].state = ADDR_PREFERRED;
+      }
+    }
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+set_global_address(void)
+{
+  uip_ipaddr_t ipaddr;
+
+  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
+  uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
+
+/* The choice of server address determines its 6LoPAN header compression.
+ * (Our address will be compressed Mode 3 since it is derived from our link-local address)
+ * Obviously the choice made here must also be selected in udp-server.c.
+ *
+ * For correct Wireshark decoding using a sniffer, add the /64 prefix to the 6LowPAN protocol preferences,
+ * e.g. set Context 0 to aaaa::.  At present Wireshark copies Context/128 and then overwrites it.
+ * (Setting Context 0 to aaaa::1111:2222:3333:4444 will report a 16 bit compressed address of aaaa::1111:22ff:fe33:xxxx)
+ *
+ * Note the IPCMV6 checksum verification depends on the correct uncompressed addresses.
+ */
+ 
+#if 0
+/* Mode 1 - 64 bits inline */
+   uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1);
+#elif 1
+/* Mode 2 - 16 bits inline */
+  uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
+#else
+/* Mode 3 - derived from server link-local (MAC) address */
+  uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0x0250, 0xc2ff, 0xfea8, 0xcd1a); //redbee-econotag
+#endif
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(udp_client_process, ev, data)
+{
+  static struct etimer periodic;
+  static struct ctimer backoff_timer;
+#if WITH_COMPOWER
+  static int print = 0;
+#endif
+
+  PROCESS_BEGIN();
+
+  PROCESS_PAUSE();
+
+  SENSORS_ACTIVATE(battery_sensor);
+  SENSORS_ACTIVATE(temp_mcu_sensor);
+  SENSORS_ACTIVATE(light_sensor);
+#ifdef CO2
+  SENSORS_ACTIVATE(co2_sa_kxx_sensor);
+#endif
+  set_global_address();
+  leds_init();
+
+  PRINTF("UDP client process started\n");
+
+  print_local_addresses();
+
+  /* new connection with remote host */
+  client_conn = udp_new(NULL, UIP_HTONS(UDP_SERVER_PORT), NULL); 
+  if(client_conn == NULL) {
+    PRINTF("No UDP connection available, exiting the process!\n");
+    PROCESS_EXIT();
+  }
+  udp_bind(client_conn, UIP_HTONS(UDP_CLIENT_PORT)); 
+
+  PRINTF("Created a connection with the server ");
+  PRINT6ADDR(&client_conn->ripaddr);
+  PRINTF(" local/remote port %u/%u\n",
+	UIP_HTONS(client_conn->lport), UIP_HTONS(client_conn->rport));
+
+#if WITH_COMPOWER
+  powertrace_sniff(POWERTRACE_ON);
+#endif
+
+  etimer_set(&periodic, SEND_INTERVAL);
+  while(1) {
+    PROCESS_YIELD();
+    if(ev == tcpip_event) {
+      tcpip_handler();
+    }
+    
+    if(etimer_expired(&periodic)) {
+      etimer_reset(&periodic);
+      ctimer_set(&backoff_timer, SEND_TIME, send_packet, NULL);
+
+#if WITH_COMPOWER
+      if (print == 0) {
+	powertrace_print("#P");
+      }
+      if (++print == 3) {
+	print = 0;
+      }
+#endif
+
+    }
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
diff --git a/platform/avr-rss2/examples/ipv6/rpl-udp-report/rss2-rpl-udp.csc b/platform/avr-rss2/examples/ipv6/rpl-udp-report/rss2-rpl-udp.csc
new file mode 100644
index 000000000..b2d599577
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/rpl-udp-report/rss2-rpl-udp.csc
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mrm</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mspsim</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/avrora</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/native_gateway</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/serial_socket</project>
+  <project EXPORT="discard">/home/user/contikiprojects/sics.se/mobility</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/collect-view</project>
+  <project EXPORT="discard">/home/user/contikiprojects/sics.se/powertracker</project>
+  <simulation>
+    <title>UDP sink/report simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      se.sics.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>100.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      se.sics.cooja.avrmote.RSS2MoteType
+      <identifier>mote1</identifier>
+      <description>Mote1</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/platform/avr-rss2/examples/ipv6/rpl-udp-report/report.c</source>
+      <commands EXPORT="discard">make report.avr-rss2 TARGET=avr-rss2 MCU=atmega128rfr2</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/platform/avr-rss2/examples/ipv6/rpl-udp-report/report.avr-rss2</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraClock</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraUsart0</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraUsart1</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.RFR2Radio</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraADC</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraLED</moteinterface>
+    </motetype>
+    <motetype>
+      se.sics.cooja.avrmote.RSS2MoteType
+      <identifier>mote2</identifier>
+      <description>Mote2</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/platform/avr-rss2/examples/ipv6/rpl-udp-report/sink.c</source>
+      <commands EXPORT="discard">make sink.avr-rss2 TARGET=avr-rss2 MCU=atmega128rfr2</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/platform/avr-rss2/examples/ipv6/rpl-udp-report/sink.avr-rss2</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraClock</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraUsart0</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraUsart1</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.RFR2Radio</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraADC</moteinterface>
+      <moteinterface>se.sics.cooja.avrmote.interfaces.AvroraLED</moteinterface>
+    </motetype>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>100.0</x>
+        <y>100.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.avrmote.interfaces.AvroraMoteID
+        <id>1</id>
+      </interface_config>
+      <motetype_identifier>mote1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>110.0</x>
+        <y>100.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.avrmote.interfaces.AvroraMoteID
+        <id>2</id>
+      </interface_config>
+      <motetype_identifier>mote2</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>280</width>
+    <z>9</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.Visualizer
+    <plugin_config>
+      <moterelations>true</moterelations>
+      <skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <viewport>3.908924509090908 0.0 0.0 3.908924509090908 -216.43707345454544 -217.89245090909074</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>5</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>1269</width>
+    <z>8</z>
+    <height>240</height>
+    <location_x>400</location_x>
+    <location_y>160</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>989</width>
+    <z>6</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.MoteInterfaceViewer
+    <mote_arg>0</mote_arg>
+    <plugin_config>
+      <interface>Serial port</interface>
+      <scrollpos>0,0</scrollpos>
+    </plugin_config>
+    <width>508</width>
+    <z>4</z>
+    <height>389</height>
+    <location_x>13</location_x>
+    <location_y>413</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.MoteInterfaceViewer
+    <mote_arg>1</mote_arg>
+    <plugin_config>
+      <interface>Serial port</interface>
+      <scrollpos>0,0</scrollpos>
+    </plugin_config>
+    <width>545</width>
+    <z>3</z>
+    <height>392</height>
+    <location_x>531</location_x>
+    <location_y>413</location_y>
+  </plugin>
+</simconf>
diff --git a/platform/avr-rss2/examples/ipv6/rpl-udp-report/sink.avr-rss2 b/platform/avr-rss2/examples/ipv6/rpl-udp-report/sink.avr-rss2
new file mode 100644
index 000000000..e69de29bb
diff --git a/platform/avr-rss2/examples/ipv6/rpl-udp-report/sink.c b/platform/avr-rss2/examples/ipv6/rpl-udp-report/sink.c
new file mode 100644
index 000000000..cb8421943
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/rpl-udp-report/sink.c
@@ -0,0 +1,184 @@
+/*
+ * 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.
+ *
+ */
+
+#include "contiki.h"
+#include "contiki-lib.h"
+#include "contiki-net.h"
+#include "net/ip/uip.h"
+#include "net/rpl/rpl.h"
+
+#include "net/netstack.h"
+#include "dev/button-sensor.h"
+#include "dev/leds.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#define DEBUG DEBUG_PRINT
+#include "net/ip/uip-debug.h"
+
+#define UIP_IP_BUF   ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
+
+#define UDP_CLIENT_PORT	8765
+#define UDP_SERVER_PORT	5678
+
+#define UDP_EXAMPLE_ID  190
+
+static struct uip_udp_conn *server_conn;
+
+PROCESS(udp_server_process, "UDP server process");
+AUTOSTART_PROCESSES(&udp_server_process);
+/*---------------------------------------------------------------------------*/
+static void
+tcpip_handler(void)
+{
+  char *appdata;
+
+  if(uip_newdata()) {
+
+    leds_on(LEDS_RED);
+
+    appdata = (char *)uip_appdata;
+    appdata[uip_datalen()] = 0;
+    PRINTF("Report RX '%s' from ", appdata);
+    PRINTF("%d",
+           UIP_IP_BUF->srcipaddr.u8[sizeof(UIP_IP_BUF->srcipaddr.u8) - 1]);
+    PRINTF("\n");
+#if SERVER_REPLY
+    PRINTF("DATA sending reply\n");
+    uip_ipaddr_copy(&server_conn->ripaddr, &UIP_IP_BUF->srcipaddr);
+    uip_udp_packet_send(server_conn, "Reply", sizeof("Reply"));
+    uip_create_unspecified(&server_conn->ripaddr);
+#endif
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+print_local_addresses(void)
+{
+  int i;
+  uint8_t state;
+
+  PRINTF("Server IPv6 addresses: ");
+  for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
+    state = uip_ds6_if.addr_list[i].state;
+    if(state == ADDR_TENTATIVE || state == ADDR_PREFERRED) {
+      PRINT6ADDR(&uip_ds6_if.addr_list[i].ipaddr);
+      PRINTF("\n");
+      /* hack to make address "final" */
+      if (state == ADDR_TENTATIVE) {
+	uip_ds6_if.addr_list[i].state = ADDR_PREFERRED;
+      }
+    }
+  }
+}
+
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(udp_server_process, ev, data)
+{
+  uip_ipaddr_t ipaddr;
+  struct uip_ds6_addr *root_if;
+
+  PROCESS_BEGIN();
+
+  PROCESS_PAUSE();
+
+  SENSORS_ACTIVATE(button_sensor);
+
+  leds_init();
+  PRINTF("UDP server started\n");
+
+
+#if UIP_CONF_ROUTER
+/* The choice of server address determines its 6LoPAN header compression.
+ * Obviously the choice made here must also be selected in udp-client.c.
+ *
+ * For correct Wireshark decoding using a sniffer, add the /64 prefix to the 6LowPAN protocol preferences,
+ * e.g. set Context 0 to aaaa::.  At present Wireshark copies Context/128 and then overwrites it.
+ * (Setting Context 0 to aaaa::1111:2222:3333:4444 will report a 16 bit compressed address of aaaa::1111:22ff:fe33:xxxx)
+ * Note Wireshark's IPCMV6 checksum verification depends on the correct uncompressed addresses.
+ */
+ 
+#if 0
+/* Mode 1 - 64 bits inline */
+   uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1);
+#elif 1
+/* Mode 2 - 16 bits inline */
+  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
+#else
+/* Mode 3 - derived from link local (MAC) address */
+  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
+#endif
+
+  uip_ds6_addr_add(&ipaddr, 0, ADDR_MANUAL);
+  root_if = uip_ds6_addr_lookup(&ipaddr);
+  if(root_if != NULL) {
+    rpl_dag_t *dag;
+    dag = rpl_set_root(RPL_DEFAULT_INSTANCE,(uip_ip6addr_t *)&ipaddr);
+    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    rpl_set_prefix(dag, &ipaddr, 64);
+    PRINTF("created a new RPL dag\n");
+  } else {
+    PRINTF("failed to create a new RPL DAG\n");
+  }
+#endif /* UIP_CONF_ROUTER */
+  
+  print_local_addresses();
+
+  /* The data sink runs with a 100% duty cycle in order to ensure high 
+     packet reception rates. */
+  //NETSTACK_MAC.off(1);
+
+  server_conn = udp_new(NULL, UIP_HTONS(UDP_CLIENT_PORT), NULL);
+  if(server_conn == NULL) {
+    PRINTF("No UDP connection available, exiting the process!\n");
+    PROCESS_EXIT();
+  }
+  udp_bind(server_conn, UIP_HTONS(UDP_SERVER_PORT));
+
+  PRINTF("Created a server connection with remote address ");
+  PRINT6ADDR(&server_conn->ripaddr);
+  PRINTF(" local/remote port %u/%u\n", UIP_HTONS(server_conn->lport),
+         UIP_HTONS(server_conn->rport));
+
+  while(1) {
+    PROCESS_YIELD();
+    if(ev == tcpip_event) {
+      tcpip_handler();
+    } else if (ev == sensors_event && data == &button_sensor) {
+      PRINTF("Initiaing global repair\n");
+      rpl_repair_root(RPL_DEFAULT_INSTANCE);
+    }
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
diff --git a/platform/avr-rss2/examples/ipv6/sensd_client/Makefile b/platform/avr-rss2/examples/ipv6/sensd_client/Makefile
new file mode 100644
index 000000000..c0eabf9b0
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/sensd_client/Makefile
@@ -0,0 +1,12 @@
+
+CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
+
+all: sensd_client server
+CONTIKI=../../../../..
+
+ifdef PERIOD
+CFLAGS+=-DPERIOD=$(PERIOD)
+endif
+
+CONTIKI_WITH_IPV6 = 1
+include $(CONTIKI)/Makefile.include
diff --git a/platform/avr-rss2/examples/ipv6/sensd_client/README.md b/platform/avr-rss2/examples/ipv6/sensd_client/README.md
new file mode 100644
index 000000000..17beb02f3
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/sensd_client/README.md
@@ -0,0 +1,222 @@
+Contiki client for sensd
+========================
+
+Sensd README describes the concept. sensd  code is on github.
+
+
+sensd - A WSN Internet GW, hub, agent, proxy & cloud
+====================================================
+
+Authors
+--------
+Robert Olsson <robert@radio-sensors.com>
+Jens Laas <jens.laas@uadm.uu.se>
+
+Contributors
+------------
+
+Abstract 
+--------
+We've outlined, designed and implemented and very simple concept for WSN 
+data sharing, including data collection, storage and retrieval using 
+standard text tools. The concept restricts Internet access to WSN 
+motes and acts agent not to expose motes directly for robustness and 
+security reasons. Low level, physical or link WSN protocol can be used. 
+including  6lowpan, RIME etc and any type of Radio Duty Cycling (RDC). 
+sensd works on the application layer.  A TCP connection initiates an 
+implicit "subscribe". The M2P model is currently supported.
+
+Key concepts
+------------
+
+* Agent. sensd works as an agent and does not allow direct Internet
+  access to motes. Recall motes are constrained in most aspects and 
+  can not support many connections, has weak security etc.
+
+* Hub. Share the data from the root or sink node over TCP. In effect sensor 
+  data can be sent over Internet to be shared over among TCP active listeners. 
+  The TCP connection initiates an implicit "subscribe".
+
+* Proxy. The support proxy functions over ipv4 and well as ipv6. Sensd can 
+  forward to a proxy on a public IP. The typical case is when GW is behind 
+  a NAT.
+ 
+* WSN RP "rendez-vous point". A concepts where data from various WSN nets  
+  are merged. This models a "cloud service" functionality for WSN networks. 
+  sensd can be used both to forward data to RP. It can also work as the RP.
+  RP receiving WSN data and allowing multiple TCP listeners.
+
+* All programs are written C, script in Java and bash. Designed for small
+  footprint and with minimal dependencies. sensd runs on Raspberry Pi and 
+  Openwrt.
+
+* This work introduces a simple tag format for sensor data. The overall
+  idea is that data tagging is an "agreement" between producers and consumer. 
+  Tags are simple are description of the data. Example T=25.2. where T=
+  is the tag 25.2 the value. Most likely this a temperature. But we 
+  can't be sure since we don't know since this is an agreement between 
+  the producer and the consumer. Tags are also used for identification.
+  Example tags, E64= Where globally unique ID can used. Another more 
+  relaxed example is TXT=  a user description. See docs.
+
+* Geotagging and timestamping is supported via tags.
+
+* Ecosystem support. There are telphone apps to for data monitoring and
+  and plotting. Android app can act as WSN-agent and forward to proxy/RP.
+
+* The concept also includes a mapping to URI (Unified Resource Identifier) 
+  to form a WSN caching server similar to CoAP using http-proxy.
+
+* Copyright. Open-Source via GPL. Projecet used github.com
+
+
+Introduction
+------------
+
+This is collection of software to implement data monitoring and data collection
+from WSN Wireless Sensor Networks. The goal is to have a very simple,
+straight-forward and robust framework.
+
+The scenario: One or several motes is connected to USB or serial port to gather
+received information from connected WSN motes. Data can be visualized in
+several ways.
+
+*  Sensor data report can be transmitted and propagated throughout the
+   Internet. sensd acts as server and sends incoming report to active
+   listeners.
+
+*  Data is kept in ASCII with tagging and ID information. Data is conveniently
+   handled, copied and viewed with standard text utilities of your OS.
+
+*  Last mote report is cached into the file system suitable for URI use. The
+   Format is SID/TAG. Typical tags are EUI64 and unique serial numbers. The
+   different TAGS are left for mote user to define. Although the TAGS used in
+   our example setup are included in this draft for example purposes.
+
+
+Both formats can easily be stored or linked directly in web tree to form a
+URI to format WSN logging/datafile or caching service.
+
+A daemon that reads WSN mote reports from USB/serial and stores data in a ASCII
+data file. Default is located at _/var/log/sensors.dat_
+
+Addtional components
+--------------------
+
+* seltag [More info] (https://github.com/herjulf/sensd/blob/master/seltag/README.md)
+
+* js A set of Java-scripts can plot, print and visualize sensor data from 
+  sensd directly in your web-browser.
+
+* documentation and sample files.  [More info] (https://github.com/herjulf/sensd/blob/master/seltag/README.md)
+
+* Read Sensors Android app.  [Source Code] (https://github.com/herjulf/Read-Sensors)
+
+
+Datafile logging
+----------------
+
+Below is and example of the anatomy of a sensors.dat file we are currently using in our WSN
+data collection networks.
+
+	2012-05-22 14:07:46 UT=1337688466 ID=283c0cdd030000d7 PS=0 T=30.56  T_MCU=34.6  V_MCU=3.08 UP=2C15C V_IN=4.66
+
+	2012-05-22 14:11:41 UT=1337688701 ID=28a9d5dc030000af PS=0 T=36.00  V_MCU=2.92 UP=12C8A0 RH=42.0 V_IN=4.13  V_A1=3.43  [ADDR=0.175 SEQ=33 RSSI=21 LQI=255 DRP=1.00]
+
+Each line is a mote report. They start with date and time and are followed by a set of
+tags. The tags is different for different motes. In other words they can
+send different data. Essential is the ID which should be unique for each mote.
+
+The information with brackets is information generated by the receiving mote
+and is not a part the motes data. Typically RSSI (Receiver Signal Strength
+Indicator) and LQI (Link Quality Indicator)
+
+
+Internet sensor data
+--------------------
+
+Start sensd with the `-report` option. This enables reports to be transmitted
+over IP to remote listeners. Default TCP port 1234.
+
+Server side example:
+
+	sensd -report -p 1234  -D /dev/ttyUSB0
+
+Client side. Example using netcat:
+
+	nc server-ip 1234
+
+URI format
+----------
+
+URI (Unified Resource Identifier) displays the node ID and the tags in a file tree.
+It is easy to export this into a web tree to form a URI similar to a CoAP gateway.
+
+Example: In our case we have a unique sensor ID followed by the different data
+fields represented by "tags".
+
+	/tmp/WSN1-GW1/281a98d20200004a:
+	DRP  ID  LQI  PS  RH  RSSI  SEQ  T  V_IN  V_MCU  ADDR
+
+	/tmp/WSN1-GW1/28be51ce02000031:
+	DRP  ID  LQI  PS  RH  RSSI  SEQ  T  UP  V_IN  V_MCU  ADDR
+
+Read Temp from a sensor:
+
+	cat /tmp/WSN1-GW1/281a98d20200004a/T
+	19.44
+
+And it's very easy to link this tree into a web-server.
+
+GPS support
+-----------
+
+Positioning support has been added via GPS device connected to serial
+or USB port. Tags added when enabled GWGPS_LON & GWGPS_LAT.
+GPS code from. https://github.com/herjulf/gps_simple
+
+Getting the source and building
+-------------------------------
+
+Code is stored in github. Typically procedure below is the very straight-
+forward unix way:
+
+	git clone http://github.com/herjulf/sensd
+	cd sensd
+	make
+
+Put your binaries after your preference:
+
+Pre-built binary versions
+--------------------------
+
+For x86:
+Sensd and friends are available in Bifrost/Linux packages. Those packages are
+statically linked and can be used on most x86 Linuxes. 32-bit compiled.
+
+http://ftp.sunet.se/pub/Linux/distributions/bifrost/download/opt/opt-sensd-2.3-1.tar.gz
+
+
+Use
+---
+
+The WSN data logging and caching concept is in actual use with Contiki, RIME
+broadcast application.
+
+Tips
+----
+
+One can use netcat to listen to reports:
+
+Example:
+
+	nc radio-sensors.com 1235
+
+To save in file use nohup:
+
+	nohup nc radio-sensors.com 1235 > /var/log/sensors.dat
+
+As sensd used TCP and ASCII encoding. tetlnet and web-browsers can be used
+as well.
+
+
diff --git a/platform/avr-rss2/examples/ipv6/sensd_client/project-conf.h b/platform/avr-rss2/examples/ipv6/sensd_client/project-conf.h
new file mode 100644
index 000000000..b004c6335
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/sensd_client/project-conf.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2015, RAdio Sensors AB, Uppsala Sweden
+ * 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
+ *         Project specific configuration defines for example
+ *
+ * \author
+ *         Robert Olsson <robert@radio-sensors.com>
+ */
+
+#ifndef PROJECT_CONF_H_
+#define PROJECT_CONF_H_
+
+#define NETSTACK_CONF_RDC nullrdc_driver
+#define NETSTACK_CONF_MAC nullmac_driver
+
+//#define NETSTACK_CONF_MAC         csma_driver
+//#define NETSTACK_CONF_RDC         contikimac_driver
+//#define NETSTACK_CONF_FRAMER      framer_802154
+//#define NETSTACK_CONF_RADIO       rf230_driver
+
+#endif /* PROJECT_CONF_H_ */
diff --git a/platform/avr-rss2/examples/ipv6/sensd_client/sensd_client.c b/platform/avr-rss2/examples/ipv6/sensd_client/sensd_client.c
new file mode 100644
index 000000000..b523e87c4
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/sensd_client/sensd_client.c
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2015, Copyright  Robert Olsson / Radio Sensors AB  
+ * 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.
+ *
+ *
+ * Author  : Robert Olsson robert@radio-sensors.com
+ * Created : 2015-12-28
+ */
+
+/**
+ * \file
+ *         A simple application reporting sensor data. Can be sensd
+ */
+
+#include <string.h>
+#include "contiki-net.h"
+#include "leds.h"
+#include "dev/leds.h"
+#include "dev/battery-sensor.h"
+#include "dev/temp_mcu-sensor.h"
+#include "dev/light-sensor.h"
+#ifdef CO2
+#include "dev/co2_sa_kxx-sensor.h"
+#endif
+
+#ifndef PERIOD
+#define PERIOD 10
+#endif
+
+#define REPORT_INTERVAL	 (PERIOD * CLOCK_SECOND)
+
+#define DEBUG DEBUG_PRINT
+#include "uip-debug.h"
+
+#define PORT 1236
+#define MAX_PAYLOAD_LEN 80
+
+static struct psock ps;
+static uint8_t out_buf[MAX_PAYLOAD_LEN];
+static char  in_buffer[MAX_PAYLOAD_LEN];
+static int i;
+static int send_now;
+static clock_time_t report_interval = REPORT_INTERVAL;
+static uint8_t state;
+static uip_ipaddr_t addr;
+static struct timer t, t1;
+static struct etimer et, et1;
+
+PROCESS(sensd_client_process, "sensd TCP client process");
+PROCESS(report_timer_process, "report pacemaker");
+AUTOSTART_PROCESSES
+(&sensd_client_process,&report_timer_process);
+
+static int
+do_report(void)
+{
+  static int seq_id;
+  int len = 0;
+  
+  seq_id++;
+  len += snprintf((char *) &out_buf[len], sizeof(out_buf), "&: ");
+  len += snprintf((char *) &out_buf[len], sizeof(out_buf), "TXT=6LOWPAN ");
+  len += snprintf((char *) &out_buf[len], sizeof(out_buf), "TARGET=avr-rss2 ");
+  len += snprintf((char *) &out_buf[len], sizeof(out_buf), "V_MCU=%-d ", battery_sensor.value(0));
+  len += snprintf((char *) &out_buf[len], sizeof(out_buf), "T_MCU=%-d ", temp_mcu_sensor.value(0));
+  len += snprintf((char *) &out_buf[len], sizeof(out_buf), "LIGHT=%-d ", light_sensor.value(0));
+#ifdef CO2
+  len += snprintf((char *) &out_buf[len], sizeof(out_buf), "CO2=%-d ", co2_sa_kxx_sensor.value(value));
+#endif
+  len += snprintf((char *) &out_buf[len], sizeof(out_buf), "\n\r");
+
+  return len;
+}
+
+static void
+print_local_addresses(void)
+{
+  PRINTF("Server IPv6 addresses:\n\r");
+  for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
+    state = uip_ds6_if.addr_list[i].state;
+    if(uip_ds6_if.addr_list[i].isused &&
+       (state == ADDR_TENTATIVE || state == ADDR_PREFERRED)) {
+      PRINT6ADDR(&uip_ds6_if.addr_list[i].ipaddr);
+      PRINTF("\n\r");
+    }
+  }
+}
+
+static void
+set_global_address(void)
+{
+  uip_ipaddr_t ipaddr;
+  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
+  uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
+}
+
+static int handle_connection(struct psock *p, long ts) {
+  PSOCK_BEGIN(p);
+  if(send_now) {
+    do_report();
+    leds_on(LEDS_YELLOW);
+    PSOCK_SEND(p, (const uint8_t *)  out_buf, strlen((const char *) out_buf));
+    send_now = 0;
+  }
+  PSOCK_END(p);
+}
+
+PROCESS_THREAD(report_timer_process, ev, data) {
+  PROCESS_BEGIN();
+  while(1) {
+    timer_set(&t1, report_interval);
+    etimer_set(&et1, timer_remaining(&t1));	
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et1));	
+    send_now = 1;
+    leds_on(LEDS_RED);
+  }
+  PROCESS_END();
+}
+
+PROCESS_THREAD(sensd_client_process, ev, data) {
+  PROCESS_BEGIN();
+
+  set_global_address();
+  leds_init();
+  print_local_addresses();
+  printf("Starting TCP client on port=%d\n", PORT);
+
+  /* Set server address. typically sensd */
+  //uip_ip6addr(&addr, 0xfe80, 0, 0, 0, 0xfec2, 0x3d00, 1, 0x63ae);
+  uip_ip6addr(&addr, 0x0000, 0, 0, 0, 0, 0xffff, 0xc0a8, 0x0201);
+  //uip_ip6addr(&addr, 0x0000, 0, 0, 0, 0, 0xffff, 0xc0a8, 0x0255);
+
+  random_init(50);
+
+  while(1) {
+
+    /* Delay connection attempts */
+    timer_set(&t, 2*CLOCK_SECOND);
+    etimer_set(&et, timer_remaining(&t));		
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+
+    /* Time out teh actual connection attempt */
+    timer_set(&t, 10*CLOCK_SECOND);
+    printf("Connecting");
+    tcp_connect(&addr, UIP_HTONS(PORT), NULL);
+    PROCESS_WAIT_EVENT_UNTIL(ev == tcpip_event);
+
+    if(uip_aborted() || uip_timedout() || uip_closed()) {
+      printf(" Failed\n");
+    } else if(uip_connected()) {
+      printf(" Success\n");
+      PSOCK_INIT(&ps, (uint8_t *)in_buffer, sizeof(in_buffer));
+      do {
+	handle_connection(&ps, clock_seconds());
+	PROCESS_WAIT_EVENT_UNTIL(ev == tcpip_event);
+      } while(!(uip_closed() || uip_aborted() || uip_timedout()));
+      printf("Disconnected\n");
+    }
+  }
+  PROCESS_END();
+}
diff --git a/platform/avr-rss2/examples/ipv6/sensd_client/server.c b/platform/avr-rss2/examples/ipv6/sensd_client/server.c
new file mode 100644
index 000000000..c2dea4514
--- /dev/null
+++ b/platform/avr-rss2/examples/ipv6/sensd_client/server.c
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2015, Copyright  Robert Olsson / Radio Sensors AB  
+ * 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.
+ *
+ *
+ * Author  : Robert Olsson robert@radio-sensors.com
+ * Created : 2015-12-28
+ */
+
+/**
+ * \file
+ *         A simple TCP server for client app.
+ */
+
+#include <string.h>
+#include "contiki-net.h"
+#include "leds.h"
+
+#define DEBUG DEBUG_PRINT
+#include "uip-debug.h"
+
+#define PORT 1236
+
+static struct psock ps;
+static uint8_t buf[120];
+static int i;
+static uint8_t state;
+
+static void
+print_local_addresses(void)
+{
+  PRINTF("Server IPv6 addresses:\n\r");
+  for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
+    state = uip_ds6_if.addr_list[i].state;
+    if(uip_ds6_if.addr_list[i].isused &&
+       (state == ADDR_TENTATIVE || state == ADDR_PREFERRED)) {
+      PRINT6ADDR(&uip_ds6_if.addr_list[i].ipaddr);
+      PRINTF("\n\r");
+    }
+  }
+}
+
+static void
+set_global_address(void)
+{
+  uip_ipaddr_t ipaddr;
+  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
+  uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
+}
+
+static
+PT_THREAD(handle_connection(struct psock *p))
+{
+  PSOCK_BEGIN(p);
+  //PSOCK_SEND_STR(p, "Type something!\n");
+  leds_on(LEDS_RED);
+  PSOCK_READTO(p, '\n');
+  printf("RX=%s", buf);
+  //PSOCK_SEND_STR(p, "Got: ");
+  //PSOCK_SEND(p, buf, PSOCK_DATALEN(p));
+  //PSOCK_SEND_STR(p, "EOL\r\n");
+  //PSOCK_CLOSE(p);
+  PSOCK_END(p);
+}
+
+PROCESS(server_process, "Server");
+AUTOSTART_PROCESSES(&server_process);
+
+PROCESS_THREAD(server_process, ev, data)
+{
+  PROCESS_BEGIN();
+
+  set_global_address();
+  leds_init();
+  print_local_addresses();
+  printf("Starting TCP server on port=%d\n", PORT);
+  tcp_listen(UIP_HTONS(PORT));
+
+  while(1) {
+    PROCESS_WAIT_EVENT_UNTIL(ev == tcpip_event);
+
+    if(uip_aborted() )
+	printf("TCP aborted\n");
+    if(uip_timedout() )
+	printf("TCP timeoutn\n");
+    if(uip_closed() )
+	printf("TCP closed\n");
+
+    if(uip_connected()) {
+      printf("TCP Connected\n\r");
+      PSOCK_INIT(&ps, buf, sizeof(buf));
+
+      while(!(uip_aborted() || uip_closed() || uip_timedout())) {
+	PROCESS_WAIT_EVENT_UNTIL(ev == tcpip_event);
+	handle_connection(&ps);
+      }
+    }
+  }
+  PROCESS_END();
+}
+
diff --git a/platform/avr-rss2/ip64-conf.h b/platform/avr-rss2/ip64-conf.h
new file mode 100644
index 000000000..26c51a55f
--- /dev/null
+++ b/platform/avr-rss2/ip64-conf.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2012, Thingsquare, http://www.thingsquare.com/.
+ * 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 copyright holder 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 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 HOLDER 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 IP64_CONF_H
+#define IP64_CONF_H
+
+#include "net/ip64/ip64-eth-interface.h"
+#include "dev/enc28j60/enc28j60-ip64-driver.h"
+#define IP64_CONF_UIP_FALLBACK_INTERFACE ip64_eth_interface
+#define IP64_CONF_INPUT                  ip64_eth_interface_input
+#define IP64_CONF_DHCP                   1
+#define IP64_CONF_ETH_DRIVER             enc28j60_ip64_driver
+
+#endif /* IP64_CONF_H */
diff --git a/platform/avr-rss2/params.c b/platform/avr-rss2/params.c
new file mode 100644
index 000000000..f2ae2abfc
--- /dev/null
+++ b/platform/avr-rss2/params.c
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 2011, 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.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ */
+#define PRINTF(FORMAT, args ...) printf_P(PSTR(FORMAT),##args)
+
+#define DEBUG 1
+#if DEBUG
+#define PRINTD(FORMAT, args ...) printf_P(PSTR(FORMAT),##args)
+#else
+#define PRINTD(...)
+#endif
+
+#include "contiki.h"
+#include <avr/pgmspace.h>
+#include <avr/eeprom.h>
+#include <stdio.h>
+#include <string.h>
+
+#if AVR_WEBSERVER
+/* #include "httpd-fs.h" */
+/* #include "httpd-cgi.h" */
+#endif
+
+#include "contiki-net.h"
+#include "params.h"
+
+#if CONTIKI_CONF_RANDOM_MAC
+extern uint8_t rng_get_uint8(void);
+static void
+generate_new_eui64(uint8_t eui64[8])
+{
+  eui64[0] = 0x02;
+  eui64[1] = rng_get_uint8();
+  eui64[2] = rng_get_uint8();
+  eui64[3] = 0xFF;
+  eui64[4] = 0xFE;
+  eui64[5] = rng_get_uint8();
+  eui64[6] = rng_get_uint8();
+  eui64[7] = rng_get_uint8();
+}
+#endif
+
+#if AVR_WEBSERVER
+/* Webserver builds can set these in httpd-fsdata.c via makefsdata.h */
+extern uint8_t default_mac_address[8];
+extern uint8_t default_server_name[16];
+extern uint8_t default_domain_name[30];
+#else
+const uint8_t default_mac_address[8] PROGMEM = PARAMS_EUI64ADDR;
+const uint8_t default_server_name[] PROGMEM = PARAMS_SERVERNAME;
+const uint8_t default_domain_name[] PROGMEM = PARAMS_DOMAINNAME;
+#endif
+
+#if PARAMETER_STORAGE == 0
+/* 0 Hard coded, minmal program and eeprom usage. */
+uint8_t
+params_get_eui64(uint8_t *eui64)
+{
+#if CONTIKI_CONF_RANDOM_MAC
+  PRINTD("Generating random EUI64 MAC\n");
+  generate_new_eui64(eui64);
+  return 1;
+#else
+  uint8_t i;
+  for(i = 0; i < sizeof(default_mac_address); i++) {
+    eui64[i] = pgm_read_byte_near(default_mac_address + i);
+  }
+  return 0;
+#endif
+}
+#elif PARAMETER_STORAGE == 1
+/* 1 Stored in fixed eeprom locations, rewritten from flash if corrupt.
+ * They can be manually changed and kept over program reflash.
+ * The channel and bit complement are used to check EEMEM integrity,
+ * If corrupt all values will be rewritten with the default flash values.
+ * To make this work, get the channel before anything else.
+ */
+#if !AVR_WEBSERVER
+uint8_t eemem_mac_address[] EEMEM = PARAMS_EUI64ADDR;
+uint8_t eemem_server_name[] EEMEM = PARAMS_SERVERNAME;
+uint8_t eemem_domain_name[] EEMEM = PARAMS_DOMAINNAME;
+#endif /*AVR_WEBSERVER */
+
+uint16_t eemem_nodeid EEMEM = PARAMS_NODEID;
+uint8_t eemem_channel[2] EEMEM = { PARAMS_CHANNEL, ~PARAMS_CHANNEL };
+uint16_t eemem_panid EEMEM = PARAMS_PANID;
+uint16_t eemem_panaddr EEMEM = PARAMS_PANADDR;
+uint8_t eemem_txpower EEMEM = PARAMS_TXPOWER;
+
+#if CONTIKI_CONF_RANDOM_MAC
+static uint8_t randomeui64;
+#endif
+
+uint8_t
+params_get_channel(void)
+{
+  uint8_t x[2];
+  *(uint16_t *)x = eeprom_read_word((uint16_t *)&eemem_channel);
+/* Don't return an invalid channel number */
+  if((x[0] < 11) || (x[0] > 26)) {
+    x[1] = x[0];
+  }
+/* Do exclusive or test on the two values read */
+  if((uint8_t)x[0] != (uint8_t) ~x[1]) { /* ~x[1] can promote comparison to 16 bit */
+/* Verification fails, rewrite everything */
+    uint8_t i, buffer[32];
+    PRINTD("EEPROM is corrupt, rewriting with defaults.\n");
+#if CONTIKI_CONF_RANDOM_MAC
+    PRINTD("Generating random EUI64 MAC\n");
+    generate_new_eui64(&buffer);
+    randomeui64 = 1;
+#else
+    for(i = 0; i < sizeof(default_mac_address); i++) {
+      buffer[i] = pgm_read_byte_near(default_mac_address + i);
+    }
+#endif
+/* eeprom_write_block should not be interrupted */
+    cli();
+    eeprom_write_block(&buffer, &eemem_mac_address, sizeof(eemem_mac_address));
+    for(i = 0; i < sizeof(default_server_name); i++) {
+      buffer[i] = pgm_read_byte_near(default_server_name + i);
+    }
+    eeprom_write_block(&buffer, &eemem_server_name, sizeof(eemem_server_name));
+    for(i = 0; i < sizeof(default_domain_name); i++) {
+      buffer[i] = pgm_read_byte_near(default_domain_name + i);
+    }
+    eeprom_write_block(&buffer, &eemem_domain_name, sizeof(eemem_domain_name));
+    eeprom_write_word(&eemem_panid, PARAMS_PANID);
+    eeprom_write_word(&eemem_panaddr, PARAMS_PANADDR);
+    eeprom_write_byte(&eemem_txpower, PARAMS_TXPOWER);
+    eeprom_write_word(&eemem_nodeid, PARAMS_NODEID);
+    x[0] = PARAMS_CHANNEL;
+    x[1] = ~x[0];
+    eeprom_write_word((uint16_t *)&eemem_channel, *(uint16_t *)x);
+    sei();
+  }
+/* Always returns a valid channel */
+  return x[0];
+}
+uint8_t
+params_get_eui64(uint8_t *eui64)
+{
+  cli();
+  eeprom_read_block((void *)eui64, &eemem_mac_address, sizeof(linkaddr_t));
+  sei();
+#if CONTIKI_CONF_RANDOM_MAC
+  return randomeui64;
+#else
+  return 0;
+#endif
+}
+uint16_t
+params_get_panid(void)
+{
+  return eeprom_read_word(&eemem_panid);
+}
+uint16_t
+params_get_panaddr(void)
+{
+  return eeprom_read_word(&eemem_panaddr);
+}
+uint8_t
+params_get_txpower(void)
+{
+  return eeprom_read_byte(&eemem_txpower);
+}
+#else /* CONTIKI_CONF_SETTINGS_MANAGER */
+
+uint8_t
+params_get_channel()
+{
+  uint8_t x;
+  size_t size = 1;
+  if(settings_get(SETTINGS_KEY_CHANNEL, 0, (unsigned char *)&x, &size) == SETTINGS_STATUS_OK) {
+    PRINTD("<-Get RF channel %u\n", x);
+  } else {
+    x = PARAMS_CHANNEL;
+    if(settings_add_uint8(SETTINGS_KEY_CHANNEL, x) == SETTINGS_STATUS_OK) {
+      PRINTD("->Set EEPROM RF channel to %d\n", x);
+    }
+  }
+  return x;
+}
+uint8_t
+params_get_eui64(uint8_t *eui64)
+{
+  size_t size = sizeof(linkaddr_t);
+  if(settings_get(SETTINGS_KEY_EUI64, 0, (unsigned char *)eui64, &size) == SETTINGS_STATUS_OK) {
+    PRINTD("<-Get EUI64 MAC\n");
+    return 0;
+  }
+#if CONTIKI_CONF_RANDOM_MAC
+  PRINTD("Generating random EUI64 MAC\n");
+  generate_new_eui64(eui64);
+#else
+  { uint8_t i;
+    for(i = 0; i < 8; i++) {
+      eui64[i] = pgm_read_byte_near(default_mac_address + i);
+    }
+  }                                                                                   /* test this */
+#endif
+  if(settings_add(SETTINGS_KEY_EUI64, (unsigned char *)eui64, 8) == SETTINGS_STATUS_OK) {
+    PRINTD("->Set EEPROM MAC address\n");
+  }
+#if CONTIKI_CONF_RANDOM_MAC
+  return 1;
+#else
+  return 0;
+#endif
+}
+uint16_t
+params_get_panid(void)
+{
+  uint16_t x;
+  size_t size = 2;
+  if(settings_get(SETTINGS_KEY_PAN_ID, 0, (unsigned char *)&x, &size) == SETTINGS_STATUS_OK) {
+    PRINTD("<-Get PAN ID of %04x\n", x);
+  } else {
+    x = PARAMS_PANID;
+    if(settings_add_uint16(SETTINGS_KEY_PAN_ID, x) == SETTINGS_STATUS_OK) {
+      PRINTD("->Set EEPROM PAN ID to %04x\n", x);
+    }
+  }
+  return x;
+}
+uint16_t
+params_get_panaddr(void)
+{
+  uint16_t x;
+  size_t size = 2;
+  if(settings_get(SETTINGS_KEY_PAN_ADDR, 0, (unsigned char *)&x, &size) == SETTINGS_STATUS_OK) {
+    PRINTD("<-Get PAN address of %04x\n", x);
+  } else {
+    x = PARAMS_PANADDR;
+    if(settings_add_uint16(SETTINGS_KEY_PAN_ADDR, x) == SETTINGS_STATUS_OK) {
+      PRINTD("->Set EEPROM PAN address to %04x\n", x);
+    }
+  }
+  return x;
+}
+uint8_t
+params_get_txpower(void)
+{
+  uint8_t x;
+  size_t size = 1;
+  if(settings_get(SETTINGS_KEY_TXPOWER, 0, (unsigned char *)&x, &size) == SETTINGS_STATUS_OK) {
+    PRINTD("<-Get tx power of %d (0=max)\n", x);
+  } else {
+    x = PARAMS_TXPOWER;
+    if(settings_add_uint8(SETTINGS_KEY_TXPOWER, x) == SETTINGS_STATUS_OK) {
+      PRINTD("->Set EEPROM tx power of %d (0=max)\n", x);
+    }
+  }
+  return x;
+}
+#endif /* CONTIKI_CONF_SETTINGS_MANAGER */
diff --git a/platform/avr-rss2/params.h b/platform/avr-rss2/params.h
new file mode 100644
index 000000000..95150333b
--- /dev/null
+++ b/platform/avr-rss2/params.h
@@ -0,0 +1,108 @@
+#ifndef __PARAMS_H__
+#define __PARAMS_H__
+/* PARAMETER_STORAGE =
+ * 0 Hard coded, minmal program and eeprom usage.
+ * 1 Stored in fixed eeprom locations, rewritten from flash if corrupt.
+ *   This allows parameter changes using a hardware programmer or custom application code.
+ *   Corruption test is based on channel verify so get the channel before anything else!
+ * 2 Obtained from eeprom using the general settings manager and read from program flash if not present.
+ *   Useful for for testing builds without wearing out flash memory.
+ * 3 Obtained from eeprom using the settings manager and rewritten from flash if not present.
+ *   This ensures all parameters are present in upper eeprom flash.
+ *
+ * Note the parameters in this file can be changed without forcing a complete rebuild.
+ */
+#define CONTIKI_CONF_RANDOM_MAC 0        /* adds 78 bytes */
+#define CONTIKI_CONF_SETTINGS_MANAGER 0  /* adds 1696 bytes */
+
+#if CONTIKI_CONF_SETTINGS_MANAGER
+/* #define PARAMETER_STORAGE 2 */
+#define PARAMETER_STORAGE 2
+#else
+#define PARAMETER_STORAGE 1
+#endif
+
+/* Include settings.h, then dummy out the write routines */
+#include "settings.h"
+#if PARAMETER_STORAGE == 2
+#define settings_add(...) 0
+#define settings_add_uint8(...) 0
+#define settings_add_uint16(...) 0
+#endif
+
+#if AVR_WEBSERVER
+/* Webserver builds can set some defaults in httpd-fsdata.c via makefsdata.h */
+extern uint8_t eemem_mac_address[8];
+extern uint8_t eemem_server_name[16];
+extern uint8_t eemem_domain_name[30];
+#endif
+
+#ifdef SERVER_NAME
+#define PARAMS_SERVERNAME SERVER_NAME
+#else
+#define PARAMS_SERVERNAME "ATMEGA256rfr2"
+#endif
+#ifdef DOMAIN_NAME
+#define PARAMS_DOMAINNAME DOMAIN_NAME
+#else
+#define PARAMS_DOMAINNAME "localhost"
+#endif
+#ifdef NODE_ID
+#define PARAMS_NODEID NODE_ID
+#else
+#define PARAMS_NODEID 0
+#endif
+#ifdef CHANNEL_802_15_4
+#define PARAMS_CHANNEL CHANNEL_802_15_4
+#else
+#define PARAMS_CHANNEL 26
+#endif
+#ifdef IEEE802154_PANID
+#define PARAMS_PANID IEEE802154_PANID
+#else
+#define PARAMS_PANID 0xABCD
+#endif
+#ifdef IEEE802154_PANADDR
+#define PARAMS_PANADDR IEEE802154_PANADDR
+#else
+#define PARAMS_PANADDR 0
+#endif
+#ifdef RF230_MAX_TX_POWER
+#define PARAMS_TXPOWER RF230_MAX_TX_POWER
+#else
+#define PARAMS_TXPOWER 0
+#endif
+#ifdef EUI64_ADDRESS
+#define PARAMS_EUI64ADDR EUI64_ADDRESS
+#else
+/* This form of of EUI64 mac allows full 6LoWPAN header compression from mac address */
+#if UIP_CONF_LL_802154
+/* #define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN} */
+#define PARAMS_EUI64ADDR { 0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01 }
+#else
+/* #define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xff, 0xfe, 0xNN, 0xNN, 0xNN} */
+#define PARAMS_EUI64ADDR { 0x00, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01 }
+#endif
+/* This form of of EUI64 mac allows 16 bit 6LoWPAN header compression on multihops */
+/* #define PARAMS_EUI64ADDR {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0xNN, 0xNN} */
+#endif
+
+uint8_t params_get_eui64(uint8_t *eui64);
+#if PARAMETER_STORAGE == 0
+/* Hard coded program flash parameters */
+#define params_get_servername(...)
+#define params_get_nodeid(...) PARAMS_NODEID
+#define params_get_channel(...) PARAMS_CHANNEL
+#define params_get_panid(...) PARAMS_PANID
+#define params_get_panaddr(...) PARAMS_PANADDR
+#define params_get_txpower(...) PARAMS_TXPOWER
+#else
+/* Parameters stored in eeprom */
+uint16_t params_get_nodeid(void);
+uint8_t params_get_channel(void);
+uint16_t params_get_panid(void);
+uint16_t params_get_panaddr(void);
+uint8_t params_get_txpower(void);
+#endif
+
+#endif /* __PARAMS_H__ */
diff --git a/platform/avr-rss2/rss2.h b/platform/avr-rss2/rss2.h
new file mode 100644
index 000000000..46ade3822
--- /dev/null
+++ b/platform/avr-rss2/rss2.h
@@ -0,0 +1,36 @@
+
+/*
+   Pin assigments for Radio Sensors board revision 2.3
+   using MCU AtMega128rfa1
+ */
+
+#define ISP_1        PB1 /* SCK */
+#define ISP_2        PB2 /* MOSI */
+#define ISP_3        PB3 /* MISO */
+
+#define LED_YELLOW   PE3 /* 1k pullup to Vcc */
+#define LED_RED      PE4 /* 1k pullup to Vcc */
+#define USB_PWR      PB5 /* High if FTDI TTL-USB cable sources */
+#define P0           PD2 /* Pulse count input. Pullup via jumper */
+#define P1           PD3 /* Pulse count input via optional Comparator */
+#define PWR_1        PE7 /* Programmable power pin Vcc via P-FET */
+
+#define AV_IN        PF0 /* V_IN ADC input. 100k/1M volt. divider */
+#define A1           PF1 /* A1 ADC input. 100k/300k volt. divider */
+#define A2           PF2 /* A2 ADC input  100k/300k volt. divider */
+#define A3           PF3 /* Light sensor A3 ADC input  100k/100k volt. divider */
+#define A3_PWR       PF4 /* Light sensor power A3_PWR */
+
+#define RX0          PE0 /* RX UART0 -- FTDI TTL-USB cable */
+#define TX0          PE1 /* TX UART0 -- FTDI TTL-USB cable */
+
+#define OW_BUS_0     PD7 /* One-Wire bus w temp/ID Pulled Up. Separate Vcc */
+#define OW_BUS_1     PD6 /* One-Wire bus extra Pulled Up. Separate Vcc */
+
+/* AVR ISP standard connected */
+/* 16 MHz  xtal */
+/* RTC 32.768 Hz  xtal */
+
+/*Optional HIH610 connected on SPI */
+#define HUM_PWR      PE2 /* Power pin for HIH6130 also to ena. HIH 6130 Alarm mode */
+
diff --git a/platform/avr-rss2/slip_uart0.c b/platform/avr-rss2/slip_uart0.c
new file mode 100644
index 000000000..8f064f980
--- /dev/null
+++ b/platform/avr-rss2/slip_uart0.c
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2010, University of Colombo School of Computing
+ * 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
+ *         Machine dependent AVR SLIP routines for UART0.
+ * \author
+ *         Kasun Hewage <kasun.ch@gmail.com>
+ */
+
+#include <stdio.h>
+#include "contiki.h"
+#include "dev/rs232.h"
+#include "slip.h"
+
+/*---------------------------------------------------------------------------*/
+static int
+slip_putchar(char c, FILE *stream)
+{
+#define SLIP_END 0300
+  static char debug_frame = 0;
+
+  if(!debug_frame) {         /* Start of debug output */
+    slip_arch_writeb(SLIP_END);
+    slip_arch_writeb('\r'); /* Type debug line == '\r' */
+    debug_frame = 1;
+  }
+
+  slip_arch_writeb((unsigned char)c);
+
+  /*
+   * Line buffered output, a newline marks the end of debug output and
+   * implicitly flushes debug output.
+   */
+  if(c == '\n') {
+    slip_arch_writeb(SLIP_END);
+    debug_frame = 0;
+  }
+
+  return c;
+}
+/*---------------------------------------------------------------------------*/
+static FILE slip_stdout = FDEV_SETUP_STREAM(slip_putchar, NULL,
+                                            _FDEV_SETUP_WRITE);
+/*---------------------------------------------------------------------------*/
+void
+slip_arch_init(unsigned long ubr)
+{
+  rs232_set_input(SLIP_PORT, slip_input_byte);
+  stdout = &slip_stdout;
+}
+/*---------------------------------------------------------------------------*/
+/*
+   XXX:
+      Currently, the following function is in cpu/avr/dev/rs232.c file. this
+      should be moved to here from there hence this is a platform specific slip
+      related function.
+   void
+   slip_arch_writeb(unsigned char c)
+   {
+   rs232_send(RS232_PORT_0, c);
+   }
+ */

From 42e7a6a7e1f9427239e0916b9a8a021ccab4c663 Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Mon, 22 Feb 2016 20:50:49 +0100
Subject: [PATCH 042/393] Adding travis regression compile test for the
 avr-rss2 platform.

---
 .travis.yml                              |  7 ++++++-
 regression-tests/23-compile-avr/Makefile | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 regression-tests/23-compile-avr/Makefile

diff --git a/.travis.yml b/.travis.yml
index 3a035fd2e..f00dc2f9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,11 @@ before_script:
     msp430-gcc --version
 
   ## Install avr toolchain
-  - sudo apt-get -qq install gcc-avr avr-libc
+  - $WGET http://atiselsts.github.io/resources/avr-gcc-4.9.2-compiled.tar.bz2 &&
+    tar xjf avr-gcc*.tar.bz2 -C /tmp/ &&
+    sudo cp -f -r /tmp/avr-gcc/* /usr/local/ &&
+    rm -rf /tmp/avr-gcc avr-gcc*.tar.bz2 &&
+    avr-gcc --version
 
   ## Install 32-bit compatibility libraries
   - sudo apt-get -qq install libc6:i386 libgcc1:i386 gcc-4.6-base:i386
@@ -140,3 +144,4 @@ env:
   - BUILD_TYPE='compile-nxp-ports' BUILD_CATEGORY='compile' BUILD_ARCH='jn516x'
   - BUILD_TYPE='slip-radio' MAKE_TARGETS='cooja'
   - BUILD_TYPE='llsec' MAKE_TARGETS='cooja'
+  - BUILD_TYPE='compile-avr' BUILD_CATEGORY='compile' BUILD_ARCH='avr-rss2'
diff --git a/regression-tests/23-compile-avr/Makefile b/regression-tests/23-compile-avr/Makefile
new file mode 100644
index 000000000..0904e2f37
--- /dev/null
+++ b/regression-tests/23-compile-avr/Makefile
@@ -0,0 +1,15 @@
+EXAMPLESDIR=../..
+TOOLSDIR=../../tools
+
+# build avr-rss2 examples, covering IPv6, RPL, Rime, Nullrdc, Contikimac
+
+EXAMPLES = \
+platform/avr-rss2/examples/hello-sensors/avr-rss2 \
+platform/avr-rss2/examples/ipv6/rpl-udp-report/avr-rss2 \
+platform/avr-rss2/examples/ipv6/rpl-border-router/avr-rss2 \
+examples/ipv6/rpl-udp/avr-rss2 \
+examples/powertrace/avr-rss2 \
+examples/rime/avr-rss2
+TOOLS=
+
+include ../Makefile.compile-test

From d8f2129b17b0dbb7dbd184850b1565373f4ab44b Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Tue, 23 Feb 2016 11:28:50 +0200
Subject: [PATCH 043/393] avr-rss2 platform: Update README.md

---
 platform/avr-rss2/README.md | 100 ++++++++++++++++++------------------
 1 file changed, 51 insertions(+), 49 deletions(-)

diff --git a/platform/avr-rss2/README.md b/platform/avr-rss2/README.md
index 260a7d4bb..05d448fc6 100644
--- a/platform/avr-rss2/README.md
+++ b/platform/avr-rss2/README.md
@@ -7,15 +7,15 @@ The platform supports different AtMega-RF boards:
 * Based on MCU AtMega256RFR2
 * Based on MCU AtMega128RFA1 
 
-Boards looks the same. "Made in EU" labeled on the AtMega256RFR2 boards
+Boards all looks the same. AtMega256RFR2 boards are labeled with "Made in EU".
 The platform and CPU code, are common for both boards, can be found under 
-`$(CONTIKI)/platfrom/avr-rssa. The port was developed and tested with RSS2.
+`$(CONTIKI)/platfrom/avr-rssa`. The port was developed and tested with RSS2.
 This guide assumes that you have basic understanding of how to use the 
-command line and perform basic admin tasks on UNIX family OSs. You should'
+command line and perform basic admin tasks on UNIX family OSs. You should
 also have understanding about the Contiki OS design as well have C 
 programming skills.
 
-Boards Features
+Board Features
 ----------------
 * Chip Antenna. Supercardiod.
 * Robust radio performance. Up to 300 meter line-of-sight.
@@ -29,10 +29,9 @@ Boards Features
 * Standard. 6-pin TTL-USB header for FTDI cable for UART.
 * PCB formfactor for cheap project box G.40X IP54
 * Power/current:
-  ** RX ~10mA (Full RPC AtMegaXXRFR2). 
-  ** Sleep ~45uA @ 16MHz XTAL
-  ** Sleep ~15uA @  8MHz using internal oscillator
-
+  * RX ~10mA (Full RPC AtMegaXXRFR2). 
+  * Sleep ~45uA @ 16MHz XTAL
+  * Sleep ~15uA @  8MHz using internal oscillator
 * Preprogammed bootloader. 
 * CE certified by test institute.
 
@@ -56,33 +55,33 @@ Note. The native OS packages does not yet support the new
 AtMega256RfR2 MCU. 
 
 We'll use toolchain from Atmels web-site. You might also consider 
-Instant Contiki
+Instant Contiki.
 
 
-* For Linux.
-See http://www.atmel.com/tools/ATMELAVRTOOLCHAINFORLINUX.aspx
-Download the proper 8-bit platform 32 or 64 bit.
-Unpack unpack under /usr/local
-Also add to your search PATH. For example .bashrc add:
-export PATH=$PATH:/usr/local/avr8-gnu-toolchain-linux_x86/bin
-or
-export PATH=$PATH:/usr/local/avr8-gnu-toolchain-linux_x86_64/bin
+###### For Linux
 
-For flash programming you'll need avrdude. For OS using apt-get
-apt-get install avrdude
+1. See http://www.atmel.com/tools/ATMELAVRTOOLCHAINFORLINUX.aspx
+2. Download the proper 8-bit platform 32 or 64 bit.
+3. Unpack under `/usr/local`
+4. Add to your search PATH. For example add to `.bashrc`: `export PATH=$PATH:/usr/local/avr8-gnu-toolchain-linux_x86_64/bin` (for 64 bit systems) or `export PATH=$PATH:/usr/local/avr8-gnu-toolchain-linux_x86/bin` (for 32 birt systems).
+5. For flash programming you'll need `avrdude`. It can be installed with the command
+`apt-get install avrdude`
+
+###### For Windows
 
-* For Windows.
 Goes here
 
 Contiki build TARGET
 --------------------
-make TARGET=avr-rss2
+    make TARGET=avr-rss2
 
 For AtMega128RFR2 boards:
-make TARGET=avr-rss2 MCU=atmega128rfr2
+
+    make TARGET=avr-rss2 MCU=atmega128rfr2
 
 For AtMega128RFA1 boards:
-make TARGET=avr-rss2 MCU=atmega128rfa1
+
+    make TARGET=avr-rss2 MCU=atmega128rfa1
 
 Flashing
 --------
@@ -91,49 +90,52 @@ Press the RESET button. The bootloader with wait for boot commands
 for 3 seconds.
 
 Flashing commnad line example 256k MCU:
-avrdude -p m256rfr2 -c stk500v2 -P /dev/ttyUSB0 -b 38400 -e -U flash:w:hello-world.avr-rss2 
+
+    avrdude -p m256rfr2 -c stk500v2 -P /dev/ttyUSB0 -b 38400 -e -U flash:w:hello-world.avr-rss2 
 
 Flashing commnad line example 128k MCU:
-avrdude -p m128rfa1 -c avr109 -P /dev/ttyUSB0 -b 38400 -e -U flash:w:hello-world.avr-rss2 
 
-Older boards may use the avr109 boot loader. The stk500v2 uses the yellow 
+    avrdude -p m128rfa1 -c avr109 -P /dev/ttyUSB0 -b 38400 -e -U flash:w:hello-world.avr-rss2 
+
+Older boards may use the avr109 boot loader. The `stk500v2` uses the yellow 
 lED while the avr109 uses the red LED.
 
 Tested applications and examples
 ---------------------------------
-hello-world
-ipv6/rpl-udp
-ipv6/simple-udp-rpl
-rime
-ipv6/multicast
-example-shell  Needs symbol.c to be added to project also seems like
-in core/dev/serial-line.c process_poll must be replaced with 
-process_post.
+* `hello-world`
+* `ipv6/rpl-udp`
+* `ipv6/simple-udp-rpl`
+* `rime`
+* `ipv6/multicast`
+* `examples/powertrace`
+* `example-shell`
 
-  /* Wake up consumer process */
--  process_poll(&serial_line_process);
-+  process_post(&serial_line_process, 0, 0);
+Note that the shell example needs file `symbols.c` to be added to project also seems like
+in `core/dev/serial-line.c` the function `process_poll` must be replaced with `process_post`:
+
+     /* Wake up consumer process */
+    -  process_poll(&serial_line_process);
+    +  process_post(&serial_line_process, 0, 0);
 
-examples/powertrace
 
 Platform tutorial applications
-.-----------------------------
-Example to read out various sensors leds serial numbers etc.
-platform/avr-rss2/examples/hello-sensors/
+-----------------------------
+Example to read out various sensors, leds, serial numbers, and so on:
+[platform/avr-rss2/examples/hello-sensors/](examples/hello-sensors/).
 
-This example shows the sensd data encoding. But UDP using 6lowpan.
-platform/avr-rss2/examles/ipv6/rpl-udp-report/
+The previous example uses the `sensd` data encoding. An example that uses UDP through 6lowpan is here:
+[platform/avr-rss2/examples/ipv6/rpl-udp-report](examples/ipv6/rpl-udp-report).
 
-NAT ip64 ethernet GW based on Contiki core/net/ip64 code 
-platform/avr-rss2/examples/ipv6/rpl-border-router/
+An Ethernet gateway with ip64 NAT, based on Contiki `core/net/ip64` code:
+[platform/avr-rss2/examples/ipv6/rpl-border-router/](examples/ipv6/rpl-border-router/).
 
 Regressions tests
 -----------------
-Travis compile regression for platform: 
-regression-tests/23-compile-avr
+Travis compile regression test for the platform: 
+[regression-tests/23-compile-avr](../../regression-tests/23-compile-avr).
 
-Port adds newer version of avr-gcc compiler (4.9.2), to support 
-testing of newwr Atmel MCU as Atmega256RFR2. Work by Atis Elsts 
+This port adds newer version of `avr-gcc` compiler (4.9.2), to support 
+testing of newer Atmel MCU as Atmega256RFR2.
 
 
 Board approvals

From 9f1fedfbc1ba122f3484abeeb6a634e6ce360877 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Tue, 23 Feb 2016 11:43:51 +0200
Subject: [PATCH 044/393] avr-rss2 platform examples: remove some binary files

---
 platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-client.avr-rss2 | 0
 platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-server.avr-rss2 | 0
 platform/avr-rss2/examples/ipv6/rpl-udp-report/report.avr-rss2   | 0
 platform/avr-rss2/examples/ipv6/rpl-udp-report/sink.avr-rss2     | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-client.avr-rss2
 delete mode 100644 platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-server.avr-rss2
 delete mode 100644 platform/avr-rss2/examples/ipv6/rpl-udp-report/report.avr-rss2
 delete mode 100644 platform/avr-rss2/examples/ipv6/rpl-udp-report/sink.avr-rss2

diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-client.avr-rss2 b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-client.avr-rss2
deleted file mode 100644
index e69de29bb..000000000
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-server.avr-rss2 b/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-server.avr-rss2
deleted file mode 100644
index e69de29bb..000000000
diff --git a/platform/avr-rss2/examples/ipv6/rpl-udp-report/report.avr-rss2 b/platform/avr-rss2/examples/ipv6/rpl-udp-report/report.avr-rss2
deleted file mode 100644
index e69de29bb..000000000
diff --git a/platform/avr-rss2/examples/ipv6/rpl-udp-report/sink.avr-rss2 b/platform/avr-rss2/examples/ipv6/rpl-udp-report/sink.avr-rss2
deleted file mode 100644
index e69de29bb..000000000

From 786aa19cbd35918f41b78d73b8e4c75241b8a7b1 Mon Sep 17 00:00:00 2001
From: Billy Kozak <bkozak@scanimetrics.com>
Date: Tue, 23 Feb 2016 10:41:01 -0700
Subject: [PATCH 045/393] Fixed numeruous bus in CC26xx-CC13xx lpm

Bug fixes include:
- keep interrupts disabled during lpm_sleep() so that we don't
  miss any interrupts we may have been expecting
- check that the pending etimer isn't already expired (and don't sleep
  at all if it is)
- check that the about-to-be scheduled rtimer wakeup is neither too
  far into  the future nor too close into the future (or even in the
  past) before actually setting the interrupt (should fix #1509); If
  the time is out of bounds we use a default min or max value instead.
- Correctly handle LPM_MODE_MAX_SUPPORTED set to zero (and added a
  macro for the zero value) so that sleeping can be disabled altogether
- If no etimer is set, we specify a wakeup time which is reasonably far
  into the future instead of setting none at all (this will save on
  power consumption whenever no etimers are set).

Also did a bit of refactoring in that some long functions were broken
into multiple functions.
---
 cpu/cc26xx-cc13xx/lpm.c | 364 +++++++++++++++++++++++-----------------
 cpu/cc26xx-cc13xx/lpm.h |   1 +
 2 files changed, 213 insertions(+), 152 deletions(-)

diff --git a/cpu/cc26xx-cc13xx/lpm.c b/cpu/cc26xx-cc13xx/lpm.c
index 6af58e899..eec8ed66d 100644
--- a/cpu/cc26xx-cc13xx/lpm.c
+++ b/cpu/cc26xx-cc13xx/lpm.c
@@ -75,7 +75,12 @@ LIST(modules_list);
  * Don't consider standby mode if the next AON RTC event is scheduled to fire
  * in less than STANDBY_MIN_DURATION rtimer ticks
  */
-#define STANDBY_MIN_DURATION (RTIMER_SECOND >> 11)
+#define STANDBY_MIN_DURATION  (RTIMER_SECOND >> 11)
+#define MINIMAL_SAFE_SCHEDUAL 8u
+#define MAX_SLEEP_TIME        RTIMER_SECOND
+#define DEFAULT_SLEEP_TIME    RTIMER_SECOND
+/*---------------------------------------------------------------------------*/
+#define CLK_TO_RT(c) ((c) * (RTIMER_SECOND / CLOCK_SECOND))
 /*---------------------------------------------------------------------------*/
 /* Prototype of a function in clock.c. Called every time we come out of DS */
 void clock_update(void);
@@ -234,30 +239,195 @@ wake_up(void)
   }
 }
 /*---------------------------------------------------------------------------*/
-void
-lpm_drop()
+static void
+deep_sleep(void)
 {
-  lpm_registered_module_t *module;
-  uint8_t max_pm = LPM_MODE_MAX_SUPPORTED;
-  uint8_t module_pm;
-  clock_time_t next_event;
-
   uint32_t domains = LOCKABLE_DOMAINS;
+  lpm_registered_module_t *module;
 
-  /* Critical. Don't get interrupted! */
-  ti_lib_int_master_disable();
+  /*
+   * Notify all registered modules that we are dropping to mode X. We do not
+   * need to do this for simple sleep.
+   *
+   * This is a chance for modules to delay us a little bit until an ongoing
+   * operation has finished (e.g. uart TX) or to configure themselves for
+   * deep sleep.
+   *
+   * At this stage, we also collect power domain locks, if any.
+   * The argument to PRCMPowerDomainOff() is a bitwise OR, so every time
+   * we encounter a lock we just clear the respective bits in the 'domains'
+   * variable as required by the lock. In the end the domains variable will
+   * just hold whatever has not been cleared
+   */
+  for(module = list_head(modules_list); module != NULL;
+      module = module->next) {
+    if(module->shutdown) {
+      module->shutdown(LPM_MODE_DEEP_SLEEP);
+    }
 
-  /* Check if any events fired before we turned interrupts off. If so, abort */
-  if(process_nevents()) {
-    ti_lib_int_master_enable();
-    return;
+    /* Clear the bits specified in the lock */
+    domains &= ~module->domain_lock;
   }
 
-  if(RTIMER_CLOCK_LT(soc_rtc_get_next_trigger(),
-                     RTIMER_NOW() + STANDBY_MIN_DURATION)) {
-    ti_lib_int_master_enable();
-    lpm_sleep();
-    return;
+  /* Pat the dog: We don't want it to shout right after we wake up */
+  watchdog_periodic();
+
+  /* Clear unacceptable bits, just in case a lock provided a bad value */
+  domains &= LOCKABLE_DOMAINS;
+
+  /*
+   * Freeze the IOs on the boundary between MCU and AON. We only do this if
+   * PERIPH is not needed
+   */
+  if(domains & PRCM_DOMAIN_PERIPH) {
+    ti_lib_aon_ioc_freeze_enable();
+  }
+
+  /*
+   * Among LOCKABLE_DOMAINS, turn off those that are not locked
+   *
+   * If domains is != 0, pass it as-is
+   */
+  if(domains) {
+    ti_lib_prcm_power_domain_off(domains);
+  }
+
+  /*
+   * Before entering Deep Sleep, we must switch off the HF XOSC. The HF XOSC
+   * is predominantly controlled by the RF driver. In a build with radio
+   * cycling (e.g. ContikiMAC), the RF driver will request the XOSC before
+   * using the Freq. Synth, and switch back to the RC when it is about to
+   * turn back off.
+   *
+   * If the radio is on, we won't even reach here, and if it's off the HF
+   * clock source should already be the HF RC.
+   *
+   * Nevertheless, request the switch to the HF RC explicitly here.
+   */
+  oscillators_switch_to_hf_rc();
+
+  /* Configure clock sources for MCU and AUX: No clock */
+  ti_lib_aon_wuc_mcu_power_down_config(AONWUC_NO_CLOCK);
+  ti_lib_aon_wuc_aux_power_down_config(AONWUC_NO_CLOCK);
+
+  /* Full RAM retention. */
+  ti_lib_aon_wuc_mcu_sram_config(MCU_RAM0_RETENTION | MCU_RAM1_RETENTION |
+                                 MCU_RAM2_RETENTION | MCU_RAM3_RETENTION);
+
+  /* Disable retention of AUX RAM */
+  ti_lib_aon_wuc_aux_sram_config(false);
+
+  /*
+   * Always turn off RFCORE, CPU, SYSBUS and VIMS. RFCORE should be off
+   * already
+   */
+  ti_lib_prcm_power_domain_off(PRCM_DOMAIN_RFCORE | PRCM_DOMAIN_CPU |
+                               PRCM_DOMAIN_VIMS | PRCM_DOMAIN_SYSBUS);
+
+  /* Request JTAG domain power off */
+  ti_lib_aon_wuc_jtag_power_off();
+
+  /* Turn off AUX */
+  ti_lib_aux_wuc_power_ctrl(AUX_WUC_POWER_OFF);
+  ti_lib_aon_wuc_domain_power_down_enable();
+  while(ti_lib_aon_wuc_power_status_get() & AONWUC_AUX_POWER_ON);
+
+  /* Configure the recharge controller */
+  ti_lib_sys_ctrl_set_recharge_before_power_down(XOSC_IN_HIGH_POWER_MODE);
+
+  /*
+   * If both PERIPH and SERIAL PDs are off, request the uLDO as the power
+   * source while in deep sleep.
+   */
+  if(domains == LOCKABLE_DOMAINS) {
+    ti_lib_pwr_ctrl_source_set(PWRCTRL_PWRSRC_ULDO);
+  }
+
+  /* We are only interested in IRQ energest while idle or in LPM */
+  ENERGEST_IRQ_RESTORE(irq_energest);
+  ENERGEST_SWITCH(ENERGEST_TYPE_CPU, ENERGEST_TYPE_LPM);
+
+  /* Sync the AON interface to ensure all writes have gone through. */
+  ti_lib_sys_ctrl_aon_sync();
+
+  /*
+   * Explicitly turn off VIMS cache, CRAM and TRAM. Needed because of
+   * retention mismatch between VIMS logic and cache. We wait to do this
+   * until right before deep sleep to be able to use the cache for as long
+   * as possible.
+   */
+  ti_lib_prcm_cache_retention_disable();
+  ti_lib_vims_mode_set(VIMS_BASE, VIMS_MODE_OFF);
+
+  /* Deep Sleep */
+  ti_lib_prcm_deep_sleep();
+
+  /*
+   * When we reach here, some interrupt woke us up. The global interrupt
+   * flag is off, hence we have a chance to run things here. We will wake up
+   * the chip properly, and then we will enable the global interrupt without
+   * unpending events so the handlers can fire
+   */
+  wake_up();
+}
+/*---------------------------------------------------------------------------*/
+static void
+safe_schedule_rtimer(rtimer_clock_t time, rtimer_clock_t now, int pm)
+{
+  rtimer_clock_t min_sleep;
+  rtimer_clock_t max_sleep;
+
+  min_sleep = now + MINIMAL_SAFE_SCHEDUAL;
+  max_sleep = now + MAX_SLEEP_TIME;
+
+  if(RTIMER_CLOCK_LT(time, min_sleep)) {
+    /* ensure that we schedule sleep a minimal number of ticks into the
+       future */
+    soc_rtc_schedule_one_shot(AON_RTC_CH1, min_sleep);
+  } else if((pm == LPM_MODE_SLEEP) && RTIMER_CLOCK_LT(max_sleep, time)) {
+    /* if max_pm is LPM_MODE_SLEEP, we could trigger the watchdog if we slept
+       for too long. */
+    soc_rtc_schedule_one_shot(AON_RTC_CH1, max_sleep);
+  } else {
+    soc_rtc_schedule_one_shot(AON_RTC_CH1, time);
+  }
+}
+/*---------------------------------------------------------------------------*/
+static int
+setup_sleep_mode(void)
+{
+  rtimer_clock_t et_distance = 0;
+
+  lpm_registered_module_t *module;
+  int max_pm;
+  int module_pm;
+  int etimer_is_pending;
+  rtimer_clock_t now;
+  rtimer_clock_t et_time;
+  rtimer_clock_t next_trig;
+
+  max_pm = LPM_MODE_MAX_SUPPORTED;
+  now = RTIMER_NOW();
+
+  if((LPM_MODE_MAX_SUPPORTED == LPM_MODE_AWAKE) || process_nevents()) {
+    return LPM_MODE_AWAKE;
+  }
+
+  etimer_is_pending = etimer_pending();
+
+  if(etimer_is_pending) {
+    et_distance = CLK_TO_RT(etimer_next_expiration_time() - clock_time());
+
+    if(RTIMER_CLOCK_LT(et_distance, 1)) {
+      /* there is an etimer which is already expired; we shouldn't go to
+         sleep at all */
+      return LPM_MODE_AWAKE;
+    }
+  }
+
+  next_trig = soc_rtc_get_next_trigger();
+  if(RTIMER_CLOCK_LT(next_trig, now + STANDBY_MIN_DURATION)) {
+    return LPM_MODE_SLEEP;
   }
 
   /* Collect max allowed PM permission from interested modules */
@@ -272,146 +442,36 @@ lpm_drop()
   }
 
   /* Reschedule AON RTC CH1 to fire just in time for the next etimer event */
-  next_event = etimer_next_expiration_time();
+  if(etimer_is_pending) {
+    et_time = soc_rtc_last_isr_time() + et_distance;
 
-  if(etimer_pending()) {
-    next_event = next_event - clock_time();
-    soc_rtc_schedule_one_shot(AON_RTC_CH1, soc_rtc_last_isr_time() +
-                              (next_event * (RTIMER_SECOND / CLOCK_SECOND)));
+    safe_schedule_rtimer(et_time, now, max_pm);
+  } else {
+    /* set a maximal sleep period if no etimers are queued */
+    soc_rtc_schedule_one_shot(AON_RTC_CH1, now + DEFAULT_SLEEP_TIME);
   }
 
+  return max_pm;
+}
+/*---------------------------------------------------------------------------*/
+void
+lpm_drop()
+{
+  uint8_t max_pm;
+
+  /* Critical. Don't get interrupted! */
+  ti_lib_int_master_disable();
+
+  max_pm = setup_sleep_mode();
+
   /* Drop */
   if(max_pm == LPM_MODE_SLEEP) {
-    ti_lib_int_master_enable();
     lpm_sleep();
-  } else {
-    /*
-     * Notify all registered modules that we are dropping to mode X. We do not
-     * need to do this for simple sleep.
-     *
-     * This is a chance for modules to delay us a little bit until an ongoing
-     * operation has finished (e.g. uart TX) or to configure themselves for
-     * deep sleep.
-     *
-     * At this stage, we also collect power domain locks, if any.
-     * The argument to PRCMPowerDomainOff() is a bitwise OR, so every time
-     * we encounter a lock we just clear the respective bits in the 'domains'
-     * variable as required by the lock. In the end the domains variable will
-     * just hold whatever has not been cleared
-     */
-    for(module = list_head(modules_list); module != NULL;
-        module = module->next) {
-      if(module->shutdown) {
-        module->shutdown(max_pm);
-      }
-
-      /* Clear the bits specified in the lock */
-      domains &= ~module->domain_lock;
-    }
-
-    /* Pat the dog: We don't want it to shout right after we wake up */
-    watchdog_periodic();
-
-    /* Clear unacceptable bits, just in case a lock provided a bad value */
-    domains &= LOCKABLE_DOMAINS;
-
-    /*
-     * Freeze the IOs on the boundary between MCU and AON. We only do this if
-     * PERIPH is not needed
-     */
-    if(domains & PRCM_DOMAIN_PERIPH) {
-      ti_lib_aon_ioc_freeze_enable();
-    }
-
-    /*
-     * Among LOCKABLE_DOMAINS, turn off those that are not locked
-     *
-     * If domains is != 0, pass it as-is
-     */
-    if(domains) {
-      ti_lib_prcm_power_domain_off(domains);
-    }
-
-    /*
-     * Before entering Deep Sleep, we must switch off the HF XOSC. The HF XOSC
-     * is predominantly controlled by the RF driver. In a build with radio
-     * cycling (e.g. ContikiMAC), the RF driver will request the XOSC before
-     * using the Freq. Synth, and switch back to the RC when it is about to
-     * turn back off.
-     *
-     * If the radio is on, we won't even reach here, and if it's off the HF
-     * clock source should already be the HF RC.
-     *
-     * Nevertheless, request the switch to the HF RC explicitly here.
-     */
-    oscillators_switch_to_hf_rc();
-
-    /* Configure clock sources for MCU and AUX: No clock */
-    ti_lib_aon_wuc_mcu_power_down_config(AONWUC_NO_CLOCK);
-    ti_lib_aon_wuc_aux_power_down_config(AONWUC_NO_CLOCK);
-
-    /* Full RAM retention. */
-    ti_lib_aon_wuc_mcu_sram_config(MCU_RAM0_RETENTION | MCU_RAM1_RETENTION |
-                                   MCU_RAM2_RETENTION | MCU_RAM3_RETENTION);
-
-    /* Disable retention of AUX RAM */
-    ti_lib_aon_wuc_aux_sram_config(false);
-
-    /*
-     * Always turn off RFCORE, CPU, SYSBUS and VIMS. RFCORE should be off
-     * already
-     */
-    ti_lib_prcm_power_domain_off(PRCM_DOMAIN_RFCORE | PRCM_DOMAIN_CPU |
-                                 PRCM_DOMAIN_VIMS | PRCM_DOMAIN_SYSBUS);
-
-    /* Request JTAG domain power off */
-    ti_lib_aon_wuc_jtag_power_off();
-
-    /* Turn off AUX */
-    ti_lib_aux_wuc_power_ctrl(AUX_WUC_POWER_OFF);
-    ti_lib_aon_wuc_domain_power_down_enable();
-    while(ti_lib_aon_wuc_power_status_get() & AONWUC_AUX_POWER_ON);
-
-    /* Configure the recharge controller */
-    ti_lib_sys_ctrl_set_recharge_before_power_down(XOSC_IN_HIGH_POWER_MODE);
-
-    /*
-     * If both PERIPH and SERIAL PDs are off, request the uLDO as the power
-     * source while in deep sleep.
-     */
-    if(domains == LOCKABLE_DOMAINS) {
-      ti_lib_pwr_ctrl_source_set(PWRCTRL_PWRSRC_ULDO);
-    }
-
-    /* We are only interested in IRQ energest while idle or in LPM */
-    ENERGEST_IRQ_RESTORE(irq_energest);
-    ENERGEST_SWITCH(ENERGEST_TYPE_CPU, ENERGEST_TYPE_LPM);
-
-    /* Sync the AON interface to ensure all writes have gone through. */
-    ti_lib_sys_ctrl_aon_sync();
-
-    /*
-     * Explicitly turn off VIMS cache, CRAM and TRAM. Needed because of
-     * retention mismatch between VIMS logic and cache. We wait to do this
-     * until right before deep sleep to be able to use the cache for as long
-     * as possible.
-     */
-    ti_lib_prcm_cache_retention_disable();
-    ti_lib_vims_mode_set(VIMS_BASE, VIMS_MODE_OFF);
-
-    /* Deep Sleep */
-    ti_lib_prcm_deep_sleep();
-
-    /*
-     * When we reach here, some interrupt woke us up. The global interrupt
-     * flag is off, hence we have a chance to run things here. We will wake up
-     * the chip properly, and then we will enable the global interrupt without
-     * unpending events so the handlers can fire
-     */
-    wake_up();
-
-    ti_lib_int_master_enable();
+  } else if(max_pm == LPM_MODE_DEEP_SLEEP) {
+    deep_sleep();
   }
+
+  ti_lib_int_master_enable();
 }
 /*---------------------------------------------------------------------------*/
 void
diff --git a/cpu/cc26xx-cc13xx/lpm.h b/cpu/cc26xx-cc13xx/lpm.h
index cc144809b..2d6f56d00 100644
--- a/cpu/cc26xx-cc13xx/lpm.h
+++ b/cpu/cc26xx-cc13xx/lpm.h
@@ -49,6 +49,7 @@
 
 #include <stdint.h>
 /*---------------------------------------------------------------------------*/
+#define LPM_MODE_AWAKE         0
 #define LPM_MODE_SLEEP         1
 #define LPM_MODE_DEEP_SLEEP    2
 #define LPM_MODE_SHUTDOWN      3

From ff6d336e8b1657e9249f688360a226a70eafe264 Mon Sep 17 00:00:00 2001
From: Billy Kozak <bkozak@scanimetrics.com>
Date: Fri, 26 Feb 2016 08:26:31 -0700
Subject: [PATCH 046/393] Fix warning about missing strcasecmp definition

On platforms which do not define the macro __SDCC the strcasecmp
function may not have a definition (true at least on CC26xx). The
prototype for this function is now defined if __SDCC is false.
---
 core/net/ip/resolv.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/net/ip/resolv.c b/core/net/ip/resolv.c
index 0dd06104b..2a3d39106 100644
--- a/core/net/ip/resolv.c
+++ b/core/net/ip/resolv.c
@@ -111,6 +111,9 @@ strcasecmp(const char *s1, const char *s2)
   /* TODO: Add case support! */
   return strcmp(s1, s2);
 }
+#else
+int strcasecmp(const char *s1, const char *s2);
+int strncasecmp(const char *s1, const char *s2, size_t n);
 #endif /* __SDCC */
 
 #define UIP_UDP_BUF ((struct uip_udpip_hdr *)&uip_buf[UIP_LLH_LEN])

From d7ee5630237fc6c9e7cd618c59d804b5307e9340 Mon Sep 17 00:00:00 2001
From: Jelmer Tiete <jelmer@tiete.be>
Date: Mon, 29 Feb 2016 13:48:24 +0100
Subject: [PATCH 047/393] Updates cc2538-bsl to 4340542, main changes are fix
 for contiki-os/contiki#1533 and an added option to invert the RTS and DTR
 lines when auto starting the bootloader

---
 tools/cc2538-bsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cc2538-bsl b/tools/cc2538-bsl
index 6185d8b16..434054237 160000
--- a/tools/cc2538-bsl
+++ b/tools/cc2538-bsl
@@ -1 +1 @@
-Subproject commit 6185d8b16f10047053fd57000a552340273d7d85
+Subproject commit 4340542370d3e319d692f9f969c5683231fce438

From de7850ed5829286cb5fdcabe327a8620d0413274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Wed, 2 Mar 2016 07:00:57 +0100
Subject: [PATCH 048/393] core/lib/settings.h: fix warning: function
 declaration isn't a prototype

---
 core/lib/settings.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lib/settings.h b/core/lib/settings.h
index e102b8b0b..bef6d0461 100644
--- a/core/lib/settings.h
+++ b/core/lib/settings.h
@@ -186,7 +186,7 @@ extern settings_status_t settings_delete(settings_key_t key, uint8_t index);
 typedef eeprom_addr_t settings_iter_t;
 
 /** Will return \ref SETTINGS_INVALID_ITER if the settings store is empty. */
-extern settings_iter_t settings_iter_begin();
+extern settings_iter_t settings_iter_begin(void);
 
 /** Will return \ref SETTINGS_INVALID_ITER if at the end of settings list. */
 extern settings_iter_t settings_iter_next(settings_iter_t iter);

From 7c11034ab71cbd8dcd17e4da08485cd6e41da42c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Wed, 2 Mar 2016 07:00:57 +0100
Subject: [PATCH 049/393] core/lib/trickle-timer.c: fix warning: function
 declaration isn't a prototype

---
 core/lib/trickle-timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lib/trickle-timer.c b/core/lib/trickle-timer.c
index 2b88f60ef..fd2d7c537 100644
--- a/core/lib/trickle-timer.c
+++ b/core/lib/trickle-timer.c
@@ -79,7 +79,7 @@ static void double_interval(void *ptr);
 #if TRICKLE_TIMER_WIDE_RAND
 /* Returns a 4-byte wide, unsigned random number */
 static uint32_t
-wide_rand()
+wide_rand(void)
 {
   return ((uint32_t)random_rand() << 16 | random_rand());
 }

From 2e47bf9cdc3d1c52a0762e7067fb2a61098d192f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Wed, 2 Mar 2016 07:00:57 +0100
Subject: [PATCH 050/393] core/net/ipv6/sicslowpan.c: fix warning: function
 declaration isn't a prototype

---
 core/net/ipv6/sicslowpan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/ipv6/sicslowpan.c b/core/net/ipv6/sicslowpan.c
index d0bf14799..3b722d598 100644
--- a/core/net/ipv6/sicslowpan.c
+++ b/core/net/ipv6/sicslowpan.c
@@ -452,7 +452,7 @@ rime_sniffer_remove(struct rime_sniffer *s)
 }
 
 static void
-set_packet_attrs()
+set_packet_attrs(void)
 {
   int c = 0;
   /* set protocol in NETWORK_ID */

From 52e7ea9cc4d9b414e5d9fce9a9ad4164e43986a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Wed, 2 Mar 2016 07:00:57 +0100
Subject: [PATCH 051/393] core/net/rpl/rpl-dag.c: fix warning: function
 declaration isn't a prototype

---
 core/net/rpl/rpl-dag.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index 46f2936ef..9cd69e7b0 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -88,7 +88,7 @@ rpl_instance_t *default_instance;
 
 /*---------------------------------------------------------------------------*/
 void
-rpl_print_neighbor_list()
+rpl_print_neighbor_list(void)
 {
   if(default_instance != NULL && default_instance->current_dag != NULL &&
       default_instance->of != NULL && default_instance->of->calculate_rank != NULL) {
@@ -160,7 +160,7 @@ rpl_get_parent_link_metric(const uip_lladdr_t *addr)
 {
   uip_ds6_nbr_t *nbr;
   nbr = nbr_table_get_from_lladdr(ds6_neighbors, (const linkaddr_t *)addr);
-  
+
   if(nbr != NULL) {
     return nbr->link_metric;
   } else {
@@ -645,7 +645,7 @@ rpl_add_parent(rpl_dag_t *dag, rpl_dio_t *dio, uip_ipaddr_t *addr)
       p->dag = dag;
       p->rank = dio->rank;
       p->dtsn = dio->dtsn;
-      
+
       /* Check whether we have a neighbor that has not gotten a link metric yet */
       if(nbr != NULL && nbr->link_metric == 0) {
 	nbr->link_metric = RPL_INIT_LINK_METRIC * RPL_DAG_MC_ETX_DIVISOR;

From d7d836fda0d5299b1a7f03f245b760b09b00fbc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Wed, 2 Mar 2016 07:00:57 +0100
Subject: [PATCH 052/393] core/net/rpl/rpl.h: fix warning: function declaration
 isn't a prototype

---
 core/net/rpl/rpl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/net/rpl/rpl.h b/core/net/rpl/rpl.h
index c3d693b26..54b63c875 100644
--- a/core/net/rpl/rpl.h
+++ b/core/net/rpl/rpl.h
@@ -179,7 +179,7 @@ typedef struct rpl_instance rpl_instance_t;
  * update_metric_container(dag)
  *
  *  Updates the metric container for outgoing DIOs in a certain DAG.
- *  If the objective function of the DAG does not use metric containers, 
+ *  If the objective function of the DAG does not use metric containers,
  *  the function should set the object type to RPL_DAG_MC_NONE.
  */
 struct rpl_of {
@@ -257,7 +257,7 @@ rpl_rank_t rpl_get_parent_rank(uip_lladdr_t *addr);
 uint16_t rpl_get_parent_link_metric(const uip_lladdr_t *addr);
 void rpl_dag_init(void);
 uip_ds6_nbr_t *rpl_get_nbr(rpl_parent_t *parent);
-void rpl_print_neighbor_list();
+void rpl_print_neighbor_list(void);
 
 /* Per-parent RPL information */
 NBR_TABLE_DECLARE(rpl_parents);

From e32b46a86690448a733d83c5d96de00393b30d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Wed, 2 Mar 2016 07:04:34 +0100
Subject: [PATCH 053/393] core/lib/gcr.c: fix warning: function declaration
 isn't a prototype

---
 core/lib/gcr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/lib/gcr.c b/core/lib/gcr.c
index 1fba2f40b..36ee98ea2 100644
--- a/core/lib/gcr.c
+++ b/core/lib/gcr.c
@@ -64,13 +64,13 @@ static unsigned char gcr_bits = 0;
 static unsigned short gcr_val = 0;
 
 /* Call before starting encoding or decoding */
-void gcr_init() {
+void gcr_init(void) {
   gcr_val = 0;
   gcr_bits = 0;
 }
 
 /* Use this to check if encoding / decoding is complete for now */
-unsigned char gcr_finished() {
+unsigned char gcr_finished(void) {
   return gcr_bits == 0;
 }
 
@@ -100,7 +100,7 @@ void gcr_decode(unsigned char gcr_data) {
 }
 
 /* check if the current decoded stream is correct */
-unsigned char gcr_valid() {
+unsigned char gcr_valid(void) {
   if (gcr_bits >= 10) {
     unsigned short val = gcr_val & 0x3ff;
     if ((GCR_decode[val >> 5u] << 4u) == 0xff ||

From 9159903f5a9fbf9ffc22dc8639a7ff3e7d2e837b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Wed, 2 Mar 2016 07:12:01 +0100
Subject: [PATCH 054/393] apps/er-coap/er-coap-transactions.h: fix warning:
 function declaration isn't a prototype

---
 apps/er-coap/er-coap-transactions.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/er-coap/er-coap-transactions.h b/apps/er-coap/er-coap-transactions.h
index 18bb421b1..10697134a 100644
--- a/apps/er-coap/er-coap-transactions.h
+++ b/apps/er-coap/er-coap-transactions.h
@@ -67,7 +67,7 @@ typedef struct coap_transaction {
                                                  * Use snprintf(buf, len+1, "", ...) to completely fill payload */
 } coap_transaction_t;
 
-void coap_register_as_transaction_handler();
+void coap_register_as_transaction_handler(void);
 
 coap_transaction_t *coap_new_transaction(uint16_t mid, uip_ipaddr_t *addr,
                                          uint16_t port);
@@ -75,6 +75,6 @@ void coap_send_transaction(coap_transaction_t *t);
 void coap_clear_transaction(coap_transaction_t *t);
 coap_transaction_t *coap_get_transaction_by_mid(uint16_t mid);
 
-void coap_check_transactions();
+void coap_check_transactions(void);
 
 #endif /* COAP_TRANSACTIONS_H_ */

From 4ff571beb205cb7ccd289ca376fe2746ee0c929c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Wed, 2 Mar 2016 07:12:01 +0100
Subject: [PATCH 055/393] apps/er-coap/er-coap-separate.h: fix warning:
 function declaration isn't a prototype

---
 apps/er-coap/er-coap-separate.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/er-coap/er-coap-separate.h b/apps/er-coap/er-coap-separate.h
index dbecf1b39..33a923240 100644
--- a/apps/er-coap/er-coap-separate.h
+++ b/apps/er-coap/er-coap-separate.h
@@ -61,7 +61,7 @@ typedef struct coap_separate {
 
 int coap_separate_handler(resource_t *resource, void *request,
                           void *response);
-void coap_separate_reject();
+void coap_separate_reject(void);
 void coap_separate_accept(void *request, coap_separate_t *separate_store);
 void coap_separate_resume(void *response, coap_separate_t *separate_store,
                           uint8_t code);

From 12197903129e2362179bb55e4a8f60602f66d58d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Wed, 2 Mar 2016 07:25:19 +0100
Subject: [PATCH 056/393] examples/er-rest-example/resources/res-event.c: fix
 warning: function declaration isn't a prototype

---
 examples/er-rest-example/resources/res-event.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/er-rest-example/resources/res-event.c b/examples/er-rest-example/resources/res-event.c
index d20f0caa9..7524d2ad2 100644
--- a/examples/er-rest-example/resources/res-event.c
+++ b/examples/er-rest-example/resources/res-event.c
@@ -53,7 +53,7 @@
 #endif
 
 static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
-static void res_event_handler();
+static void res_event_handler(void);
 
 /*
  * Example for an event resource.
@@ -86,7 +86,7 @@ res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferr
  * It is called through <res_name>.trigger(), usually from the server process.
  */
 static void
-res_event_handler()
+res_event_handler(void)
 {
   /* Do the update triggered by the event here, e.g., sampling a sensor. */
   ++event_counter;

From 6876b97466aca2dc1fea0be4b76fd903480fe858 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <ol.sc@web.de>
Date: Sun, 6 Mar 2016 21:11:18 +0100
Subject: [PATCH 057/393] Adjusted segment names to match recent cc65 change.

---
 platform/apple2enh/lib/pfs.S | 2 +-
 platform/c128/lib/pfs.S      | 2 +-
 platform/c64/lib/pfs.S       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/apple2enh/lib/pfs.S b/platform/apple2enh/lib/pfs.S
index ed44dfc1e..5c2ac488c 100644
--- a/platform/apple2enh/lib/pfs.S
+++ b/platform/apple2enh/lib/pfs.S
@@ -66,7 +66,7 @@ read_count_out:	.word	$0000		    ;TRANS_COUNT
 close_param:	.byte	$01		    ;PARAM_COUNT
 close_fd:	.byte	$00		    ;REF_NUM
 ;---------------------------------------------------------------------
-	.segment	"INIT"
+	.segment	"ONCE"
 
 init_pfs:
 	; Allow exec() to keep file open
diff --git a/platform/c128/lib/pfs.S b/platform/c128/lib/pfs.S
index acec45959..62a2a7840 100644
--- a/platform/c128/lib/pfs.S
+++ b/platform/c128/lib/pfs.S
@@ -72,7 +72,7 @@ pw:	.byte	$2C, $50, $2C, $57	;,p,w
 cmdc:	.byte	0
 flags:	.res	10
 ;---------------------------------------------------------------------
-	.segment	"INIT"
+	.segment	"ONCE"
 
 init_pfs:
 	ldy	#F_MAXLEN+8
diff --git a/platform/c64/lib/pfs.S b/platform/c64/lib/pfs.S
index 35e64f652..c63d08d2e 100644
--- a/platform/c64/lib/pfs.S
+++ b/platform/c64/lib/pfs.S
@@ -72,7 +72,7 @@ pw:	.byte	$2C, $50, $2C, $57	;,p,w
 cmdc:	.byte	0
 flags:	.res	10
 ;---------------------------------------------------------------------
-	.segment	"INIT"
+	.segment	"ONCE"
 
 init_pfs:
 	ldy	#F_MAXLEN+8

From 07ec06ad092c6029c6a580fe5560e116f89332ca Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Sun, 6 Mar 2016 21:35:19 +0100
Subject: [PATCH 058/393] Setting node_id and RIME linkaddr from EUI64 chip.

---
 platform/avr-rss2/contiki-main.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/platform/avr-rss2/contiki-main.c b/platform/avr-rss2/contiki-main.c
index 172c6139f..8abac4d04 100644
--- a/platform/avr-rss2/contiki-main.c
+++ b/platform/avr-rss2/contiki-main.c
@@ -193,9 +193,9 @@ initialize(void)
 
 #if 0
   /* Do it my way... */
-  UBRR0L = 25;
-  UBRR0H = 0;
-  UCSR0A = (1 << U2X0);  /*Double */
+  //UBRR0L =  8; UBRR0H = 0; UCSR0A = (0 << U2X0);  // 115.2k  err=-3.5%  
+  //UBRR0L = 16; UBRR0H = 0; UCSR0A = (1 << U2X0);  // 115.2k     2.1%  
+  //UBRR0L =  3; UBRR0H = 0; UCSR0A = (1 << U2X0);  // 500k         0%
 #endif
 
   rs232_set_input(RS232_PORT_0, serial_line_input_byte);
@@ -277,17 +277,18 @@ initialize(void)
   /* Set addresses BEFORE starting tcpip process */
 
   linkaddr_t addr;
+  char eui64[8];
 
   printf("I2C: ");
   i2c_probed = i2c_probe();
   printf("\n");
   
   if( i2c_probed & I2C_AT24MAC ) {
-    i2c_at24mac_read((char *)&addr.u8, 1);
-    linkaddr_set_node_addr(&addr);
+    i2c_at24mac_read((char *)&eui64, 1);
+    linkaddr_set_node_addr((linkaddr_t *) &eui64);
+    node_id = (eui64[1] << 8) + eui64[7];
   }
   else {
-    char eui64[8];
     printf("Random EUI64 address generated\n");
     eui64[0] = 0xfc; /* Atmels OUI */
     eui64[1] = 0xc2; 
@@ -297,12 +298,13 @@ initialize(void)
     eui64[5] = 0;
     eui64[6] = node_id >> 8;
     eui64[7] = node_id & 0xff;
-    linkaddr_set_node_addr(&eui64);
+    linkaddr_set_node_addr((linkaddr_t *)&eui64);
   }
 
   /* memcpy(&uip_lladdr.addr, &addr.u8, sizeof(linkaddr_t)); */
 
 #if NETSTACK_CONF_WITH_IPV6
+  memcpy(&addr.u8, &eui64,  sizeof(linkaddr_t));
   memcpy(&uip_lladdr.addr, &addr.u8, sizeof(linkaddr_t));
 #endif
 
@@ -315,6 +317,9 @@ initialize(void)
 #else
   PRINTA("MAC address ");
   uint8_t i;
+  addr.u8[0] = eui64[1] ; 
+  addr.u8[1] = eui64[7];
+
   for(i = sizeof(linkaddr_t); i > 0; i--) {
     PRINTA("%x:", addr.u8[i - 1]);
   }

From b4c2cd9619aac07bce4eefc706ef443b8b58c3c2 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Mon, 7 Mar 2016 17:25:40 +0100
Subject: [PATCH 059/393] Macros for TSCH

US_TO_RTIMERTICKS(US) and RTIMERTICKS_TO_US(T)
---
 cpu/cc2538/rtimer-arch.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/cpu/cc2538/rtimer-arch.h b/cpu/cc2538/rtimer-arch.h
index ddb020af1..45ebc5c5d 100644
--- a/cpu/cc2538/rtimer-arch.h
+++ b/cpu/cc2538/rtimer-arch.h
@@ -65,6 +65,20 @@
 
 #define RTIMER_ARCH_SECOND 32768
 
+/* Do the math in 32bits to save precision.
+ * Round to nearest integer rather than truncate. */
+#define US_TO_RTIMERTICKS(US)  ((US) >= 0 ?                        \
+                               (((int32_t)(US) * (RTIMER_ARCH_SECOND) + 500000) / 1000000L) :      \
+                               ((int32_t)(US) * (RTIMER_ARCH_SECOND) - 500000) / 1000000L)
+
+#define RTIMERTICKS_TO_US(T)   ((T) >= 0 ?                     \
+                               (((int32_t)(T) * 1000000L + ((RTIMER_ARCH_SECOND) / 2)) / (RTIMER_ARCH_SECOND)) : \
+                               ((int32_t)(T) * 1000000L - ((RTIMER_ARCH_SECOND) / 2)) / (RTIMER_ARCH_SECOND))
+
+/* A 64-bit version because the 32-bit one cannot handle T >= 4295 ticks.
+   Intended only for positive values of T. */
+#define RTIMERTICKS_TO_US_64(T)  ((uint32_t)(((uint64_t)(T) * 1000000 + ((RTIMER_ARCH_SECOND) / 2)) / (RTIMER_ARCH_SECOND)))
+
 /** \sa RTIMER_NOW() */
 rtimer_clock_t rtimer_arch_now(void);
 

From 73fcfa42c259443b015ca81c498dd789179341a8 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Mon, 7 Mar 2016 17:42:17 +0100
Subject: [PATCH 060/393] TSCH: fix compiler warning that shows up when
 disabling TSCH_LOG_LEVEL

---
 core/net/mac/tsch/tsch.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/net/mac/tsch/tsch.c b/core/net/mac/tsch/tsch.c
index 1d9701e42..4e24ea8da 100644
--- a/core/net/mac/tsch/tsch.c
+++ b/core/net/mac/tsch/tsch.c
@@ -936,6 +936,7 @@ send_packet(mac_callback_t sent, void *ptr)
              tsch_queue_packet_count(addr),
              p->header_len,
              queuebuf_datalen(p->qb));
+      (void)packet_count_before; /* Discard "variable set but unused" warning in case of TSCH_LOG_LEVEL of 0 */
     }
   }
   if(ret != MAC_TX_DEFERRED) {

From 8b63b41b96a0dbcbf78fe3e430ad20f3bfdb51fd Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Mon, 7 Mar 2016 17:43:25 +0100
Subject: [PATCH 061/393] TSCH-security: disable TSCH logs to save ROM, relax
 checks in 21-z1-rpl-tsch-security.csc accordingly

---
 examples/ipv6/rpl-tsch/project-conf.h                | 2 +-
 regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/examples/ipv6/rpl-tsch/project-conf.h b/examples/ipv6/rpl-tsch/project-conf.h
index 7ecfb74c1..2b602d908 100644
--- a/examples/ipv6/rpl-tsch/project-conf.h
+++ b/examples/ipv6/rpl-tsch/project-conf.h
@@ -153,7 +153,7 @@
 #define TSCH_SCHEDULE_CONF_DEFAULT_LENGTH 2
 /* Reduce log level to make space for security on z1 */
 #undef TSCH_LOG_CONF_LEVEL
-#define TSCH_LOG_CONF_LEVEL 1
+#define TSCH_LOG_CONF_LEVEL 0
 #endif /* WITH_SECURITY */
 
 #endif /* CONTIKI_TARGET_Z1 */
diff --git a/regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc b/regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc
index a24f7fe5b..e2cda7e44 100644
--- a/regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc
+++ b/regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc
@@ -270,9 +270,6 @@ make node.z1 TARGET=z1 MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=1</commands>
       <script>TIMEOUT(300000); /* Time out after 5 minutes */&#xD;
 &#xD;
 log.log("Waiting for association with security\n");&#xD;
-/* Check that nodes associate with security */&#xD;
-WAIT_UNTIL(msg.startsWith("TSCH: association done, sec 1,"));&#xD;
-log.log("Association with security done\n");&#xD;
 &#xD;
 /* Wait until a node (can only be the DAGRoot) has&#xD;
  * 8 routing entries (i.e. can reach every node) */&#xD;

From b0a673ca5c24155bc95b6b7faacef3f99da6b2f2 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Mon, 7 Mar 2016 17:46:53 +0100
Subject: [PATCH 062/393] Changes to enable TSCH

poll mode for TSCH including SFD timestamps and send_on_cca
---
 cpu/cc2538/dev/cc2538-rf.c | 137 ++++++++++++++++++++++++++++++-------
 1 file changed, 111 insertions(+), 26 deletions(-)

diff --git a/cpu/cc2538/dev/cc2538-rf.c b/cpu/cc2538/dev/cc2538-rf.c
index 58b464fc5..a76c1c356 100644
--- a/cpu/cc2538/dev/cc2538-rf.c
+++ b/cpu/cc2538/dev/cc2538-rf.c
@@ -120,6 +120,17 @@ static const uint8_t magic[] = { 0x53, 0x6E, 0x69, 0x66 };      /** Snif */
 #define CC2538_RF_AUTOACK 1
 #endif
 /*---------------------------------------------------------------------------*/
+#if CC2538_RF_CONF_SFD_TIMESTAMPS
+static rtimer_clock_t cc2538_sfd_rtime;
+#endif
+
+/* Are we currently in poll mode? Disabled by default */
+static uint8_t volatile poll_mode = 0;
+/* Do we perform a CCA before sending? Enabled by default. */
+static uint8_t send_on_cca = 1;
+static int8_t cc2538_last_rssi;
+static uint8_t cc2538_last_crc_corr_lqi;
+/*---------------------------------------------------------------------------*/
 static uint8_t rf_flags;
 static uint8_t rf_channel = CC2538_RF_CHANNEL;
 
@@ -329,6 +340,29 @@ set_frame_filtering(uint8_t enable)
 }
 /*---------------------------------------------------------------------------*/
 static void
+set_poll_mode(uint8_t enable)
+{
+  poll_mode = enable;
+  
+  if(enable) {
+    REG(RFCORE_XREG_RFIRQM0) &= ~RFCORE_XREG_RFIRQM0_FIFOP;	// mask out FIFOP interrupt source
+    REG(RFCORE_SFR_RFIRQF0) &= ~RFCORE_SFR_RFIRQF0_FIFOP;	// clear pending FIFOP interrupt
+    REG(RFCORE_XREG_RFIRQM0) |= RFCORE_XREG_RFIRQM0_SFD;	// enable SFD interrupt source
+  } else {
+    REG(RFCORE_XREG_RFIRQM0) |= RFCORE_XREG_RFIRQM0_FIFOP;	// enable FIFOP interrupt source
+    REG(RFCORE_XREG_RFIRQM0) &= ~RFCORE_XREG_RFIRQM0_SFD;	// mask out SFD interrupt source
+    REG(RFCORE_SFR_RFIRQF0) &= ~RFCORE_SFR_RFIRQF0_SFD;		// clear pending SFD interrupt
+  }
+  nvic_interrupt_enable(NVIC_INT_RF_RXTX);			        // enable RF interrupts
+}
+/*---------------------------------------------------------------------------*/
+static void
+set_send_on_cca(uint8_t enable)
+{
+  send_on_cca = enable;
+}
+/*---------------------------------------------------------------------------*/
+static void
 set_auto_ack(uint8_t enable)
 {
   if(enable) {
@@ -395,7 +429,9 @@ off(void)
   /* Wait for ongoing TX to complete (e.g. this could be an outgoing ACK) */
   while(REG(RFCORE_XREG_FSMSTAT1) & RFCORE_XREG_FSMSTAT1_TX_ACTIVE);
 
-  CC2538_RF_CSP_ISFLUSHRX();
+  if (!(REG(RFCORE_XREG_FSMSTAT1) & RFCORE_XREG_FSMSTAT1_FIFOP)) {
+    CC2538_RF_CSP_ISFLUSHRX();
+  }
 
   /* Don't turn off if we are off as this will trigger a Strobe Error */
   if(REG(RFCORE_XREG_RXENABLE) != 0) {
@@ -459,10 +495,6 @@ init(void)
 
   set_channel(rf_channel);
 
-  /* Acknowledge RF interrupts, FIFOP only */
-  REG(RFCORE_XREG_RFIRQM0) |= RFCORE_XREG_RFIRQM0_FIFOP;
-  nvic_interrupt_enable(NVIC_INT_RF_RXTX);
-
   /* Acknowledge all RF Error interrupts */
   REG(RFCORE_XREG_RFERRM) = RFCORE_XREG_RFERRM_RFERRM;
   nvic_interrupt_enable(NVIC_INT_RF_ERR);
@@ -488,6 +520,8 @@ init(void)
      */
     udma_set_channel_src(CC2538_RF_CONF_RX_DMA_CHAN, RFCORE_SFR_RFDATA);
   }
+  
+  set_poll_mode(poll_mode);
 
   process_start(&cc2538_rf_process, NULL);
 
@@ -700,15 +734,15 @@ read(void *buf, unsigned short bufsize)
   }
 
   /* Read the RSSI and CRC/Corr bytes */
-  rssi = ((int8_t)REG(RFCORE_SFR_RFDATA)) - RSSI_OFFSET;
-  crc_corr = REG(RFCORE_SFR_RFDATA);
+  cc2538_last_rssi = ((int8_t)REG(RFCORE_SFR_RFDATA)) - RSSI_OFFSET;
+  cc2538_last_crc_corr_lqi = REG(RFCORE_SFR_RFDATA);
 
-  PRINTF("%02x%02x\n", (uint8_t)rssi, crc_corr);
+  PRINTF("%02x%02x\n", (uint8_t)cc2538_last_rssi, cc2538_last_crc_corr_lqi);
 
   /* MS bit CRC OK/Not OK, 7 LS Bits, Correlation value */
-  if(crc_corr & CRC_BIT_MASK) {
-    packetbuf_set_attr(PACKETBUF_ATTR_RSSI, rssi);
-    packetbuf_set_attr(PACKETBUF_ATTR_LINK_QUALITY, crc_corr & LQI_BIT_MASK);
+  if(cc2538_last_crc_corr_lqi & CRC_BIT_MASK) {
+    packetbuf_set_attr(PACKETBUF_ATTR_RSSI, cc2538_last_rssi);
+    packetbuf_set_attr(PACKETBUF_ATTR_LINK_QUALITY, cc2538_last_crc_corr_lqi & LQI_BIT_MASK);
     RIMESTATS_ADD(llrx);
   } else {
     RIMESTATS_ADD(badcrc);
@@ -731,14 +765,18 @@ read(void *buf, unsigned short bufsize)
   flush();
 #endif
 
-  /* If FIFOP==1 and FIFO==0 then we had a FIFO overflow at some point. */
-  if(REG(RFCORE_XREG_FSMSTAT1) & RFCORE_XREG_FSMSTAT1_FIFOP) {
-    if(REG(RFCORE_XREG_FSMSTAT1) & RFCORE_XREG_FSMSTAT1_FIFO) {
-      process_poll(&cc2538_rf_process);
-    } else {
-      CC2538_RF_CSP_ISFLUSHRX();
+  if(!poll_mode) {
+    /* If FIFOP==1 and FIFO==0 then we had a FIFO overflow at some point. */
+    if(REG(RFCORE_XREG_FSMSTAT1) & RFCORE_XREG_FSMSTAT1_FIFOP) {
+      if(REG(RFCORE_XREG_FSMSTAT1) & RFCORE_XREG_FSMSTAT1_FIFO) {
+        process_poll(&cc2538_rf_process);
+      } else {
+        CC2538_RF_CSP_ISFLUSHRX();
+      }
     }
   }
+  
+  CC2538_RF_CSP_ISFLUSHRX();
 
   return (len);
 }
@@ -796,6 +834,15 @@ get_value(radio_param_t param, radio_value_t *value)
     if(REG(RFCORE_XREG_FRMCTRL0) & RFCORE_XREG_FRMCTRL0_AUTOACK) {
       *value |= RADIO_RX_MODE_AUTOACK;
     }
+    if(poll_mode) {
+      *value |= RADIO_RX_MODE_POLL_MODE;
+    }
+    return RADIO_RESULT_OK;
+  case RADIO_PARAM_TX_MODE:
+    *value = 0;
+    if(send_on_cca) {
+      *value |= RADIO_TX_MODE_SEND_ON_CCA;
+    }
     return RADIO_RESULT_OK;
   case RADIO_PARAM_TXPOWER:
     *value = get_tx_power();
@@ -806,6 +853,12 @@ get_value(radio_param_t param, radio_value_t *value)
   case RADIO_PARAM_RSSI:
     *value = get_rssi();
     return RADIO_RESULT_OK;
+  case RADIO_PARAM_LAST_RSSI:
+    *value = cc2538_last_rssi;
+    return RADIO_RESULT_OK;
+  case RADIO_PARAM_LAST_LINK_QUALITY:
+    *value = cc2538_last_crc_corr_lqi & LQI_BIT_MASK;
+    return RADIO_RESULT_OK;
   case RADIO_CONST_CHANNEL_MIN:
     *value = CC2538_RF_CHANNEL_MIN;
     return RADIO_RESULT_OK;
@@ -854,13 +907,21 @@ set_value(radio_param_t param, radio_value_t value)
     return RADIO_RESULT_OK;
   case RADIO_PARAM_RX_MODE:
     if(value & ~(RADIO_RX_MODE_ADDRESS_FILTER |
-                 RADIO_RX_MODE_AUTOACK)) {
+                 RADIO_RX_MODE_AUTOACK |
+                 RADIO_RX_MODE_POLL_MODE)) {
       return RADIO_RESULT_INVALID_VALUE;
     }
 
     set_frame_filtering((value & RADIO_RX_MODE_ADDRESS_FILTER) != 0);
     set_auto_ack((value & RADIO_RX_MODE_AUTOACK) != 0);
+    set_poll_mode((value & RADIO_RX_MODE_POLL_MODE) != 0);
 
+    return RADIO_RESULT_OK;
+  case RADIO_PARAM_TX_MODE:
+    if(value & ~(RADIO_TX_MODE_SEND_ON_CCA)) {
+      return RADIO_RESULT_INVALID_VALUE;
+    }
+    set_send_on_cca((value & RADIO_TX_MODE_SEND_ON_CCA) != 0);
     return RADIO_RESULT_OK;
   case RADIO_PARAM_TXPOWER:
     if(value < OUTPUT_POWER_MIN || value > OUTPUT_POWER_MAX) {
@@ -895,6 +956,19 @@ get_object(radio_param_t param, void *dest, size_t size)
 
     return RADIO_RESULT_OK;
   }
+  
+  if(param == RADIO_PARAM_LAST_PACKET_TIMESTAMP) {
+#if CC2538_RF_CONF_SFD_TIMESTAMPS
+    if(size != sizeof(rtimer_clock_t) || !dest) {
+      return RADIO_RESULT_INVALID_VALUE;
+    }
+    *(rtimer_clock_t*)dest = cc2538_sfd_rtime;
+    return RADIO_RESULT_OK;
+#else
+    return RADIO_RESULT_NOT_SUPPORTED;
+#endif
+  }
+  
   return RADIO_RESULT_NOT_SUPPORTED;
 }
 /*---------------------------------------------------------------------------*/
@@ -950,15 +1024,18 @@ PROCESS_THREAD(cc2538_rf_process, ev, data)
   PROCESS_BEGIN();
 
   while(1) {
-    PROCESS_YIELD_UNTIL(ev == PROCESS_EVENT_POLL);
+    /* Only if we are not in poll mode oder we are in poll mode and transceiver has to be reset */
+    PROCESS_YIELD_UNTIL((!poll_mode || (poll_mode && (rf_flags & RF_MUST_RESET))) && (ev == PROCESS_EVENT_POLL));
 
-    packetbuf_clear();
-    len = read(packetbuf_dataptr(), PACKETBUF_SIZE);
+    if(!poll_mode) {
+      packetbuf_clear();
+      len = read(packetbuf_dataptr(), PACKETBUF_SIZE);
 
-    if(len > 0) {
-      packetbuf_set_datalen(len);
+      if(len > 0) {
+        packetbuf_set_datalen(len);
 
-      NETSTACK_RDC.input();
+        NETSTACK_RDC.input();
+      }
     }
 
     /* If we were polled due to an RF error, reset the transceiver */
@@ -995,10 +1072,18 @@ void
 cc2538_rf_rx_tx_isr(void)
 {
   ENERGEST_ON(ENERGEST_TYPE_IRQ);
+  
+#if CC2538_RF_CONF_SFD_TIMESTAMPS
+  if(poll_mode) {
+    cc2538_sfd_rtime = RTIMER_NOW();
+  }
+#endif
 
-  process_poll(&cc2538_rf_process);
+  if(!poll_mode) {
+    process_poll(&cc2538_rf_process);
+  }
 
-  /* We only acknowledge FIFOP so we can safely wipe out the entire SFR */
+  /* We only acknowledge FIFOP or SFD so we can safely wipe out the entire SFR */
   REG(RFCORE_SFR_RFIRQF0) = 0;
 
   ENERGEST_OFF(ENERGEST_TYPE_IRQ);

From dea04c67d79e2bec92382340be6df70de90d3210 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Wed, 30 Sep 2015 16:06:58 +0200
Subject: [PATCH 063/393] Change the default IPv6 prefix from aaaa::/64 to
 fd00::/64

---
 core/net/ipv6/sicslowpan.c                    |  4 +--
 core/net/ipv6/uip-ds6.h                       | 30 +++++++++++++++++++
 core/net/rpl/rpl-dag-root.c                   |  4 +--
 cpu/native/net/wpcap.c                        |  2 +-
 examples/cc2530dk/border-router/README.md     |  4 +--
 examples/cc2530dk/udp-ipv6/client.c           |  2 +-
 examples/cc2530dk/udp-ipv6/ping6.c            |  2 +-
 examples/cc2530dk/udp-ipv6/server.c           |  4 +--
 .../cc2538-common/mqtt-demo/project-conf.h    |  2 +-
 examples/er-rest-example/Makefile             |  6 ++--
 examples/er-rest-example/README.md            |  8 ++---
 examples/hello-world/README.md                |  2 +-
 examples/ipv6/json-ws/json-ws.c               |  2 +-
 examples/ipv6/multicast/root.c                |  2 +-
 examples/ipv6/multicast/sink.c                |  2 +-
 examples/ipv6/native-border-router/Makefile   |  2 +-
 .../ipv6/native-border-router/slip-config.c   |  2 +-
 examples/ipv6/rpl-border-router/Makefile      |  2 +-
 examples/ipv6/rpl-collect/udp-sender.c        |  4 +--
 examples/ipv6/rpl-collect/udp-sink.c          |  4 +--
 examples/ipv6/rpl-udp/udp-client.c            | 12 ++++----
 examples/ipv6/rpl-udp/udp-server.c            | 12 ++++----
 .../ipv6/simple-udp-rpl/unicast-receiver.c    |  4 +--
 examples/ipv6/simple-udp-rpl/unicast-sender.c |  2 +-
 examples/ipv6/sky-websense/Makefile           |  4 +--
 examples/ipv6/sky-websense/README.md          |  4 +--
 examples/ipv6/sky-websense/websense-remote.c  |  4 +--
 examples/jn516x/rpl/README.md                 |  2 +-
 examples/jn516x/rpl/border-router/Makefile    |  2 +-
 .../jn516x/rpl/coap-dongle-node/dongle-node.c |  3 +-
 .../jn516x/rpl/coap-dr1175-node/dr1175-node.c |  3 +-
 .../jn516x/rpl/coap-dr1199-node/dr1199-node.c |  3 +-
 examples/jn516x/rpl/node/node.c               |  3 +-
 examples/mbxxx/mbxxx-websense/Makefile        |  4 +--
 examples/mbxxx/udp-ipv6-sleep/udp-client.c    |  4 +--
 examples/mbxxx/udp-ipv6-sleep/udp-server.c    |  2 +-
 .../servreg-hack/example-servreg-client.c     |  2 +-
 .../servreg-hack/example-servreg-server.c     |  2 +-
 examples/udp-ipv6/udp-client.c                |  4 +--
 examples/udp-ipv6/udp-server.c                |  2 +-
 examples/udp-stream/udp-stream.c              |  4 +--
 examples/webserver-ipv6/README.md             |  2 +-
 .../zolertia/z1/ipv6/z1-websense/Makefile     |  4 +--
 .../zolertia/z1/ipv6/z1-websense/README.md    |  4 +--
 .../z1/ipv6/z1-websense/websense-remote.c     |  4 +--
 .../apps/raven-ipso/raven-ipso.c              |  2 +-
 platform/avr-atmega128rfa1/contiki-conf.h     |  4 +--
 platform/avr-atmega128rfa1/contiki-main.c     |  2 +-
 .../avr-raven/apps/raven-ipso/raven-ipso.c    |  2 +-
 platform/avr-raven/contiki-conf.h             |  4 +--
 .../contiki-raven-default-init-net.c          |  2 +-
 platform/avr-raven/contiki-raven-main.c       |  2 +-
 platform/avr-ravenusb/contiki-conf.h          |  4 +--
 platform/cc2530dk/contiki-conf.h              |  4 +--
 platform/cc2538dk/README.md                   |  6 ++--
 platform/cc2538dk/contiki-conf.h              |  4 +--
 platform/cooja-ip64/contiki-cooja-ip64-main.c |  2 +-
 platform/cooja/contiki-cooja-main.c           |  2 +-
 platform/ev-aducrf101mkxz/README.md           |  6 ++--
 platform/eval-adf7xxxmb4z/README.md           |  6 ++--
 platform/exp5438/contiki-exp5438-main.c       |  2 +-
 platform/jn516x/contiki-jn516x-main.c         |  2 +-
 platform/mbxxx/contiki-main.c                 |  2 +-
 platform/micaz/init-net.c                     |  2 +-
 platform/minimal-net/contiki-main.c           |  2 +-
 platform/sky/contiki-sky-main.c               |  2 +-
 platform/wismote/contiki-wismote-main.c       |  2 +-
 platform/z1/contiki-z1-main.c                 |  2 +-
 platform/zoul/contiki-conf.h                  |  4 +--
 .../11-ipv6/code/receiver/udp-receiver.c      |  2 +-
 .../11-ipv6/code/sender/unicast-sender.c      |  6 ++--
 regression-tests/12-rpl/code/receiver-node.c  |  2 +-
 regression-tests/12-rpl/code/root-node.c      |  4 +--
 regression-tests/12-rpl/code/sender-node.c    |  4 +--
 .../13-ipv6-apps/x02-sky-coap.csc             | 10 +++----
 tools/sky/uip6-bridge/Makefile                |  4 +--
 tools/stm32w/wpcapslip6/README.md             |  4 +--
 tools/tunslip6.c                              |  2 +-
 78 files changed, 165 insertions(+), 131 deletions(-)

diff --git a/core/net/ipv6/sicslowpan.c b/core/net/ipv6/sicslowpan.c
index 3b722d598..de9d78181 100644
--- a/core/net/ipv6/sicslowpan.c
+++ b/core/net/ipv6/sicslowpan.c
@@ -1757,8 +1757,8 @@ sicslowpan_init(void)
 #ifdef SICSLOWPAN_CONF_ADDR_CONTEXT_0
   SICSLOWPAN_CONF_ADDR_CONTEXT_0;
 #else
-  addr_contexts[0].prefix[0] = 0xaa;
-  addr_contexts[0].prefix[1] = 0xaa;
+  addr_contexts[0].prefix[0] = UIP_DS6_DEFAULT_PREFIX_0;
+  addr_contexts[0].prefix[1] = UIP_DS6_DEFAULT_PREFIX_1;
 #endif
 #endif /* SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS > 0 */
 
diff --git a/core/net/ipv6/uip-ds6.h b/core/net/ipv6/uip-ds6.h
index 1c00a50b0..294eb230c 100644
--- a/core/net/ipv6/uip-ds6.h
+++ b/core/net/ipv6/uip-ds6.h
@@ -67,6 +67,36 @@
 #endif
 #define UIP_DS6_DEFRT_NB UIP_DS6_DEFRT_NBS + UIP_DS6_DEFRT_NBU
 
+/* Default prefix */
+#ifdef UIP_CONF_DS6_DEFAULT_PREFIX
+#define UIP_DS6_DEFAULT_PREFIX UIP_CONF_DS6_DEFAULT_PREFIX
+#else
+/* From RFC4193, section 3.1:
+ *  | 7 bits |1|  40 bits   |  16 bits  |          64 bits           |
+ *  +--------+-+------------+-----------+----------------------------+
+ *  | Prefix |L| Global ID  | Subnet ID |        Interface ID        |
+ *  +--------+-+------------+-----------+----------------------------+
+ *     Prefix            FC00::/7 prefix to identify Local IPv6 unicast
+ *                       addresses.
+ *     L                 Set to 1 if the prefix is locally assigned.
+ *                       Set to 0 may be defined in the future.  See
+ *                       Section 3.2 for additional information.
+ *     Global ID         40-bit global identifier used to create a
+ *                       globally unique prefix.  See Section 3.2 for
+ *                       additional information.
+ *
+ * We set prefix to 0xfc00 and set the local bit, resulting in 0xfd00.
+ * For high probability of network uniqueness, Global ID must be generated
+ * pseudo-randomly. As this is a hard-coded default prefix, we simply use
+ * a Global ID of 0. For real deployments, make sure to install a pseudo-random
+ * Global ID, e.g. in a RPL network, by configuring it at the root.
+ */
+#define UIP_DS6_DEFAULT_PREFIX 0xfd00
+#endif /* UIP_CONF_DS6_DEFAULT_PREFIX */
+
+#define UIP_DS6_DEFAULT_PREFIX_0 ((UIP_DS6_DEFAULT_PREFIX >> 8) & 0xff)
+#define UIP_DS6_DEFAULT_PREFIX_1 (UIP_DS6_DEFAULT_PREFIX & 0xff)
+
 /* Prefix list */
 #define UIP_DS6_PREFIX_NBS  1
 #ifndef UIP_CONF_DS6_PREFIX_NBU
diff --git a/core/net/rpl/rpl-dag-root.c b/core/net/rpl/rpl-dag-root.c
index efbdb4035..d053a1a13 100644
--- a/core/net/rpl/rpl-dag-root.c
+++ b/core/net/rpl/rpl-dag-root.c
@@ -146,7 +146,7 @@ set_global_address(void)
 
   /* Assign a unique local address (RFC4193,
      http://tools.ietf.org/html/rfc4193). */
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
@@ -213,7 +213,7 @@ rpl_dag_root_init_dag_immediately(void)
         dag->instance->def_route = NULL;
       }
 
-      uip_ip6addr(&prefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+      uip_ip6addr(&prefix, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
       rpl_set_prefix(dag, &prefix, 64);
       PRINTF("rpl_dag_root_init_dag: created a new RPL dag\n");
       return 0;
diff --git a/cpu/native/net/wpcap.c b/cpu/native/net/wpcap.c
index f32ba980f..301b07d91 100644
--- a/cpu/native/net/wpcap.c
+++ b/cpu/native/net/wpcap.c
@@ -525,7 +525,7 @@ wpcap_init(void)
 //	  }
 #else
       addr.s_addr = inet_addr("10.10.10.10");   //prefer ipv4 default for legacy compatibility
-//    uiplib_ipaddrconv("aaaa::1",(uip_ipaddr_t*) &addr6.s6_addr);
+//    uiplib_ipaddrconv("fd00::1",(uip_ipaddr_t*) &addr6.s6_addr);
 #endif
 
 #ifdef UIP_FALLBACK_INTERFACE
diff --git a/examples/cc2530dk/border-router/README.md b/examples/cc2530dk/border-router/README.md
index ebb9545a2..8c5025c4d 100644
--- a/examples/cc2530dk/border-router/README.md
+++ b/examples/cc2530dk/border-router/README.md
@@ -15,6 +15,6 @@ The node will use this address to obtain the network prefix
 
 For example:
 
-    sudo ./tunslip6 aaaa::1/64
+    sudo ./tunslip6 fd00::1/64
 
-This will use aaaa:: / 64 as the prefix for the 15.4 network.
+This will use fd00:: / 64 as the prefix for the 15.4 network.
diff --git a/examples/cc2530dk/udp-ipv6/client.c b/examples/cc2530dk/udp-ipv6/client.c
index 77d50b0df..065c07089 100644
--- a/examples/cc2530dk/udp-ipv6/client.c
+++ b/examples/cc2530dk/udp-ipv6/client.c
@@ -130,7 +130,7 @@ PROCESS_THREAD(udp_client_process, ev, data)
   PRINTF(" local/remote port %u/%u\n",
          UIP_HTONS(l_conn->lport), UIP_HTONS(l_conn->rport));
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0x0215, 0x2000, 0x0002, 0x2145);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0x0215, 0x2000, 0x0002, 0x2145);
   g_conn = udp_new(&ipaddr, UIP_HTONS(3000), NULL);
   if(!g_conn) {
     PRINTF("udp_new g_conn error.\n");
diff --git a/examples/cc2530dk/udp-ipv6/ping6.c b/examples/cc2530dk/udp-ipv6/ping6.c
index e19a36895..3f6fce89b 100644
--- a/examples/cc2530dk/udp-ipv6/ping6.c
+++ b/examples/cc2530dk/udp-ipv6/ping6.c
@@ -105,7 +105,7 @@ PROCESS_THREAD(ping6_process, ev, data)
   PRINTF("ping6 running.\n");
   PRINTF("Button 1: 5 pings 16 byte payload.\n");
 
-  uip_ip6addr(&dest_addr, 0xaaaa, 0, 0, 0, 0x0215, 0x2000, 0x0002, 0x2145);
+  uip_ip6addr(&dest_addr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0x0215, 0x2000, 0x0002, 0x2145);
   count = 0;
 
   icmp6_new(NULL);
diff --git a/examples/cc2530dk/udp-ipv6/server.c b/examples/cc2530dk/udp-ipv6/server.c
index 0b61194aa..ab381ccf5 100644
--- a/examples/cc2530dk/udp-ipv6/server.c
+++ b/examples/cc2530dk/udp-ipv6/server.c
@@ -126,7 +126,7 @@ create_dag()
 {
   rpl_dag_t *dag;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
@@ -135,7 +135,7 @@ create_dag()
   dag = rpl_set_root(RPL_DEFAULT_INSTANCE,
                      &uip_ds6_get_global(ADDR_PREFERRED)->ipaddr);
   if(dag != NULL) {
-    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     rpl_set_prefix(dag, &ipaddr, 64);
     PRINTF("Created a new RPL dag with ID: ");
     PRINT6ADDR(&dag->dag_id);
diff --git a/examples/cc2538-common/mqtt-demo/project-conf.h b/examples/cc2538-common/mqtt-demo/project-conf.h
index 0aaef655d..bcdabff20 100644
--- a/examples/cc2538-common/mqtt-demo/project-conf.h
+++ b/examples/cc2538-common/mqtt-demo/project-conf.h
@@ -45,7 +45,7 @@
 #define MQTT_DEMO_PUBLISH_TRIGGER &button_right_sensor
 
 /* If undefined, the demo will attempt to connect to IBM's quickstart */
-#define MQTT_DEMO_BROKER_IP_ADDR "aaaa::1"
+#define MQTT_DEMO_BROKER_IP_ADDR "fd00::1"
 /*---------------------------------------------------------------------------*/
 #endif /* PROJECT_CONF_H_ */
 /*---------------------------------------------------------------------------*/
diff --git a/examples/er-rest-example/Makefile b/examples/er-rest-example/Makefile
index a20d814ee..817a83b9d 100644
--- a/examples/er-rest-example/Makefile
+++ b/examples/er-rest-example/Makefile
@@ -57,13 +57,13 @@ $(CONTIKI)/tools/tunslip6:	$(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
 connect-router:	$(CONTIKI)/tools/tunslip6
-	sudo $(CONTIKI)/tools/tunslip6 aaaa::1/64
+	sudo $(CONTIKI)/tools/tunslip6 fd00::1/64
 
 connect-router-cooja:	$(CONTIKI)/tools/tunslip6
-	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 -p 60001 aaaa::1/64
+	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 -p 60001 fd00::1/64
 
 connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-router.native
-	sudo $(CONTIKI)/exmples/ipv6/native-border-router/border-router.native -a 127.0.0.1 -p 60001 aaaa::1/64
+	sudo $(CONTIKI)/exmples/ipv6/native-border-router/border-router.native -a 127.0.0.1 -p 60001 fd00::1/64
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0 
diff --git a/examples/er-rest-example/README.md b/examples/er-rest-example/README.md
index fe82ed9b5..25abd60e4 100644
--- a/examples/er-rest-example/README.md
+++ b/examples/er-rest-example/README.md
@@ -23,8 +23,8 @@ PRELIMINARIES
     #define NETSTACK_CONF_RDC     nullrdc_driver
 - Alternatively, you can use the native-border-router together with the slip-radio.
 - For convenience, define the Cooja addresses in /etc/hosts
-      aaaa::0212:7401:0001:0101 cooja1
-      aaaa::0212:7402:0002:0202 cooja2
+      fd00::0212:7401:0001:0101 cooja1
+      fd00::0212:7402:0002:0202 cooja2
       ...
 - Get the Copper (Cu) CoAP user-agent from
   [https://addons.mozilla.org/en-US/firefox/addon/copper-270430](https://addons.mozilla.org/en-US/firefox/addon/copper-270430)
@@ -82,11 +82,11 @@ TMOTES HOWTO
 
 3. Start Copper and discover resources at:
 
-        coap://[aaaa::____:____:____:____]:5683/
+        coap://[fd00::____:____:____:____]:5683/
 
 ### Add a client:
 
-1. Change the hard-coded server address in er-example-client.c to aaaa::____:____:____:____
+1. Change the hard-coded server address in er-example-client.c to fd00::____:____:____:____
 2. Connect a third Tmote Sky
 
         make TARGET=sky er-example-client.upload MOTE=3
diff --git a/examples/hello-world/README.md b/examples/hello-world/README.md
index c4cbd2c6e..a92c242ab 100644
--- a/examples/hello-world/README.md
+++ b/examples/hello-world/README.md
@@ -34,7 +34,7 @@ For example, using a loopback interface with the minimal-net platform:
     make UIP_CONF_IPV6=1 TARGET=minimal-net
     ./hello-world.minimal-net
     Hello, world
-    IPV6 Address: [aaaa::206:98ff:fe00:232]
+    IPV6 Address: [fd00::206:98ff:fe00:232]
     IPV6 Address: [fe80::206:98ff:fe00:232]
     ^C
 
diff --git a/examples/ipv6/json-ws/json-ws.c b/examples/ipv6/json-ws/json-ws.c
index 6c6177f16..6a290a194 100644
--- a/examples/ipv6/json-ws/json-ws.c
+++ b/examples/ipv6/json-ws/json-ws.c
@@ -78,7 +78,7 @@
 static const char http_content_type_json[] = "application/json";
 
 /* Maximum 40 chars in host name?: 5 x 8 */
-static char callback_host[40] = "[aaaa::1]";
+static char callback_host[40] = "[fd00::1]";
 static uint16_t callback_port = CALLBACK_PORT;
 static uint16_t callback_interval = SEND_INTERVAL;
 static char callback_path[80] = "/debug/";
diff --git a/examples/ipv6/multicast/root.c b/examples/ipv6/multicast/root.c
index 0f27e7d17..cb7d2b4a6 100644
--- a/examples/ipv6/multicast/root.c
+++ b/examples/ipv6/multicast/root.c
@@ -111,7 +111,7 @@ set_own_addresses(void)
   rpl_dag_t *dag;
   uip_ipaddr_t ipaddr;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
diff --git a/examples/ipv6/multicast/sink.c b/examples/ipv6/multicast/sink.c
index 4c272869a..ea2ef1085 100644
--- a/examples/ipv6/multicast/sink.c
+++ b/examples/ipv6/multicast/sink.c
@@ -84,7 +84,7 @@ join_mcast_group(void)
   uip_ds6_maddr_t *rv;
 
   /* First, set our v6 global */
-  uip_ip6addr(&addr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&addr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&addr, &uip_lladdr);
   uip_ds6_addr_add(&addr, 0, ADDR_AUTOCONF);
 
diff --git a/examples/ipv6/native-border-router/Makefile b/examples/ipv6/native-border-router/Makefile
index d781ed35c..dc60e18d9 100644
--- a/examples/ipv6/native-border-router/Makefile
+++ b/examples/ipv6/native-border-router/Makefile
@@ -24,4 +24,4 @@ CONTIKI_WITH_IPV6 = 1
 include $(CONTIKI)/Makefile.include
 
 connect-router:	border-router.native
-	sudo ./border-router.native aaaa::1/64
+	sudo ./border-router.native fd00::1/64
diff --git a/examples/ipv6/native-border-router/slip-config.c b/examples/ipv6/native-border-router/slip-config.c
index 84d256127..782259f8c 100644
--- a/examples/ipv6/native-border-router/slip-config.c
+++ b/examples/ipv6/native-border-router/slip-config.c
@@ -125,7 +125,7 @@ slip_config_handle_arguments(int argc, char **argv)
     case 'h':
     default:
 fprintf(stderr,"usage:  %s [options] ipaddress\n", prog);
-fprintf(stderr,"example: border-router.native -L -v2 -s ttyUSB1 aaaa::1/64\n");
+fprintf(stderr,"example: border-router.native -L -v2 -s ttyUSB1 fd00::1/64\n");
 fprintf(stderr,"Options are:\n");
 #ifdef linux
 fprintf(stderr," -B baudrate    9600,19200,38400,57600,115200,921600 (default 115200)\n");
diff --git a/examples/ipv6/rpl-border-router/Makefile b/examples/ipv6/rpl-border-router/Makefile
index ce90a4eac..6595186be 100644
--- a/examples/ipv6/rpl-border-router/Makefile
+++ b/examples/ipv6/rpl-border-router/Makefile
@@ -33,7 +33,7 @@ CFLAGS += -DWEBSERVER=2
 endif
 
 ifeq ($(PREFIX),)
- PREFIX = aaaa::1/64
+ PREFIX = fd00::1/64
 endif
 
 CONTIKI_WITH_IPV6 = 1
diff --git a/examples/ipv6/rpl-collect/udp-sender.c b/examples/ipv6/rpl-collect/udp-sender.c
index dd279cc7f..469d5e6f0 100644
--- a/examples/ipv6/rpl-collect/udp-sender.c
+++ b/examples/ipv6/rpl-collect/udp-sender.c
@@ -195,12 +195,12 @@ set_global_address(void)
 {
   uip_ipaddr_t ipaddr;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
   /* set server address */
-  uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1);
+  uip_ip6addr(&server_ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 1);
 
 }
 /*---------------------------------------------------------------------------*/
diff --git a/examples/ipv6/rpl-collect/udp-sink.c b/examples/ipv6/rpl-collect/udp-sink.c
index dbdde2d01..7834c7cbc 100644
--- a/examples/ipv6/rpl-collect/udp-sink.c
+++ b/examples/ipv6/rpl-collect/udp-sink.c
@@ -145,14 +145,14 @@ PROCESS_THREAD(udp_server_process, ev, data)
   PRINTF("UDP server started\n");
 
 #if UIP_CONF_ROUTER
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 1);
   /* uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr); */
   uip_ds6_addr_add(&ipaddr, 0, ADDR_MANUAL);
   root_if = uip_ds6_addr_lookup(&ipaddr);
   if(root_if != NULL) {
     rpl_dag_t *dag;
     dag = rpl_set_root(RPL_DEFAULT_INSTANCE,(uip_ip6addr_t *)&ipaddr);
-    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     rpl_set_prefix(dag, &ipaddr, 64);
     PRINTF("created a new RPL dag\n");
   } else {
diff --git a/examples/ipv6/rpl-udp/udp-client.c b/examples/ipv6/rpl-udp/udp-client.c
index c16b0ba48..279703880 100644
--- a/examples/ipv6/rpl-udp/udp-client.c
+++ b/examples/ipv6/rpl-udp/udp-client.c
@@ -116,7 +116,7 @@ set_global_address(void)
 {
   uip_ipaddr_t ipaddr;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
@@ -125,21 +125,21 @@ set_global_address(void)
  * Obviously the choice made here must also be selected in udp-server.c.
  *
  * For correct Wireshark decoding using a sniffer, add the /64 prefix to the 6LowPAN protocol preferences,
- * e.g. set Context 0 to aaaa::.  At present Wireshark copies Context/128 and then overwrites it.
- * (Setting Context 0 to aaaa::1111:2222:3333:4444 will report a 16 bit compressed address of aaaa::1111:22ff:fe33:xxxx)
+ * e.g. set Context 0 to fd00::.  At present Wireshark copies Context/128 and then overwrites it.
+ * (Setting Context 0 to fd00::1111:2222:3333:4444 will report a 16 bit compressed address of fd00::1111:22ff:fe33:xxxx)
  *
  * Note the IPCMV6 checksum verification depends on the correct uncompressed addresses.
  */
  
 #if 0
 /* Mode 1 - 64 bits inline */
-   uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1);
+   uip_ip6addr(&server_ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 1);
 #elif 1
 /* Mode 2 - 16 bits inline */
-  uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
+  uip_ip6addr(&server_ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
 #else
 /* Mode 3 - derived from server link-local (MAC) address */
-  uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0x0250, 0xc2ff, 0xfea8, 0xcd1a); //redbee-econotag
+  uip_ip6addr(&server_ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0x0250, 0xc2ff, 0xfea8, 0xcd1a); //redbee-econotag
 #endif
 }
 /*---------------------------------------------------------------------------*/
diff --git a/examples/ipv6/rpl-udp/udp-server.c b/examples/ipv6/rpl-udp/udp-server.c
index b735d3bb2..17c1b1fb8 100644
--- a/examples/ipv6/rpl-udp/udp-server.c
+++ b/examples/ipv6/rpl-udp/udp-server.c
@@ -114,20 +114,20 @@ PROCESS_THREAD(udp_server_process, ev, data)
  * Obviously the choice made here must also be selected in udp-client.c.
  *
  * For correct Wireshark decoding using a sniffer, add the /64 prefix to the 6LowPAN protocol preferences,
- * e.g. set Context 0 to aaaa::.  At present Wireshark copies Context/128 and then overwrites it.
- * (Setting Context 0 to aaaa::1111:2222:3333:4444 will report a 16 bit compressed address of aaaa::1111:22ff:fe33:xxxx)
+ * e.g. set Context 0 to fd00::.  At present Wireshark copies Context/128 and then overwrites it.
+ * (Setting Context 0 to fd00::1111:2222:3333:4444 will report a 16 bit compressed address of fd00::1111:22ff:fe33:xxxx)
  * Note Wireshark's IPCMV6 checksum verification depends on the correct uncompressed addresses.
  */
  
 #if 0
 /* Mode 1 - 64 bits inline */
-   uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1);
+   uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 1);
 #elif 1
 /* Mode 2 - 16 bits inline */
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
 #else
 /* Mode 3 - derived from link local (MAC) address */
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
 #endif
 
@@ -136,7 +136,7 @@ PROCESS_THREAD(udp_server_process, ev, data)
   if(root_if != NULL) {
     rpl_dag_t *dag;
     dag = rpl_set_root(RPL_DEFAULT_INSTANCE,(uip_ip6addr_t *)&ipaddr);
-    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     rpl_set_prefix(dag, &ipaddr, 64);
     PRINTF("created a new RPL dag\n");
   } else {
diff --git a/examples/ipv6/simple-udp-rpl/unicast-receiver.c b/examples/ipv6/simple-udp-rpl/unicast-receiver.c
index 1100886b4..7c6205dab 100644
--- a/examples/ipv6/simple-udp-rpl/unicast-receiver.c
+++ b/examples/ipv6/simple-udp-rpl/unicast-receiver.c
@@ -80,7 +80,7 @@ set_global_address(void)
   int i;
   uint8_t state;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
@@ -109,7 +109,7 @@ create_rpl_dag(uip_ipaddr_t *ipaddr)
     
     rpl_set_root(RPL_DEFAULT_INSTANCE, ipaddr);
     dag = rpl_get_any_dag();
-    uip_ip6addr(&prefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&prefix, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     rpl_set_prefix(dag, &prefix, 64);
     PRINTF("created a new RPL dag\n");
   } else {
diff --git a/examples/ipv6/simple-udp-rpl/unicast-sender.c b/examples/ipv6/simple-udp-rpl/unicast-sender.c
index 60cb91204..f441ec728 100644
--- a/examples/ipv6/simple-udp-rpl/unicast-sender.c
+++ b/examples/ipv6/simple-udp-rpl/unicast-sender.c
@@ -78,7 +78,7 @@ set_global_address(void)
   int i;
   uint8_t state;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
diff --git a/examples/ipv6/sky-websense/Makefile b/examples/ipv6/sky-websense/Makefile
index 17385c016..7096128a4 100644
--- a/examples/ipv6/sky-websense/Makefile
+++ b/examples/ipv6/sky-websense/Makefile
@@ -16,7 +16,7 @@ $(CONTIKI)/tools/tunslip6:	$(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
 connect-router:	$(CONTIKI)/tools/tunslip6
-	sudo $(CONTIKI)/tools/tunslip6 aaaa::1/64
+	sudo $(CONTIKI)/tools/tunslip6 fd00::1/64
 
 connect-router-cooja:	$(CONTIKI)/tools/tunslip6
-	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 aaaa::1/64
+	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 fd00::1/64
diff --git a/examples/ipv6/sky-websense/README.md b/examples/ipv6/sky-websense/README.md
index 64e566b17..ab644f887 100644
--- a/examples/ipv6/sky-websense/README.md
+++ b/examples/ipv6/sky-websense/README.md
@@ -17,8 +17,8 @@ To test the example in COOJA under Linux
     make connect-router-cooja
 
 3. You should now be able to browse to the nodes using your web browser:
-   Router: http://[aaaa::0212:7401:0001:0101]/
-   Node 2: http://[aaaa::0212:7402:0002:0202]/
+   Router: http://[fd00::0212:7401:0001:0101]/
+   Node 2: http://[fd00::0212:7402:0002:0202]/
 
 
 To run the example on real nodes under Linux
diff --git a/examples/ipv6/sky-websense/websense-remote.c b/examples/ipv6/sky-websense/websense-remote.c
index 75737b484..76fc7d0a7 100644
--- a/examples/ipv6/sky-websense/websense-remote.c
+++ b/examples/ipv6/sky-websense/websense-remote.c
@@ -44,13 +44,13 @@
 #include <stdio.h>
 
 /* The address of the server to register the services for this node */
-#define SERVER       "[aaaa::1]"
+#define SERVER       "[fd00::1]"
 
 /* This command registers two services (/0 and /1) to turn the leds on or off */
 #define REGISTER_COMMAND "/r?p=0&d=Turn%20off%20leds&p=1&d=Turn%20on%20leds"
 
 /* The address of the other node to control */
-#define OTHER_NODE   "[aaaa::1]"
+#define OTHER_NODE   "[fd00::1]"
 
 /* The commands to send to the other node */
 #define SET_LEDS_ON  "/1"
diff --git a/examples/jn516x/rpl/README.md b/examples/jn516x/rpl/README.md
index 39a213268..fb8cd49b4 100644
--- a/examples/jn516x/rpl/README.md
+++ b/examples/jn516x/rpl/README.md
@@ -28,7 +28,7 @@ From a Linux terminal, go to `contiki/examples/jn516x/rpl/border-router` and do
 or `make connect-router-sw` if you have **SW flow control**
 
 This will start a tunnel interface (tun0) on the host machine.
-All traffic towards our network (prefix aaaa::1/64) will now be routed to the border router.
+All traffic towards our network (prefix fd00::1/64) will now be routed to the border router.
 
 ## RPL Node
 
diff --git a/examples/jn516x/rpl/border-router/Makefile b/examples/jn516x/rpl/border-router/Makefile
index de68ecde8..1904e5ce8 100644
--- a/examples/jn516x/rpl/border-router/Makefile
+++ b/examples/jn516x/rpl/border-router/Makefile
@@ -14,7 +14,7 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 PROJECT_SOURCEFILES += slip-bridge.c slip.c
 
 ifeq ($(PREFIX),)
- PREFIX = aaaa::1/64
+ PREFIX = fd00::1/64
 endif
 
 include $(CONTIKI)/Makefile.include
diff --git a/examples/jn516x/rpl/coap-dongle-node/dongle-node.c b/examples/jn516x/rpl/coap-dongle-node/dongle-node.c
index ab5845dff..233834610 100644
--- a/examples/jn516x/rpl/coap-dongle-node/dongle-node.c
+++ b/examples/jn516x/rpl/coap-dongle-node/dongle-node.c
@@ -33,6 +33,7 @@
  */
 #include "contiki.h"
 #include "net/ip/uip.h"
+#include "net/ipv6/uip-ds6.h"
 #include "tools/rpl-tools.h"
 #include "rest-engine.h"
 #include "sys/ctimer.h"
@@ -130,7 +131,7 @@ PROCESS_THREAD(start_app, ev, data)
   /* Start net stack */
   if(is_coordinator) {
     uip_ipaddr_t prefix;
-    uip_ip6addr(&prefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&prefix, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     rpl_tools_init(&prefix);
   } else {
     rpl_tools_init(NULL);
diff --git a/examples/jn516x/rpl/coap-dr1175-node/dr1175-node.c b/examples/jn516x/rpl/coap-dr1175-node/dr1175-node.c
index f377dc3b3..641f3eca5 100644
--- a/examples/jn516x/rpl/coap-dr1175-node/dr1175-node.c
+++ b/examples/jn516x/rpl/coap-dr1175-node/dr1175-node.c
@@ -34,6 +34,7 @@
 
 #include "contiki.h"
 #include "net/ip/uip.h"
+#include "net/ipv6/uip-ds6.h"
 #include "tools/rpl-tools.h"
 #include "rest-engine.h"
 #include "light-sensor.h"
@@ -350,7 +351,7 @@ PROCESS_THREAD(start_app, ev, data)
   /* Start net stack */
   if(is_coordinator) {
     uip_ipaddr_t prefix;
-    uip_ip6addr(&prefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&prefix, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     rpl_tools_init(&prefix);
   } else {
     rpl_tools_init(NULL);
diff --git a/examples/jn516x/rpl/coap-dr1199-node/dr1199-node.c b/examples/jn516x/rpl/coap-dr1199-node/dr1199-node.c
index 373922e58..933b247d6 100644
--- a/examples/jn516x/rpl/coap-dr1199-node/dr1199-node.c
+++ b/examples/jn516x/rpl/coap-dr1199-node/dr1199-node.c
@@ -33,6 +33,7 @@
  */
 #include "contiki.h"
 #include "net/ip/uip.h"
+#include "net/ipv6/uip-ds6.h"
 #include "tools/rpl-tools.h"
 #include "rest-engine.h"
 #include "dev/leds.h"
@@ -351,7 +352,7 @@ PROCESS_THREAD(start_app, ev, data)
   /* Start net stack */
   if(is_coordinator) {
     uip_ipaddr_t prefix;
-    uip_ip6addr(&prefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&prefix, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     rpl_tools_init(&prefix);
   } else {
     rpl_tools_init(NULL);
diff --git a/examples/jn516x/rpl/node/node.c b/examples/jn516x/rpl/node/node.c
index 59b812357..b6a6f3096 100644
--- a/examples/jn516x/rpl/node/node.c
+++ b/examples/jn516x/rpl/node/node.c
@@ -36,6 +36,7 @@
  */
 
 #include "contiki.h"
+#include "net/ipv6/uip-ds6.h"
 #include "net/rpl/rpl.h"
 #include "tools/rpl-tools.h"
 
@@ -98,7 +99,7 @@ PROCESS_THREAD(node_process, ev, data)
 
   if(is_coordinator) {
     uip_ipaddr_t prefix;
-    uip_ip6addr(&prefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&prefix, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     rpl_tools_init(&prefix);
   } else {
     rpl_tools_init(NULL);
diff --git a/examples/mbxxx/mbxxx-websense/Makefile b/examples/mbxxx/mbxxx-websense/Makefile
index 6239a7043..accb4e412 100644
--- a/examples/mbxxx/mbxxx-websense/Makefile
+++ b/examples/mbxxx/mbxxx-websense/Makefile
@@ -16,7 +16,7 @@ $(CONTIKI)/tools/tunslip6:     $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
 connect-router:        $(CONTIKI)/tools/tunslip6
-	sudo $(CONTIKI)/tools/tunslip6 aaaa::1/64
+	sudo $(CONTIKI)/tools/tunslip6 fd00::1/64
 
 connect-router-cooja:  $(CONTIKI)/tools/tunslip6
-	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 aaaa::1/64
+	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 fd00::1/64
diff --git a/examples/mbxxx/udp-ipv6-sleep/udp-client.c b/examples/mbxxx/udp-ipv6-sleep/udp-client.c
index 4408a2c19..3c6f7934d 100644
--- a/examples/mbxxx/udp-ipv6-sleep/udp-client.c
+++ b/examples/mbxxx/udp-ipv6-sleep/udp-client.c
@@ -107,7 +107,7 @@ set_global_address(void)
 {
   uip_ipaddr_t ipaddr;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 }
@@ -123,7 +123,7 @@ set_connection_address(uip_ipaddr_t *ipaddr)
     PRINTF("UDP client failed to parse address '%s'\n", QUOTEME(UDP_CONNECTION_ADDR));
   }
 #elif UIP_CONF_ROUTER
-  uip_ip6addr(ipaddr,0xaaaa,0,0,0,0x0280,0xe102,0x0000,0x008a);
+  uip_ip6addr(ipaddr,UIP_DS6_DEFAULT_PREFIX,0,0,0,0x0280,0xe102,0x0000,0x008a);
 #else
   uip_ip6addr(ipaddr,0xfe80,0,0,0,0x0280,0xe102,0x0000,0x008a);
 #endif /* UDP_CONNECTION_ADDR */
diff --git a/examples/mbxxx/udp-ipv6-sleep/udp-server.c b/examples/mbxxx/udp-ipv6-sleep/udp-server.c
index 68fc1915c..78c6f9d3a 100644
--- a/examples/mbxxx/udp-ipv6-sleep/udp-server.c
+++ b/examples/mbxxx/udp-ipv6-sleep/udp-server.c
@@ -95,7 +95,7 @@ PROCESS_THREAD(udp_server_process, ev, data)
   PRINTF("UDP server started\n");
 
 #if UIP_CONF_ROUTER
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 #endif /* UIP_CONF_ROUTER */
diff --git a/examples/servreg-hack/example-servreg-client.c b/examples/servreg-hack/example-servreg-client.c
index 108d40aeb..4557fab71 100644
--- a/examples/servreg-hack/example-servreg-client.c
+++ b/examples/servreg-hack/example-servreg-client.c
@@ -54,7 +54,7 @@ set_global_address(void)
 {
   uip_ipaddr_t ipaddr;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 }
diff --git a/examples/servreg-hack/example-servreg-server.c b/examples/servreg-hack/example-servreg-server.c
index 01dd7175a..4ff70060c 100644
--- a/examples/servreg-hack/example-servreg-server.c
+++ b/examples/servreg-hack/example-servreg-server.c
@@ -53,7 +53,7 @@ PROCESS_THREAD(example_servreg_server_process, ev, data)
   PROCESS_BEGIN();
 
   /* Set a global address. */
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
diff --git a/examples/udp-ipv6/udp-client.c b/examples/udp-ipv6/udp-client.c
index 7f9b7659e..85854a48b 100644
--- a/examples/udp-ipv6/udp-client.c
+++ b/examples/udp-ipv6/udp-client.c
@@ -98,7 +98,7 @@ set_global_address(void)
 {
   uip_ipaddr_t ipaddr;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 }
@@ -111,7 +111,7 @@ set_connection_address(uip_ipaddr_t *ipaddr)
 #if RESOLV_CONF_SUPPORTS_MDNS
 #define UDP_CONNECTION_ADDR       contiki-udp-server.local
 #elif UIP_CONF_ROUTER
-#define UDP_CONNECTION_ADDR       aaaa:0:0:0:0212:7404:0004:0404
+#define UDP_CONNECTION_ADDR       fd00:0:0:0:0212:7404:0004:0404
 #else
 #define UDP_CONNECTION_ADDR       fe80:0:0:0:6466:6666:6666:6666
 #endif
diff --git a/examples/udp-ipv6/udp-server.c b/examples/udp-ipv6/udp-server.c
index c56720f9a..eeb7de700 100644
--- a/examples/udp-ipv6/udp-server.c
+++ b/examples/udp-ipv6/udp-server.c
@@ -99,7 +99,7 @@ PROCESS_THREAD(udp_server_process, ev, data)
 #endif
 
 #if UIP_CONF_ROUTER
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 #endif /* UIP_CONF_ROUTER */
diff --git a/examples/udp-stream/udp-stream.c b/examples/udp-stream/udp-stream.c
index c10e8d6a5..875b594d8 100644
--- a/examples/udp-stream/udp-stream.c
+++ b/examples/udp-stream/udp-stream.c
@@ -74,7 +74,7 @@ set_global_address(void)
   int i;
   uint8_t state;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
@@ -102,7 +102,7 @@ create_rpl_dag(uip_ipaddr_t *ipaddr)
 
     rpl_set_root(RPL_DEFAULT_INSTANCE, ipaddr);
     dag = rpl_get_any_dag();
-    uip_ip6addr(&prefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&prefix, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     rpl_set_prefix(dag, &prefix, 64);
     printf("created a new RPL dag\n");
   } else {
diff --git a/examples/webserver-ipv6/README.md b/examples/webserver-ipv6/README.md
index ddeb5cb87..fae6057a1 100644
--- a/examples/webserver-ipv6/README.md
+++ b/examples/webserver-ipv6/README.md
@@ -41,7 +41,7 @@ On linux you can set up router advertisements as follows:
 
 - You might need to add a route:
 
-        ip -6 route add aaaa:0000:0000:0000:0206:98ff:fe00:0232/64 dev tap0
+        ip -6 route add fd00:0000:0000:0000:0206:98ff:fe00:0232/64 dev tap0
 
 - Then configure a global address by sending a router advertisement (RA) with a
   prefix option. You can use radvd for example to generate such a packet.
diff --git a/examples/zolertia/z1/ipv6/z1-websense/Makefile b/examples/zolertia/z1/ipv6/z1-websense/Makefile
index 717802ae9..8db74458e 100644
--- a/examples/zolertia/z1/ipv6/z1-websense/Makefile
+++ b/examples/zolertia/z1/ipv6/z1-websense/Makefile
@@ -18,10 +18,10 @@ $(CONTIKI)/tools/tunslip6:	$(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
 connect-router:	$(CONTIKI)/tools/tunslip6
-	sudo $(CONTIKI)/tools/tunslip6 aaaa::1/64
+	sudo $(CONTIKI)/tools/tunslip6 fd00::1/64
 
 connect-router-cooja:	$(CONTIKI)/tools/tunslip6
-	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 aaaa::1/64
+	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 fd00::1/64
 
 CUSTOM_RULE_LINK=1 
 %.$(TARGET): %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a $(LD) $(LDFLAGS) $(TARGET_STARTFILES) ${filter-out %.a,$^} ${filter %.a,$^} $(TARGET_LIBFILES) -o $@ -lm
diff --git a/examples/zolertia/z1/ipv6/z1-websense/README.md b/examples/zolertia/z1/ipv6/z1-websense/README.md
index af373adc6..82e7f34ee 100644
--- a/examples/zolertia/z1/ipv6/z1-websense/README.md
+++ b/examples/zolertia/z1/ipv6/z1-websense/README.md
@@ -19,8 +19,8 @@ To test the example in COOJA under Linux
 
 3. You should now be able to browse to the nodes using your web browser:
 
-   Router: http://[aaaa::0212:7401:0001:0101]/
-   Node 2: http://[aaaa::0212:7402:0002:0202]/
+   Router: http://[fd00::0212:7401:0001:0101]/
+   Node 2: http://[fd00::0212:7402:0002:0202]/
 
 
 To run the example on real nodes under Linux
diff --git a/examples/zolertia/z1/ipv6/z1-websense/websense-remote.c b/examples/zolertia/z1/ipv6/z1-websense/websense-remote.c
index 7cfebd355..a6336260d 100644
--- a/examples/zolertia/z1/ipv6/z1-websense/websense-remote.c
+++ b/examples/zolertia/z1/ipv6/z1-websense/websense-remote.c
@@ -45,13 +45,13 @@
 #include <stdio.h>
 /*---------------------------------------------------------------------------*/
 /* The address of the server to register the services for this node */
-#define SERVER       "aaaa::1"
+#define SERVER       "fd00::1"
 
 /* This command registers two services (/0 and /1) to turn the leds on or off */
 #define REGISTER_COMMAND "/r?p=0&d=Turn%20off%20leds&p=1&d=Turn%20on%20leds"
 
 /* The address of the other node to control */
-#define OTHER_NODE   "aaaa::212:7403:3:303"
+#define OTHER_NODE   "fd00::212:7403:3:303"
 
 /* The commands to send to the other node */
 #define SET_LEDS_ON  "/1"
diff --git a/platform/avr-atmega128rfa1/apps/raven-ipso/raven-ipso.c b/platform/avr-atmega128rfa1/apps/raven-ipso/raven-ipso.c
index 214a64efe..04802951a 100644
--- a/platform/avr-atmega128rfa1/apps/raven-ipso/raven-ipso.c
+++ b/platform/avr-atmega128rfa1/apps/raven-ipso/raven-ipso.c
@@ -95,7 +95,7 @@ raven_ping6(void)
   /* ping ipv6.google.com*/
   uip_ip6addr(&ping_addr,0x2001,0x420,0x5FFF,0x7D,0x2D0,0xB7FF,0xFE23,0xE6DB);
   //uip_ip6addr(&ping_addr, 0x2001, 0x4860, 0, 0x2001, 0, 0, 0, 0x68);
-  //uip_ip6addr(&ping_addr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1);
+  //uip_ip6addr(&ping_addr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 1);
   
   UIP_IP_BUF->vtc = 0x60;
   UIP_IP_BUF->tcflow = 1;
diff --git a/platform/avr-atmega128rfa1/contiki-conf.h b/platform/avr-atmega128rfa1/contiki-conf.h
index 9dfbd9518..9cad6d3b8 100644
--- a/platform/avr-atmega128rfa1/contiki-conf.h
+++ b/platform/avr-atmega128rfa1/contiki-conf.h
@@ -151,10 +151,10 @@ typedef unsigned short uip_stats_t;
 #define UIP_CONF_LLH_LEN          0
 
 /* 10 bytes per stateful address context - see sicslowpan.c */
-/* Default is 1 context with prefix aaaa::/64 */
+/* Default is 1 context with prefix fd00::/64 */
 /* These must agree with all the other nodes or there will be a failure to communicate! */
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 1
-#define SICSLOWPAN_CONF_ADDR_CONTEXT_0 {addr_contexts[0].prefix[0]=0xaa;addr_contexts[0].prefix[1]=0xaa;}
+#define SICSLOWPAN_CONF_ADDR_CONTEXT_0 {addr_contexts[0].prefix[0]=UIP_DS6_DEFAULT_PREFIX_0;addr_contexts[0].prefix[1]=UIP_DS6_DEFAULT_PREFIX_1;}
 #define SICSLOWPAN_CONF_ADDR_CONTEXT_1 {addr_contexts[1].prefix[0]=0xbb;addr_contexts[1].prefix[1]=0xbb;}
 #define SICSLOWPAN_CONF_ADDR_CONTEXT_2 {addr_contexts[2].prefix[0]=0x20;addr_contexts[2].prefix[1]=0x01;addr_contexts[2].prefix[2]=0x49;addr_contexts[2].prefix[3]=0x78,addr_contexts[2].prefix[4]=0x1d;addr_contexts[2].prefix[5]=0xb1;}
 
diff --git a/platform/avr-atmega128rfa1/contiki-main.c b/platform/avr-atmega128rfa1/contiki-main.c
index 8d2d8f9b7..ec22d58f6 100644
--- a/platform/avr-atmega128rfa1/contiki-main.c
+++ b/platform/avr-atmega128rfa1/contiki-main.c
@@ -340,7 +340,7 @@ uint8_t i;
 #if 0
 {  
   uip_ip6addr_t ipaddr;
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 //  uip_ds6_prefix_add(&ipaddr,64,0);
 }
diff --git a/platform/avr-raven/apps/raven-ipso/raven-ipso.c b/platform/avr-raven/apps/raven-ipso/raven-ipso.c
index 2b51ac519..5779e814b 100644
--- a/platform/avr-raven/apps/raven-ipso/raven-ipso.c
+++ b/platform/avr-raven/apps/raven-ipso/raven-ipso.c
@@ -95,7 +95,7 @@ raven_ping6(void)
   /* ping ipv6.google.com*/
   uip_ip6addr(&ping_addr,0x2001,0x420,0x5FFF,0x7D,0x2D0,0xB7FF,0xFE23,0xE6DB);
   //uip_ip6addr(&ping_addr, 0x2001, 0x4860, 0, 0x2001, 0, 0, 0, 0x68);
-  //uip_ip6addr(&ping_addr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1);
+  //uip_ip6addr(&ping_addr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 1);
   
   UIP_IP_BUF->vtc = 0x60;
   UIP_IP_BUF->tcflow = 1;
diff --git a/platform/avr-raven/contiki-conf.h b/platform/avr-raven/contiki-conf.h
index aa97db2e5..ab770540d 100644
--- a/platform/avr-raven/contiki-conf.h
+++ b/platform/avr-raven/contiki-conf.h
@@ -167,10 +167,10 @@ typedef unsigned short uip_stats_t;
 #define UIP_CONF_LLH_LEN         0
 
 /* 10 bytes per stateful address context - see sicslowpan.c */
-/* Default is 1 context with prefix aaaa::/64 */
+/* Default is 1 context with prefix fd00::/64 */
 /* These must agree with all the other nodes or there will be a failure to communicate! */
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 1
-#define SICSLOWPAN_CONF_ADDR_CONTEXT_0 {addr_contexts[0].prefix[0]=0xaa;addr_contexts[0].prefix[1]=0xaa;}
+#define SICSLOWPAN_CONF_ADDR_CONTEXT_0 {addr_contexts[0].prefix[0]=UIP_DS6_DEFAULT_PREFIX_0;addr_contexts[0].prefix[1]=UIP_DS6_DEFAULT_PREFIX_1;}
 #define SICSLOWPAN_CONF_ADDR_CONTEXT_1 {addr_contexts[1].prefix[0]=0xbb;addr_contexts[1].prefix[1]=0xbb;}
 #define SICSLOWPAN_CONF_ADDR_CONTEXT_2 {addr_contexts[2].prefix[0]=0x20;addr_contexts[2].prefix[1]=0x01;addr_contexts[2].prefix[2]=0x49;addr_contexts[2].prefix[3]=0x78,addr_contexts[2].prefix[4]=0x1d;addr_contexts[2].prefix[5]=0xb1;}
 
diff --git a/platform/avr-raven/contiki-raven-default-init-net.c b/platform/avr-raven/contiki-raven-default-init-net.c
index 61fc23213..ca29e34fb 100644
--- a/platform/avr-raven/contiki-raven-default-init-net.c
+++ b/platform/avr-raven/contiki-raven-default-init-net.c
@@ -44,7 +44,7 @@ init_net(void)
 
 /*  uip_ipaddr_t ipprefix;
 
-  uip_ip6addr(&ipprefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipprefix, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
 
   uip_netif_addr_add(&ipprefix, UIP_DEFAULT_PREFIX_LEN, 0, AUTOCONF);
   uip_nd6_prefix_add(&ipprefix, UIP_DEFAULT_PREFIX_LEN, 0);
diff --git a/platform/avr-raven/contiki-raven-main.c b/platform/avr-raven/contiki-raven-main.c
index 723bd9436..274bdf2ff 100644
--- a/platform/avr-raven/contiki-raven-main.c
+++ b/platform/avr-raven/contiki-raven-main.c
@@ -357,7 +357,7 @@ uint8_t i;
 #if 0
 {  
   uip_ip6addr_t ipaddr;
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 //  uip_ds6_prefix_add(&ipaddr,64,0);
 }
diff --git a/platform/avr-ravenusb/contiki-conf.h b/platform/avr-ravenusb/contiki-conf.h
index c6cab8c54..71d56e248 100644
--- a/platform/avr-ravenusb/contiki-conf.h
+++ b/platform/avr-ravenusb/contiki-conf.h
@@ -236,10 +236,10 @@ extern void mac_log_802_15_4_rx(const uint8_t* buffer, size_t total_len);
 #define UIP_CONF_BUFSIZE		 UIP_LINK_MTU + UIP_LLH_LEN + 4   /* +4 for vlan on macosx */
 
 /* 10 bytes per stateful address context - see sicslowpan.c */
-/* Default is 1 context with prefix aaaa::/64 */
+/* Default is 1 context with prefix fd00::/64 */
 /* These must agree with all the other nodes or there will be a failure to communicate! */
 #//define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 1
-#define SICSLOWPAN_CONF_ADDR_CONTEXT_0 {addr_contexts[0].prefix[0]=0xaa;addr_contexts[0].prefix[1]=0xaa;}
+#define SICSLOWPAN_CONF_ADDR_CONTEXT_0 {addr_contexts[0].prefix[0]=UIP_DS6_DEFAULT_PREFIX_0;addr_contexts[0].prefix[1]=UIP_DS6_DEFAULT_PREFIX_1;}
 #define SICSLOWPAN_CONF_ADDR_CONTEXT_1 {addr_contexts[1].prefix[0]=0xbb;addr_contexts[1].prefix[1]=0xbb;}
 #define SICSLOWPAN_CONF_ADDR_CONTEXT_2 {addr_contexts[2].prefix[0]=0x20;addr_contexts[2].prefix[1]=0x01;addr_contexts[2].prefix[2]=0x49;addr_contexts[2].prefix[3]=0x78,addr_contexts[2].prefix[4]=0x1d;addr_contexts[2].prefix[5]=0xb1;}
 
diff --git a/platform/cc2530dk/contiki-conf.h b/platform/cc2530dk/contiki-conf.h
index 5d3beb6bb..9c79aa828 100644
--- a/platform/cc2530dk/contiki-conf.h
+++ b/platform/cc2530dk/contiki-conf.h
@@ -259,8 +259,8 @@
 /* Define our IPv6 prefixes/contexts here */
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS    1
 #define SICSLOWPAN_CONF_ADDR_CONTEXT_0 { \
-  addr_contexts[0].prefix[0] = 0xaa; \
-  addr_contexts[0].prefix[1] = 0xaa; \
+  addr_contexts[0].prefix[0] = UIP_DS6_DEFAULT_PREFIX_0; \
+  addr_contexts[0].prefix[1] = UIP_DS6_DEFAULT_PREFIX_1; \
 }
 
 #define MAC_CONF_CHANNEL_CHECK_RATE          8
diff --git a/platform/cc2538dk/README.md b/platform/cc2538dk/README.md
index 998a574b3..4bcb2c6f4 100644
--- a/platform/cc2538dk/README.md
+++ b/platform/cc2538dk/README.md
@@ -308,14 +308,14 @@ Start by building a border router from `examples/ipv6/rpl-border-router`
   * Connect device to Linux or OS X over its XDS port.
   * `cd $(CONTIKI)/tools`
   * `make tunslip6`
-  * `sudo $(CONTIKI)/tools/tunslip6 -s /dev/<device> aaaa::1/64`
+  * `sudo $(CONTIKI)/tools/tunslip6 -s /dev/<device> fd00::1/64`
   * The router will print its own IPv6 address. Use it below.
 
         Got configuration message of type P
-        Setting prefix aaaa::
+        Setting prefix fd00::
         created a new RPL dag
         Server IPv6 addresses:
-         aaaa::212:4b00:89ab:cdef
+         fd00::212:4b00:89ab:cdef
          fe80::212:4b00:89ab:cdef
 
   * `ping6 <address>`
diff --git a/platform/cc2538dk/contiki-conf.h b/platform/cc2538dk/contiki-conf.h
index 34a7f1673..ad9aafeeb 100644
--- a/platform/cc2538dk/contiki-conf.h
+++ b/platform/cc2538dk/contiki-conf.h
@@ -472,8 +472,8 @@ typedef uint32_t rtimer_clock_t;
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS    1
 #ifndef SICSLOWPAN_CONF_ADDR_CONTEXT_0
 #define SICSLOWPAN_CONF_ADDR_CONTEXT_0 { \
-  addr_contexts[0].prefix[0] = 0xaa; \
-  addr_contexts[0].prefix[1] = 0xaa; \
+  addr_contexts[0].prefix[0] = UIP_DS6_DEFAULT_PREFIX_0; \
+  addr_contexts[0].prefix[1] = UIP_DS6_DEFAULT_PREFIX_1; \
 }
 #endif
 
diff --git a/platform/cooja-ip64/contiki-cooja-ip64-main.c b/platform/cooja-ip64/contiki-cooja-ip64-main.c
index 3bc94f864..02576a3be 100644
--- a/platform/cooja-ip64/contiki-cooja-ip64-main.c
+++ b/platform/cooja-ip64/contiki-cooja-ip64-main.c
@@ -217,7 +217,7 @@ contiki_init(void)
   printf("%02x%02x\n", lladdr->ipaddr.u8[14],
          lladdr->ipaddr.u8[15]);
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_TENTATIVE);
   printf("Tentative global IPv6 address ");
diff --git a/platform/cooja/contiki-cooja-main.c b/platform/cooja/contiki-cooja-main.c
index f251c9178..40dd49d1c 100644
--- a/platform/cooja/contiki-cooja-main.c
+++ b/platform/cooja/contiki-cooja-main.c
@@ -304,7 +304,7 @@ contiki_init()
     if(1) {
       uip_ipaddr_t ipaddr;
       int i;
-      uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+      uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
       uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
       uip_ds6_addr_add(&ipaddr, 0, ADDR_TENTATIVE);
       printf("Tentative global IPv6 address ");
diff --git a/platform/ev-aducrf101mkxz/README.md b/platform/ev-aducrf101mkxz/README.md
index a4cf4dcb4..5dd7c5b06 100644
--- a/platform/ev-aducrf101mkxz/README.md
+++ b/platform/ev-aducrf101mkxz/README.md
@@ -71,9 +71,9 @@ the SLIP tunnel on the host machine:
 
     sudo contiki/tools/tunslip6 \
         -s /dev/serial/by-id/usb-SEGGER_J-Link_000541011111-if00 \
-        -B 115200 -v3 aaaa::1/64
+        -B 115200 -v3 fd00::1/64
 
-Open the border router's home page at: http://[aaaa::3230:3030:3132:3334]/
+Open the border router's home page at: http://[fd00::3230:3030:3132:3334]/
 
 #### Web Server ####
 
@@ -90,7 +90,7 @@ router:
     adi-cm3sd/cm3sd.py -a contiki/examples/webserver-ipv6/webserver6.ev-aducrf101mkxz.hex \
         /dev/serial/by-id/usb-SEGGER_J-Link_000541022222-if00
 
-Open the web server's home page at: http://[aaaa::3230:3030:3536:3738]/
+Open the web server's home page at: http://[fd00::3230:3030:3536:3738]/
 
 On Windows:
 -----------
diff --git a/platform/eval-adf7xxxmb4z/README.md b/platform/eval-adf7xxxmb4z/README.md
index 1faa1a625..dc023e766 100644
--- a/platform/eval-adf7xxxmb4z/README.md
+++ b/platform/eval-adf7xxxmb4z/README.md
@@ -51,9 +51,9 @@ Build and run the SLIP tunnel on the host machine.
 Here it is assumed that the Secondary UART USB port (J3) is attached to /dev/ttyUSB1:
 
 	make -C contiki/tools tunslip6
-	sudo contiki/tools/tunslip6 -B 38400 -s /dev/ttyUSB1 -v3 aaaa::1/64
+	sudo contiki/tools/tunslip6 -B 38400 -s /dev/ttyUSB1 -v3 fd00::1/64
 
-Open the border router home page at http://[aaaa::302:304:506:708]/
+Open the border router home page at http://[fd00::302:304:506:708]/
 
 Build and run the IPv6 web server example on another eval board.
 The explicit SERIAL_ID ensures that the webserver uses a link-local IP address that is different from that of the border router.
@@ -61,7 +61,7 @@ The explicit SERIAL_ID ensures that the webserver uses a link-local IP address t
 	make -C contiki/examples/webserver-ipv6 TARGET=eval-adf7xxxmb4z SERIAL_ID='"\x01\x02\x03\x04\x05\x06\x07\x09"' webserver6.eval-adf7xxxmb4z.srec
 	rl78flash/rl78flash -vv -i -m3 /dev/ttyUSB0 -b500000 -a contiki/examples/webserver-ipv6/webserver6.eval-adf7xxxmb4z.srec
 
-Open the web server's home page at http://[aaaa::7a30:3178:3032:7830]
+Open the web server's home page at http://[fd00::7a30:3178:3032:7830]
 
 
 On Windows:
diff --git a/platform/exp5438/contiki-exp5438-main.c b/platform/exp5438/contiki-exp5438-main.c
index 2f85f6ba2..321bb9171 100644
--- a/platform/exp5438/contiki-exp5438-main.c
+++ b/platform/exp5438/contiki-exp5438-main.c
@@ -236,7 +236,7 @@ main(int argc, char **argv)
   if(!UIP_CONF_IPV6_RPL) {
     uip_ipaddr_t ipaddr;
     int i;
-    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
     uip_ds6_addr_add(&ipaddr, 0, ADDR_TENTATIVE);
     printf("Tentative global IPv6 address ");
diff --git a/platform/jn516x/contiki-jn516x-main.c b/platform/jn516x/contiki-jn516x-main.c
index 8c88a10df..171b94a2a 100644
--- a/platform/jn516x/contiki-jn516x-main.c
+++ b/platform/jn516x/contiki-jn516x-main.c
@@ -226,7 +226,7 @@ start_uip6(void)
   if(!UIP_CONF_IPV6_RPL) {
     uip_ipaddr_t ipaddr;
     int i;
-    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
     uip_ds6_addr_add(&ipaddr, 0, ADDR_TENTATIVE);
     PRINTF("Tentative global IPv6 address ");
diff --git a/platform/mbxxx/contiki-main.c b/platform/mbxxx/contiki-main.c
index c383b0f61..700fbb5cc 100644
--- a/platform/mbxxx/contiki-main.c
+++ b/platform/mbxxx/contiki-main.c
@@ -214,7 +214,7 @@ main(void)
   if(!UIP_CONF_IPV6_RPL) {
     uip_ipaddr_t ipaddr;
     int i;
-    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
     uip_ds6_addr_add(&ipaddr, 0, ADDR_TENTATIVE);
     printf("Tentative global IPv6 address ");
diff --git a/platform/micaz/init-net.c b/platform/micaz/init-net.c
index 271b402c8..9c09fe4ae 100644
--- a/platform/micaz/init-net.c
+++ b/platform/micaz/init-net.c
@@ -177,7 +177,7 @@ init_net(void)
   if(!UIP_CONF_IPV6_RPL) {
     uip_ipaddr_t ipaddr;
     int i;
-    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
     uip_ds6_addr_add(&ipaddr, 0, ADDR_TENTATIVE);
     printf_P(PSTR("Tentative global IPv6 address "));
diff --git a/platform/minimal-net/contiki-main.c b/platform/minimal-net/contiki-main.c
index 35b466a39..90d700876 100644
--- a/platform/minimal-net/contiki-main.c
+++ b/platform/minimal-net/contiki-main.c
@@ -289,7 +289,7 @@ main(int argc, char **argv)
 #ifdef HARD_CODED_ADDRESS
     uiplib_ipaddrconv(HARD_CODED_ADDRESS, &ipaddr);
 #else
-    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
 #endif
     if((ipaddr.u16[0] != 0) ||
        (ipaddr.u16[1] != 0) ||
diff --git a/platform/sky/contiki-sky-main.c b/platform/sky/contiki-sky-main.c
index ea3afd93a..7fe033900 100644
--- a/platform/sky/contiki-sky-main.c
+++ b/platform/sky/contiki-sky-main.c
@@ -330,7 +330,7 @@ main(int argc, char **argv)
   if(!UIP_CONF_IPV6_RPL) {
     uip_ipaddr_t ipaddr;
     int i;
-    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
     uip_ds6_addr_add(&ipaddr, 0, ADDR_TENTATIVE);
     PRINTF("Tentative global IPv6 address ");
diff --git a/platform/wismote/contiki-wismote-main.c b/platform/wismote/contiki-wismote-main.c
index d65ccaf1e..f2a41a48e 100644
--- a/platform/wismote/contiki-wismote-main.c
+++ b/platform/wismote/contiki-wismote-main.c
@@ -324,7 +324,7 @@ main(int argc, char **argv)
   if(!UIP_CONF_IPV6_RPL) {
     uip_ipaddr_t ipaddr;
     int i;
-    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
     uip_ds6_addr_add(&ipaddr, 0, ADDR_TENTATIVE);
     printf("Tentative global IPv6 address ");
diff --git a/platform/z1/contiki-z1-main.c b/platform/z1/contiki-z1-main.c
index 45e97bde9..477bab975 100644
--- a/platform/z1/contiki-z1-main.c
+++ b/platform/z1/contiki-z1-main.c
@@ -345,7 +345,7 @@ main(int argc, char **argv)
   if(!UIP_CONF_IPV6_RPL) {
     uip_ipaddr_t ipaddr;
     int i;
-    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
     uip_ds6_addr_add(&ipaddr, 0, ADDR_TENTATIVE);
     printf("Tentative global IPv6 address ");
diff --git a/platform/zoul/contiki-conf.h b/platform/zoul/contiki-conf.h
index cef99108c..52cd22dfd 100644
--- a/platform/zoul/contiki-conf.h
+++ b/platform/zoul/contiki-conf.h
@@ -540,8 +540,8 @@ typedef uint32_t rtimer_clock_t;
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS    1
 #ifndef SICSLOWPAN_CONF_ADDR_CONTEXT_0
 #define SICSLOWPAN_CONF_ADDR_CONTEXT_0 { \
-  addr_contexts[0].prefix[0] = 0xaa; \
-  addr_contexts[0].prefix[1] = 0xaa; \
+  addr_contexts[0].prefix[0] = UIP_DS6_DEFAULT_PREFIX_0; \
+  addr_contexts[0].prefix[1] = UIP_DS6_DEFAULT_PREFIX_1; \
 }
 #endif
 
diff --git a/regression-tests/11-ipv6/code/receiver/udp-receiver.c b/regression-tests/11-ipv6/code/receiver/udp-receiver.c
index 564c2672e..e84c57637 100644
--- a/regression-tests/11-ipv6/code/receiver/udp-receiver.c
+++ b/regression-tests/11-ipv6/code/receiver/udp-receiver.c
@@ -39,7 +39,7 @@ PROCESS_THREAD(udp_process, ev, data)
 
   PROCESS_BEGIN();
 
-  uip_ip6addr(&addr, 0xaaaa, 0, 0, 0, 0, 0, 0, 2);
+  uip_ip6addr(&addr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 2);
   uip_ds6_addr_add(&addr, 0, ADDR_AUTOCONF);
 
   simple_udp_register(&broadcast_connection, UDP_PORT,
diff --git a/regression-tests/11-ipv6/code/sender/unicast-sender.c b/regression-tests/11-ipv6/code/sender/unicast-sender.c
index 071e3ac37..10a139986 100644
--- a/regression-tests/11-ipv6/code/sender/unicast-sender.c
+++ b/regression-tests/11-ipv6/code/sender/unicast-sender.c
@@ -40,12 +40,12 @@ PROCESS_THREAD(udp_process, ev, data)
 
   PROCESS_BEGIN();
 
-  uip_ip6addr(&addr, 0xaaaa, 0, 0, 0, 0, 0, 0, 3);
+  uip_ip6addr(&addr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 3);
   uip_ds6_addr_add(&addr, 0, ADDR_AUTOCONF);
 
   rpl_set_root(RPL_DEFAULT_INSTANCE, &addr);
   /*  dag = rpl_get_any_dag();
-  uip_ip6addr(&prefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&prefix, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   rpl_set_prefix(dag, &prefix, 64);*/
 
 
@@ -63,7 +63,7 @@ PROCESS_THREAD(udp_process, ev, data)
     etimer_reset(&periodic_timer);
 
     printf("Sending unicast\n");
-    uip_ip6addr(&addr, 0xaaaa, 0, 0, 0, 0, 0, 0, 2);
+    uip_ip6addr(&addr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 2);
     simple_udp_sendto(&broadcast_connection, buf, sizeof(buf), &addr);
   }
 
diff --git a/regression-tests/12-rpl/code/receiver-node.c b/regression-tests/12-rpl/code/receiver-node.c
index 4ba3cb148..727a23f84 100644
--- a/regression-tests/12-rpl/code/receiver-node.c
+++ b/regression-tests/12-rpl/code/receiver-node.c
@@ -73,7 +73,7 @@ set_global_address(void)
   int i;
   uint8_t state;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
diff --git a/regression-tests/12-rpl/code/root-node.c b/regression-tests/12-rpl/code/root-node.c
index 0609e1bd8..fdea828f8 100644
--- a/regression-tests/12-rpl/code/root-node.c
+++ b/regression-tests/12-rpl/code/root-node.c
@@ -77,7 +77,7 @@ set_global_address(void)
   int i;
   uint8_t state;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
@@ -106,7 +106,7 @@ create_rpl_dag(uip_ipaddr_t *ipaddr)
     
     rpl_set_root(RPL_DEFAULT_INSTANCE, ipaddr);
     dag = rpl_get_any_dag();
-    uip_ip6addr(&prefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&prefix, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     rpl_set_prefix(dag, &prefix, 64);
     PRINTF("created a new RPL dag\n");
   } else {
diff --git a/regression-tests/12-rpl/code/sender-node.c b/regression-tests/12-rpl/code/sender-node.c
index 08d81b62d..55dfdd15f 100644
--- a/regression-tests/12-rpl/code/sender-node.c
+++ b/regression-tests/12-rpl/code/sender-node.c
@@ -72,7 +72,7 @@ set_global_address(void)
   int i;
   uint8_t state;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
@@ -109,7 +109,7 @@ PROCESS_THREAD(sender_node_process, ev, data)
 
     PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&send_timer));
 
-    uip_ip6addr(&addr, 0xaaaa, 0, 0, 0, 0x0201, 0x001, 0x001, 0x001);
+    uip_ip6addr(&addr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0x0201, 0x001, 0x001, 0x001);
 
     {
       static unsigned int message_number;
diff --git a/regression-tests/13-ipv6-apps/x02-sky-coap.csc b/regression-tests/13-ipv6-apps/x02-sky-coap.csc
index ad3155f3d..d3d284a2d 100644
--- a/regression-tests/13-ipv6-apps/x02-sky-coap.csc
+++ b/regression-tests/13-ipv6-apps/x02-sky-coap.csc
@@ -181,14 +181,14 @@ PROCESS_CONF_NO_PROCESS_NAMES=1
 
 The test script communicates with the REST server via the RPL border router using external commands.
 (* $ make connect-router-cooja)
-* $ ping6 -c 10 -I tun0 aaaa::212:7401:1:101
-* $ ping6 -c 10 -I tun0 aaaa::212:7402:2:202
-* $ wget -t 1 -T 10 -O - http://[aaaa::212:7402:2:202]
+* $ ping6 -c 10 -I tun0 fd00::212:7401:1:101
+* $ ping6 -c 10 -I tun0 fd00::212:7402:2:202
+* $ wget -t 1 -T 10 -O - http://[fd00::212:7402:2:202]
 
 The final test uses the CoAP Java implementation by Matthias Kovatsch, downloaded from:
 https://github.com/mkovatsc/Californium/blob/master/run/ExampleClient.jar
-* $ java -jar ExampleClient.jar DISCOVER coap://[aaaa::212:7402:2:202]
-* $ java -jar ExampleClient.jar GET coap://[aaaa::212:7402:2:202]/hello</notes>
+* $ java -jar ExampleClient.jar DISCOVER coap://[fd00::212:7402:2:202]
+* $ java -jar ExampleClient.jar GET coap://[fd00::212:7402:2:202]/hello</notes>
       <decorations>true</decorations>
     </plugin_config>
     <width>751</width>
diff --git a/tools/sky/uip6-bridge/Makefile b/tools/sky/uip6-bridge/Makefile
index 492dc9b77..11fa74356 100644
--- a/tools/sky/uip6-bridge/Makefile
+++ b/tools/sky/uip6-bridge/Makefile
@@ -36,5 +36,5 @@ connect: ../../tapslip6
 
 bridge:
 	@sudo service radvd restart || echo radvd could not be restarted
-	sudo route add -6 aaaa::/64 tap0
-	sudo ip -6 address add aaaa::1/64 dev tap0
+	sudo route add -6 fd00::/64 tap0
+	sudo ip -6 address add fd00::1/64 dev tap0
diff --git a/tools/stm32w/wpcapslip6/README.md b/tools/stm32w/wpcapslip6/README.md
index f3c277efb..63bb6dccd 100644
--- a/tools/stm32w/wpcapslip6/README.md
+++ b/tools/stm32w/wpcapslip6/README.md
@@ -14,9 +14,9 @@ rpl-border-router (the latter on Windows Vista and later only).
 
 An example of usage with the RPL border router:
 
-    wpcapslip6 -s COMXX -b aaaa:: -a aaaa:1::1/128 02-00-00-00-00-01
+    wpcapslip6 -s COMXX -b fd00:: -a fd00:1::1/128 02-00-00-00-00-01
 
 where 02-00-00-00-00-01 is the MAC address of the local network adapter.
 
--a aaaa:1::1/128 can be omitted if an IP address is already set to the network
+-a fd00:1::1/128 can be omitted if an IP address is already set to the network
 adapter.
diff --git a/tools/tunslip6.c b/tools/tunslip6.c
index 369f16ec8..49019a66b 100644
--- a/tools/tunslip6.c
+++ b/tools/tunslip6.c
@@ -837,7 +837,7 @@ main(int argc, char **argv)
     case 'h':
     default:
 fprintf(stderr,"usage:  %s [options] ipaddress\n", prog);
-fprintf(stderr,"example: tunslip6 -L -v2 -s ttyUSB1 aaaa::1/64\n");
+fprintf(stderr,"example: tunslip6 -L -v2 -s ttyUSB1 fd00::1/64\n");
 fprintf(stderr,"Options are:\n");
 #ifndef __APPLE__
 fprintf(stderr," -B baudrate    9600,19200,38400,57600,115200 (default),230400,460800,921600\n");

From 73d36ebb6b9d7291fdb43592b271dd8b161ccad9 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Mon, 7 Mar 2016 18:34:54 +0100
Subject: [PATCH 064/393] SFD timestamp

Only save SFD timestamp when we are actually receiving.
---
 cpu/cc2538/dev/cc2538-rf.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cpu/cc2538/dev/cc2538-rf.c b/cpu/cc2538/dev/cc2538-rf.c
index a76c1c356..fda88ceed 100644
--- a/cpu/cc2538/dev/cc2538-rf.c
+++ b/cpu/cc2538/dev/cc2538-rf.c
@@ -1075,7 +1075,9 @@ cc2538_rf_rx_tx_isr(void)
   
 #if CC2538_RF_CONF_SFD_TIMESTAMPS
   if(poll_mode) {
-    cc2538_sfd_rtime = RTIMER_NOW();
+    if(REG(RFCORE_XREG_FSMSTAT1) & RFCORE_XREG_FSMSTAT1_RX_ACTIVE) {
+      cc2538_sfd_rtime = RTIMER_NOW();
+    }
   }
 #endif
 

From b32ad0dbbdf77b0bf5c2c738694e40ffb3fe478c Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Mon, 7 Mar 2016 18:37:03 +0100
Subject: [PATCH 065/393] define for SFD timestamp on cc2538

---
 examples/ipv6/rpl-tsch/project-conf.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/examples/ipv6/rpl-tsch/project-conf.h b/examples/ipv6/rpl-tsch/project-conf.h
index 7ecfb74c1..13595f333 100644
--- a/examples/ipv6/rpl-tsch/project-conf.h
+++ b/examples/ipv6/rpl-tsch/project-conf.h
@@ -67,6 +67,11 @@
 #define TSCH_CALLBACK_JOINING_NETWORK tsch_rpl_callback_joining_network
 #define TSCH_CALLBACK_LEAVING_NETWORK tsch_rpl_callback_leaving_network
 
+/* Needed for cc2538 platform only */
+/* Enable SFD timestamp (uses SFD interrupt) */
+#undef CC2538_RF_CONF_SFD_TIMESTAMPS
+#define CC2538_RF_CONF_SFD_TIMESTAMPS		1
+
 /* Needed for cc2420 platforms only */
 /* Disable DCO calibration (uses timerB) */
 #undef DCOSYNCH_CONF_ENABLED

From 9ac14d1c7bf1d831de885fc139010411c7eba222 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Mon, 7 Mar 2016 18:39:13 +0100
Subject: [PATCH 066/393] defines needed for TSCH

---
 platform/cc2538dk/contiki-conf.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/platform/cc2538dk/contiki-conf.h b/platform/cc2538dk/contiki-conf.h
index 34a7f1673..380288f02 100644
--- a/platform/cc2538dk/contiki-conf.h
+++ b/platform/cc2538dk/contiki-conf.h
@@ -40,6 +40,12 @@ typedef uint32_t rtimer_clock_t;
 #define RTIMER_CLOCK_LT(a,b)     ((int32_t)((a)-(b)) < 0)
 /** @} */
 /*---------------------------------------------------------------------------*/
+#define SYS_CTRL_CONF_OSC32K_USE_XTAL	1
+
+#define RADIO_DELAY_BEFORE_TX     ((unsigned)US_TO_RTIMERTICKS(300))
+#define RADIO_DELAY_BEFORE_RX     ((unsigned)US_TO_RTIMERTICKS(100))
+#define RADIO_DELAY_BEFORE_DETECT 0
+/*---------------------------------------------------------------------------*/
 /**
  * \name Serial Boot Loader Backdoor configuration
  *

From 6e5e1d05cdc9e6fb6dddaf95da5608d5687a808c Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Tue, 8 Mar 2016 15:48:16 +0100
Subject: [PATCH 067/393] TSCH: define to enable/disable HW frame filtering

---
 core/net/mac/tsch/tsch-conf.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/net/mac/tsch/tsch-conf.h b/core/net/mac/tsch/tsch-conf.h
index bd9726042..b23355539 100644
--- a/core/net/mac/tsch/tsch-conf.h
+++ b/core/net/mac/tsch/tsch-conf.h
@@ -175,4 +175,11 @@
 #define TSCH_ADAPTIVE_TIMESYNC 0
 #endif
 
+/* HW frame filtering enabled */
+#ifdef TSCH_CONF_HW_FRAME_FILTERING
+#define TSCH_HW_FRAME_FILTERING	TSCH_CONF_HW_FRAME_FILTERING
+#else /* TSCH_CONF_HW_FRAME_FILTERING */
+#define TSCH_HW_FRAME_FILTERING	1
+#endif
+
 #endif /* __TSCH_CONF_H__ */

From 38348b8703b7f914cf892ef71b4969de0b7c8851 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Tue, 8 Mar 2016 15:50:37 +0100
Subject: [PATCH 068/393] enable/disable HW frame filtering

enable/disable HW frame filtering as defined in TSCH_CONF_HW_FRAME_FILTERING
---
 core/net/mac/tsch/tsch-slot-operation.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/net/mac/tsch/tsch-slot-operation.c b/core/net/mac/tsch/tsch-slot-operation.c
index 3174787c2..be1885bc7 100644
--- a/core/net/mac/tsch/tsch-slot-operation.c
+++ b/core/net/mac/tsch/tsch-slot-operation.c
@@ -514,9 +514,11 @@ PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
               TSCH_DEBUG_TX_EVENT();
               NETSTACK_RADIO.off();
 
+#if TSCH_HW_FRAME_FILTERING
               /* Leaving promiscuous mode */
               NETSTACK_RADIO.get_value(RADIO_PARAM_RX_MODE, &radio_rx_mode);
               NETSTACK_RADIO.set_value(RADIO_PARAM_RX_MODE, radio_rx_mode | RADIO_RX_MODE_ADDRESS_FILTER);
+#endif /* TSCH_HW_FRAME_FILTERING */
 
               /* Read ack frame */
               ack_len = NETSTACK_RADIO.read((void *)ackbuf, sizeof(ackbuf));

From 0e0dba932ffcfcf7d08857cb5f500403ee2116e6 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Tue, 8 Mar 2016 15:52:40 +0100
Subject: [PATCH 069/393] disable TSCH HW frame filtering

---
 platform/cc2538dk/contiki-conf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/cc2538dk/contiki-conf.h b/platform/cc2538dk/contiki-conf.h
index 380288f02..c91338849 100644
--- a/platform/cc2538dk/contiki-conf.h
+++ b/platform/cc2538dk/contiki-conf.h
@@ -40,7 +40,7 @@ typedef uint32_t rtimer_clock_t;
 #define RTIMER_CLOCK_LT(a,b)     ((int32_t)((a)-(b)) < 0)
 /** @} */
 /*---------------------------------------------------------------------------*/
-#define SYS_CTRL_CONF_OSC32K_USE_XTAL	1
+#define TSCH_CONF_HW_FRAME_FILTERING	0
 
 #define RADIO_DELAY_BEFORE_TX     ((unsigned)US_TO_RTIMERTICKS(300))
 #define RADIO_DELAY_BEFORE_RX     ((unsigned)US_TO_RTIMERTICKS(100))

From a4ccce8dac213de5b581cddbf2d861a908309ff6 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Tue, 8 Mar 2016 15:54:03 +0100
Subject: [PATCH 070/393] enable 32 kHz crystal oscillator for TSCH

---
 examples/ipv6/rpl-tsch/project-conf.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/ipv6/rpl-tsch/project-conf.h b/examples/ipv6/rpl-tsch/project-conf.h
index 13595f333..71a8e5425 100644
--- a/examples/ipv6/rpl-tsch/project-conf.h
+++ b/examples/ipv6/rpl-tsch/project-conf.h
@@ -71,6 +71,10 @@
 /* Enable SFD timestamp (uses SFD interrupt) */
 #undef CC2538_RF_CONF_SFD_TIMESTAMPS
 #define CC2538_RF_CONF_SFD_TIMESTAMPS		1
+/* For TSCH we have to use the more accurate crystal oscillator
+ * by default the RC oscillator is activated */
+#undef SYS_CTRL_CONF_OSC32K_USE_XTAL
+#define SYS_CTRL_CONF_OSC32K_USE_XTAL			1
 
 /* Needed for cc2420 platforms only */
 /* Disable DCO calibration (uses timerB) */

From 1b185392e444d2f22559db60d1f1a0f0a31f6a61 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Tue, 8 Mar 2016 16:17:40 +0100
Subject: [PATCH 071/393] make cc2538_sfd_rtime volatile

---
 cpu/cc2538/dev/cc2538-rf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpu/cc2538/dev/cc2538-rf.c b/cpu/cc2538/dev/cc2538-rf.c
index fda88ceed..f889a373d 100644
--- a/cpu/cc2538/dev/cc2538-rf.c
+++ b/cpu/cc2538/dev/cc2538-rf.c
@@ -121,7 +121,7 @@ static const uint8_t magic[] = { 0x53, 0x6E, 0x69, 0x66 };      /** Snif */
 #endif
 /*---------------------------------------------------------------------------*/
 #if CC2538_RF_CONF_SFD_TIMESTAMPS
-static rtimer_clock_t cc2538_sfd_rtime;
+static rtimer_clock_t volatile cc2538_sfd_rtime;
 #endif
 
 /* Are we currently in poll mode? Disabled by default */

From 39094e3c415da767ed0519ece2a4a54b97284a4c Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Tue, 8 Mar 2016 20:04:01 +0100
Subject: [PATCH 072/393] CO2 sensor bug fix

---
 .../examples/ipv6/sensd_client/sensd_client.c | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/platform/avr-rss2/examples/ipv6/sensd_client/sensd_client.c b/platform/avr-rss2/examples/ipv6/sensd_client/sensd_client.c
index b523e87c4..df6494031 100644
--- a/platform/avr-rss2/examples/ipv6/sensd_client/sensd_client.c
+++ b/platform/avr-rss2/examples/ipv6/sensd_client/sensd_client.c
@@ -43,8 +43,10 @@
 #include "leds.h"
 #include "dev/leds.h"
 #include "dev/battery-sensor.h"
+#include "dev/temp-sensor.h"
 #include "dev/temp_mcu-sensor.h"
 #include "dev/light-sensor.h"
+#include "dev/pulse-sensor.h"
 #ifdef CO2
 #include "dev/co2_sa_kxx-sensor.h"
 #endif
@@ -58,7 +60,7 @@
 #define DEBUG DEBUG_PRINT
 #include "uip-debug.h"
 
-#define PORT 1236
+#define PORT 1234
 #define MAX_PAYLOAD_LEN 80
 
 static struct psock ps;
@@ -85,13 +87,13 @@ do_report(void)
   
   seq_id++;
   len += snprintf((char *) &out_buf[len], sizeof(out_buf), "&: ");
-  len += snprintf((char *) &out_buf[len], sizeof(out_buf), "TXT=6LOWPAN ");
+  len += snprintf((char *) &out_buf[len], sizeof(out_buf), "TXT=ERICSON-6LOWPAN ");
   len += snprintf((char *) &out_buf[len], sizeof(out_buf), "TARGET=avr-rss2 ");
   len += snprintf((char *) &out_buf[len], sizeof(out_buf), "V_MCU=%-d ", battery_sensor.value(0));
   len += snprintf((char *) &out_buf[len], sizeof(out_buf), "T_MCU=%-d ", temp_mcu_sensor.value(0));
   len += snprintf((char *) &out_buf[len], sizeof(out_buf), "LIGHT=%-d ", light_sensor.value(0));
 #ifdef CO2
-  len += snprintf((char *) &out_buf[len], sizeof(out_buf), "CO2=%-d ", co2_sa_kxx_sensor.value(value));
+  len += snprintf((char *) &out_buf[len], sizeof(out_buf), "CO2=%-d ", co2_sa_kxx_sensor.value(CO2_SA_KXX_CO2));
 #endif
   len += snprintf((char *) &out_buf[len], sizeof(out_buf), "\n\r");
 
@@ -148,14 +150,27 @@ PROCESS_THREAD(sensd_client_process, ev, data) {
   PROCESS_BEGIN();
 
   set_global_address();
-  leds_init();
   print_local_addresses();
+
+  SENSORS_ACTIVATE(temp_sensor);
+  SENSORS_ACTIVATE(battery_sensor);
+  SENSORS_ACTIVATE(temp_mcu_sensor);
+  SENSORS_ACTIVATE(light_sensor);
+  SENSORS_ACTIVATE(pulse_sensor);
+#ifdef CO2
+  SENSORS_ACTIVATE(co2_sa_kxx_sensor);
+#endif
+  leds_init(); 
+  leds_on(LEDS_RED);
+  leds_on(LEDS_YELLOW);
+
   printf("Starting TCP client on port=%d\n", PORT);
 
   /* Set server address. typically sensd */
   //uip_ip6addr(&addr, 0xfe80, 0, 0, 0, 0xfec2, 0x3d00, 1, 0x63ae);
-  uip_ip6addr(&addr, 0x0000, 0, 0, 0, 0, 0xffff, 0xc0a8, 0x0201);
+  //uip_ip6addr(&addr, 0x0000, 0, 0, 0, 0, 0xffff, 0xc0a8, 0x0201);
   //uip_ip6addr(&addr, 0x0000, 0, 0, 0, 0, 0xffff, 0xc0a8, 0x0255);
+  uip_ip6addr(&addr, 0x0000, 0, 0, 0, 0, 0xffff, 0xc010, 0x7dea); //192.16.125.234 
 
   random_init(50);
 

From f83e4989781a35a51e6c59b6e21570a224bacb4d Mon Sep 17 00:00:00 2001
From: Yasuyuki Tanaka <yasuyuki.tanaka@inf.ethz.ch>
Date: Wed, 9 Mar 2016 11:32:02 +0100
Subject: [PATCH 073/393] Fix typos in debug messages

---
 core/net/rpl/rpl-dag.c    | 4 ++--
 core/net/rpl/rpl-timers.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index 9cd69e7b0..27a534b09 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -1282,7 +1282,7 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
         PRINTF("RPL: Global repair\n");
         if(dio->prefix_info.length != 0) {
           if(dio->prefix_info.flags & UIP_ND6_RA_FLAG_AUTONOMOUS) {
-            PRINTF("RPL : Prefix announced in DIO\n");
+            PRINTF("RPL: Prefix announced in DIO\n");
             rpl_set_prefix(dag, &dio->prefix_info.prefix, dio->prefix_info.length);
           }
         }
@@ -1338,7 +1338,7 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
   /* Prefix Information Option treated to add new prefix */
   if(dio->prefix_info.length != 0) {
     if(dio->prefix_info.flags & UIP_ND6_RA_FLAG_AUTONOMOUS) {
-      PRINTF("RPL : Prefix announced in DIO\n");
+      PRINTF("RPL: Prefix announced in DIO\n");
       rpl_set_prefix(dag, &dio->prefix_info.prefix, dio->prefix_info.length);
     }
   }
diff --git a/core/net/rpl/rpl-timers.c b/core/net/rpl/rpl-timers.c
index f8c913b61..ac993691d 100644
--- a/core/net/rpl/rpl-timers.c
+++ b/core/net/rpl/rpl-timers.c
@@ -161,7 +161,7 @@ handle_dio_timer(void *ptr)
 #endif /* RPL_CONF_STATS */
       dio_output(instance, NULL);
     } else {
-      PRINTF("RPL: Supressing DIO transmission (%d >= %d)\n",
+      PRINTF("RPL: Suppressing DIO transmission (%d >= %d)\n",
              instance->dio_counter, instance->dio_redundancy);
     }
     instance->dio_send = 0;

From add5a8be6708cafc1bf065f7629e82fdf5707dab Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Thu, 10 Mar 2016 11:33:40 +0100
Subject: [PATCH 074/393] Code style

---
 core/net/ipv6/uip-icmp6.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/net/ipv6/uip-icmp6.c b/core/net/ipv6/uip-icmp6.c
index 05f18a026..157ed0edb 100644
--- a/core/net/ipv6/uip-icmp6.c
+++ b/core/net/ipv6/uip-icmp6.c
@@ -206,15 +206,14 @@ echo_request_input(void)
 /*---------------------------------------------------------------------------*/
 void
 uip_icmp6_error_output(uint8_t type, uint8_t code, uint32_t param) {
-
- /* check if originating packet is not an ICMP error*/
-  if (uip_ext_len) {
-    if(UIP_EXT_BUF->next == UIP_PROTO_ICMP6 && UIP_ICMP_BUF->type < 128){
+  /* check if originating packet is not an ICMP error */
+  if(uip_ext_len) {
+    if(UIP_EXT_BUF->next == UIP_PROTO_ICMP6 && UIP_ICMP_BUF->type < 128) {
       uip_clear_buf();
       return;
     }
   } else {
-    if(UIP_IP_BUF->proto == UIP_PROTO_ICMP6 && UIP_ICMP_BUF->type < 128){
+    if(UIP_IP_BUF->proto == UIP_PROTO_ICMP6 && UIP_ICMP_BUF->type < 128) {
       uip_clear_buf();
       return;
     }
@@ -231,8 +230,9 @@ uip_icmp6_error_output(uint8_t type, uint8_t code, uint32_t param) {
 
   uip_len += UIP_IPICMPH_LEN + UIP_ICMP6_ERROR_LEN;
 
-  if(uip_len > UIP_LINK_MTU)
+  if(uip_len > UIP_LINK_MTU) {
     uip_len = UIP_LINK_MTU;
+  }
 
   memmove((uint8_t *)UIP_ICMP6_ERROR_BUF + uip_ext_len + UIP_ICMP6_ERROR_LEN,
           (void *)UIP_IP_BUF, uip_len - UIP_IPICMPH_LEN - uip_ext_len - UIP_ICMP6_ERROR_LEN);

From 9930756d7c5ac0cd38fb0a523c596265ccc7cea6 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Thu, 10 Mar 2016 11:34:23 +0100
Subject: [PATCH 075/393] uip6: restore proto after calling remove_ext_hdr

---
 core/net/ipv6/uip6.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/net/ipv6/uip6.c b/core/net/ipv6/uip6.c
index 5cbf39203..55bebcfb5 100644
--- a/core/net/ipv6/uip6.c
+++ b/core/net/ipv6/uip6.c
@@ -1473,6 +1473,7 @@ uip_process(uint8_t flag)
  udp_input:
 
   remove_ext_hdr();
+  UIP_IP_BUF->proto = UIP_PROTO_UDP;
 
   PRINTF("Receiving UDP packet\n");
 
@@ -1593,6 +1594,7 @@ uip_process(uint8_t flag)
  tcp_input:
 
   remove_ext_hdr();
+  UIP_IP_BUF->proto = UIP_PROTO_TCP;
 
   UIP_STAT(++uip_stat.tcp.recv);
   PRINTF("Receiving TCP packet\n");

From 5886bdea31b065b410e92aa68e113cfde4587f61 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Thu, 10 Mar 2016 11:35:51 +0100
Subject: [PATCH 076/393] uip_icmp6_error_output: remove and add RPL ext header
 instead of inverting it, so that the payload of the returned ICMP error
 matches the original packet

---
 core/net/ipv6/uip-icmp6.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/net/ipv6/uip-icmp6.c b/core/net/ipv6/uip-icmp6.c
index 157ed0edb..80d7a5582 100644
--- a/core/net/ipv6/uip-icmp6.c
+++ b/core/net/ipv6/uip-icmp6.c
@@ -220,8 +220,8 @@ uip_icmp6_error_output(uint8_t type, uint8_t code, uint32_t param) {
   }
 
 #if UIP_CONF_IPV6_RPL
-  uip_ext_len = rpl_invert_header();
-#else /* UIP_CONF_IPV6_RPL */
+  rpl_remove_header();
+#else
   uip_ext_len = 0;
 #endif /* UIP_CONF_IPV6_RPL */
 
@@ -280,6 +280,10 @@ uip_icmp6_error_output(uint8_t type, uint8_t code, uint32_t param) {
   UIP_ICMP_BUF->icmpchksum = 0;
   UIP_ICMP_BUF->icmpchksum = ~uip_icmp6chksum();
 
+#if UIP_CONF_IPV6_RPL
+  rpl_insert_header();
+#endif /* UIP_CONF_IPV6_RPL */
+
   UIP_STAT(++uip_stat.icmp.sent);
 
   PRINTF("Sending ICMPv6 ERROR message type %d code %d to ", type, code);

From 06e984a02eb66acf5f5647b73a87bc0721f44f1d Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Thu, 10 Mar 2016 11:40:30 +0100
Subject: [PATCH 077/393] uip6: enable sending of "port unreachable" ICMPv6
 message

---
 core/net/ipv6/uip6.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/net/ipv6/uip6.c b/core/net/ipv6/uip6.c
index 55bebcfb5..057d6173a 100644
--- a/core/net/ipv6/uip6.c
+++ b/core/net/ipv6/uip6.c
@@ -1529,12 +1529,8 @@ uip_process(uint8_t flag)
   PRINTF("udp: no matching connection found\n");
   UIP_STAT(++uip_stat.udp.drop);
 
-#if UIP_UDP_SEND_UNREACH_NOPORT
   uip_icmp6_error_output(ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT, 0);
   goto send;
-#else
-  goto drop;
-#endif
 
  udp_found:
   PRINTF("In udp_found\n");

From 3fa25eac8c8aa787dba4dc92433cfef2eddef856 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Thu, 10 Mar 2016 11:41:06 +0100
Subject: [PATCH 078/393] uip6: fix bug that caused the payload of ICMPv6
 messages not to match that of the original packet

---
 core/net/ipv6/uip6.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/net/ipv6/uip6.c b/core/net/ipv6/uip6.c
index 057d6173a..7e9ab0016 100644
--- a/core/net/ipv6/uip6.c
+++ b/core/net/ipv6/uip6.c
@@ -1482,8 +1482,6 @@ uip_process(uint8_t flag)
      work. If the application sets uip_slen, it has a packet to
      send. */
 #if UIP_UDP_CHECKSUMS
-  uip_len = uip_len - UIP_IPUDPH_LEN;
-  uip_appdata = &uip_buf[UIP_IPUDPH_LEN + UIP_LLH_LEN];
   /* XXX hack: UDP/IPv6 receivers should drop packets with UDP
      checksum 0. Here, we explicitly receive UDP packets with checksum
      0. This is to be able to debug code that for one reason or
@@ -1496,8 +1494,6 @@ uip_process(uint8_t flag)
            uip_udpchksum());
     goto drop;
   }
-#else /* UIP_UDP_CHECKSUMS */
-  uip_len = uip_len - UIP_IPUDPH_LEN;
 #endif /* UIP_UDP_CHECKSUMS */
 
   /* Make sure that the UDP destination port number is not zero. */
@@ -1536,6 +1532,8 @@ uip_process(uint8_t flag)
   PRINTF("In udp_found\n");
   UIP_STAT(++uip_stat.udp.recv);
 
+  uip_len = uip_len - UIP_IPUDPH_LEN;
+  uip_appdata = &uip_buf[UIP_IPUDPH_LEN + UIP_LLH_LEN];
   uip_conn = NULL;
   uip_flags = UIP_NEWDATA;
   uip_sappdata = uip_appdata = &uip_buf[UIP_IPUDPH_LEN + UIP_LLH_LEN];

From 217e623337620c3e463f91ed4994668a9dc93cb4 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Thu, 10 Mar 2016 18:09:00 +0100
Subject: [PATCH 079/393] remove unused variables

---
 cpu/cc2538/dev/cc2538-rf.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cpu/cc2538/dev/cc2538-rf.c b/cpu/cc2538/dev/cc2538-rf.c
index f889a373d..9a1957fe0 100644
--- a/cpu/cc2538/dev/cc2538-rf.c
+++ b/cpu/cc2538/dev/cc2538-rf.c
@@ -664,8 +664,6 @@ read(void *buf, unsigned short bufsize)
 {
   uint8_t i;
   uint8_t len;
-  uint8_t crc_corr;
-  int8_t rssi;
 
   PRINTF("RF: Read\n");
 

From 57a47bb12f6639c1cccb87b06bd6862ed693a8e7 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Thu, 10 Mar 2016 18:36:47 +0100
Subject: [PATCH 080/393] node_id on cc2538dk

---
 examples/ipv6/rpl-tsch/node.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/ipv6/rpl-tsch/node.c b/examples/ipv6/rpl-tsch/node.c
index 2aee41d81..beceff326 100644
--- a/examples/ipv6/rpl-tsch/node.c
+++ b/examples/ipv6/rpl-tsch/node.c
@@ -38,6 +38,7 @@
 
 #include "contiki.h"
 #include "node-id.h"
+#include "linkaddr.h"
 #include "net/rpl/rpl.h"
 #include "net/ipv6/uip-ds6-route.h"
 #include "net/mac/tsch/tsch.h"
@@ -131,6 +132,7 @@ net_init(uip_ipaddr_t *br_prefix)
 PROCESS_THREAD(node_process, ev, data)
 {
   static struct etimer et;
+  static unsigned short node_id;
   PROCESS_BEGIN();
 
   /* 3 possible roles:
@@ -142,6 +144,8 @@ PROCESS_THREAD(node_process, ev, data)
   static enum { role_6ln, role_6dr, role_6dr_sec } node_role;
   node_role = role_6ln;
   
+  node_id = linkaddr_node_addr.u8[LINKADDR_SIZE - 2] | linkaddr_node_addr.u8[LINKADDR_SIZE - 1];
+  
   /* Set node with ID == 1 as coordinator, convenient in Cooja. */
   if(node_id == 1) {
     if(LLSEC802154_CONF_SECURITY_LEVEL) {

From 45c7477650a19c2cbee5162c652e33786aa86b4d Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Fri, 11 Mar 2016 11:02:43 +0100
Subject: [PATCH 081/393] original node.c

---
 examples/ipv6/rpl-tsch/node.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/examples/ipv6/rpl-tsch/node.c b/examples/ipv6/rpl-tsch/node.c
index beceff326..2aee41d81 100644
--- a/examples/ipv6/rpl-tsch/node.c
+++ b/examples/ipv6/rpl-tsch/node.c
@@ -38,7 +38,6 @@
 
 #include "contiki.h"
 #include "node-id.h"
-#include "linkaddr.h"
 #include "net/rpl/rpl.h"
 #include "net/ipv6/uip-ds6-route.h"
 #include "net/mac/tsch/tsch.h"
@@ -132,7 +131,6 @@ net_init(uip_ipaddr_t *br_prefix)
 PROCESS_THREAD(node_process, ev, data)
 {
   static struct etimer et;
-  static unsigned short node_id;
   PROCESS_BEGIN();
 
   /* 3 possible roles:
@@ -144,8 +142,6 @@ PROCESS_THREAD(node_process, ev, data)
   static enum { role_6ln, role_6dr, role_6dr_sec } node_role;
   node_role = role_6ln;
   
-  node_id = linkaddr_node_addr.u8[LINKADDR_SIZE - 2] | linkaddr_node_addr.u8[LINKADDR_SIZE - 1];
-  
   /* Set node with ID == 1 as coordinator, convenient in Cooja. */
   if(node_id == 1) {
     if(LLSEC802154_CONF_SECURITY_LEVEL) {

From 400a09e82ceb8e77464bf072748ba42f18ed38e6 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Fri, 11 Mar 2016 11:05:04 +0100
Subject: [PATCH 082/393] comment

---
 platform/cc2538dk/contiki-conf.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/cc2538dk/contiki-conf.h b/platform/cc2538dk/contiki-conf.h
index c91338849..ae7c3275d 100644
--- a/platform/cc2538dk/contiki-conf.h
+++ b/platform/cc2538dk/contiki-conf.h
@@ -42,6 +42,7 @@ typedef uint32_t rtimer_clock_t;
 /*---------------------------------------------------------------------------*/
 #define TSCH_CONF_HW_FRAME_FILTERING	0
 
+/* TODO: measure the delays, this are only estimations */
 #define RADIO_DELAY_BEFORE_TX     ((unsigned)US_TO_RTIMERTICKS(300))
 #define RADIO_DELAY_BEFORE_RX     ((unsigned)US_TO_RTIMERTICKS(100))
 #define RADIO_DELAY_BEFORE_DETECT 0

From 4bf868fd99c948fd9189490e1f5735f4deafa181 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Mon, 14 Mar 2016 13:56:00 +0100
Subject: [PATCH 083/393] Fix a number of leftover mentions of aaaa as a prefix
 (now fd00)

---
 examples/ipso-objects/README.md                      |  4 ++--
 examples/ipso-objects/example-ipso-objects.c         |  2 +-
 examples/ipso-objects/example-server.c               | 12 ++++++------
 examples/ipv6/rpl-tsch/node.c                        |  2 +-
 .../jn516x/tsch/tx-power-verification/node/node.c    |  2 +-
 .../jn516x/tsch/uart1-test-node/uart1-test-node.c    |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/examples/ipso-objects/README.md b/examples/ipso-objects/README.md
index 6d1eb5871..e9be82dcb 100644
--- a/examples/ipso-objects/README.md
+++ b/examples/ipso-objects/README.md
@@ -26,10 +26,10 @@ First program a device with the examples/ipso-objects/example-ipso-objects.c
 >...
 ```
 
-After that start up a native-border router or other border router on aaaa::1/64
+After that start up a native-border router or other border router on fd00::1/64
 or another prefix - NOTE: if you use another prefix you will need to change LWM2M_SERVER_ADDRESS for which the device will register - in project-conf.h:
 ```
-#define LWM2M_SERVER_ADDRESS "aaaa::1"
+#define LWM2M_SERVER_ADDRESS "fd00::1"
 ```
 
 Then when everything is setup you can download a Leshan and use that to
diff --git a/examples/ipso-objects/example-ipso-objects.c b/examples/ipso-objects/example-ipso-objects.c
index 66a31a0bb..bbb7aa464 100644
--- a/examples/ipso-objects/example-ipso-objects.c
+++ b/examples/ipso-objects/example-ipso-objects.c
@@ -52,7 +52,7 @@
 #endif
 
 #ifndef LWM2M_SERVER_ADDRESS
-#define LWM2M_SERVER_ADDRESS "aaaa::1"
+#define LWM2M_SERVER_ADDRESS "fd00::1"
 #endif
 
 PROCESS(example_ipso_objects, "IPSO object example");
diff --git a/examples/ipso-objects/example-server.c b/examples/ipso-objects/example-server.c
index 2d48c738b..605e3295a 100644
--- a/examples/ipso-objects/example-server.c
+++ b/examples/ipso-objects/example-server.c
@@ -229,19 +229,19 @@ setup_network(void)
  * Obviously the choice made here must also be selected in udp-client.c.
  *
  * For correct Wireshark decoding using a sniffer, add the /64 prefix to the 6LowPAN protocol preferences,
- * e.g. set Context 0 to aaaa::.  At present Wireshark copies Context/128 and then overwrites it.
- * (Setting Context 0 to aaaa::1111:2222:3333:4444 will report a 16 bit compressed address of aaaa::1111:22ff:fe33:xxxx)
+ * e.g. set Context 0 to fd00::.  At present Wireshark copies Context/128 and then overwrites it.
+ * (Setting Context 0 to fd00::1111:2222:3333:4444 will report a 16 bit compressed address of fd00::1111:22ff:fe33:xxxx)
  * Note Wireshark's IPCMV6 checksum verification depends on the correct uncompressed addresses.
  */
 #if 0
 /* Mode 1 - 64 bits inline */
-   uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1);
+   uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 1);
 #elif 1
 /* Mode 2 - 16 bits inline */
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
 #else
 /* Mode 3 - derived from link local (MAC) address */
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
 #endif
 
@@ -249,7 +249,7 @@ setup_network(void)
   root_if = uip_ds6_addr_lookup(&ipaddr);
   if(root_if != NULL) {
     dag = rpl_set_root(RPL_DEFAULT_INSTANCE, &ipaddr);
-    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     rpl_set_prefix(dag, &ipaddr, 64);
     PRINTF("created a new RPL dag\n");
   } else {
diff --git a/examples/ipv6/rpl-tsch/node.c b/examples/ipv6/rpl-tsch/node.c
index 2aee41d81..203dfd9a9 100644
--- a/examples/ipv6/rpl-tsch/node.c
+++ b/examples/ipv6/rpl-tsch/node.c
@@ -187,7 +187,7 @@ PROCESS_THREAD(node_process, ev, data)
 
   if(is_coordinator) {
     uip_ipaddr_t prefix;
-    uip_ip6addr(&prefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&prefix, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     net_init(&prefix);
   } else {
     net_init(NULL);
diff --git a/examples/jn516x/tsch/tx-power-verification/node/node.c b/examples/jn516x/tsch/tx-power-verification/node/node.c
index 1e77d3a2e..1b2c75dfe 100644
--- a/examples/jn516x/tsch/tx-power-verification/node/node.c
+++ b/examples/jn516x/tsch/tx-power-verification/node/node.c
@@ -105,7 +105,7 @@ PROCESS_THREAD(start_app, ev, data)
   /* Start network stack */
   if(is_coordinator) {
     uip_ipaddr_t prefix;
-    uip_ip6addr(&prefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&prefix, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     rpl_tools_init(&prefix);
   } else {
     rpl_tools_init(NULL);
diff --git a/examples/jn516x/tsch/uart1-test-node/uart1-test-node.c b/examples/jn516x/tsch/uart1-test-node/uart1-test-node.c
index 0a4259f95..f2fbacafa 100644
--- a/examples/jn516x/tsch/uart1-test-node/uart1-test-node.c
+++ b/examples/jn516x/tsch/uart1-test-node/uart1-test-node.c
@@ -145,7 +145,7 @@ PROCESS_THREAD(start_app, ev, data)
   /* Start network stack */
   if(is_coordinator) {
     uip_ipaddr_t prefix;
-    uip_ip6addr(&prefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&prefix, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     rpl_tools_init(&prefix);
   } else {
     rpl_tools_init(NULL);

From 88a0db6aeefaa79b5954e2525b5383159be03fe1 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Mon, 14 Mar 2016 14:52:59 +0100
Subject: [PATCH 084/393] Add missing includes

---
 examples/jn516x/tsch/tx-power-verification/node/node.c | 1 +
 examples/jn516x/tsch/uart1-test-node/uart1-test-node.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/examples/jn516x/tsch/tx-power-verification/node/node.c b/examples/jn516x/tsch/tx-power-verification/node/node.c
index 1b2c75dfe..85b19fa10 100644
--- a/examples/jn516x/tsch/tx-power-verification/node/node.c
+++ b/examples/jn516x/tsch/tx-power-verification/node/node.c
@@ -32,6 +32,7 @@
 *
 */
 #include "contiki.h"
+#include "net/ipv6/uip-ds6.h"
 #include "net/netstack.h"
 #include "net/ip/uip.h"
 #include "net/linkaddr.h"
diff --git a/examples/jn516x/tsch/uart1-test-node/uart1-test-node.c b/examples/jn516x/tsch/uart1-test-node/uart1-test-node.c
index f2fbacafa..4accd3dc4 100644
--- a/examples/jn516x/tsch/uart1-test-node/uart1-test-node.c
+++ b/examples/jn516x/tsch/uart1-test-node/uart1-test-node.c
@@ -31,6 +31,8 @@
 * Author: Theo van Daele <theo.van.daele@nxp.com>
 *
 */
+#include "contiki.h"
+#include "net/ipv6/uip-ds6.h"
 #include "net/ip/uip.h"
 #include "net/linkaddr.h"
 #include "rpl-tools.h"

From 072e416d4a5cf68c10f406c0c941a44613080d78 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Tue, 15 Mar 2016 10:00:54 +0100
Subject: [PATCH 085/393] Fix doxygen warning

---
 doc/uip6-doc.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/uip6-doc.txt b/doc/uip6-doc.txt
index b120bccef..492337f25 100644
--- a/doc/uip6-doc.txt
+++ b/doc/uip6-doc.txt
@@ -161,7 +161,7 @@ Determine the link-layer address of a %neighbor given its IPv6 address.\n
 \li Neighbor unreachability detection\n
 Verify that a neighbor is still reachable via a cached link-layer
 address.\n
--> send a NS (done in #uip_ds6_neighbor_periodic).
+-> send a NS (done in uip_ds6_neighbor_periodic).
 \li Next-hop determination\n
 Map an IPv6 destination address into the IPv6 address of the %neighbor
 to which traffic for the destination should be sent.\n

From 0aa36eaa0a02e634d17e19be73441477a521cc2c Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Fri, 4 Mar 2016 15:07:40 +0100
Subject: [PATCH 086/393] TSCH: explicitly turn radio off after ACK tx

---
 core/net/mac/tsch/tsch-slot-operation.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/net/mac/tsch/tsch-slot-operation.c b/core/net/mac/tsch/tsch-slot-operation.c
index 3174787c2..c632549dd 100644
--- a/core/net/mac/tsch/tsch-slot-operation.c
+++ b/core/net/mac/tsch/tsch-slot-operation.c
@@ -776,6 +776,7 @@ PT_THREAD(tsch_rx_slot(struct pt *pt, struct rtimer *t))
                   packet_duration + tsch_timing[tsch_ts_tx_ack_delay] - RADIO_DELAY_BEFORE_TX, "RxBeforeAck");
               TSCH_DEBUG_RX_EVENT();
               NETSTACK_RADIO.transmit(ack_len);
+              NETSTACK_RADIO.off();
             }
 
             /* If the sender is a time source, proceed to clock drift compensation */

From 0fd097f8218be2be8b4cd85e1d0c2de1171b4dda Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Fri, 4 Mar 2016 15:08:51 +0100
Subject: [PATCH 087/393] TSCH: bound max packet size to the system's packetbuf
 size

---
 core/net/mac/tsch/tsch-packet.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/net/mac/tsch/tsch-packet.h b/core/net/mac/tsch/tsch-packet.h
index 24f533a88..c48bd479b 100644
--- a/core/net/mac/tsch/tsch-packet.h
+++ b/core/net/mac/tsch/tsch-packet.h
@@ -36,6 +36,7 @@
 /********** Includes **********/
 
 #include "contiki.h"
+#include "net/packetbuf.h"
 #include "net/mac/tsch/tsch-private.h"
 #include "net/mac/frame802154.h"
 #include "net/mac/frame802154e-ie.h"
@@ -81,7 +82,7 @@ by default, useful in case of duplicate seqno */
 /********** Constants *********/
 
 /* Max TSCH packet lenght */
-#define TSCH_PACKET_MAX_LEN 127
+#define TSCH_PACKET_MAX_LEN MIN(127,PACKETBUF_SIZE)
 
 /********** Functions *********/
 

From 4b4ea36e9b4e8bd6eef939740aa35c62b74b98c2 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Tue, 8 Mar 2016 17:11:42 +0100
Subject: [PATCH 088/393] TSCH: substract RADIO_DELAY_BEFORE_DETECT from ACK
 timestamp (more accurate timeout for the following busy wait)

---
 core/net/mac/tsch/tsch-slot-operation.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/mac/tsch/tsch-slot-operation.c b/core/net/mac/tsch/tsch-slot-operation.c
index c632549dd..befd5a18f 100644
--- a/core/net/mac/tsch/tsch-slot-operation.c
+++ b/core/net/mac/tsch/tsch-slot-operation.c
@@ -506,7 +506,7 @@ PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
                   tx_start_time, tx_duration + tsch_timing[tsch_ts_rx_ack_delay] + tsch_timing[tsch_ts_ack_wait]);
               TSCH_DEBUG_TX_EVENT();
 
-              ack_start_time = RTIMER_NOW();
+              ack_start_time = RTIMER_NOW() - RADIO_DELAY_BEFORE_DETECT;
 
               /* Wait for ACK to finish */
               BUSYWAIT_UNTIL_ABS(!NETSTACK_RADIO.receiving_packet(),

From 3057cb3363d2456ecd04e61cd4da2ff60b05fe0f Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Tue, 15 Mar 2016 16:10:01 +0100
Subject: [PATCH 089/393] TSCH: reset now also flushes all queues and resets
 backoff exponents

---
 core/net/mac/tsch/tsch-queue.c | 6 +++++-
 core/net/mac/tsch/tsch-queue.h | 4 ++--
 core/net/mac/tsch/tsch.c       | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/net/mac/tsch/tsch-queue.c b/core/net/mac/tsch/tsch-queue.c
index afe868030..1fdf04232 100644
--- a/core/net/mac/tsch/tsch-queue.c
+++ b/core/net/mac/tsch/tsch-queue.c
@@ -302,14 +302,17 @@ tsch_queue_free_packet(struct tsch_packet *p)
 /*---------------------------------------------------------------------------*/
 /* Flush all neighbor queues */
 void
-tsch_queue_flush_all(void)
+tsch_queue_reset(void)
 {
   /* Deallocate unneeded neighbors */
   if(!tsch_is_locked()) {
     struct tsch_neighbor *n = list_head(neighbor_list);
     while(n != NULL) {
       struct tsch_neighbor *next_n = list_item_next(n);
+      /* Flush queue */
       tsch_queue_flush_nbr_queue(n);
+      /* Reset backoff exponent */
+      tsch_queue_backoff_reset(n);
       n = next_n;
     }
   }
@@ -379,6 +382,7 @@ tsch_queue_get_packet_for_dest_addr(const linkaddr_t *addr, struct tsch_link *li
   }
   return NULL;
 }
+/*---------------------------------------------------------------------------*/
 /* Returns the head packet of any neighbor queue with zero backoff counter.
  * Writes pointer to the neighbor in *n */
 struct tsch_packet *
diff --git a/core/net/mac/tsch/tsch-queue.h b/core/net/mac/tsch/tsch-queue.h
index b4061be23..c350ab063 100644
--- a/core/net/mac/tsch/tsch-queue.h
+++ b/core/net/mac/tsch/tsch-queue.h
@@ -166,8 +166,8 @@ int tsch_queue_packet_count(const linkaddr_t *addr);
 struct tsch_packet *tsch_queue_remove_packet_from_queue(struct tsch_neighbor *n);
 /* Free a packet */
 void tsch_queue_free_packet(struct tsch_packet *p);
-/* Flush all neighbor queues */
-void tsch_queue_flush_all(void);
+/* Reset neighbor queues */
+void tsch_queue_reset(void);
 /* Deallocate neighbors with empty queue */
 void tsch_queue_free_unused_neighbors(void);
 /* Is the neighbor queue empty? */
diff --git a/core/net/mac/tsch/tsch.c b/core/net/mac/tsch/tsch.c
index 4e24ea8da..fa92fe8ad 100644
--- a/core/net/mac/tsch/tsch.c
+++ b/core/net/mac/tsch/tsch.c
@@ -199,8 +199,8 @@ tsch_reset(void)
   frame802154_set_pan_id(0xffff);
   /* First make sure pending packet callbacks are sent etc */
   process_post_synch(&tsch_pending_events_process, PROCESS_EVENT_POLL, NULL);
-  /* Empty all neighbor queues */
-  /* tsch_queue_flush_all(); */
+  /* Reset neighbor queues */
+  tsch_queue_reset();
   /* Remove unused neighbors */
   tsch_queue_free_unused_neighbors();
   tsch_queue_update_time_source(NULL);

From 2d9b53667fdd49573a703bbf226c73115bcca817 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Wed, 16 Mar 2016 12:24:49 +0100
Subject: [PATCH 090/393] not leaving promiscuous mode anymore if
 TSCH_HW_FRAME_FILTERING disabled

---
 core/net/mac/tsch/tsch-slot-operation.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/net/mac/tsch/tsch-slot-operation.c b/core/net/mac/tsch/tsch-slot-operation.c
index be1885bc7..7deccaa92 100644
--- a/core/net/mac/tsch/tsch-slot-operation.c
+++ b/core/net/mac/tsch/tsch-slot-operation.c
@@ -493,9 +493,11 @@ PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
               uint8_t ack_hdrlen;
               frame802154_t frame;
 
+#if TSCH_HW_FRAME_FILTERING
               /* Entering promiscuous mode so that the radio accepts the enhanced ACK */
               NETSTACK_RADIO.get_value(RADIO_PARAM_RX_MODE, &radio_rx_mode);
               NETSTACK_RADIO.set_value(RADIO_PARAM_RX_MODE, radio_rx_mode & (~RADIO_RX_MODE_ADDRESS_FILTER));
+#endif /* TSCH_HW_FRAME_FILTERING */
               /* Unicast: wait for ack after tx: sleep until ack time */
               TSCH_SCHEDULE_AND_YIELD(pt, t, current_slot_start,
                   tsch_timing[tsch_ts_tx_offset] + tx_duration + tsch_timing[tsch_ts_rx_ack_delay] - RADIO_DELAY_BEFORE_RX, "TxBeforeAck");

From 66a0bbcd24dbd529586de9400e0e045c5744f63d Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Wed, 16 Mar 2016 16:38:04 +0100
Subject: [PATCH 091/393] renaming variables back to their original name

---
 cpu/cc2538/dev/cc2538-rf.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/cpu/cc2538/dev/cc2538-rf.c b/cpu/cc2538/dev/cc2538-rf.c
index 9a1957fe0..a07108e8b 100644
--- a/cpu/cc2538/dev/cc2538-rf.c
+++ b/cpu/cc2538/dev/cc2538-rf.c
@@ -128,8 +128,8 @@ static rtimer_clock_t volatile cc2538_sfd_rtime;
 static uint8_t volatile poll_mode = 0;
 /* Do we perform a CCA before sending? Enabled by default. */
 static uint8_t send_on_cca = 1;
-static int8_t cc2538_last_rssi;
-static uint8_t cc2538_last_crc_corr_lqi;
+static int8_t rssi;
+static uint8_t crc_corr;
 /*---------------------------------------------------------------------------*/
 static uint8_t rf_flags;
 static uint8_t rf_channel = CC2538_RF_CHANNEL;
@@ -732,15 +732,15 @@ read(void *buf, unsigned short bufsize)
   }
 
   /* Read the RSSI and CRC/Corr bytes */
-  cc2538_last_rssi = ((int8_t)REG(RFCORE_SFR_RFDATA)) - RSSI_OFFSET;
-  cc2538_last_crc_corr_lqi = REG(RFCORE_SFR_RFDATA);
+  rssi = ((int8_t)REG(RFCORE_SFR_RFDATA)) - RSSI_OFFSET;
+  crc_corr = REG(RFCORE_SFR_RFDATA);
 
-  PRINTF("%02x%02x\n", (uint8_t)cc2538_last_rssi, cc2538_last_crc_corr_lqi);
+  PRINTF("%02x%02x\n", (uint8_t)rssi, crc_corr);
 
   /* MS bit CRC OK/Not OK, 7 LS Bits, Correlation value */
-  if(cc2538_last_crc_corr_lqi & CRC_BIT_MASK) {
-    packetbuf_set_attr(PACKETBUF_ATTR_RSSI, cc2538_last_rssi);
-    packetbuf_set_attr(PACKETBUF_ATTR_LINK_QUALITY, cc2538_last_crc_corr_lqi & LQI_BIT_MASK);
+  if(crc_corr & CRC_BIT_MASK) {
+    packetbuf_set_attr(PACKETBUF_ATTR_RSSI, rssi);
+    packetbuf_set_attr(PACKETBUF_ATTR_LINK_QUALITY, crc_corr & LQI_BIT_MASK);
     RIMESTATS_ADD(llrx);
   } else {
     RIMESTATS_ADD(badcrc);
@@ -852,10 +852,10 @@ get_value(radio_param_t param, radio_value_t *value)
     *value = get_rssi();
     return RADIO_RESULT_OK;
   case RADIO_PARAM_LAST_RSSI:
-    *value = cc2538_last_rssi;
+    *value = rssi;
     return RADIO_RESULT_OK;
   case RADIO_PARAM_LAST_LINK_QUALITY:
-    *value = cc2538_last_crc_corr_lqi & LQI_BIT_MASK;
+    *value = crc_corr & LQI_BIT_MASK;
     return RADIO_RESULT_OK;
   case RADIO_CONST_CHANNEL_MIN:
     *value = CC2538_RF_CHANNEL_MIN;

From 60acf7de9817cfd690cd5f1cf6a042d63bfa9c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= <remy.leone@gmail.com>
Date: Wed, 16 Mar 2016 18:48:09 +0100
Subject: [PATCH 092/393] fix SerialSocketServer when run without GUI

---
 .../org/contikios/cooja/serialsocket/SerialSocketServer.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/cooja/apps/serial_socket/java/org/contikios/cooja/serialsocket/SerialSocketServer.java b/tools/cooja/apps/serial_socket/java/org/contikios/cooja/serialsocket/SerialSocketServer.java
index fa55da74b..e73eac513 100644
--- a/tools/cooja/apps/serial_socket/java/org/contikios/cooja/serialsocket/SerialSocketServer.java
+++ b/tools/cooja/apps/serial_socket/java/org/contikios/cooja/serialsocket/SerialSocketServer.java
@@ -644,6 +644,7 @@ public class SerialSocketServer extends VisPlugin implements MotePlugin {
   private Timer updateTimer = new Timer(UPDATE_INTERVAL, new ActionListener() {
     @Override
 	  public void actionPerformed(ActionEvent e) {
+	  	if (Cooja.isVisualized()) {
 		  if (closed) {
 			  updateTimer.stop();
 			  return;
@@ -652,6 +653,7 @@ public class SerialSocketServer extends VisPlugin implements MotePlugin {
 		  socketToMoteLabel.setText(inBytes + " bytes");
 		  moteToSocketLabel.setText(outBytes + " bytes");
 	  }
+	  }
   });
 }
 

From 25c07613c254a71d426332b0964ce940e54f3611 Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Sat, 26 Sep 2015 22:15:45 -0700
Subject: [PATCH 093/393] x86: Add driver for message bus

The Intel Quark X1000 SoC includes a message bus that is accessible
via PCI configuration registers.  It communicates to various SoC
components such as the Isolated Memory Region (IMR) registers and the
Remote Management Unit.  This patch adds a driver for accessing the
message bus.
---
 cpu/x86/Makefile.x86_quarkX1000      |   1 +
 cpu/x86/drivers/quarkX1000/msg-bus.c | 113 +++++++++++++++++++++++++++
 cpu/x86/drivers/quarkX1000/msg-bus.h |  50 ++++++++++++
 platform/galileo/README.md           |   1 +
 4 files changed, 165 insertions(+)
 create mode 100644 cpu/x86/drivers/quarkX1000/msg-bus.c
 create mode 100644 cpu/x86/drivers/quarkX1000/msg-bus.h

diff --git a/cpu/x86/Makefile.x86_quarkX1000 b/cpu/x86/Makefile.x86_quarkX1000
index ec9da64be..e5c0b1801 100644
--- a/cpu/x86/Makefile.x86_quarkX1000
+++ b/cpu/x86/Makefile.x86_quarkX1000
@@ -3,6 +3,7 @@ include $(CONTIKI)/cpu/x86/Makefile.x86_common
 CONTIKI_CPU_DIRS += drivers/legacy_pc drivers/quarkX1000 init/legacy_pc
 
 CONTIKI_SOURCEFILES += bootstrap_quarkX1000.S rtc.c pit.c pic.c irq.c nmi.c pci.c uart-16x50.c uart.c gpio.c i2c.c eth.c shared-isr.c
+CONTIKI_SOURCEFILES += msg-bus.c
 
 CFLAGS += -m32 -march=i586 -mtune=i586
 LDFLAGS += -m32 -Xlinker -T -Xlinker $(CONTIKI)/cpu/x86/quarkX1000.ld
diff --git a/cpu/x86/drivers/quarkX1000/msg-bus.c b/cpu/x86/drivers/quarkX1000/msg-bus.c
new file mode 100644
index 000000000..e7a4bca44
--- /dev/null
+++ b/cpu/x86/drivers/quarkX1000/msg-bus.c
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2015-2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+#include "msg-bus.h"
+#include "pci.h"
+
+/** Message bus control register */
+#define MCR_PCI_REG_ADDR 0xD0
+/** Message data register */
+#define MDR_PCI_REG_ADDR 0xD4
+/** Message control register extension */
+#define MCRX_PCI_REG_ADDR 0xD8
+
+typedef union mcr {
+  struct {
+    uint32_t         : 4;
+    uint32_t byte_en : 4;
+    uint32_t reg_off : 8;
+    uint32_t port    : 8;
+    uint32_t opcode  : 8;
+  };
+  uint32_t raw;
+} mcr_t;
+
+typedef union mcrx {
+  struct {
+    uint32_t           : 8;
+    uint32_t reg_off   : 24;
+  };
+  uint32_t raw;
+} mcrx_t;
+
+/*---------------------------------------------------------------------------*/
+static void
+request_op(uint8_t port, uint32_t reg_off, uint8_t opcode)
+{
+  pci_config_addr_t pci_addr = { .raw = 0 };
+  mcr_t mcr = { .raw = 0 };
+  mcrx_t mcrx = { .raw = 0 };
+
+  pci_addr.reg_off = MCR_PCI_REG_ADDR;
+  mcr.opcode = opcode;
+  mcr.byte_en = 0xF;
+  mcr.port = port;
+  mcr.reg_off = reg_off & 0xFF;
+  pci_config_write(pci_addr, mcr.raw);
+
+  pci_addr.reg_off = MCRX_PCI_REG_ADDR;
+  mcrx.reg_off = reg_off >> 8;
+  pci_config_write(pci_addr, mcrx.raw);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief         Read from a message bus register.
+ * \param port    Port of message bus register to be read.
+ * \param reg_off Register/offset identifier of message bus register to read.
+ * \param val     Storage location for value that has been read.
+ */
+void
+quarkX1000_msg_bus_read(uint8_t port, uint32_t reg_off, uint32_t *val)
+{
+  pci_config_addr_t pci_addr = { .raw = 0 };
+
+  request_op(port, reg_off, 0x10);
+
+  pci_addr.reg_off = MDR_PCI_REG_ADDR;
+  *val = pci_config_read(pci_addr);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief         Write to a message bus register.
+ * \param port    Port of message bus register to be written.
+ * \param reg_off Register/offset identifier of message bus register to write.
+ * \param val     Value to write.
+ */
+void
+quarkX1000_msg_bus_write(uint8_t port, uint32_t reg_off, uint32_t val)
+{
+  pci_config_addr_t pci_addr = { .raw = 0 };
+
+  pci_addr.reg_off = MDR_PCI_REG_ADDR;
+  pci_config_write(pci_addr, val);
+
+  request_op(port, reg_off, 0x11);
+}
+/*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/drivers/quarkX1000/msg-bus.h b/cpu/x86/drivers/quarkX1000/msg-bus.h
new file mode 100644
index 000000000..0b810e06d
--- /dev/null
+++ b/cpu/x86/drivers/quarkX1000/msg-bus.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2015-2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_DRIVERS_QUARKX1000_MSG_BUS_H_
+#define CPU_X86_DRIVERS_QUARKX1000_MSG_BUS_H_
+
+#include <stdint.h>
+
+/* Routines for accessing the message bus.
+ *
+ * The Intel Quark X1000 SoC includes a message bus that is accessible
+ * via PCI configuration registers.  It communicates to various SoC
+ * components such as the Isolated Memory Region (IMR) registers and the
+ * Remote Management Unit.
+ *
+ * Refer to Intel Quark SoC X1000 Datasheet, Section 12.5 for more details on
+ * the message bus.
+ */
+
+void quarkX1000_msg_bus_read(uint8_t port, uint32_t reg_off, uint32_t *val);
+void quarkX1000_msg_bus_write(uint8_t port, uint32_t reg_off, uint32_t val);
+
+#endif /* CPU_X86_DRIVERS_QUARKX1000_MSG_BUS_H_ */
diff --git a/platform/galileo/README.md b/platform/galileo/README.md
index 815b09011..63c929c4f 100644
--- a/platform/galileo/README.md
+++ b/platform/galileo/README.md
@@ -33,6 +33,7 @@ Device drivers:
   * I2C
   * GPIO (default pinmux configuration is listed in
     platform/galileo/drivers/galileo-pinmux.c)
+  * Intel Quark X1000 SoC message bus
 
 Contiki APIs:
   * Clock module

From 58a00b7c233735db3c751df10ec524a09bc7298d Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Sat, 26 Sep 2015 22:27:42 -0700
Subject: [PATCH 094/393] x86, galileo: Add driver for Isolated Memory Regions
 (IMRs)

The Intel Quark X1000 SoC includes support for Isolated Memory Regions
(IMRs), which are specified using range registers and associated
control registers that are accessible via the message bus.  This patch
adds a driver for accessing those registers.
---
 cpu/x86/Makefile.x86_quarkX1000  |   2 +-
 cpu/x86/drivers/quarkX1000/imr.c |  89 ++++++++++++++++++++++
 cpu/x86/drivers/quarkX1000/imr.h | 125 +++++++++++++++++++++++++++++++
 platform/galileo/README.md       |   1 +
 4 files changed, 216 insertions(+), 1 deletion(-)
 create mode 100644 cpu/x86/drivers/quarkX1000/imr.c
 create mode 100644 cpu/x86/drivers/quarkX1000/imr.h

diff --git a/cpu/x86/Makefile.x86_quarkX1000 b/cpu/x86/Makefile.x86_quarkX1000
index e5c0b1801..7205a446a 100644
--- a/cpu/x86/Makefile.x86_quarkX1000
+++ b/cpu/x86/Makefile.x86_quarkX1000
@@ -3,7 +3,7 @@ include $(CONTIKI)/cpu/x86/Makefile.x86_common
 CONTIKI_CPU_DIRS += drivers/legacy_pc drivers/quarkX1000 init/legacy_pc
 
 CONTIKI_SOURCEFILES += bootstrap_quarkX1000.S rtc.c pit.c pic.c irq.c nmi.c pci.c uart-16x50.c uart.c gpio.c i2c.c eth.c shared-isr.c
-CONTIKI_SOURCEFILES += msg-bus.c
+CONTIKI_SOURCEFILES += imr.c msg-bus.c
 
 CFLAGS += -m32 -march=i586 -mtune=i586
 LDFLAGS += -m32 -Xlinker -T -Xlinker $(CONTIKI)/cpu/x86/quarkX1000.ld
diff --git a/cpu/x86/drivers/quarkX1000/imr.c b/cpu/x86/drivers/quarkX1000/imr.c
new file mode 100644
index 000000000..03c43a0c0
--- /dev/null
+++ b/cpu/x86/drivers/quarkX1000/imr.c
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2015-2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+#include <assert.h>
+#include "imr.h"
+#include "msg-bus.h"
+
+#define MEM_MANAGER_PORT 5
+
+#define IMR_BASE_OFFSET  0x40
+#define IMR_REG_COUNT    4
+
+#define IMR_LO_OFFSET    0
+#define IMR_HI_OFFSET    1
+#define IMR_RDMSK_OFFSET 2
+#define IMR_WRMSK_OFFSET 3
+
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Read the contents of the specified IMR.
+ */
+quarkX1000_imr_t
+quarkX1000_imr_read(uint32_t imr_idx)
+{
+  quarkX1000_imr_t imr;
+  uint32_t reg_base = IMR_BASE_OFFSET + (IMR_REG_COUNT * imr_idx);
+
+  assert(imr_idx < QUARKX1000_IMR_CNT);
+
+  quarkX1000_msg_bus_read(MEM_MANAGER_PORT,
+                          reg_base + IMR_LO_OFFSET, &imr.lo.raw);
+  quarkX1000_msg_bus_read(MEM_MANAGER_PORT,
+                          reg_base + IMR_HI_OFFSET, &imr.hi.raw);
+  quarkX1000_msg_bus_read(MEM_MANAGER_PORT,
+                          reg_base + IMR_RDMSK_OFFSET, &imr.rdmsk.raw);
+  quarkX1000_msg_bus_read(MEM_MANAGER_PORT,
+                          reg_base + IMR_WRMSK_OFFSET, &imr.wrmsk.raw);
+
+  return imr;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Overwrite the contents of the specified IMR.
+ */
+void
+quarkX1000_imr_write(uint32_t imr_idx, quarkX1000_imr_t imr)
+{
+  uint32_t reg_base = IMR_BASE_OFFSET + (IMR_REG_COUNT * imr_idx);
+
+  assert(imr_idx < QUARKX1000_IMR_CNT);
+
+  quarkX1000_msg_bus_write(MEM_MANAGER_PORT,
+                           reg_base + IMR_HI_OFFSET, imr.hi.raw);
+  quarkX1000_msg_bus_write(MEM_MANAGER_PORT,
+                           reg_base + IMR_RDMSK_OFFSET, imr.rdmsk.raw);
+  quarkX1000_msg_bus_write(MEM_MANAGER_PORT,
+                           reg_base + IMR_WRMSK_OFFSET, imr.wrmsk.raw);
+  /* This register must be programmed last, in case it sets the lock bit. */
+  quarkX1000_msg_bus_write(MEM_MANAGER_PORT,
+                           reg_base + IMR_LO_OFFSET, imr.lo.raw);
+}
+/*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/drivers/quarkX1000/imr.h b/cpu/x86/drivers/quarkX1000/imr.h
new file mode 100644
index 000000000..f5ddef3e2
--- /dev/null
+++ b/cpu/x86/drivers/quarkX1000/imr.h
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2015-2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_DRIVERS_QUARKX1000_IMR_H_
+#define CPU_X86_DRIVERS_QUARKX1000_IMR_H_
+
+#include <stdint.h>
+
+typedef union quarkX1000_imr_lo {
+  struct {
+    uint32_t      : 2;
+    uint32_t addr : 22;
+    uint32_t      : 7;
+    uint32_t lock : 1;
+  };
+  uint32_t raw;
+} quarkX1000_imr_lo_t;
+
+typedef union quarkX1000_imr_hi {
+  struct {
+    uint32_t      : 2;
+    uint32_t addr : 22;
+    uint32_t      : 8;
+  };
+  uint32_t raw;
+} quarkX1000_imr_hi_t;
+
+/* Amount to shift imr_lo/hi.addr left to obtain the bound address */
+#define QUARKX1000_IMR_SHAMT 10
+
+typedef union quarkX1000_imr_rdmsk {
+  struct {
+    uint32_t cpu0             : 1;
+    uint32_t cpu_0            : 1;
+    uint32_t                  : 6;
+    uint32_t vc0_sai_id0      : 1;
+    uint32_t vc0_sai_id1      : 1;
+    uint32_t vc0_sai_id2      : 1;
+    uint32_t vc0_sai_id3      : 1;
+    uint32_t vc1_sai_id0      : 1;
+    uint32_t vc1_sai_id1      : 1;
+    uint32_t vc1_sai_id2      : 1;
+    uint32_t vc1_sai_id3      : 1;
+    uint32_t                  : 13;
+    uint32_t punit            : 1;
+    uint32_t                  : 1;
+    uint32_t esram_flush_init : 1;
+  };
+  uint32_t raw;
+} quarkX1000_imr_rdmsk_t;
+
+typedef union quarkX1000_imr_wrmsk {
+  struct {
+    uint32_t cpu0             : 1;
+    uint32_t cpu_0            : 1;
+    uint32_t                  : 6;
+    uint32_t vc0_sai_id0      : 1;
+    uint32_t vc0_sai_id1      : 1;
+    uint32_t vc0_sai_id2      : 1;
+    uint32_t vc0_sai_id3      : 1;
+    uint32_t vc1_sai_id0      : 1;
+    uint32_t vc1_sai_id1      : 1;
+    uint32_t vc1_sai_id2      : 1;
+    uint32_t vc1_sai_id3      : 1;
+    uint32_t                  : 13;
+    uint32_t punit            : 1;
+    uint32_t cpu_snoop        : 1;
+    uint32_t esram_flush_init : 1;
+  };
+  uint32_t raw;
+} quarkX1000_imr_wrmsk_t;
+
+/* Refer to Intel Quark SoC X1000 Datasheet, Section 12.7.4 for more details on
+ * the IMR registers.
+ */
+typedef struct quarkX1000_imr {
+  quarkX1000_imr_lo_t lo;
+  quarkX1000_imr_hi_t hi;
+  quarkX1000_imr_rdmsk_t rdmsk;
+  quarkX1000_imr_wrmsk_t wrmsk;
+} quarkX1000_imr_t;
+
+/* The Intel Quark SoC X1000 defines eight general IMRs. */
+#define QUARKX1000_IMR_CNT 8
+
+/* Routines for accessing the Isolated Memory Region (IMR) feature.
+ *
+ * The Intel Quark X1000 SoC includes support for Isolated Memory Regions
+ * (IMRs), which are specified using range registers and associated
+ * control registers that are accessible via the message bus.
+ *
+ * Refer to Intel Quark SoC X1000 Datasheet, Section 12.2 for more information.
+ */
+
+quarkX1000_imr_t quarkX1000_imr_read(uint32_t imr_idx);
+void quarkX1000_imr_write(uint32_t imr_idx, quarkX1000_imr_t imr);
+
+#endif /* CPU_X86_DRIVERS_QUARKX1000_IMR_H_ */
diff --git a/platform/galileo/README.md b/platform/galileo/README.md
index 63c929c4f..95d2f6353 100644
--- a/platform/galileo/README.md
+++ b/platform/galileo/README.md
@@ -34,6 +34,7 @@ Device drivers:
   * GPIO (default pinmux configuration is listed in
     platform/galileo/drivers/galileo-pinmux.c)
   * Intel Quark X1000 SoC message bus
+  * Isolated Memory Regions (IMRs)
 
 Contiki APIs:
   * Clock module

From e0d124c7c548f916e2b8a7dc68ec8ba7805ef562 Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Tue, 19 Jan 2016 15:08:35 -0800
Subject: [PATCH 095/393] galileo: Add example to print out IMR information

This patch adds an example program to print out information about the
configuration of the Intel Quark X1000 SoC Isolated Memory Regions
(IMRs), the Host System Management Mode Controls register, and the
Host Memory I/O Boundary register.
---
 examples/galileo/Makefile    |   2 +-
 examples/galileo/README.md   |  10 +++
 examples/galileo/print-imr.c | 157 +++++++++++++++++++++++++++++++++++
 3 files changed, 168 insertions(+), 1 deletion(-)
 create mode 100644 examples/galileo/print-imr.c

diff --git a/examples/galileo/Makefile b/examples/galileo/Makefile
index f925f565a..94a327bfd 100644
--- a/examples/galileo/Makefile
+++ b/examples/galileo/Makefile
@@ -1,6 +1,6 @@
 TARGET=galileo
 
-KNOWN_EXAMPLES = gpio-input gpio-output gpio-interrupt i2c-LSM9DS0 i2c-callbacks
+KNOWN_EXAMPLES = gpio-input gpio-output gpio-interrupt i2c-LSM9DS0 i2c-callbacks print-imr
 
 ifeq ($(filter $(EXAMPLE),$(KNOWN_EXAMPLES)),)
     $(info Set the variable EXAMPLE to one of the following Galileo-specific examples:)
diff --git a/examples/galileo/README.md b/examples/galileo/README.md
index b725ec867..49777a16c 100644
--- a/examples/galileo/README.md
+++ b/examples/galileo/README.md
@@ -83,6 +83,16 @@ MODE1 register, which should have previously been initialized to the
 value 0x20. The test verifies that this expected value is returned by
 the read.
 
+Isolated Memory Regions
+-----------------------
+
+### Print IMR info (EXAMPLE=print-imr)
+
+This application prints out information about the configuration of the
+Intel Quark X1000 SoC Isolated Memory Regions (IMRs), the Host System
+Management Mode Controls register, and the Host Memory I/O Boundary
+register.
+
 References
 ----------
 
diff --git a/examples/galileo/print-imr.c b/examples/galileo/print-imr.c
new file mode 100644
index 000000000..07cd89fed
--- /dev/null
+++ b/examples/galileo/print-imr.c
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2015-2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+#include <stdio.h>
+
+#include "contiki.h"
+
+#include "imr.h"
+#include "msg-bus.h"
+
+#define HOST_BRIGE_PORT  3
+
+#define HSMMCTL_OFFSET   4
+
+#define HMBOUND_OFFSET   8
+
+/* Refer to Intel Quark SoC X1000 Datasheet, Section 12.7.2.2 for more details
+ * on the Host System Management Mode Controls register.
+ */
+typedef union hsmmctl {
+  struct {
+    uint32_t lock             : 1;
+    uint32_t rd_open          : 1;
+    uint32_t wr_open          : 1;
+    uint32_t                  : 1;
+    uint32_t start            : 12;
+    uint32_t                  : 1;
+    uint32_t non_host_rd_open : 1;
+    uint32_t non_host_wr_open : 1;
+    uint32_t                  : 1;
+    uint32_t end              : 12;
+  };
+  uint32_t raw;
+} hsmmctl_t;
+
+/* Amount to shift hsmmctl.start/end left to obtain the bound address */
+#define HSMMCTL_SHAMT 20
+
+/* Refer to Intel Quark SoC X1000 Datasheet, Section 12.7.2.3 for more details
+ * on the Host Memory I/O Boundary register.
+ */
+typedef union hmbound {
+  struct {
+    uint32_t lock   : 1;
+    uint32_t io_dis : 1;
+    uint32_t        : 10;
+    uint32_t io_bnd : 20;
+  };
+  uint32_t raw;
+} hmbound_t;
+
+/* Amount to shift hmbound.io_bnd left to obtain the bound address */
+#define HMBOUND_SHAMT 12
+
+PROCESS(imr_process, "IMR Process");
+AUTOSTART_PROCESSES(&imr_process);
+/*---------------------------------------------------------------------------*/
+static hsmmctl_t
+hsmmctl_read(void)
+{
+  hsmmctl_t hsmm;
+
+  quarkX1000_msg_bus_read(HOST_BRIGE_PORT, HSMMCTL_OFFSET, &hsmm.raw);
+
+  return hsmm;
+}
+/*---------------------------------------------------------------------------*/
+static void
+hsmmctl_print(hsmmctl_t hsmm)
+{
+  printf("[%08x, %08x) %slocked, non-SMM host: %c%c, non-host: %c%c",
+         hsmm.start << HSMMCTL_SHAMT, hsmm.end << HSMMCTL_SHAMT,
+         hsmm.lock ? "" : "un",
+         hsmm.rd_open ? 'R' : '-', hsmm.wr_open ? 'W' : '-',
+         hsmm.non_host_rd_open ? 'R' : '-', hsmm.non_host_wr_open ? 'W' : '-');
+}
+/*---------------------------------------------------------------------------*/
+static hmbound_t
+hmbound_read(void)
+{
+  hmbound_t hmb;
+
+  quarkX1000_msg_bus_read(HOST_BRIGE_PORT, HMBOUND_OFFSET, &hmb.raw);
+
+  return hmb;
+}
+/*---------------------------------------------------------------------------*/
+static void
+hmbound_print(hmbound_t hmb)
+{
+  printf("%08x %slocked, IO %sabled",
+         hmb.io_bnd << HMBOUND_SHAMT,
+         hmb.lock ? "" : "un",
+         hmb.io_dis ? "dis" : "en");
+}
+/*---------------------------------------------------------------------------*/
+static void
+imr_print(quarkX1000_imr_t imr)
+{
+  printf("[%08x, %08x) %slocked, rdmsk: %08x, wrmsk: %08x",
+         imr.lo.addr << QUARKX1000_IMR_SHAMT,
+         imr.hi.addr << QUARKX1000_IMR_SHAMT,
+         imr.lo.lock ? "" : "un", imr.rdmsk.raw, imr.wrmsk.raw);
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(imr_process, ev, data)
+{
+  int i;
+  quarkX1000_imr_t imr;
+  hsmmctl_t hsmm;
+  hmbound_t hmb;
+
+  PROCESS_BEGIN();
+
+  fputs("Host SMM Controls: ", stdout);
+  hsmm = hsmmctl_read();
+  hsmmctl_print(hsmm);
+  fputs("\nHost Memory IO Boundary: ", stdout);
+  hmb = hmbound_read();
+  hmbound_print(hmb);
+  puts("\nIsolated Memory Regions:");
+  for(i = 0; i < QUARKX1000_IMR_CNT; i++) {
+    printf(" - #%d: ", i);
+    imr = quarkX1000_imr_read(i);
+    imr_print(imr);
+    puts("");
+  }
+
+  PROCESS_END();
+}

From 93126b57bb19c92ebe021bae3938005a0f324ca8 Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Tue, 29 Sep 2015 21:29:35 -0700
Subject: [PATCH 096/393] x86, galileo: Use IMRs to restrict DMA

This patch configures Isolated Memory Regions (IMRs) to block DMA to
code and data regions that do not contain any data that needs to be
DMA-accessible.
---
 cpu/x86/Makefile.x86_quarkX1000       |  6 +++
 cpu/x86/dma.h                         | 40 +++++++++++++++
 cpu/x86/drivers/quarkX1000/eth.c      |  3 +-
 cpu/x86/drivers/quarkX1000/imr-conf.c | 73 +++++++++++++++++++++++++++
 cpu/x86/drivers/quarkX1000/imr-conf.h | 36 +++++++++++++
 cpu/x86/quarkX1000_dma.ld             | 51 +++++++++++++++++++
 platform/galileo/README.md            |  6 +++
 platform/galileo/contiki-main.c       |  4 ++
 8 files changed, 218 insertions(+), 1 deletion(-)
 create mode 100644 cpu/x86/dma.h
 create mode 100644 cpu/x86/drivers/quarkX1000/imr-conf.c
 create mode 100644 cpu/x86/drivers/quarkX1000/imr-conf.h
 create mode 100644 cpu/x86/quarkX1000_dma.ld

diff --git a/cpu/x86/Makefile.x86_quarkX1000 b/cpu/x86/Makefile.x86_quarkX1000
index 7205a446a..e6e794206 100644
--- a/cpu/x86/Makefile.x86_quarkX1000
+++ b/cpu/x86/Makefile.x86_quarkX1000
@@ -9,6 +9,12 @@ CFLAGS += -m32 -march=i586 -mtune=i586
 LDFLAGS += -m32 -Xlinker -T -Xlinker $(CONTIKI)/cpu/x86/quarkX1000.ld
 ASFLAGS += --32 -march=i586 -mtune=i586
 
+ifeq ($(X86_CONF_RESTRICT_DMA),1)
+CONTIKI_SOURCEFILES += imr-conf.c
+CFLAGS += -DX86_CONF_RESTRICT_DMA
+LDFLAGS += -Xlinker -T -Xlinker $(CONTIKI)/cpu/x86/quarkX1000_dma.ld
+endif
+
 ### UEFI support
 
 UEFI_DIR = $(CONTIKI_CPU)/uefi
diff --git a/cpu/x86/dma.h b/cpu/x86/dma.h
new file mode 100644
index 000000000..a83ccd2eb
--- /dev/null
+++ b/cpu/x86/dma.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_DMA_H_
+#define CPU_X86_DMA_H_
+
+#ifdef X86_CONF_RESTRICT_DMA
+#define ATTR_BSS_DMA __attribute__((section(".dma_bss")))
+#else
+#define ATTR_BSS_DMA
+#endif
+
+#endif /* CPU_X86_DMA_H_ */
diff --git a/cpu/x86/drivers/quarkX1000/eth.c b/cpu/x86/drivers/quarkX1000/eth.c
index 2f02213ea..c9322d6a7 100644
--- a/cpu/x86/drivers/quarkX1000/eth.c
+++ b/cpu/x86/drivers/quarkX1000/eth.c
@@ -32,6 +32,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include "contiki-net.h"
+#include "dma.h"
 #include "eth.h"
 #include "helpers.h"
 #include "net/ip/uip.h"
@@ -188,7 +189,7 @@ typedef struct quarkX1000_eth_meta {
 #define REG_ADDR_DMA_OPERATION         0x1018
 
 static quarkX1000_eth_driver_t drv;
-static quarkX1000_eth_meta_t meta;
+static quarkX1000_eth_meta_t ATTR_BSS_DMA meta;
 
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/cpu/x86/drivers/quarkX1000/imr-conf.c b/cpu/x86/drivers/quarkX1000/imr-conf.c
new file mode 100644
index 000000000..b2646e892
--- /dev/null
+++ b/cpu/x86/drivers/quarkX1000/imr-conf.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2015-2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+#include "imr.h"
+
+extern int _sbss_dma_addr, _ebss_dma_addr;
+
+/*---------------------------------------------------------------------------*/
+void
+quarkX1000_imr_conf(void)
+{
+  quarkX1000_imr_t imr;
+  int imr_idx = 0;
+
+  imr.lo.raw = 0;
+  imr.hi.raw = 0;
+  imr.rdmsk.raw = 0;
+  imr.wrmsk.raw = 0;
+
+  imr.lo.lock = 1;
+
+  imr.rdmsk.cpu0 = imr.rdmsk.cpu_0 = 1;
+  imr.wrmsk.cpu0 = imr.wrmsk.cpu_0 = 1;
+
+  imr.lo.addr = 0;
+  imr.hi.addr = (((uint32_t)&_sbss_dma_addr) - 1) >> QUARKX1000_IMR_SHAMT;
+  quarkX1000_imr_write(imr_idx, imr);
+  imr_idx++;
+
+  imr.lo.addr = ((uint32_t)&_ebss_dma_addr) >> QUARKX1000_IMR_SHAMT;
+  imr.hi.addr = ~0;
+  quarkX1000_imr_write(imr_idx, imr);
+  imr_idx++;
+
+  imr.lo.addr = 0;
+  imr.hi.addr = 0;
+  imr.rdmsk.raw = ~0;
+  imr.wrmsk.raw = ~0;
+
+  /* Lock the other IMRs open */
+  while(imr_idx < QUARKX1000_IMR_CNT) {
+    quarkX1000_imr_write(imr_idx, imr);
+    imr_idx++;
+  }
+}
+/*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/drivers/quarkX1000/imr-conf.h b/cpu/x86/drivers/quarkX1000/imr-conf.h
new file mode 100644
index 000000000..a81888c29
--- /dev/null
+++ b/cpu/x86/drivers/quarkX1000/imr-conf.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2015-2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_DRIVERS_QUARKX1000_IMR_CONF_H_
+#define CPU_X86_DRIVERS_QUARKX1000_IMR_CONF_H_
+
+void quarkX1000_imr_conf(void);
+
+#endif /* CPU_X86_DRIVERS_QUARKX1000_IMR_CONF_H_ */
diff --git a/cpu/x86/quarkX1000_dma.ld b/cpu/x86/quarkX1000_dma.ld
new file mode 100644
index 000000000..71ebd04b1
--- /dev/null
+++ b/cpu/x86/quarkX1000_dma.ld
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2015-2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+SECTIONS {
+
+    /*
+       It would be more natural to use a 1K alignment for this entire section.
+       However, the UEFI GenFw program ratchets up its alignment
+       granularity to the maximum granularity discovered in its input file.
+       Using 1K-alignment perturbs the symbols, hindering debugging.  Thus,
+       this section is simply padded out to the desired alignment and
+       declared to have a section alignment of only 32 bytes.
+    */
+    .bss.dma ALIGN (32) (NOLOAD) :
+    {
+        /* The IMR feature operates at 1K granularity. */
+        . = ALIGN(1K);
+        _sbss_dma_addr = .;
+        *(.dma_bss)
+        . = ALIGN(1K);
+        _ebss_dma_addr = .;
+    }
+
+}
diff --git a/platform/galileo/README.md b/platform/galileo/README.md
index 95d2f6353..89e6f5711 100644
--- a/platform/galileo/README.md
+++ b/platform/galileo/README.md
@@ -86,6 +86,12 @@ you can run the following command prior to building applications:
 $ cpu/x86/uefi/build_uefi.sh
 ```
 
+To restrict DMA so that peripherals are blocked from accessing memory
+regions that do not contain any data that needs to be DMA-accessible,
+specify X86_CONF_RESTRICT_DMA=1 as a command-line argument to the make
+command that is used to build the image.  This will configure and lock
+the IMRs.
+
 Running
 -------
 
diff --git a/platform/galileo/contiki-main.c b/platform/galileo/contiki-main.c
index 141ad2a51..42568d90a 100644
--- a/platform/galileo/contiki-main.c
+++ b/platform/galileo/contiki-main.c
@@ -37,6 +37,7 @@
 #include "galileo-pinmux.h"
 #include "gpio.h"
 #include "i2c.h"
+#include "imr-conf.h"
 #include "interrupt.h"
 #include "shared-isr.h"
 #include "uart.h"
@@ -52,6 +53,9 @@ int
 main(void)
 {
   cpu_init();
+#ifdef X86_CONF_RESTRICT_DMA
+  quarkX1000_imr_conf();
+#endif
   /* Initialize UART connected to Galileo Gen2 FTDI header */
   quarkX1000_uart_init(QUARK_X1000_UART_1);
   clock_init();

From de2ecf8e3acacb0582e3a7b0454997272a34be9c Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Mon, 21 Mar 2016 00:00:33 +0000
Subject: [PATCH 097/393] Document that LaunchPads can be programmed with
 cc2538-bsl

---
 platform/srf06-cc26xx/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform/srf06-cc26xx/README.md b/platform/srf06-cc26xx/README.md
index 1be849c3b..4e709ca7d 100644
--- a/platform/srf06-cc26xx/README.md
+++ b/platform/srf06-cc26xx/README.md
@@ -107,6 +107,8 @@ errors.
 
 If you want to upload the compiled firmware to a node via the serial boot loader you need to manually enable the boot loader and then use `make cc26xx-demo.upload`. On the SmartRF06 board you enable the boot loader by resetting the board (EM RESET button) while holding the `select` button. (The boot loader backdoor needs to be enabled on the chip, and the chip needs to be configured correctly, for this to work. See README in the `tools/cc2538-bsl` directory for more info). The serial uploader script will automatically pick the first available serial port. If this is not the port where your node is connected, you can force the script to use a specific port by defining the `PORT` argument eg. `make cc26xx-demo.upload PORT=/dev/tty.usbserial`
 
+The serial bootloader can also be used with the LaunchPad and the changes required to achieve this are the same as those required for the SmartRF. The only difference is that you will need to map `BL_PIN_NUMBER` to either the left or right user button (values to be used for `BL_PIN_NUMBER` in `ccfg.c` are `0x0D` and `0x0E` respectively).
+
 Note that uploading over serial doesn't work for the Sensortag, you can use TI's SmartRF Flash Programmer in this case.
 
 For the `cc26xx-demo`, the included readme describes in detail what the example does.

From b0de416682d74ae35fb68ad5be3021694260d36a Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Mon, 21 Mar 2016 17:13:36 -0700
Subject: [PATCH 098/393] x86: Adjust UEFI header size

The UEFI GenFw program inserts headers ahead of the code in the UEFI
binary.  The linker script adjusts the starting address of the .text
section to account for that.  This prevents the symbols from being
perturbed.  This patch accounts for a recent change in the size of the
headers added by the GenFw program.
---
 cpu/x86/quarkX1000.ld | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpu/x86/quarkX1000.ld b/cpu/x86/quarkX1000.ld
index ba437d540..a7f2c2555 100644
--- a/cpu/x86/quarkX1000.ld
+++ b/cpu/x86/quarkX1000.ld
@@ -37,20 +37,20 @@ SECTIONS {
        OS-Dev Wiki says it is common for kernels to start at 1M. Addresses before that
        are used by BIOS/EFI, the bootloader and memory-mapped I/O.
 
-       The UEFI GenFw program inserts a 0x240-byte offset between the image base and
+       The UEFI GenFw program inserts a 0x220-byte offset between the image base and
        the .text section.  We add that same offset here to align the symbols in the
        UEFI DLL with those in the final UEFI binary to make debugging easier.  We also
        apply 32-byte alignments to sections rather than more conventional 4K-byte
        alignments to avoid symbols being shifted from the intermediate DLL to the
        final UEFI image as would occur if the GenFw program shifted the .text section
-       from a higher, 4K-aligned offset to the 0x240-byte offset from the image base.
+       from a higher, 4K-aligned offset to the 0x220-byte offset from the image base.
        Such shifting may make debugging more difficult by preventing the DLL from
        being a directly-useful source of symbol information.  The debugging symbols
        are not included in the final UEFI image.  The GenFw program uses a minimum
        section alignment of 32 bytes, so smaller alignment granularities may also
        result in symbol perturbation.
     */
-    . = 1M + 0x240;
+    . = 1M + 0x220;
 
     .text ALIGN (32) :
     {

From 39082530385deadc461e6ae8975b99949ab0d53c Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Mon, 10 Aug 2015 08:34:02 -0700
Subject: [PATCH 099/393] x86: Add support for (paging-based) protection
 domains

This patch implements a simple, lightweight form of protection domains
using a pluggable framework.  Currently, the following plugin is
available:

 - Flat memory model with paging.

The overall goal of a protection domain implementation within this
framework is to define a set of resources that should be accessible to
each protection domain and to prevent that protection domain from
accessing other resources.  The details of each implementation of
protection domains may differ substantially, but they should all be
guided by the principle of least privilege.  However, that idealized
principle is balanced against the practical objectives of limiting the
number of relatively time-consuming context switches and minimizing
changes to existing code.

For additional information, please refer to cpu/x86/mm/README.md.

This patch also causes the C compiler to be used as the default linker
and assembler.
---
 cpu/x86/Makefile.x86_common                |   6 +-
 cpu/x86/Makefile.x86_quarkX1000            |  35 +-
 cpu/x86/bootstrap_quarkX1000.S             |  15 +-
 cpu/x86/dma.h                              |   8 +
 cpu/x86/drivers/legacy_pc/pci.c            |  77 ++-
 cpu/x86/drivers/legacy_pc/pci.h            |  27 +-
 cpu/x86/drivers/legacy_pc/shared-isr.c     |  10 +-
 cpu/x86/drivers/legacy_pc/uart-16x50.c     |  63 +-
 cpu/x86/drivers/quarkX1000/eth.c           | 174 ++++--
 cpu/x86/drivers/quarkX1000/gpio.c          |  46 +-
 cpu/x86/drivers/quarkX1000/i2c-registers.h |   2 +
 cpu/x86/drivers/quarkX1000/i2c.c           |  55 +-
 cpu/x86/drivers/quarkX1000/imr-conf.c      |  13 +-
 cpu/x86/drivers/quarkX1000/msg-bus.c       |  40 +-
 cpu/x86/drivers/quarkX1000/msg-bus.h       |   2 +
 cpu/x86/drivers/quarkX1000/uart.c          |  14 +-
 cpu/x86/helpers.h                          |  11 +
 cpu/x86/init/common/cpu.c                  |  75 ++-
 cpu/x86/init/common/cpu.h                  |   4 +-
 cpu/x86/init/common/gdt.c                  | 144 ++---
 cpu/x86/init/common/gdt.h                  |  30 +-
 cpu/x86/init/common/idt.c                  |  19 +-
 cpu/x86/init/common/idt.h                  |   8 +-
 cpu/x86/init/common/interrupt.h            |  63 +-
 cpu/x86/mm/README.md                       | 669 +++++++++++++++++++++
 cpu/x86/mm/gdt-layout.h                    | 105 ++++
 cpu/x86/mm/paging-prot-domains.c           | 297 +++++++++
 cpu/x86/mm/paging-prot-domains.h           | 114 ++++
 cpu/x86/mm/paging.h                        |  65 ++
 cpu/x86/mm/prot-domains.c                  |  69 +++
 cpu/x86/mm/prot-domains.h                  | 275 +++++++++
 cpu/x86/mm/segmentation.h                  | 131 ++++
 cpu/x86/mm/stacks.c                        |  40 ++
 cpu/x86/mm/stacks.h                        |  92 +++
 cpu/x86/mm/syscalls-int-asm.S              |  87 +++
 cpu/x86/mm/syscalls-int.c                  | 298 +++++++++
 cpu/x86/mm/syscalls-int.h                  | 109 ++++
 cpu/x86/mm/syscalls.h                      | 115 ++++
 cpu/x86/mm/tss.c                           |  65 ++
 cpu/x86/mm/tss.h                           |  70 +++
 cpu/x86/quarkX1000.ld                      |  12 +-
 cpu/x86/quarkX1000_dma.ld                  |   6 +-
 cpu/x86/quarkX1000_paging.ld               | 204 +++++++
 cpu/x86/uefi/bootstrap_uefi.c              |   7 +-
 examples/galileo/Makefile                  |   4 +
 platform/galileo/README.md                 |   3 +
 platform/galileo/contiki-main.c            |  68 ++-
 platform/galileo/net/eth-conf.c            |   7 +-
 48 files changed, 3558 insertions(+), 295 deletions(-)
 create mode 100644 cpu/x86/mm/README.md
 create mode 100644 cpu/x86/mm/gdt-layout.h
 create mode 100644 cpu/x86/mm/paging-prot-domains.c
 create mode 100644 cpu/x86/mm/paging-prot-domains.h
 create mode 100644 cpu/x86/mm/paging.h
 create mode 100644 cpu/x86/mm/prot-domains.c
 create mode 100644 cpu/x86/mm/prot-domains.h
 create mode 100644 cpu/x86/mm/segmentation.h
 create mode 100644 cpu/x86/mm/stacks.c
 create mode 100644 cpu/x86/mm/stacks.h
 create mode 100644 cpu/x86/mm/syscalls-int-asm.S
 create mode 100644 cpu/x86/mm/syscalls-int.c
 create mode 100644 cpu/x86/mm/syscalls-int.h
 create mode 100644 cpu/x86/mm/syscalls.h
 create mode 100644 cpu/x86/mm/tss.c
 create mode 100644 cpu/x86/mm/tss.h
 create mode 100644 cpu/x86/quarkX1000_paging.ld

diff --git a/cpu/x86/Makefile.x86_common b/cpu/x86/Makefile.x86_common
index d6e692e9a..c27626815 100644
--- a/cpu/x86/Makefile.x86_common
+++ b/cpu/x86/Makefile.x86_common
@@ -3,8 +3,10 @@ CONTIKI_CPU_DIRS += . init/common
 CONTIKI_SOURCEFILES += gdt.c helpers.S idt.c cpu.c
 
 CC       = gcc
-LD       = gcc
-AS       = as
+LD       = $(CC)
+# Use gcc to invoke the assembler so that the preprocessor will be run on each
+# file first, enabling us to use macros within assembly language files:
+AS       = $(CC)
 OBJCOPY  = objcopy
 SIZE     = size
 STRIP    = strip
diff --git a/cpu/x86/Makefile.x86_quarkX1000 b/cpu/x86/Makefile.x86_quarkX1000
index e6e794206..4a7668cc6 100644
--- a/cpu/x86/Makefile.x86_quarkX1000
+++ b/cpu/x86/Makefile.x86_quarkX1000
@@ -1,13 +1,42 @@
+# See mm/README.md for a description of available settings:
+X86_CONF_PROT_DOMAINS ?= none
+
 include $(CONTIKI)/cpu/x86/Makefile.x86_common
 
-CONTIKI_CPU_DIRS += drivers/legacy_pc drivers/quarkX1000 init/legacy_pc
+CONTIKI_CPU_DIRS += drivers/legacy_pc drivers/quarkX1000 init/legacy_pc net mm
 
 CONTIKI_SOURCEFILES += bootstrap_quarkX1000.S rtc.c pit.c pic.c irq.c nmi.c pci.c uart-16x50.c uart.c gpio.c i2c.c eth.c shared-isr.c
 CONTIKI_SOURCEFILES += imr.c msg-bus.c
+CONTIKI_SOURCEFILES += stacks.c
+
+ifneq ($(X86_CONF_PROT_DOMAINS),none)
+CONTIKI_SOURCEFILES += prot-domains.c $(X86_CONF_PROT_DOMAINS)-prot-domains.c imr-conf.c
+
+ifeq ($(X86_CONF_PROT_DOMAINS),paging)
+LINKERSCRIPT_SFX = _paging
+X86_CONF_SYSCALLS_INT = 1
+ifeq ($(X86_CONF_USE_INVLPG),1)
+CFLAGS += -DX86_CONF_USE_INVLPG
+endif
+# This matches the definition of X86_CONF_PROT_DOMAINS__PAGING in prot-domains.h:
+CFLAGS += -DX86_CONF_PROT_DOMAINS=1
+else
+$(error Unrecognized setting for X86_CONF_PROT_DOMAINS: \
+        $(X86_CONF_PROT_DOMAINS).  See cpu/x86/mm/README.md for \
+        descriptions of available settings)
+endif
+
+ifeq ($(X86_CONF_SYSCALLS_INT),1)
+CONTIKI_SOURCEFILES += syscalls-int-asm.S tss.c
+endif
+
+endif
 
 CFLAGS += -m32 -march=i586 -mtune=i586
-LDFLAGS += -m32 -Xlinker -T -Xlinker $(CONTIKI)/cpu/x86/quarkX1000.ld
-ASFLAGS += --32 -march=i586 -mtune=i586
+LDFLAGS += -m32 -Xlinker -T -Xlinker $(CONTIKI)/cpu/x86/quarkX1000$(LINKERSCRIPT_SFX).ld
+# The C compiler is used to invoke the assembler, so the CFLAGS should be
+# passed to it on the command line:
+ASFLAGS = -c $(CFLAGS)
 
 ifeq ($(X86_CONF_RESTRICT_DMA),1)
 CONTIKI_SOURCEFILES += imr-conf.c
diff --git a/cpu/x86/bootstrap_quarkX1000.S b/cpu/x86/bootstrap_quarkX1000.S
index 8def35843..4211e51a3 100644
--- a/cpu/x86/bootstrap_quarkX1000.S
+++ b/cpu/x86/bootstrap_quarkX1000.S
@@ -28,8 +28,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-# Kernel
-.set STACK_SIZE, 8192
+#include "stacks.h"
 
 # Multiboot
 .set MAGIC_NUMBER, 0x1BADB002
@@ -42,15 +41,9 @@
 .long FLAGS
 .long CHECKSUM
 
-# Reserve space for the C stack.
-.lcomm c_stack, STACK_SIZE
-
-.section .text
+.section .boot_text
 .global start
 start:
         cli
-        movl $(c_stack + STACK_SIZE), %esp
-        call main
-
-        /* We're not expected to return from main(). But if we do we halt */
-        call halt
+        mov $(stacks_main + STACKS_SIZE_MAIN), %esp
+        call cpu_boot_stage0
diff --git a/cpu/x86/dma.h b/cpu/x86/dma.h
index a83ccd2eb..b0122fcdb 100644
--- a/cpu/x86/dma.h
+++ b/cpu/x86/dma.h
@@ -31,10 +31,18 @@
 #ifndef CPU_X86_DMA_H_
 #define CPU_X86_DMA_H_
 
+#include "prot-domains.h"
+
 #ifdef X86_CONF_RESTRICT_DMA
 #define ATTR_BSS_DMA __attribute__((section(".dma_bss")))
 #else
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__NONE
 #define ATTR_BSS_DMA
+#else
+#define ATTR_BSS_DMA ATTR_BSS_META
+#endif
 #endif
 
+extern int _sbss_dma_addr, _ebss_dma_addr;
+
 #endif /* CPU_X86_DMA_H_ */
diff --git a/cpu/x86/drivers/legacy_pc/pci.c b/cpu/x86/drivers/legacy_pc/pci.c
index 0507ad231..e94c9ecbe 100644
--- a/cpu/x86/drivers/legacy_pc/pci.c
+++ b/cpu/x86/drivers/legacy_pc/pci.c
@@ -32,12 +32,15 @@
 
 #include "pci.h"
 #include "helpers.h"
+#include "syscalls.h"
 
 /* I/O port for PCI configuration address */
 #define PCI_CONFIG_ADDR_PORT 0xCF8
 /* I/O port for PCI configuration data */
 #define PCI_CONFIG_DATA_PORT 0xCFC
 
+PROT_DOMAINS_ALLOC(dom_client_data_t, root_complex_drv);
+
 /*---------------------------------------------------------------------------*/
 /* Initialize PCI configuration register address in preparation for accessing
  * the specified register.
@@ -101,40 +104,34 @@ pci_command_enable(pci_config_addr_t addr, uint32_t flags)
  * \param agent Interrupt Queue Agent to be used, IRQAGENT[0:3].
  * \param pin   Interrupt Pin Route to be used, INT[A:D].
  * \param pirq  PIRQ to be used, PIRQ[A:H].
- * \return      Returns 0 on success and a negative number otherwise.
  */
-int
-pci_irq_agent_set_pirq(IRQAGENT agent, INTR_PIN pin, PIRQ pirq)
+SYSCALLS_DEFINE_SINGLETON(pci_irq_agent_set_pirq,
+                          root_complex_drv,
+                          IRQAGENT agent, INTR_PIN pin, PIRQ pirq)
 {
-  pci_config_addr_t pci;
   uint16_t value;
   uint32_t rcba_addr, offset = 0;
 
+  rcba_addr = PROT_DOMAINS_MMIO(root_complex_drv);
+
   assert(agent >= IRQAGENT0 && agent <= IRQAGENT3);
   assert(pin >= INTA && pin <= INTD);
   assert(pirq >= PIRQA && pirq <= PIRQH);
 
-  pci.raw = 0;
-  pci.bus = 0;
-  pci.dev = 31;
-  pci.func = 0;
-  pci.reg_off = 0xF0; /* Root Complex Base Address Register */
-
-  /* masked to clear non-address bits. */
-  rcba_addr = pci_config_read(pci) & ~0x3FFF;
-
   switch(agent) {
   case IRQAGENT0:
-    if (pin != INTA)
-      return -1;
+    if(pin != INTA) {
+      halt();
+    }
     offset = 0x3140;
     break;
   case IRQAGENT1:
     offset = 0x3142;
     break;
   case IRQAGENT2:
-    if (pin != INTA)
-      return -1;
+    if(pin != INTA) {
+      halt();
+    }
     offset = 0x3144;
     break;
   case IRQAGENT3:
@@ -163,8 +160,6 @@ pci_irq_agent_set_pirq(IRQAGENT agent, INTR_PIN pin, PIRQ pirq)
   }
 
   *(uint16_t*)(rcba_addr + offset) = value;
-
-  return 0;
 }
 /*---------------------------------------------------------------------------*/
 /**
@@ -231,13 +226,51 @@ pci_pirq_set_irq(PIRQ pirq, uint8_t irq, uint8_t route_to_legacy)
  *                 firmware.
  * \param c_this   Structure that will be initialized to represent the driver.
  * \param pci_addr PCI base address of device.
+ * \param mmio_sz  Size of MMIO region.
  * \param meta     Base address of optional driver-defined metadata.
+ * \param meta_sz  Size of optional driver-defined metadata.
  */
 void
-pci_init(pci_driver_t *c_this, pci_config_addr_t pci_addr, uintptr_t meta)
+pci_init(pci_driver_t *c_this,
+         pci_config_addr_t pci_addr,
+         size_t mmio_sz,
+         uintptr_t meta,
+         size_t meta_sz)
 {
+  uintptr_t mmio;
+
   /* The BAR value is masked to clear non-address bits. */
-  c_this->mmio = pci_config_read(pci_addr) & ~0xFFF;
-  c_this->meta = meta;
+  mmio = pci_config_read(pci_addr) & ~0xFFF;
+
+  prot_domains_reg(c_this, mmio, mmio_sz, meta, meta_sz, false);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Initialize the PCI root complex driver.
+ */
+void
+pci_root_complex_init(void)
+{
+  uint32_t rcba_addr;
+  pci_config_addr_t pci = { .raw = 0 };
+  pci.dev = 31;
+  pci.reg_off = 0xF0; /* Root Complex Base Address Register */
+
+  /* masked to clear non-address bits. */
+  rcba_addr = pci_config_read(pci) & ~0x3FFF;
+
+  PROT_DOMAINS_INIT_ID(root_complex_drv);
+  prot_domains_reg(&root_complex_drv, rcba_addr, 0x4000, 0, 0, false);
+  SYSCALLS_INIT(pci_irq_agent_set_pirq);
+  SYSCALLS_AUTHZ(pci_irq_agent_set_pirq, root_complex_drv);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Prevent further invocations of pci_irq_agent_set_pirq.
+ */
+void
+pci_root_complex_lock(void)
+{
+  SYSCALLS_DEAUTHZ(pci_irq_agent_set_pirq, root_complex_drv);
 }
 /*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/drivers/legacy_pc/pci.h b/cpu/x86/drivers/legacy_pc/pci.h
index c938f9c6c..fff53a048 100644
--- a/cpu/x86/drivers/legacy_pc/pci.h
+++ b/cpu/x86/drivers/legacy_pc/pci.h
@@ -33,6 +33,8 @@
 
 #include <stdint.h>
 #include "helpers.h"
+#include <stdlib.h>
+#include "prot-domains.h"
 
 /** PCI configuration register identifier for Base Address Registers */
 #define PCI_CONFIG_REG_BAR0 0x10
@@ -98,22 +100,23 @@ uint32_t pci_config_read(pci_config_addr_t addr);
 void pci_config_write(pci_config_addr_t addr, uint32_t data);
 void pci_command_enable(pci_config_addr_t addr, uint32_t flags);
 
-/**
- * PCI device driver instance with an optional single MMIO range and optional
- * metadata.
- */
-typedef struct pci_driver {
-  uintptr_t mmio; /**< MMIO range base address */
-  uintptr_t meta; /**< Driver-defined metadata base address */
-} pci_driver_t;
+typedef dom_client_data_t pci_driver_t;
 
-void pci_init(pci_driver_t *c_this, pci_config_addr_t pci_addr, uintptr_t meta);
-int pci_irq_agent_set_pirq(IRQAGENT agent, INTR_PIN pin, PIRQ pirq);
+void pci_init(pci_driver_t *c_this,
+              pci_config_addr_t pci_addr,
+              size_t mmio_sz,
+              uintptr_t meta,
+              size_t meta_sz);
+void pci_irq_agent_set_pirq(IRQAGENT agent, INTR_PIN pin, PIRQ pirq);
 void pci_pirq_set_irq(PIRQ pirq, uint8_t irq, uint8_t route_to_legacy);
+void pci_root_complex_init(void);
+void pci_root_complex_lock(void);
 
 #define PCI_MMIO_READL(c_this, dest, reg_addr)                                \
-  dest = *((volatile uint32_t *)((c_this).mmio + (reg_addr)))
+  dest = *((volatile uint32_t *)                                              \
+    (((uintptr_t)PROT_DOMAINS_MMIO(c_this)) + (reg_addr)))
 #define PCI_MMIO_WRITEL(c_this, reg_addr, src)                                \
-  *((volatile uint32_t *)((c_this).mmio + (reg_addr))) = (src)
+  *((volatile uint32_t *)                                                     \
+    (((uintptr_t)PROT_DOMAINS_MMIO(c_this)) + (reg_addr))) = (src)
 
 #endif /* CPU_X86_DRIVERS_LEGACY_PC_PCI_H_ */
diff --git a/cpu/x86/drivers/legacy_pc/shared-isr.c b/cpu/x86/drivers/legacy_pc/shared-isr.c
index e13c7ab93..f04f6aba8 100644
--- a/cpu/x86/drivers/legacy_pc/shared-isr.c
+++ b/cpu/x86/drivers/legacy_pc/shared-isr.c
@@ -62,7 +62,8 @@ shared_isr_init(void)
 
   void shared_isr_stub(void);
   __asm__ __volatile__ (
-    ISR_STUB("shared_isr_stub", 0, "shared_handler")
+    ISR_STUB("shared_isr_stub", 0, "shared_handler", 0)
+    :
   );
 
   while(client < &_edata_shared_isr) {
@@ -91,11 +92,10 @@ shared_isr_init(void)
              (client->pin == consistency_check_client->pin) &&
              (client->pirq == consistency_check_client->pirq));
     } else {
-      idt_set_intr_gate_desc(PIC_INT(client->irq), (uint32_t)shared_isr_stub);
+      idt_set_intr_gate_desc(PIC_INT(client->irq), (uint32_t)shared_isr_stub,
+                             GDT_SEL_CODE_INT, PRIV_LVL_INT);
 
-      assert(pci_irq_agent_set_pirq(client->agent,
-                                    client->pin,
-                                    client->pirq) == 0);
+      pci_irq_agent_set_pirq(client->agent, client->pin, client->pirq);
 
       pci_pirq_set_irq(client->pirq, client->irq, 1);
 
diff --git a/cpu/x86/drivers/legacy_pc/uart-16x50.c b/cpu/x86/drivers/legacy_pc/uart-16x50.c
index 296719faa..d1f2c498d 100644
--- a/cpu/x86/drivers/legacy_pc/uart-16x50.c
+++ b/cpu/x86/drivers/legacy_pc/uart-16x50.c
@@ -28,9 +28,12 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "uart-16x50.h"
 #include <stdlib.h>
 #include "helpers.h"
+#include "paging.h"
+#include "prot-domains.h"
+#include "syscalls.h"
+#include "uart-16x50.h"
 
 /* Refer to Intel Quark SoC X1000 Datasheet, Chapter 18 for more details on
  * UART operation.
@@ -64,24 +67,22 @@ typedef struct uart_16x50_regs {
   volatile uint32_t mcr, lsr, msr, scr, usr, htx, dmasa;
 } uart_16x50_regs_t;
 
-/*---------------------------------------------------------------------------*/
-/**
- * \brief          Initialize an MMIO-programmable 16X50 UART.
- * \param c_this   Structure that will be initialized to represent the device.
- * \param pci_addr PCI address of device.
- * \param dl       Divisor setting to configure the baud rate.
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__PAGING
+/* When paging-based protection domains are in use, at least one page of memory
+ * must be reserved to facilitate access to the MMIO region, since that is the
+ * smallest unit of memory that can be managed with paging:
  */
-void
-uart_16x50_init(uart_16x50_driver_t *c_this,
-                pci_config_addr_t pci_addr,
-                uint16_t dl)
-{
-  /* This assumes that the UART had an MMIO range assigned to it by the
-   * firmware during boot.
-   */
-  pci_init(c_this, pci_addr, 0);
+#define UART_MMIO_SZ MIN_PAGE_SIZE
+#else
+#define UART_MMIO_SZ sizeof(uart_16x50_regs_t)
+#endif
 
-  uart_16x50_regs_t *regs = (uart_16x50_regs_t *)c_this->mmio;
+void uart_16x50_setup(uart_16x50_driver_t c_this, uint16_t dl);
+
+/*---------------------------------------------------------------------------*/
+SYSCALLS_DEFINE(uart_16x50_setup, uart_16x50_driver_t c_this, uint16_t dl)
+{
+  uart_16x50_regs_t *regs = (uart_16x50_regs_t *)PROT_DOMAINS_MMIO(c_this);
 
   /* Set the DLAB bit to enable access to divisor settings. */
   regs->lcr = UART_LCR_7_DLAB;
@@ -109,10 +110,9 @@ uart_16x50_init(uart_16x50_driver_t *c_this,
  *               This procedure will block indefinitely until the UART is ready
  *               to accept the character to be transmitted.
  */
-void
-uart_16x50_tx(uart_16x50_driver_t c_this, uint8_t c)
+SYSCALLS_DEFINE(uart_16x50_tx, uart_16x50_driver_t c_this, uint8_t c)
 {
-  struct uart_16x50_regs *regs = (uart_16x50_regs_t *)c_this.mmio;
+  uart_16x50_regs_t *regs = (uart_16x50_regs_t *)PROT_DOMAINS_MMIO(c_this);
 
   /* Wait for space in TX FIFO. */
   while((regs->lsr & UART_LSR_5_THRE) == 0);
@@ -121,3 +121,26 @@ uart_16x50_tx(uart_16x50_driver_t c_this, uint8_t c)
   regs->rbr_thr_dll = c;
 }
 /*---------------------------------------------------------------------------*/
+/**
+ * \brief          Initialize an MMIO-programmable 16X50 UART.
+ * \param c_this   Structure that will be initialized to represent the device.
+ * \param pci_addr PCI address of device.
+ * \param dl       Divisor setting to configure the baud rate.
+ */
+void
+uart_16x50_init(uart_16x50_driver_t *c_this,
+                pci_config_addr_t pci_addr,
+                uint16_t dl)
+{
+  /* This assumes that the UART had an MMIO range assigned to it by the
+   * firmware during boot.
+   */
+  pci_init(c_this, pci_addr, UART_MMIO_SZ, 0, 0);
+  SYSCALLS_INIT(uart_16x50_setup);
+  SYSCALLS_AUTHZ(uart_16x50_setup, *c_this);
+  SYSCALLS_INIT(uart_16x50_tx);
+  SYSCALLS_AUTHZ(uart_16x50_tx, *c_this);
+
+  uart_16x50_setup(*c_this, dl);
+}
+/*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/drivers/quarkX1000/eth.c b/cpu/x86/drivers/quarkX1000/eth.c
index c9322d6a7..5c16b10a5 100644
--- a/cpu/x86/drivers/quarkX1000/eth.c
+++ b/cpu/x86/drivers/quarkX1000/eth.c
@@ -35,6 +35,7 @@
 #include "dma.h"
 #include "eth.h"
 #include "helpers.h"
+#include "syscalls.h"
 #include "net/ip/uip.h"
 #include "pci.h"
 
@@ -158,12 +159,29 @@ typedef struct quarkX1000_eth_meta {
   /* Transmit descriptor */
   volatile quarkX1000_eth_tx_desc_t tx_desc;
   /* Transmit DMA packet buffer */
-  volatile uint8_t tx_buf[UIP_BUFSIZE];
+  volatile uint8_t tx_buf[ALIGN(UIP_BUFSIZE, 4)];
   /* Receive descriptor */
   volatile quarkX1000_eth_rx_desc_t rx_desc;
   /* Receive DMA packet buffer */
-  volatile uint8_t rx_buf[UIP_BUFSIZE];
-} quarkX1000_eth_meta_t;
+  volatile uint8_t rx_buf[ALIGN(UIP_BUFSIZE, 4)];
+
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__PAGING
+  /* Domain-defined metadata must fill an even number of pages, since that is
+   * the minimum granularity of access control supported by paging.  However,
+   * using the "aligned(4096)" attribute causes the alignment of the kernel
+   * data section to increase, which causes problems when generating UEFI
+   * binaries, as is described in the linker script.  Thus, it is necessary
+   * to manually pad the structure to fill a page.  This only works if the
+   * sizes of the actual fields of the structure are collectively less than a
+   * page.
+   */
+  uint8_t pad[MIN_PAGE_SIZE -
+              (sizeof(quarkX1000_eth_tx_desc_t) +
+               ALIGN(UIP_BUFSIZE, 4) +
+               sizeof(quarkX1000_eth_rx_desc_t) +
+               ALIGN(UIP_BUFSIZE, 4))];
+#endif
+} __attribute__((packed)) quarkX1000_eth_meta_t;
 
 #define LOG_PFX "quarkX1000_eth: "
 
@@ -188,37 +206,18 @@ typedef struct quarkX1000_eth_meta {
 #define REG_ADDR_TX_DESC_LIST          0x1010
 #define REG_ADDR_DMA_OPERATION         0x1018
 
-static quarkX1000_eth_driver_t drv;
+PROT_DOMAINS_ALLOC(quarkX1000_eth_driver_t, drv);
 static quarkX1000_eth_meta_t ATTR_BSS_DMA meta;
 
+void quarkX1000_eth_setup(uintptr_t meta_phys_base);
+
 /*---------------------------------------------------------------------------*/
-/**
- * \brief Initialize the first Quark X1000 Ethernet MAC.
- *
- *        This procedure assumes that an MMIO range for the device was
- *        previously assigned, e.g. by firmware.
- */
-void
-quarkX1000_eth_init(void)
+SYSCALLS_DEFINE_SINGLETON(quarkX1000_eth_setup, drv, uintptr_t meta_phys_base)
 {
-  pci_config_addr_t pci_addr = { .raw = 0 };
   uip_eth_addr mac_addr;
   uint32_t mac_tmp1, mac_tmp2;
-
-  /* PCI address from section 15.4 of Intel Quark SoC X1000 Datasheet. */
-
-  pci_addr.dev = 20;
-  pci_addr.func = 6;
-
-  /* Activate MMIO and DMA access. */
-  pci_command_enable(pci_addr, PCI_CMD_2_BUS_MST_EN | PCI_CMD_1_MEM_SPACE_EN);
-
-  printf(LOG_PFX "Activated MMIO and DMA access.\n");
-
-  pci_addr.reg_off = PCI_CONFIG_REG_BAR0;
-
-  /* Configure the device MMIO range and initialize the driver structure. */
-  pci_init(&drv, pci_addr, (uintptr_t)&meta);
+  quarkX1000_eth_meta_t *loc_meta =
+    (quarkX1000_eth_meta_t *)PROT_DOMAINS_META(drv);
 
   /* Read the MAC address from the device. */
   PCI_MMIO_READL(drv, mac_tmp1, REG_ADDR_MACADDR_HI);
@@ -246,29 +245,37 @@ quarkX1000_eth_init(void)
   uip_setethaddr(mac_addr);
 
   /* Initialize transmit descriptor. */
-  meta.tx_desc.tdes0 = 0;
-  meta.tx_desc.tdes1 = 0;
+  loc_meta->tx_desc.tdes0 = 0;
+  loc_meta->tx_desc.tdes1 = 0;
 
-  meta.tx_desc.buf1_ptr = (uint8_t *)meta.tx_buf;
-  meta.tx_desc.tx_end_of_ring = 1;
-  meta.tx_desc.first_seg_in_frm = 1;
-  meta.tx_desc.last_seg_in_frm = 1;
-  meta.tx_desc.tx_end_of_ring = 1;
+  loc_meta->tx_desc.buf1_ptr =
+    (uint8_t *)PROT_DOMAINS_META_OFF_TO_PHYS(
+      (uintptr_t)&loc_meta->tx_buf, meta_phys_base);
+  loc_meta->tx_desc.tx_end_of_ring = 1;
+  loc_meta->tx_desc.first_seg_in_frm = 1;
+  loc_meta->tx_desc.last_seg_in_frm = 1;
+  loc_meta->tx_desc.tx_end_of_ring = 1;
 
   /* Initialize receive descriptor. */
-  meta.rx_desc.rdes0 = 0;
-  meta.rx_desc.rdes1 = 0;
+  loc_meta->rx_desc.rdes0 = 0;
+  loc_meta->rx_desc.rdes1 = 0;
 
-  meta.rx_desc.buf1_ptr = (uint8_t *)meta.rx_buf;
-  meta.rx_desc.own = 1;
-  meta.rx_desc.first_desc = 1;
-  meta.rx_desc.last_desc = 1;
-  meta.rx_desc.rx_buf1_sz = UIP_BUFSIZE;
-  meta.rx_desc.rx_end_of_ring = 1;
+  loc_meta->rx_desc.buf1_ptr =
+    (uint8_t *)PROT_DOMAINS_META_OFF_TO_PHYS(
+      (uintptr_t)&loc_meta->rx_buf, meta_phys_base);
+  loc_meta->rx_desc.own = 1;
+  loc_meta->rx_desc.first_desc = 1;
+  loc_meta->rx_desc.last_desc = 1;
+  loc_meta->rx_desc.rx_buf1_sz = UIP_BUFSIZE;
+  loc_meta->rx_desc.rx_end_of_ring = 1;
 
   /* Install transmit and receive descriptors. */
-  PCI_MMIO_WRITEL(drv, REG_ADDR_RX_DESC_LIST, (uint32_t)&meta.rx_desc);
-  PCI_MMIO_WRITEL(drv, REG_ADDR_TX_DESC_LIST, (uint32_t)&meta.tx_desc);
+  PCI_MMIO_WRITEL(drv, REG_ADDR_RX_DESC_LIST,
+                  PROT_DOMAINS_META_OFF_TO_PHYS(
+                    (uintptr_t)&loc_meta->rx_desc, meta_phys_base));
+  PCI_MMIO_WRITEL(drv, REG_ADDR_TX_DESC_LIST,
+                  PROT_DOMAINS_META_OFF_TO_PHYS(
+                    (uintptr_t)&loc_meta->tx_desc, meta_phys_base));
 
   PCI_MMIO_WRITEL(drv, REG_ADDR_MAC_CONF,
                   /* Set the RMII speed to 100Mbps */
@@ -302,28 +309,32 @@ quarkX1000_eth_init(void)
  *                  If a frame is received, this procedure copies it into the
  *                  global uip_buf buffer.
  */
-void
-quarkX1000_eth_poll(uint16_t *frame_len)
+SYSCALLS_DEFINE_SINGLETON(quarkX1000_eth_poll, drv, uint16_t * frame_len)
 {
+  uint16_t *loc_frame_len;
   uint16_t frm_len = 0;
+  quarkX1000_eth_meta_t *loc_meta =
+    (quarkX1000_eth_meta_t *)PROT_DOMAINS_META(drv);
+
+  PROT_DOMAINS_VALIDATE_PTR(loc_frame_len, frame_len, sizeof(*frame_len));
 
   /* Check whether the RX descriptor is still owned by the device.  If not,
    * process the received frame or an error that may have occurred.
    */
-  if(meta.rx_desc.own == 0) {
-    if(meta.rx_desc.err_summary) {
+  if(loc_meta->rx_desc.own == 0) {
+    if(loc_meta->rx_desc.err_summary) {
       fprintf(stderr,
               LOG_PFX "Error receiving frame: RDES0 = %08x, RDES1 = %08x.\n",
-              meta.rx_desc.rdes0, meta.rx_desc.rdes1);
+              loc_meta->rx_desc.rdes0, loc_meta->rx_desc.rdes1);
       assert(0);
     }
 
-    frm_len = meta.rx_desc.frm_len;
+    frm_len = loc_meta->rx_desc.frm_len;
     assert(frm_len <= UIP_BUFSIZE);
-    memcpy(uip_buf, (void *)meta.rx_buf, frm_len);
+    memcpy(uip_buf, (void *)loc_meta->rx_buf, frm_len);
 
     /* Return ownership of the RX descriptor to the device. */
-    meta.rx_desc.own = 1;
+    loc_meta->rx_desc.own = 1;
 
     /* Request that the device check for an available RX descriptor, since
      * ownership of the descriptor was just transferred to the device.
@@ -331,7 +342,7 @@ quarkX1000_eth_poll(uint16_t *frame_len)
     PCI_MMIO_WRITEL(drv, REG_ADDR_RX_POLL_DEMAND, 1);
   }
 
-  *frame_len = frm_len;
+  *loc_frame_len = frm_len;
 }
 /*---------------------------------------------------------------------------*/
 /**
@@ -343,27 +354,29 @@ quarkX1000_eth_poll(uint16_t *frame_len)
  *        buffer and signals to the device that a new frame is available to be
  *        transmitted.
  */
-void
-quarkX1000_eth_send(void)
+SYSCALLS_DEFINE_SINGLETON(quarkX1000_eth_send, drv)
 {
+  quarkX1000_eth_meta_t *loc_meta =
+    (quarkX1000_eth_meta_t *)PROT_DOMAINS_META(drv);
+
   /* Wait until the TX descriptor is no longer owned by the device. */
-  while(meta.tx_desc.own == 1);
+  while(loc_meta->tx_desc.own == 1);
 
   /* Check whether an error occurred transmitting the previous frame. */
-  if(meta.tx_desc.err_summary) {
+  if(loc_meta->tx_desc.err_summary) {
     fprintf(stderr,
             LOG_PFX "Error transmitting frame: TDES0 = %08x, TDES1 = %08x.\n",
-            meta.tx_desc.tdes0, meta.tx_desc.tdes1);
+            loc_meta->tx_desc.tdes0, loc_meta->tx_desc.tdes1);
     assert(0);
   }
 
   /* Transmit the next frame. */
   assert(uip_len <= UIP_BUFSIZE);
-  memcpy((void *)meta.tx_buf, uip_buf, uip_len);
+  memcpy((void *)loc_meta->tx_buf, uip_buf, uip_len);
 
-  meta.tx_desc.tx_buf1_sz = uip_len;
+  loc_meta->tx_desc.tx_buf1_sz = uip_len;
 
-  meta.tx_desc.own = 1;
+  loc_meta->tx_desc.own = 1;
 
   /* Request that the device check for an available TX descriptor, since
    * ownership of the descriptor was just transferred to the device.
@@ -371,3 +384,40 @@ quarkX1000_eth_send(void)
   PCI_MMIO_WRITEL(drv, REG_ADDR_TX_POLL_DEMAND, 1);
 }
 /*---------------------------------------------------------------------------*/
+/**
+ * \brief Initialize the first Quark X1000 Ethernet MAC.
+ *
+ *        This procedure assumes that an MMIO range for the device was
+ *        previously assigned, e.g. by firmware.
+ */
+void
+quarkX1000_eth_init(void)
+{
+  pci_config_addr_t pci_addr = { .raw = 0 };
+
+  /* PCI address from section 15.4 of Intel Quark SoC X1000 Datasheet. */
+
+  pci_addr.dev = 20;
+  pci_addr.func = 6;
+
+  /* Activate MMIO and DMA access. */
+  pci_command_enable(pci_addr, PCI_CMD_2_BUS_MST_EN | PCI_CMD_1_MEM_SPACE_EN);
+
+  printf(LOG_PFX "Activated MMIO and DMA access.\n");
+
+  pci_addr.reg_off = PCI_CONFIG_REG_BAR0;
+
+  PROT_DOMAINS_INIT_ID(drv);
+  /* Configure the device MMIO range and initialize the driver structure. */
+  pci_init(&drv, pci_addr, MMIO_SZ,
+           (uintptr_t)&meta, sizeof(quarkX1000_eth_meta_t));
+  SYSCALLS_INIT(quarkX1000_eth_setup);
+  SYSCALLS_AUTHZ(quarkX1000_eth_setup, drv);
+  SYSCALLS_INIT(quarkX1000_eth_poll);
+  SYSCALLS_AUTHZ(quarkX1000_eth_poll, drv);
+  SYSCALLS_INIT(quarkX1000_eth_send);
+  SYSCALLS_AUTHZ(quarkX1000_eth_send, drv);
+
+  quarkX1000_eth_setup(prot_domains_lookup_meta_phys_base(&drv));
+}
+/*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/drivers/quarkX1000/gpio.c b/cpu/x86/drivers/quarkX1000/gpio.c
index 7d7d7dd64..642cad310 100644
--- a/cpu/x86/drivers/quarkX1000/gpio.c
+++ b/cpu/x86/drivers/quarkX1000/gpio.c
@@ -30,8 +30,11 @@
 
 #include "gpio.h"
 
+#include <stdbool.h>
 #include "helpers.h"
+#include "paging.h"
 #include "shared-isr.h"
+#include "syscalls.h"
 
 /* GPIO Controler Registers */
 #define SWPORTA_DR    0x00
@@ -51,25 +54,55 @@
 
 #define GPIO_IRQ 9
 
+#define HIGHEST_REG   LS_SYNC
+
+#define MMIO_SZ       MIN_PAGE_SIZE
+
+PROT_DOMAINS_ALLOC(pci_driver_t, drv);
+
 struct gpio_internal_data {
-  pci_driver_t pci;
   quarkX1000_gpio_callback callback;
 };
 
 static struct gpio_internal_data data;
 
+void quarkX1000_gpio_mmin(uint32_t offset, uint32_t *res);
+SYSCALLS_DEFINE_SINGLETON(quarkX1000_gpio_mmin, drv,
+                          uint32_t offset, uint32_t *res)
+{
+  uint32_t *loc_res;
+
+  PROT_DOMAINS_VALIDATE_PTR(loc_res, res, sizeof(*res));
+  if(HIGHEST_REG < offset) {
+    halt();
+  }
+
+  PCI_MMIO_READL(drv, *loc_res, offset);
+}
+
 static inline uint32_t
 read(uint32_t offset)
 {
   uint32_t res;
-  PCI_MMIO_READL(data.pci, res, offset);
+  quarkX1000_gpio_mmin(offset, &res);
   return res;
 }
 
+void quarkX1000_gpio_mmout(uint32_t offset, uint32_t val);
+SYSCALLS_DEFINE_SINGLETON(quarkX1000_gpio_mmout, drv,
+                          uint32_t offset, uint32_t val)
+{
+  if(HIGHEST_REG < offset) {
+    halt();
+  }
+
+  PCI_MMIO_WRITEL(drv, offset, val);
+}
+
 static inline void
 write(uint32_t offset, uint32_t val)
 {
-  PCI_MMIO_WRITEL(data.pci, offset, val);
+  quarkX1000_gpio_mmout(offset, val);
 }
 
 /* value must be 0x0 or 0x1 */
@@ -231,7 +264,12 @@ quarkX1000_gpio_init(void)
 
   pci_command_enable(pci_addr, PCI_CMD_1_MEM_SPACE_EN);
 
-  pci_init(&data.pci, pci_addr, 0);
+  PROT_DOMAINS_INIT_ID(drv);
+  pci_init(&drv, pci_addr, MMIO_SZ, 0, 0);
+  SYSCALLS_INIT(quarkX1000_gpio_mmin);
+  SYSCALLS_AUTHZ(quarkX1000_gpio_mmin, drv);
+  SYSCALLS_INIT(quarkX1000_gpio_mmout);
+  SYSCALLS_AUTHZ(quarkX1000_gpio_mmout, drv);
 
   data.callback = 0;
 
diff --git a/cpu/x86/drivers/quarkX1000/i2c-registers.h b/cpu/x86/drivers/quarkX1000/i2c-registers.h
index 7b9e4cec0..3ff7746ec 100644
--- a/cpu/x86/drivers/quarkX1000/i2c-registers.h
+++ b/cpu/x86/drivers/quarkX1000/i2c-registers.h
@@ -61,6 +61,8 @@
 #define QUARKX1000_IC_ENABLE_STATUS  0x9C
 #define QUARKX1000_IC_FS_SPKLEN      0xA0
 
+#define QUARKX1000_IC_HIGHEST        QUARKX1000_IC_FS_SPKLEN
+
 /* IC_CON */
 #define QUARKX1000_IC_CON_MASTER_MODE_SHIFT         0
 #define QUARKX1000_IC_CON_MASTER_MODE_MASK       0x01
diff --git a/cpu/x86/drivers/quarkX1000/i2c.c b/cpu/x86/drivers/quarkX1000/i2c.c
index 4e5669079..746e52b96 100644
--- a/cpu/x86/drivers/quarkX1000/i2c.c
+++ b/cpu/x86/drivers/quarkX1000/i2c.c
@@ -32,7 +32,9 @@
 #include "i2c.h"
 
 #include "i2c-registers.h"
+#include "paging.h"
 #include "shared-isr.h"
+#include "syscalls.h"
 
 #define I2C_CLOCK_SPEED 25 /* kHz */
 #define I2C_FIFO_DEPTH  16
@@ -49,11 +51,15 @@
 
 #define I2C_IRQ 9
 
+#define MMIO_SZ MIN_PAGE_SIZE
+
 typedef enum {
   I2C_DIRECTION_READ,
   I2C_DIRECTION_WRITE
 } I2C_DIRECTION;
 
+PROT_DOMAINS_ALLOC(pci_driver_t, drv);
+
 struct quarkX1000_i2c_config {
   QUARKX1000_I2C_SPEED speed;
   QUARKX1000_I2C_ADDR_MODE addressing_mode;
@@ -66,8 +72,6 @@ struct quarkX1000_i2c_config {
 struct i2c_internal_data {
   struct quarkX1000_i2c_config config;
 
-  pci_driver_t pci;
-
   I2C_DIRECTION direction;
 
   uint8_t rx_len;
@@ -82,18 +86,46 @@ struct i2c_internal_data {
 
 static struct i2c_internal_data device;
 
-static uint32_t
+static int inited = 0;
+
+void quarkX1000_i2c_mmin(uint32_t offset, uint32_t *res);
+SYSCALLS_DEFINE_SINGLETON(quarkX1000_i2c_mmin, drv,
+                          uint32_t offset, uint32_t *res)
+{
+  uint32_t *loc_res;
+
+  PROT_DOMAINS_VALIDATE_PTR(loc_res, res, sizeof(*res));
+  if(QUARKX1000_IC_HIGHEST < offset) {
+    halt();
+  }
+
+  PCI_MMIO_READL(drv, *loc_res, offset);
+}
+
+static inline uint32_t
 read(uint32_t offset)
 {
   uint32_t res;
-  PCI_MMIO_READL(device.pci, res, offset);
+  quarkX1000_i2c_mmin(offset, &res);
+
   return res;
 }
 
-static void
+void quarkX1000_i2c_mmout(uint32_t offset, uint32_t val);
+SYSCALLS_DEFINE_SINGLETON(quarkX1000_i2c_mmout, drv,
+                          uint32_t offset, uint32_t val)
+{
+  if(QUARKX1000_IC_HIGHEST < offset) {
+    halt();
+  }
+
+  PCI_MMIO_WRITEL(drv, offset, val);
+}
+
+static inline void
 write(uint32_t offset, uint32_t val)
 {
-  PCI_MMIO_WRITEL(device.pci, offset, val);
+  quarkX1000_i2c_mmout(offset, val);
 }
 
 static uint32_t
@@ -504,7 +536,7 @@ quarkX1000_i2c_polling_read(uint8_t *buf, uint8_t len, uint16_t addr)
 int
 quarkX1000_i2c_is_available(void)
 {
-  return device.pci.mmio ? 1 : 0;
+  return inited;
 }
 
 DEFINE_SHARED_IRQ(I2C_IRQ, IRQAGENT3, INTC, PIRQC, i2c_isr);
@@ -522,7 +554,14 @@ quarkX1000_i2c_init(void)
 
   pci_command_enable(pci_addr, PCI_CMD_1_MEM_SPACE_EN);
 
-  pci_init(&device.pci, pci_addr, 0);
+  PROT_DOMAINS_INIT_ID(drv);
+  pci_init(&drv, pci_addr, MMIO_SZ, 0, 0);
+  SYSCALLS_INIT(quarkX1000_i2c_mmin);
+  SYSCALLS_AUTHZ(quarkX1000_i2c_mmin, drv);
+  SYSCALLS_INIT(quarkX1000_i2c_mmout);
+  SYSCALLS_AUTHZ(quarkX1000_i2c_mmout, drv);
+
+  inited = 1;
 
   return 0;
 }
diff --git a/cpu/x86/drivers/quarkX1000/imr-conf.c b/cpu/x86/drivers/quarkX1000/imr-conf.c
index b2646e892..8c5b6703a 100644
--- a/cpu/x86/drivers/quarkX1000/imr-conf.c
+++ b/cpu/x86/drivers/quarkX1000/imr-conf.c
@@ -28,9 +28,9 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "dma.h"
 #include "imr.h"
-
-extern int _sbss_dma_addr, _ebss_dma_addr;
+#include "msg-bus.h"
 
 /*---------------------------------------------------------------------------*/
 void
@@ -49,6 +49,8 @@ quarkX1000_imr_conf(void)
   imr.rdmsk.cpu0 = imr.rdmsk.cpu_0 = 1;
   imr.wrmsk.cpu0 = imr.wrmsk.cpu_0 = 1;
 
+  quarkX1000_msg_bus_init();
+
   imr.lo.addr = 0;
   imr.hi.addr = (((uint32_t)&_sbss_dma_addr) - 1) >> QUARKX1000_IMR_SHAMT;
   quarkX1000_imr_write(imr_idx, imr);
@@ -69,5 +71,12 @@ quarkX1000_imr_conf(void)
     quarkX1000_imr_write(imr_idx, imr);
     imr_idx++;
   }
+
+#ifndef DBG_IMRS
+  /* The IMRs are locked by the hardware, but the message bus could still
+   * provide access to other potentially-sensitive functionality.
+   */
+  quarkX1000_msg_bus_lock();
+#endif
 }
 /*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/drivers/quarkX1000/msg-bus.c b/cpu/x86/drivers/quarkX1000/msg-bus.c
index e7a4bca44..fc64a6f8c 100644
--- a/cpu/x86/drivers/quarkX1000/msg-bus.c
+++ b/cpu/x86/drivers/quarkX1000/msg-bus.c
@@ -30,6 +30,9 @@
 
 #include "msg-bus.h"
 #include "pci.h"
+#include "syscalls.h"
+
+PROT_DOMAINS_ALLOC(dom_client_data_t, quarkX1000_msg_bus);
 
 /** Message bus control register */
 #define MCR_PCI_REG_ADDR 0xD0
@@ -83,15 +86,21 @@ request_op(uint8_t port, uint32_t reg_off, uint8_t opcode)
  * \param reg_off Register/offset identifier of message bus register to read.
  * \param val     Storage location for value that has been read.
  */
-void
-quarkX1000_msg_bus_read(uint8_t port, uint32_t reg_off, uint32_t *val)
+SYSCALLS_DEFINE_SINGLETON(quarkX1000_msg_bus_read,
+                          quarkX1000_msg_bus,
+                          uint8_t port,
+                          uint32_t reg_off,
+                          uint32_t *val)
 {
+  uint32_t *loc_val;
   pci_config_addr_t pci_addr = { .raw = 0 };
 
+  PROT_DOMAINS_VALIDATE_PTR(loc_val, val, sizeof(*val));
+
   request_op(port, reg_off, 0x10);
 
   pci_addr.reg_off = MDR_PCI_REG_ADDR;
-  *val = pci_config_read(pci_addr);
+  *loc_val = pci_config_read(pci_addr);
 }
 /*---------------------------------------------------------------------------*/
 /**
@@ -100,8 +109,11 @@ quarkX1000_msg_bus_read(uint8_t port, uint32_t reg_off, uint32_t *val)
  * \param reg_off Register/offset identifier of message bus register to write.
  * \param val     Value to write.
  */
-void
-quarkX1000_msg_bus_write(uint8_t port, uint32_t reg_off, uint32_t val)
+SYSCALLS_DEFINE_SINGLETON(quarkX1000_msg_bus_write,
+                          quarkX1000_msg_bus,
+                          uint8_t port,
+                          uint32_t reg_off,
+                          uint32_t val)
 {
   pci_config_addr_t pci_addr = { .raw = 0 };
 
@@ -111,3 +123,21 @@ quarkX1000_msg_bus_write(uint8_t port, uint32_t reg_off, uint32_t val)
   request_op(port, reg_off, 0x11);
 }
 /*---------------------------------------------------------------------------*/
+void
+quarkX1000_msg_bus_init(void)
+{
+  PROT_DOMAINS_INIT_ID(quarkX1000_msg_bus);
+  prot_domains_reg(&quarkX1000_msg_bus, 0, 0, 0, 0, true);
+  SYSCALLS_INIT(quarkX1000_msg_bus_read);
+  SYSCALLS_AUTHZ(quarkX1000_msg_bus_read, quarkX1000_msg_bus);
+  SYSCALLS_INIT(quarkX1000_msg_bus_write);
+  SYSCALLS_AUTHZ(quarkX1000_msg_bus_write, quarkX1000_msg_bus);
+}
+/*---------------------------------------------------------------------------*/
+void
+quarkX1000_msg_bus_lock(void)
+{
+  SYSCALLS_DEAUTHZ(quarkX1000_msg_bus_read, quarkX1000_msg_bus);
+  SYSCALLS_DEAUTHZ(quarkX1000_msg_bus_write, quarkX1000_msg_bus);
+}
+/*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/drivers/quarkX1000/msg-bus.h b/cpu/x86/drivers/quarkX1000/msg-bus.h
index 0b810e06d..11bab0849 100644
--- a/cpu/x86/drivers/quarkX1000/msg-bus.h
+++ b/cpu/x86/drivers/quarkX1000/msg-bus.h
@@ -44,6 +44,8 @@
  * the message bus.
  */
 
+void quarkX1000_msg_bus_init(void);
+void quarkX1000_msg_bus_lock(void);
 void quarkX1000_msg_bus_read(uint8_t port, uint32_t reg_off, uint32_t *val);
 void quarkX1000_msg_bus_write(uint8_t port, uint32_t reg_off, uint32_t val);
 
diff --git a/cpu/x86/drivers/quarkX1000/uart.c b/cpu/x86/drivers/quarkX1000/uart.c
index 23731ba93..dcd0af8f2 100644
--- a/cpu/x86/drivers/quarkX1000/uart.c
+++ b/cpu/x86/drivers/quarkX1000/uart.c
@@ -32,8 +32,8 @@
 #include "uart-16x50.h"
 #include <assert.h>
 
-static uart_16x50_driver_t quarkX1000_uart0;
-static uart_16x50_driver_t quarkX1000_uart1;
+PROT_DOMAINS_ALLOC(uart_16x50_driver_t, quarkX1000_uart0);
+PROT_DOMAINS_ALLOC(uart_16x50_driver_t, quarkX1000_uart1);
 
 /* Divisor setting for 115200 baud from section 18.2.2 of Intel Quark SoC
  * X1000 Datasheet.
@@ -49,6 +49,7 @@ void
 quarkX1000_uart_init(quarkX1000_uart_dev_t dev)
 {
   pci_config_addr_t pci_addr;
+  uart_16x50_driver_t *drv;
 
   assert((dev == QUARK_X1000_UART_0) || (dev == QUARK_X1000_UART_1));
 
@@ -59,7 +60,14 @@ quarkX1000_uart_init(quarkX1000_uart_dev_t dev)
   pci_addr.func = (dev == QUARK_X1000_UART_0) ? 1 : 5;
   pci_addr.reg_off = PCI_CONFIG_REG_BAR0;
 
-  uart_16x50_init((dev == QUARK_X1000_UART_0) ? &quarkX1000_uart0 : &quarkX1000_uart1, pci_addr, QUARK_X1000_UART_DL_115200);
+  if(dev == QUARK_X1000_UART_0) {
+    drv = &quarkX1000_uart0;
+    PROT_DOMAINS_INIT_ID(quarkX1000_uart0);
+  } else {
+    drv = &quarkX1000_uart1;
+    PROT_DOMAINS_INIT_ID(quarkX1000_uart1);
+  }
+  uart_16x50_init(drv, pci_addr, QUARK_X1000_UART_DL_115200);
 }
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/cpu/x86/helpers.h b/cpu/x86/helpers.h
index 91b120a9e..1ef312e14 100644
--- a/cpu/x86/helpers.h
+++ b/cpu/x86/helpers.h
@@ -37,6 +37,17 @@
 
 void halt(void) __attribute__((__noreturn__));
 
+#define STRINGIFY(x) #x
+/* The C preprocessor will not expand macro arguments that are converted to
+ * strings in the macro body using the '#' operator.  The EXP_STRINGIFY macro
+ * introduces an additional level of argument expansion for instances where
+ * the developer wishes to convert the expanded argument to a string.
+ */
+#define EXP_STRINGIFY(x) STRINGIFY(x)
+
+#define ALIGN(x, amt) \
+  (((x) & ~((amt) - 1)) + ((((x) & ((amt) - 1)) == 0) ? 0 : (amt)))
+
 /** Wrappers for the assembly 'out' instruction. */
 void outb(uint16_t port, uint8_t val);
 void outl(uint16_t port, uint32_t val);
diff --git a/cpu/x86/init/common/cpu.c b/cpu/x86/init/common/cpu.c
index a174853cc..94ec2ddab 100644
--- a/cpu/x86/init/common/cpu.c
+++ b/cpu/x86/init/common/cpu.c
@@ -28,11 +28,13 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "cpu.h"
 #include "gdt.h"
 #include "helpers.h"
 #include "idt.h"
 #include "interrupt.h"
 #include "irq.h"
+#include "stacks.h"
 
 static void
 double_fault_handler(struct interrupt_context context)
@@ -40,16 +42,79 @@ double_fault_handler(struct interrupt_context context)
   halt();
 }
 /*---------------------------------------------------------------------------*/
-void
-cpu_init(void)
+/* The OS has switched to its own segment descriptors.  However, the protection
+ * domain support, if enabled, has not yet been fully activated.
+ */
+static void
+boot_stage1(void)
 {
-  gdt_init();
   idt_init();
 
   /* Set an interrupt handler for Double Fault exception. This way, we avoid
    * the system to triple fault, leaving no trace about what happened.
    */
-  SET_INTERRUPT_HANDLER(8, 1, double_fault_handler);
+  SET_EXCEPTION_HANDLER(8, 1, double_fault_handler);
 
-  irq_init();
+  /* Initialize protection domain support, if enabled */
+  prot_domains_init();
+
+  prot_domains_leave_boot_stage1();
+}
+/*---------------------------------------------------------------------------*/
+int main(void);
+/* This routine runs with the initial, flat address space, even if protection
+ * domain support is enabled.  The goal behind the design of this routine is to
+ * keep it as short as possible, since it is unable to directly reference data
+ * and invoke functions that are intended to be accessible later after the
+ * system has booted when a multi-segment protection domain model is in use.
+ */
+void
+cpu_boot_stage0(void)
+{
+  /* Reserve three stack slots for return addresses */
+  uintptr_t top_of_stack = STACKS_INIT_TOP;
+
+#if X86_CONF_PROT_DOMAINS != X86_CONF_PROT_DOMAINS__NONE
+  uintptr_t *top_of_stack_ptr = (uintptr_t *)top_of_stack;
+
+  top_of_stack_ptr[0] = (uintptr_t)prot_domains_launch_kernel;
+  top_of_stack_ptr[1] = (uintptr_t)prot_domains_launch_app;
+#endif
+
+  /* Perform common GDT initialization */
+  gdt_init();
+
+  /* Switch all data segment registers to the newly-initialized flat data
+   * descriptor.
+   */
+  __asm__(
+    "mov %0, %%ds\n\t"
+    "mov %0, %%es\n\t"
+    "mov %0, %%fs\n\t"
+    "mov %0, %%gs\n\t"
+    :
+    : "r" (GDT_SEL_DATA_FLAT)
+    );
+
+  /**
+   * Perform specific GDT initialization tasks for the protection domain
+   * implementation that is enabled, if any.
+   */
+  prot_domains_gdt_init();
+
+  /* Do not pass memory operands to the asm block below, since it is
+   * switching from the flat address space to a multi-segment address space
+   * model if such a model is used by the enabled protection domain
+   * implementation, if any.
+   */
+  __asm__(
+    "mov %[_ss_], %%ss\n\t"
+    "mov %[_esp_], %%esp\n\t"
+    "ljmp %[_cs_], %[_stage1_]\n\t"
+    :
+    : [_ss_] "r" (GDT_SEL_STK_EXC),
+      [_esp_] "r" (top_of_stack),
+      [_cs_] "i" ((uint16_t)GDT_SEL_CODE_EXC),
+      [_stage1_] "i" (boot_stage1)
+    );
 }
diff --git a/cpu/x86/init/common/cpu.h b/cpu/x86/init/common/cpu.h
index a56d0db5a..4fd9b835b 100644
--- a/cpu/x86/init/common/cpu.h
+++ b/cpu/x86/init/common/cpu.h
@@ -31,6 +31,8 @@
 #ifndef CPU_H
 #define CPU_H
 
-void cpu_init(void);
+#include "prot-domains.h"
+
+void cpu_boot_stage0(void) ATTR_CODE_BOOT;
 
 #endif /* CPU_H */
diff --git a/cpu/x86/init/common/gdt.c b/cpu/x86/init/common/gdt.c
index 39a8a7ce4..f7fa10342 100644
--- a/cpu/x86/init/common/gdt.c
+++ b/cpu/x86/init/common/gdt.c
@@ -29,45 +29,15 @@
  */
 
 #include <stdint.h>
+#include "gdt.h"
+#include "gdt-layout.h"
+#include "helpers.h"
+#include "prot-domains.h"
+#include "segmentation.h"
 
-#define NUM_DESC 3
-
-#define GDT_IDX_NULL 0
-#define GDT_IDX_CODE 1
-#define GDT_IDX_DATA 2
-
-/* All code in the x86 port of Contiki runs at ring (privilege) level 0 */
-#define PRIV_LVL 0
-
-/* Compute GDT selector from descriptor index and requested privilege level */
-#define GDT_SEL(IDX, RPL) (((IDX) << 3) | (RPL))
-
-#define GDT_SEL_NULL GDT_SEL(GDT_IDX_NULL, 0)
-#define GDT_SEL_CODE GDT_SEL(GDT_IDX_CODE, PRIV_LVL)
-#define GDT_SEL_DATA GDT_SEL(GDT_IDX_DATA, PRIV_LVL)
-
-/* Each define here is for a specific flag in the descriptor. Refer to Intel
- * Combined Manual (Intel 64 and IA-32 Architectures Software Developer's
- * Manual), Vol. 3, Section 3.4.5 for a description of each flag.
- */
-#define SEG_DESCTYPE(x)  ((x) << 0x04) /* Descriptor type (0 for system, 1 for code/data) */
-#define SEG_PRES(x)      ((x) << 0x07) /* Present */
-#define SEG_SAVL(x)      ((x) << 0x0C) /* Available for system use */
-#define SEG_LONG(x)      ((x) << 0x0D) /* Long mode */
-#define SEG_SIZE(x)      ((x) << 0x0E) /* Size (0 for 16-bit, 1 for 32) */
-#define SEG_GRAN(x)      ((x) << 0x0F) /* Granularity (0 for 1B - 1MB, 1 for 4KB - 4GB) */
-#define SEG_PRIV(x)      (((x) &  0x03) << 0x05) /* Set privilege level (0 - 3) */
-
-#define SEG_DATA_RDWR    0x02 /* Read/Write */
-#define SEG_CODE_EXRD    0x0A /* Execute/Read */
-
-#define GDT_CODE_PL0 SEG_DESCTYPE(1) | SEG_PRES(1) | SEG_SAVL(0) | \
-                     SEG_LONG(0)     | SEG_SIZE(1) | SEG_GRAN(1) | \
-                     SEG_PRIV(0)     | SEG_CODE_EXRD
-
-#define GDT_DATA_PL0 SEG_DESCTYPE(1) | SEG_PRES(1) | SEG_SAVL(0) | \
-                     SEG_LONG(0)     | SEG_SIZE(1) | SEG_GRAN(1) | \
-                     SEG_PRIV(0)     | SEG_DATA_RDWR
+#define GDT_MEM_PL0  (SEG_DESCTYPE_NSYS | SEG_GRAN_PAGE)
+#define GDT_CODE_PL0 (GDT_MEM_PL0 | SEG_TYPE_CODE_EXRD)
+#define GDT_DATA_PL0 (GDT_MEM_PL0 | SEG_TYPE_DATA_RDWR)
 
 typedef struct gdtr
 {
@@ -75,41 +45,53 @@ typedef struct gdtr
   uint32_t base;
 } __attribute__((packed)) gdtr_t;
 
-typedef uint64_t segment_desc_t;
-
 /* From Intel Combined Manual, Vol. 3 , Section 3.5.1: The base addresses of
  * the GDT should be aligned on an eight-byte boundary to yield the best
  * processor performance.
  */
-static segment_desc_t gdt[NUM_DESC] __attribute__ ((aligned (8)));
+segment_desc_t __attribute__ ((aligned(8))) ATTR_BSS_GDT_START
+  gdt[GDT_NUM_FIXED_DESC];
 
-static void
-set_descriptor(unsigned int index, uint32_t base, uint32_t limit, uint16_t flag)
+#define GDT_LEN                                    \
+  ((((uintptr_t)&_ebss_gdt_addr) -                 \
+    (uintptr_t)gdt)/sizeof(segment_desc_t))
+
+/*---------------------------------------------------------------------------*/
+static void ATTR_CODE_BOOT
+set_descriptor(unsigned int index,
+               uint32_t base,
+               uint32_t len,
+               uint16_t flag)
 {
   segment_desc_t descriptor;
 
-  if (index >= NUM_DESC)
-    return;
+  if(GDT_LEN <= index) {
+    halt();
+  }
 
-  /* Create the high 32 bit segment */
-  descriptor  =  limit       & 0x000F0000; /* set limit bits 19:16 */
-  descriptor |= (flag <<  8) & 0x00F0FF00; /* set type, p, dpl, s, g, d/b, l and avl fields */
-  descriptor |= (base >> 16) & 0x000000FF; /* set base bits 23:16 */
-  descriptor |=  base        & 0xFF000000; /* set base bits 31:24 */
-
-  /* Shift by 32 to allow for low part of segment */
-  descriptor <<= 32;
-
-  /* Create the low 32 bit segment */
-  descriptor |= base  << 16; /* set base bits 15:0 */
-  descriptor |= limit  & 0x0000FFFF; /* set limit bits 15:0 */
+  segment_desc_init(&descriptor, base, len, flag);
 
   /* Save descriptor into gdt */
   gdt[index] = descriptor;
 }
+/*---------------------------------------------------------------------------*/
+void
+gdt_copy_desc_change_dpl(unsigned int dest_idx,
+                         unsigned int src_idx,
+                         unsigned dpl)
+{
+  segment_desc_t desc;
 
+  if((GDT_LEN <= dest_idx) || (GDT_LEN <= src_idx)) {
+    halt();
+  }
 
-/* This function initializes the Global Offset Table. For simplicity, the
+  desc = gdt[src_idx];
+  SEG_SET_FLAG(desc, DPL, dpl);
+  gdt[dest_idx] = desc;
+}
+/*---------------------------------------------------------------------------*/
+/* This function initializes the Global Descriptor Table. For simplicity, the
  * memory is organized following the flat model. Thus, memory appears to
  * Contiki as a single continuous address space. Code, data, and stack
  * are all contained in this address space (so called linear address space).
@@ -120,29 +102,35 @@ gdt_init(void)
   gdtr_t gdtr;
 
   /* Initialize gdtr structure */
-  gdtr.limit = sizeof(segment_desc_t) * NUM_DESC - 1;
+  gdtr.limit = sizeof(segment_desc_t) * GDT_LEN - 1;
   gdtr.base = (uint32_t) &gdt;
 
   /* Initialize descriptors */
   set_descriptor(GDT_IDX_NULL, 0, 0, 0);
-  set_descriptor(GDT_IDX_CODE, 0, 0x0FFFFF, GDT_CODE_PL0);
-  set_descriptor(GDT_IDX_DATA, 0, 0x0FFFFF, GDT_DATA_PL0);
+  set_descriptor(GDT_IDX_CODE_FLAT, 0, 0x100000, GDT_CODE_PL0);
+  set_descriptor(GDT_IDX_DATA_FLAT, 0, 0x100000, GDT_DATA_PL0);
 
-  /* Load GDTR register and update segment registers.
-   *
-   * CS register cannot be changed directly. For that reason, we do a far jump.
-   */
-  __asm__ ("lgdt %[_gdtr_]\n\t"
-           "jmp %[_cs_], $1f\n\t"
-           "1:\n\t"
-           "mov %[_ds_], %%ds\n\t"
-           "mov %[_ds_], %%ss\n\t"
-           "mov %[_ds_], %%es\n\t"
-           "mov %[_ds_], %%fs\n\t"
-           "mov %[_ds_], %%gs\n\t"
-      :
-      : [_gdtr_] "m" (gdtr),
-        [_cs_] "i" (GDT_SEL_CODE),
-        [_ds_] "r" (GDT_SEL_DATA)
-  );
+  /* Load GDTR */
+  __asm__ __volatile__ ("lgdt %0" :: "m" (gdtr));
 }
+/*---------------------------------------------------------------------------*/
+void
+gdt_insert(unsigned int idx, segment_desc_t desc)
+{
+  if(GDT_LEN <= idx) {
+    halt();
+  }
+
+  gdt[idx] = desc;
+}
+/*---------------------------------------------------------------------------*/
+void
+gdt_lookup(unsigned int idx, segment_desc_t *desc)
+{
+  if((GDT_LEN <= idx) || (desc == NULL)) {
+    halt();
+  }
+
+  *desc = gdt[idx];
+}
+/*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/init/common/gdt.h b/cpu/x86/init/common/gdt.h
index 3db17f08c..37f1f4dbe 100644
--- a/cpu/x86/init/common/gdt.h
+++ b/cpu/x86/init/common/gdt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, Intel Corporation. All rights reserved.
+ * Copyright (C) 2015-2016, Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,6 +31,32 @@
 #ifndef GDT_H
 #define GDT_H
 
-void gdt_init(void);
+#include "gdt-layout.h"
+#include "prot-domains.h"
+#include "segmentation.h"
+
+extern segment_desc_t gdt[];
+extern int _ebss_gdt_addr;
+
+#define GDT_IDX_OF_DESC(ptr)                      \
+       ((((uintptr_t)(ptr)) - ((uintptr_t)&gdt))/ \
+        sizeof(segment_desc_t))
+
+/**
+ * \brief     Compute the selector for a GDT entry allocated somewhere besides gdt.c.
+ * \param ptr Pointer to GDT descriptor.
+ * \param rpl Requested Privilege Level.
+ */
+#define GDT_SEL_OF_DESC(ptr, rpl) GDT_SEL(GDT_IDX_OF_DESC(ptr), rpl)
+
+#define ATTR_BSS_GDT       __attribute__((section(".gdt_bss")))
+#define ATTR_BSS_GDT_START __attribute__((section(".gdt_bss_start")))
+
+void gdt_copy_desc_change_dpl(unsigned int dest_idx,
+                              unsigned int src_idx,
+                              unsigned dpl);
+void gdt_init(void) ATTR_CODE_BOOT;
+void gdt_insert(unsigned int idx, segment_desc_t desc);
+void gdt_lookup(unsigned int idx, segment_desc_t *desc);
 
 #endif /* GDT_H */
diff --git a/cpu/x86/init/common/idt.c b/cpu/x86/init/common/idt.c
index d561f49f7..441668a75 100644
--- a/cpu/x86/init/common/idt.c
+++ b/cpu/x86/init/common/idt.c
@@ -28,9 +28,13 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "gdt-layout.h"
+#include "prot-domains.h"
 #include <stdint.h>
 
 #include "helpers.h"
+#include "segmentation.h"
+#include "idt.h"
 
 #define NUM_DESC 256
 
@@ -55,22 +59,27 @@ typedef struct intr_gate_desc {
  * of the IDT should be aligned on an 8-byte boundary to maximize performance
  * of cache line fills.
  */
-static intr_gate_desc_t idt[NUM_DESC] __attribute__ ((aligned(8)));
+static intr_gate_desc_t __attribute__((aligned(8))) ATTR_BSS_KERN
+  idt[NUM_DESC];
 
+/*---------------------------------------------------------------------------*/
 /* XXX: If you change this function prototype, make sure you fix the assembly
- * code in SET_INTERRUPT_HANDLER macro in interrupt.h. Otherwise, you might
+ * code in SET_INT_EXC_HANDLER macro in interrupt.h. Otherwise, you might
  * face a very-hard-to-find bug in the interrupt handling system.
  */
 void
-idt_set_intr_gate_desc(int intr_num, uint32_t offset)
+idt_set_intr_gate_desc(int intr_num,
+                       uint32_t offset,
+                       uint16_t cs,
+                       uint16_t dpl)
 {
   intr_gate_desc_t *desc = &idt[intr_num];
 
   desc->offset_low = offset & 0xFFFF;
-  desc->selector = 0x08; /* Offset in GDT for code segment */
+  desc->selector = cs;
   desc->fixed = BIT(9) | BIT(10);
   desc->d = 1;
-  desc->dpl = 0;
+  desc->dpl = dpl;
   desc->p = 1;
   desc->offset_high = (offset >> 16) & 0xFFFF;
 }
diff --git a/cpu/x86/init/common/idt.h b/cpu/x86/init/common/idt.h
index d29b97153..18f168ad8 100644
--- a/cpu/x86/init/common/idt.h
+++ b/cpu/x86/init/common/idt.h
@@ -32,8 +32,12 @@
 #define IDT_H
 
 #include <stdint.h>
+#include "prot-domains.h"
 
-void idt_init(void);
-void idt_set_intr_gate_desc(int intr_num, uint32_t offset);
+void idt_init(void) ATTR_CODE_BOOT;
+void idt_set_intr_gate_desc(int intr_num,
+                            uint32_t offset,
+                            uint16_t cs,
+                            uint16_t dpl);
 
 #endif /* IDT_H */
diff --git a/cpu/x86/init/common/interrupt.h b/cpu/x86/init/common/interrupt.h
index 601695bde..10b906be4 100644
--- a/cpu/x86/init/common/interrupt.h
+++ b/cpu/x86/init/common/interrupt.h
@@ -32,10 +32,17 @@
 #define INTERRUPT_H
 
 #include <stdint.h>
+#include "gdt-layout.h"
 
 #include "idt.h"
 
 struct interrupt_context {
+  /* The general-purpose register values are saved by the pushal instruction in
+   * the interrupt dispatcher. Having access to these saved values may be
+   * useful in some future interrupt or exception handler, and saving and later
+   * restoring them also enables the ISR to freely overwrite the EAX, ECX, and
+   * EDX registers as is permitted by the cdecl calling convention.
+   */
   uint32_t edi;
   uint32_t esi;
   uint32_t ebp;
@@ -44,16 +51,28 @@ struct interrupt_context {
   uint32_t edx;
   uint32_t ecx;
   uint32_t eax;
+  /* These two values are pushed on the stack by the CPU when it delivers an
+   * exception with an associated error code.  Currently, only the double fault
+   * handler accepts this structure as a parameter, and that type of exception
+   * does have an associated error code.
+   */
   uint32_t error_code;
   uint32_t eip;
+  /* The CPU pushes additional values beyond these on the stack, specifically
+   * the code segment descriptor and flags.  If a privilege-level change occurs
+   * during delivery, the CPU additionally pushes the stack pointer and stack
+   * segment descriptor.
+   */
 };
 
-#define ISR_STUB(label_str, has_error_code, handler_str)         \
+#define ISR_STUB(label_str, has_error_code, handler_str, exc)    \
   "jmp 2f\n\t"                                                   \
   ".align 4\n\t"                                                 \
   label_str ":\n\t"                                              \
   "         pushal\n\t"                                          \
+  PROT_DOMAINS_ENTER_ISR(exc)                                    \
   "         call " handler_str "\n\t"                            \
+  PROT_DOMAINS_LEAVE_ISR(exc)                                    \
   "         popal\n\t"                                           \
   "         .if " #has_error_code "\n\t"                         \
   "         add $4, %%esp\n\t"                                   \
@@ -72,6 +91,14 @@ struct interrupt_context {
  *                  void handler(void)
  *                  Otherwise, it should be:
  *                  void handler(struct interrupt_context context)
+ * exc:             0 if this is an interrupt, which should be handled
+ *                  at the interrupt privilege level.  1 if this is an
+ *                  exception, which should be handled at the
+ *                  exception privilege level.
+ * dpl:             Privilege level for IDT descriptor, which is the
+ *                  numerically-highest privilege level that can
+ *                  generate this interrupt with a software interrupt
+ *                  instruction.
  *
  * Since there is no easy way to write an Interrupt Service Routines
  * (ISR) in C (for further information on this, see [1]), we provide
@@ -81,18 +108,30 @@ struct interrupt_context {
  *
  * [1] http://wiki.osdev.org/Interrupt_Service_Routines
  */
-#define SET_INTERRUPT_HANDLER(num, has_error_code, handler)      \
-  do {                                                           \
-    __asm__ __volatile__ (                                       \
-      "push $1f\n\t"                                             \
-      "push %0\n\t"                                              \
-      "call %P1\n\t"                                             \
-      "add $8, %%esp\n\t"                                        \
-      ISR_STUB("1", has_error_code, "%P2")                       \
-      :: "g" (num), "i" (idt_set_intr_gate_desc), "i" (handler)  \
-      : "eax", "ecx", "edx"                                      \
-    );                                                           \
+#define SET_INT_EXC_HANDLER(num, has_error_code, handler, exc, dpl) \
+  do {                                                              \
+    __asm__ __volatile__ (                                          \
+      "pushl %[_dpl_]\n\t"                                          \
+      "pushl %[_cs_]\n\t"                                           \
+      "pushl $1f\n\t"                                               \
+      "pushl %[_isr_num_]\n\t"                                      \
+      "call idt_set_intr_gate_desc\n\t"                             \
+      "add $16, %%esp\n\t"                                          \
+      ISR_STUB("1", has_error_code, "%P[_handler_]", exc)           \
+      :                                                             \
+      : [_isr_num_] "g" (num),                                      \
+        [_handler_] "i" (handler),                                  \
+        [_cs_] "i" (exc ? GDT_SEL_CODE_EXC : GDT_SEL_CODE_INT),     \
+        [_dpl_] "i" (dpl)                                           \
+      /* the invocation of idt_set_intr_gate_desc may clobber   */  \
+      /* the caller-saved registers:                            */  \
+      : "eax", "ecx", "edx"                                         \
+    );                                                              \
   } while (0)
+#define SET_INTERRUPT_HANDLER(num, has_error_code, handler)         \
+  SET_INT_EXC_HANDLER(num, has_error_code, handler, 0, PRIV_LVL_INT)
+#define SET_EXCEPTION_HANDLER(num, has_error_code, handler)         \
+  SET_INT_EXC_HANDLER(num, has_error_code, handler, 1, PRIV_LVL_EXC)
 
 /* Disable maskable hardware interrupts */
 #define DISABLE_IRQ()                                            \
diff --git a/cpu/x86/mm/README.md b/cpu/x86/mm/README.md
new file mode 100644
index 000000000..8990beec9
--- /dev/null
+++ b/cpu/x86/mm/README.md
@@ -0,0 +1,669 @@
+X86 Lightweight Protection Domain Support for Contiki
+=====================================================
+
+Introduction
+------------
+
+The X86 port of Contiki implements a simple, lightweight form of
+protection domains using a pluggable framework.  Currently, the
+following plugin is available:
+
+ - Flat memory model with paging.
+
+For an introduction to paging and possible ways in which it can be
+used, refer to the following resources:
+
+ - Intel Combined Manual (Intel 64 and IA-32 Architectures Software
+   Developer's Manual), Vol. 3, Chapter 4
+ - Programming the 80386, by John H. Crawford and Patrick
+   P. Gelsinger, Chapter 5
+
+The overall goal of a protection domain implementation within this
+framework is to define a set of resources that should be accessible to
+each protection domain and to prevent that protection domain from
+accessing other resources.  The details of each implementation of
+protection domains may differ substantially, but they should all be
+guided by the principle of least privilege [1].  However, that
+idealized principle is balanced against the practical objectives of
+limiting the number of relatively time-consuming context switches and
+minimizing changes to existing code.  In fact, no changes were made to
+code outside of the CPU- and platform-specific code directories for
+the initial plugin.
+
+Each protection domain can optionally be associated with a metadata
+and/or MMIO region.  The hardware can support additional regions per
+protection domain, but that would increase complexity and is unneeded
+for the existing protection domains.
+
+After boot, all code runs in the context of some protection domain.
+Two default protection domains are implemented:
+
+- kern: Kernel protection domain that is more privileged than any
+  other protection domain.  As little code as possible should be placed
+  in this protection domain.
+- app: Application protection domain used whenever special privileges
+  are not required.
+
+Additional protection domains are defined as needed.  For example,
+each driver may reside in a separate protection domain, although not
+all drivers require additional privileges beyond those available in
+the relevant scheduling context in the app protection domain.  The
+Ethernet and UART drivers are assigned separate protection domains.
+Non-driver protection domains can also be defined.  Other drivers only
+require access to programmed IO ports accessible via the IN* and OUT*
+instructions, and such drivers do not require separate protection
+domains.  They run in the Contiki preemptive scheduling context and
+the kernel protection domain, both of which are granted access to all
+IO ports.
+
+Each protection domain may have associated system calls.  A system
+call transfers control from a client protection domain to a defined
+entrypoint in a server protection domain.  As their name suggests,
+system calls adhere to a synchronous call-return model (rather than
+some alternative such as an asynchronous message-passing model).  To
+invoke a system call, the client provides two identifiers to the
+system call dispatcher.  The first identifies the server domain and
+the second identifies the system call to be invoked.  The protection
+domain implementation should associate allowable system calls with
+particular server protection domains and reject any system call
+requests that are not within that set of allowable system calls.  The
+system call implementations do not restrict the clients that are
+permitted to invoke each system call.  No modifications that the
+client can make to the server domain and system call identifiers can
+open up new entrypoints into the server domain.  The entrypoints are
+fixed at boot time.
+
+However, if the identifiers were stored in shared memory, it may be
+possible for a protection domain to influence the system calls issued
+by some other protection domain, which may be undesirable.  Thus, the
+server domain identifiers are stored in memory that can only be
+written by the kernel protection domain and the system call
+identifiers are embedded in the code.
+
+The system call dispatcher is responsible for reconfiguring the system
+to enforce the appropriate resource access controls for the server
+protection domain.  It should then transfer control to the approved
+entrypoint for the requested system call.
+
+Contiki defines a process concept that is orthogonal to protection
+domains [2].  A single Contiki process may run code in multiple
+protection domains at various points in time.  Contiki processes run
+in a cooperative scheduling context.  Contiki also defines a
+preemptive scheduling context for interrupt handlers and real-time
+timers.  When protection domain support is enabled, interrupts are
+only enabled when the application protection domain is active and is
+running code in the cooperative scheduling context.  Code running in
+the preemptive context may also invoke multiple protection domains.
+Contiki can also support preemptive multithreading, but support for
+that has not yet been added to the X86 port so we do not discuss it
+further.
+
+A single stack is shared by all code that runs in the cooperative
+scheduling context in all protection domains, and separate stacks are
+defined for short interrupt dispatchers in the preemptive scheduling
+context and for exception handlers and software system call
+dispatchers.  Except for the interrupt dispatchers, code in the
+preemptive scheduling context also shares the same stack with the
+cooperative scheduling context.  All protection domains also share a
+main data section, so similar considerations are also relevant to
+that.
+
+Introducing multi-core support would complicate things further, since
+another core running a protection domain that the first core never
+invoked could access data from the protection domain on the first
+core. It may be possible to adequately address such concerns by
+allocating per-core stacks.
+
+Note that this stack arrangement means that a given protection domain
+may read and write data written to the stack by some other protection
+domain.  For example, a protection domain B may push data onto the
+stack and later pop that data off of the stack, but a protection
+domain A that invoked protection domain B may still be able to read
+the data that was pushed and popped to and from the stack, since
+popping the data off of the stack does not automatically erase that
+stack memory location.  Another possibility is that protection domain
+B may modify a stack entry pushed by protection domain A before it
+invoked protection domain B, and protection domain A may later use the
+modified value.  Permitting legitimate accesses to callers' stacks is
+in fact the primary motivation for this stack arrangement, in that it
+makes it simple for A to pass data to and from B (on the shared stack)
+when requesting services from B.  A system call invocation is nearly
+transparent to the developer, appearing almost identical to an
+ordinary function call.  However, B can access any data on the stack.
+The third case is that A can read data placed on the stack by B after
+B returns, unless B wipes that data from the stack before returning.
+A related sub-case is that if an interrupt handler is invoked, it
+pushes the current contents of the general-purpose registers onto the
+stack, which may then be revealed to other protection domains besides
+the one that was interrupted.  However, interrupts are only actually
+enabled in the application protection domain.
+
+Similarly, register contents may be accessed and modified across
+protection domain boundaries.
+
+For the reasons described above, each protection domain should only
+invoke other protection domains that it trusts to properly handle data
+on the stack.
+
+Design
+------
+
+### Boot Process
+
+The system boots in the following phases.
+
+#### UEFI Bootstrap
+
+Primary implementation sources:
+
+ - cpu/x86/uefi/bootstrap_uefi.c
+
+When the OS is compiled as a UEFI binary, a short bootstrap phase that
+is UEFI-compliant is run initially.  It simply performs a minimal set
+of functions to exit the UEFI boot services and then transfer control
+to the Multiboot bootstrap phase.
+
+#### Multiboot Bootstrap
+
+Primary implementation sources:
+
+ - cpu/x86/bootstrap_quarkX1000.S
+
+This phase disables interrupts, sets the stack pointer to the top of
+the main stack, and then invokes boot stage 0.
+
+#### Boot Stage 0
+
+Primary implementation sources:
+
+ - cpu/x86/init/common/cpu.c
+ - cpu/x86/init/common/gdt.c
+
+The UEFI firmware or Multiboot-compliant bootloader should have
+configured an initial Global Descriptor Table (GDT) with flat segments
+and configured the CPU to operate in protected mode with paging
+disabled.  Flat segments each map the whole 4GiB physical memory
+space.  This is the state of the system when the OS enters boot stage
+0.  This stage is responsible for setting up a new GDT and loading the
+segment registers with the appropriate descriptors from the new GDT to
+enable boot stage 1 to run.
+
+#### Boot Stage 1
+
+Primary implementation sources:
+
+ - cpu/x86/init/common/cpu.c
+ - cpu/x86/init/common/idt.c
+ - cpu/x86/mm/prot-domains.c
+
+Boot stage 1 intializes the Interrupt Descriptor Table (IDT) and
+installs a handler for double-fault exceptions.  Handlers for
+additional interrupts and exceptions are installed later in boot
+stages 1 and 2.
+
+This stage also initializes protection domain support and enters the
+kernel protection domain.
+
+#### Boot Stage 2
+
+Primary implementation sources:
+
+ - cpu/x86/init/common/cpu.c
+ - platform/galileo/contiki-main.c
+
+The entrypoint for the kernel protection domain is 'main'.  Boot stage
+2 initializes hardware devices and associated interrupts.  It then
+transfers control to the application protection domain.  Note that
+this is a transfer of control, not a call that would be matched with
+some future return.  This is an important distinction, because
+protection domains are not reentrant.  Thus, if the kernel protection
+domain called the application protection domain, it would not be
+possible to invoke any kernel system calls until the system is reset,
+since the application protection domain never exits/returns while the
+system is running.  There are not actually any kernel system calls
+provided in the initial implementation of protection domains, but they
+may be added in the future.
+
+The core protection domain configuration (e.g. allowable system calls
+and entrypoints, registered protection domains, etc.) is frozen by the
+conclusion of boot stage 2 to help prevent erroneous changes that
+could reduce the robustness of the system.  The way that it is frozen
+is that there are no kernel system calls that are intended to permit
+changes to the core protection domain configuration.  Thus, once the
+kernel protection domain has exited, the only way the core protection
+domain configuration can change would be due to undesirable memory
+manipulations (e.g. due to a faulty device driver).
+
+#### Boot Stage 3
+
+Primary implementation sources:
+
+ - platform/galileo/contiki-main.c
+
+Boot stage 3 performs initialization procedures that are less
+tightly-coupled to hardware.  For example, it launches Contiki
+processes and invokes Contiki configuration routines.
+
+### Privilege Levels
+
+When protection domain support is inactive, all code runs at
+ring/privilege level 0.  When protection domain support is active,
+only exception handlers and system call dispatchers (including
+dispatchers for system call returns) run at ring level 0.  Code in the
+preemptive scheduling context runs at ring level 2 and code in the
+cooperative scheduling context runs at ring level 3.  Ring levels with
+higher numbers are less privileged than those with lower numbers.
+Ring level 1 is unused.
+
+### IO and Interrupt Privileges
+
+The kernel protection domain cooperative scheduling context needs
+access to IO ports, for device initialization.  Other protection
+domains may also require such access.  The IO Privilege Level (IOPL)
+that is assigned to a protection domain using the relevant bits in the
+EFLAGS field could be set according to whether IO port access is
+required in that protection domain.  However, this would introduce
+additional complexity and overhead in the critical system call and
+return dispatchers.  Instead, the IOPL is always set to block IO
+access from the cooperative scheduling context.  Port IO instructions
+in that context will then generate general protection faults, and the
+exception handler decodes and emulates authorized port IO
+instructions.
+
+Interrupts are handled at ring level 2, since they do not use any
+privileged instructions.  They do cause the interrupt flag to be
+cleared as they are delivered.  The interrupt flag can only be
+modified by instructions executing at a ring level that is numerically
+less than or equal to the IOPL.  Each interrupt handler needs to set
+the interrupt flag using the IRET instruction when it returns.
+Protection domains that require access to port IO (currently just the
+kernel protection domain) are configured with an IOPL of 3 whereas
+others are configured with an IOPL of 2.  That is why interrupts are
+configured to run at ring level 2.  Interrupts are only enabled in the
+application protection domain.
+
+Some interrupt handlers require access to port IO, and all are
+permitted such access, since they need it anyway for restoring the
+interrupt flag when returning.  IO port access is a very powerful
+privilege, since it can be used to remap MMIO regions of PCI devices,
+reconfigure PCI devices, etc.  Thus, further restricting access to IO
+ports may improve the robustness of the system, but would increase
+complexity and space requirements and possibly necessitate additional
+context switches, since IO port access is controlled by the combined
+settings of IOPL as well as an optional IO bitmap in the TSS.
+
+### Interrupt and Exception Dispatching
+
+Primary implementation sources:
+ - cpu/x86/init/common/interrupt.h
+
+Separate stacks are allocated for dispatching interrupts and
+exceptions.  However, to save space, the main bodies of some interrupt
+and exception handlers are run on the main stack.  A handler may
+expect to have access to data from the interrupt or exception stack,
+so the interrupt or exception dispatcher copies that data prior to
+pivoting to the main stack and executing the handler.
+
+### Protection Domain Control Structures (PDCSes)
+
+Each protection domain is managed by the kernel and privileged
+functions using a PDCS.  The PDCS structure is entirely
+software-defined.  The initial protection domain plugin does not
+support re-entrant protection domains to simplify the implementation
+of the plugin by enabling domain-specific information (e.g. system
+call return address) to be trivially stored in each PDCS.
+
+### Paging-Based Protection Domains
+
+Primary implementation sources:
+
+ - cpu/x86/mm/paging-prot-domains.c
+ - cpu/x86/mm/syscalls-int.c
+ - cpu/x86/mm/syscalls-int-asm.S
+
+#### Introduction
+
+Only a single page table is used for all protection domains.  A flat
+memory model is used.  Almost all linear-to-physical address mappings
+are identity mappings, with the exceptions being the MMIO and metadata
+regions.  The X86 port of Contiki currently only supports at most one
+MMIO and one metadata range per driver, and the paging-based
+protection domain implementation always starts at particular linear
+addresses when mapping an MMIO or metadata range.  This may reduce
+overhead, due to the way protection domain switches are implemented.
+
+#### System Call and Return Dispatching
+
+The system call dispatcher executes at ring level 0, since it uses the
+privileged INVLPG or MOV CR3 instructions to invalidate TLB entries.
+The dispatcher modifies page table entries to grant only the
+permissions required by the protection domain being activated.  It
+then optionally uses the INVLPG instruction to invalidate any TLB
+entries for any page table entries that were modified.  If INVLPG is
+not used to invalidate specific TLB entries, then CR3 is reloaded to
+invalidate the entire TLB (global entries would be excluded, but they
+are not used in this implementation).
+
+It is more efficient to always start at a particular linear address
+when mapping an MMIO or metadata region, since the page table entries
+for that region can be updated to unmap any previous region of that
+type, map the new region, and then invalidated to cause the new
+settings to take effect.  The alternative using an identity
+linear-to-physical address mapping for regions would be to unmap the
+previous region by editing one set of page table entries and to then
+map the new region by editing a different set of page table entries
+and to finally perform invalidations for both sets of page table
+entries.  Another drawback of such an identity address mapping is that
+additional page tables may need to be allocated to represent the
+various MMIO regions, since page tables are indexed by linear address
+and MMIO regions are often at high physical addresses.  Note that this
+is specific to MMIO regions, since metadata regions are not at
+particularly high physical addresses.  Additionally, if different base
+linear addresses are used, it is necessary to communicate those to the
+system call handler code so that the regions can be accessed.  This
+would require care to prevent an adversary from manipulating the
+addresses and it may increase complexity.
+
+The overall process of handling a system call can be illustrated at a
+high level as follows.  Some minor steps are omitted in the interest
+of clarity and brevity.
+
+```
+ == BEGIN Client protection domain ==========================================
+ -- BEGIN Caller ------------------------------------------------------------
+  1.  Call system call stub.
+ --
+  20. Continue execution...
+ -- END Caller --------------------------------------------------------------
+ -- BEGIN System call stub --------------------------------------------------
+  2.  Already in desired (server) protection domain?
+    - No: Issue software interrupt #100 to request system call.
+    - Yes: Jump to system call body.
+ -- END System call stub ----------------------------------------------------
+ == END Client protection domain ============================================
+ == BEGIN Ring level 0 ======================================================
+ -- BEGIN System call dispatcher---------------------------------------------
+  3.  Check that the requested system call is allowed.  Get entrypoint.
+  4.  Check that the server protection domain is available (not yet present
+      in the protection domain call stack) and then mark it as busy.
+  5.  Save the caller return address from the main stack into the client
+      PDCS.
+  6.  Overwrite the caller return address on the main stack to point to
+      system call return stub.
+  7.  Push server protection domain onto protection domain call stack.
+  8.  Update the interrupt return stack EIP to start of system call body.
+  9.  Update and invalidate page table entries to grant only the permissions
+      required by the server protection domain.
+  10. Update interrupt flag to disable interrupts, since interrupts are only
+      enabled in app protection domain, which exports no system calls.
+  11. Perform interrupt return (IRET).
+ -- END System call dispatcher ----------------------------------------------
+ -- BEGIN System call return dispatcher -------------------------------------
+  15. Mark protection domain on top of protection domain call stack as
+      available.
+  16. Retrieve the caller return address from the kernel data structure for
+      the client protection domain and use it to overwrite the EIP in the
+      interrupt return stack.
+  17. Update and invalidate page table entries to grant only the permissions
+      required by the client protection domain.
+  18. Update interrupt flag to only enable interrupts if returning to app
+      protection domain cooperative scheduling context.
+  19. Perform interrupt return (IRET).
+ -- END System call dispatcher ----------------------------------------------
+ == END Ring level 0 ========================================================
+ == BEGIN Server protection domain ==========================================
+ -- BEGIN System call body --------------------------------------------------
+  12. Execute the work for the requested system call.
+  13. Return (to system call return stub, unless invoked from server
+      protection domain, in which case return is to caller).
+ -- END System call body ----------------------------------------------------
+ -- BEGIN System call return stub -------------------------------------------
+  14. Issue software interrupt #101 to request system call return.
+ -- END System call return stub ---------------------------------------------
+ == END Server protection domain ============================================
+```
+
+The first step in performing a system call is to invoke a system call
+stub that actually issues the software interrupt to request a system
+call dispatch.  This approach reduces disruption to existing code,
+since macros are used to generate separate stubs and corresponding
+system call bodies with a single system call signature definition.
+
+#### Memory Layout
+
+The approximate memory layout of the system is depicted below,
+starting with the highest physical addresses and proceeding to lower
+physical addresses.  Optional permissions are denoted with
+parentheses.  See cpu/x86/quarkX1000_paging.ld for details of how this
+memory layout is implemented.
+
+```
+                                              | Kernel | App    | Other  |
+ ...                                          +--------+--------+--------+
+ +------------------------------------------+ |        |        |        |
+ | Domain X MMIO                            | |        |        | (RW)   |
+ +------------------------------------------+ |        |        |        |
+ ...                                          |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ | Domain X DMA-accessible metadata         | |        |        | (RW)   |
+ | (section .dma_bss)                       | |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ | Domain X metadata (section .meta_bss)    | |        |        | (RW)   |
+ +------------------------------------------+ |        |        |        |
+ ...                                          |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ | Kernel-private data                      | | RW     |        |        |
+ | (sections .prot_dom_bss, .gdt_bss, etc.) | |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ | System call data (section .syscall_bss)  | | RW     | R      | R      |
+ +------------------------------------------+ |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ | Kernel-owned data (section .kern_bss)    | | RW     | R      | R      |
+ +------------------------------------------+ |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ | Page-aligned, Kernel-owned data          | | RW     | R      | R      |
+ | (section .page_aligned_kern_bss)         | |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ | Common data                              | | RW     | RW     | RW     |
+ | (sections .data, .rodata*, .bss, etc.)   | |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ (not-present guard band page)                |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ | Exception stack                          | | RW     | RW     | RW     |
+ | (section .exc_stack)                     | |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ | Interrupt stack                          | | RW     | RW     | RW     |
+ | (section .int_stack)                     | |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ | Main stack (section .main_stack)         | | RW     | RW     | RW     |
+ +------------------------------------------+ |        |        |        |
+ (not-present guard band page)                |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ | Main code (.text)                        | | RX     | RX     | RX     |
+ +------------------------------------------+ |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ | Bootstrap code (section .boot_text)      | |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ | Multiboot header                         | |        |        |        |
+ +------------------------------------------+ |        |        |        |
+ ...
+```
+
+The only protection domain that is permitted to access kernel-owned
+data is the kernel protection domain.  Some devices can also be
+instructed to perform DMA to kernel-owned data, although that is an
+incorrect configuration.
+
+Paging only differentiates between memory accesses from ring 3 (user
+level) and those from rings 0-2 (supervisor level).  To avoid granting
+code running in the preemptive scheduling context supervisory write
+access to kernel data structures (including the page tables), those
+structures are marked read-only (except when the kernel protection
+domain is active) and the Write Protect (WP) bit in Control Register 0
+(CR0) is cleared only when it is necessary to update a write-protected
+structure.  Only ring 0 is allowed to modify CR0.
+
+Optional metadata for each protection domain is intended to only be
+accessible from the associated protection domain and devices.
+
+Read accesses to executable code have not been observed to be needed
+in at least a limited set of tests, but they are permitted, since
+paging does not support an execute-only permission setting.  On the
+other hand, the Execute-Disable feature is used to prevent execution
+of non-code memory regions.  All non-startup code is mapped in all
+protection domains.  Limiting the code that is executable within each
+protection domain to just the code that is actually needed within that
+protection domain could improve the robustness of the system, but it
+is challenging to determine all code that may be needed in a given
+protection domain (e.g. all needed library routines).
+
+Stack accesses to non-stack memory are not needed, but they are
+permitted.  However, one page of unmapped linear address space is
+placed above and below the stacks to detect erroneous stack accesses
+to those linear address regions, which are the types of accesses most
+likely to occur during a stack overflow or underflow condition.  The
+main stack is placed just below the interrupt stack, which is just
+below the exception stack.  Stack overflows are more common than stack
+underflows, which motivates arranging the stacks such that an overflow
+from a less-critical stack will not affect a more-critical stack.
+Furthermore, the main stack is the most likely to overflow, since the
+code that uses it is typically the most voluminous and difficult to
+characterize.  That provides additional motivation for positioning it
+such that an overflow results in an immediate page fault.  An
+alternative design placing each stack on a separate group of
+contiguous pages may improve the robustness of the system by
+permitting the insertion of unmapped guard pages around them to
+generate page faults in the event an overflow or underflow occurs on
+any stack.  However, that would consume additional memory.
+
+Data in the .rodata sections is marked read/write, even though it may
+be possible to improve the robustness of the system by marking that
+data as read-only.  Doing so would introduce additional complexity
+into the system.
+
+### Pointer Validation
+
+Primary implementation sources:
+ - cpu/x86/mm/syscalls.h
+
+At the beginning of each system call routine, it is necessary to check
+that any untrusted pointer that could have been influenced by a caller
+(i.e. a stack parameter or global variable) refers to a location above
+the return address and to halt otherwise.  This is to prevent a
+protection domain from calling a different protection domain and
+passing a pointer that references a location in the callee's stack
+other than its parameters to influence the execution of the callee in
+an unintended manner.  For example, if an incoming pointer referenced
+the return address, it could potentially redirect execution with the
+privileges of the callee protection domain.
+
+It is also necessary to check that the pointer is either within the
+stack region or the shared data region (or a guard band region, since
+that will generate a fault) to prevent redirection of data accesses to
+MMIO or metadata regions.
+
+The pointer is both validated and copied to a new storage location,
+which must be within the callee's local stack region (excluding the
+parameter region).  This is to mitigate scenarios such as two pointers
+being validated and an adversary later inducing a write through one of
+the pointers to the other pointer to corrupt the latter pointer before
+it is used.
+
+Any pointer whose value is fixed at link or load time does not need to
+be validated prior to use, since no adversary within the defined
+threat model is able to influence the link or load process.
+
+### DMA Restrictions
+
+Primary implementation sources:
+ - cpu/x86/drivers/quarkX1000/imr.c
+ - cpu/x86/drivers/quarkX1000/imr-conf.c
+
+The CPU is not the only agent with the ability to issue requests to
+the interconnect within the SoC.  For example, SoC peripherals such as
+the Ethernet driver use DMA to efficiently access memory buffers.
+This could introduce a risk that DMA could be used to bypass the
+memory protections enforced on the CPU by segmentation or paging.  For
+example, a device driver could instruct a device to access a memory
+region to which the kernel has not granted the driver's protection
+domain permission to access.
+
+The Isolated Memory Region (IMR) feature is configured to restrict the
+memory that can be accessed by system agents other than the CPU [3].
+It only allows those system agents to access portions of the Contiki
+memory space that are specifically intended to be used with DMA.  The
+source code for each protection domain specifies that its optional
+metadata region needs to be accessible from other system agents
+besides the CPU by using ATTR_BSS_DMA instead of ATTR_BSS_META when
+allocating storage for the metadata.
+
+Extending the Framework
+-----------------------
+
+### Adding a New Protection Domain
+
+The following steps are required.  See the existing device drivers for
+examples of various types of protection domains and how they are
+initialized.
+
+ - Allocate storage for the PDCS and the corresponding
+   client-accessible data structure using the PROT_DOMAINS_ALLOC
+   macro.
+ - Apply the ATTR_BSS_META attribute to the metadata structure, if
+   applicable.  Apply the ATTR_BSS_DMA attribute instead if the
+   metadata structure needs to be DMA-accessible.  Pad the metadata
+   structure to completely fill an integer multiple of the minimum
+   page size, 4096, when paging-based protection domains are in use.
+   See the definition of quarkX1000_eth_meta_t for an example.
+ - Perform the following steps during boot stage 2:
+   - Initialize the protection domain ID in the client-accessible data
+     structure using the PROT_DOMAINS_INIT_ID macro.
+   - Register the domain.  See prot-domains.c:prot_domains_init for an
+     example of registering a non-driver protection domain.  See
+     cpu/x86/drivers/quarkX1000/eth.c:quarkX1000_eth_init for an
+     example of registering a PCI driver protection domain with an
+     MMIO region and a metadata region.
+
+### Adding a New System Call
+
+The following steps are required:
+
+ - Define the system call procedure using the SYSCALLS_DEFINE or
+   SYSCALLS_DEFINE_SINGLETON macro.  See
+   cpu/x86/drivers/legacy_pc/uart-16x50.c:uart_16x50_tx for an example
+   of a non-singleton system call.  See
+   cpu/x86/drivers/quarkX1000/eth.c:quarkX1000_eth_send for an example
+   of a singleton system call.  A singleton system call is one for
+   which at most one server protection domain will be associated with
+   it.
+ - During boot phase 2, associate the system call with one or more
+   server protection domains using the SYSCALLS_AUTHZ macro.
+
+Usage
+-----
+
+To enable protection domain support, add
+"X86_CONF_PROT_DOMAINS=paging" to the command line.
+
+The paging option accepts a sub-option to determine whether the TLB is
+fully- or selectively-invalidated during protection domain switches.
+By default, full invalidation is selected.  Set the
+X86_CONF_USE_INVLPG variable to 1 to override the default.
+
+References
+----------
+
+[1] J. H. Saltzer, "Protection and the Control of Information Sharing
+    in Multics," Commun. ACM, vol. 17, no. 7, pp. 388-402, Jul. 1974.
+
+[2] https://github.com/contiki-os/contiki/wiki/Processes
+
+[3] "Intel(R) Quark(TM) SoC X1000 Secure Boot Programmer's Reference
+    Manual,"
+    http://www.intel.com/support/processors/quark/sb/CS-035228.htm
diff --git a/cpu/x86/mm/gdt-layout.h b/cpu/x86/mm/gdt-layout.h
new file mode 100644
index 000000000..8a5af6cbf
--- /dev/null
+++ b/cpu/x86/mm/gdt-layout.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2015-2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_MM_GDT_LAYOUT_H_
+#define CPU_X86_MM_GDT_LAYOUT_H_
+
+#include "prot-domains.h"
+
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__PAGING
+/**
+ * Number of fixed GDT descriptors.  Additional descriptors may be defined
+ * outside of gdt.c.
+ */
+#define GDT_NUM_FIXED_DESC    7
+#else
+#define GDT_NUM_FIXED_DESC    3
+#endif
+
+#define GDT_IDX_NULL          0
+/**
+ * Flat code segment, used at boot and also for the rest of the system's
+ * runtime when protection domains are disabled
+ */
+#define GDT_IDX_CODE_FLAT     1
+/**
+ * Flat data segment, used at boot and also for the rest of the system's
+ * runtime when protection domains are disabled
+ */
+#define GDT_IDX_DATA_FLAT     2
+
+#if X86_CONF_PROT_DOMAINS != X86_CONF_PROT_DOMAINS__NONE
+/** Default (post-boot) code segment */
+#define GDT_IDX_CODE          3
+/**
+ * Same bounds and permissions as default code segment, but at the interrupt
+ * handler privilege level
+ */
+#define GDT_IDX_CODE_INT      4
+/** Stack segment for interrupt handlers */
+#define GDT_IDX_STK_INT       5
+
+#define GDT_IDX_CODE_EXC      GDT_IDX_CODE_FLAT
+/** Default data segment used by code at all privilege levels */
+#define GDT_IDX_DATA          6
+#define GDT_IDX_STK           GDT_IDX_DATA
+#define GDT_IDX_STK_EXC       GDT_IDX_DATA_FLAT
+#else
+#define GDT_IDX_CODE          GDT_IDX_CODE_FLAT
+#define GDT_IDX_CODE_INT      GDT_IDX_CODE_FLAT
+#define GDT_IDX_CODE_EXC      GDT_IDX_CODE_FLAT
+#define GDT_IDX_DATA          GDT_IDX_DATA_FLAT
+#define GDT_IDX_STK           GDT_IDX_DATA_FLAT
+#define GDT_IDX_STK_INT       GDT_IDX_DATA_FLAT
+#define GDT_IDX_STK_EXC       GDT_IDX_DATA_FLAT
+#endif
+
+#define GDT_SEL(idx, rpl)     (((idx) << 3) | (rpl))
+
+#define DT_SEL_GET_IDX(sel)   ((sel) >> 3)
+
+#define DT_SEL_GET_RPL(sel)   ((sel) & 3)
+
+#define GDT_SEL_NULL          GDT_SEL(GDT_IDX_NULL, 0)
+#define GDT_SEL_CODE_FLAT     GDT_SEL(GDT_IDX_CODE_FLAT, PRIV_LVL_EXC)
+#define GDT_SEL_DATA_FLAT     GDT_SEL(GDT_IDX_DATA_FLAT, PRIV_LVL_EXC)
+
+#define GDT_SEL_CODE          GDT_SEL(GDT_IDX_CODE, PRIV_LVL_USER)
+#define GDT_SEL_CODE_INT      GDT_SEL(GDT_IDX_CODE_INT, PRIV_LVL_INT)
+#define GDT_SEL_CODE_EXC      GDT_SEL(GDT_IDX_CODE_EXC, PRIV_LVL_EXC)
+
+#define GDT_SEL_DATA          GDT_SEL(GDT_IDX_DATA, PRIV_LVL_EXC)
+
+#define GDT_SEL_STK           GDT_SEL(GDT_IDX_STK, PRIV_LVL_USER)
+#define GDT_SEL_STK_INT       GDT_SEL(GDT_IDX_STK_INT, PRIV_LVL_INT)
+#define GDT_SEL_STK_EXC       GDT_SEL(GDT_IDX_STK_EXC, PRIV_LVL_EXC)
+
+#endif /* CPU_X86_MM_GDT_LAYOUT_H_ */
+
diff --git a/cpu/x86/mm/paging-prot-domains.c b/cpu/x86/mm/paging-prot-domains.c
new file mode 100644
index 000000000..6c28c03e2
--- /dev/null
+++ b/cpu/x86/mm/paging-prot-domains.c
@@ -0,0 +1,297 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+#include <string.h>
+#include "dma.h"
+#include "gdt.h"
+#include "gdt-layout.h"
+#include "helpers.h"
+#include "idt.h"
+#include "paging.h"
+#include "prot-domains.h"
+#include "segmentation.h"
+#include "stacks.h"
+#include "syscalls.h"
+#include "tss.h"
+
+/*#define DBG_PAGE_ALLOC*/
+
+/* Enable PAE-mode paging */
+#define CR4_PAE BIT(5)
+
+/* Extended Feature Enables MSR */
+#define MSR_EFER 0xC0000080
+
+/* Enable Execute Disable bit support */
+#define EFER_NXE BIT(11)
+
+/* Root page-directory-pointer table */
+static pdpt_t root_pgtbl __attribute__((aligned(32))) ATTR_BSS_KERN;
+/* Although the following page tables must be page-aligned, it is infeasible to
+ * apply the "aligned(4096)" attribute for the reasons described in the linker
+ * script.
+ */
+/* Second-level page directory */
+static page_table_t
+  second_lvl_pgtbl ATTR_BSS_KERN_PAGE_ALIGNED;
+/* Leaf-level page table */
+static page_table_t leaf_pgtbl ATTR_BSS_KERN_PAGE_ALIGNED;
+
+#define LINEAR_ADDR_BOUND (MIN_PAGE_SIZE * ENTRIES_PER_PAGE_TABLE)
+
+/*---------------------------------------------------------------------------*/
+void
+prot_domains_reg(dom_client_data_t *dcd,
+                 uintptr_t mmio,
+                 size_t mmio_sz,
+                 uintptr_t meta,
+                 size_t meta_sz,
+                 bool pio)
+{
+  dom_id_t dom_id = dcd->dom_id;
+  volatile struct dom_kern_data *dkd =
+    prot_domains_kern_data + dom_id;
+
+  /* All addresses and sizes must be page-aligned */
+  if((PROT_DOMAINS_ACTUAL_CNT <= dom_id) ||
+     ((mmio & (MIN_PAGE_SIZE - 1)) != 0) ||
+     ((mmio_sz & (MIN_PAGE_SIZE - 1)) != 0) ||
+     ((meta & (MIN_PAGE_SIZE - 1)) != 0) ||
+     ((meta_sz & (MIN_PAGE_SIZE - 1)) != 0) ||
+     (PROT_DOMAINS_MAX_MMIO_SZ < mmio_sz) ||
+     (LINEAR_ADDR_BOUND < (PROT_DOMAINS_META_LINEAR_BASE + meta_sz))) {
+    halt();
+  }
+
+  if((dkd->flags & PROT_DOMAINS_FLAG_INITED) == PROT_DOMAINS_FLAG_INITED) {
+    halt();
+  }
+
+  dkd->mmio = mmio;
+  dkd->mmio_sz = mmio_sz;
+  dkd->meta = meta;
+  dkd->meta_sz = meta_sz;
+  dkd->flags = PROT_DOMAINS_FLAG_INITED;
+  if(pio) {
+    dkd->flags |= PROT_DOMAINS_FLAG_PIO;
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void __attribute__((regparm(3)))
+set_ptes(uintptr_t start_la, uintptr_t start_pa, uintptr_t end_pa,
+         pte_t template)
+{
+#ifdef DBG_PAGE_ALLOC
+#warning Checking page allocations at runtime.
+
+  if(((start_la & (MIN_PAGE_SIZE - 1)) != 0) ||
+     ((start_pa & (MIN_PAGE_SIZE - 1)) != 0) ||
+     ((start_la & (MIN_PAGE_SIZE - 1)) != 0) ||
+     ((end_pa & (MIN_PAGE_SIZE - 1)) != 0) ||
+     (LINEAR_ADDR_BOUND <= (start_la + (end_pa - start_pa)))) {
+    halt();
+  }
+#endif
+
+  while(start_pa < end_pa) {
+    template.addr = start_pa >> 12;
+
+    leaf_pgtbl[start_la >> MIN_PAGE_SIZE_SHAMT] = template;
+
+#ifdef X86_CONF_USE_INVLPG
+    __asm__("invlpg %0" :: "m" (*(uint8_t *)start_la));
+#endif
+
+    start_la += MIN_PAGE_SIZE;
+    start_pa += MIN_PAGE_SIZE;
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void __attribute__((fastcall))
+set_ptes_identity_map(uintptr_t start_pa, uintptr_t end_pa, pte_t template)
+{
+  set_ptes(start_pa, start_pa, end_pa, template);
+}
+/*---------------------------------------------------------------------------*/
+static inline uint32_t __attribute__((always_inline))
+prot_domains_switch(dom_id_t from_id, dom_id_t to_id,
+                    interrupt_stack_t *intr_stk)
+{
+  volatile dom_kern_data_t *from, *to;
+
+  from = prot_domains_kern_data + from_id;
+  to = prot_domains_kern_data + to_id;
+
+  if((from_id == DOM_ID_kern) ||
+     (to_id == DOM_ID_kern)) {
+    pte_t to_kern_data_pte = { .raw = 0 };
+    to_kern_data_pte.present = 1;
+    to_kern_data_pte.exec_disable = 1;
+    /* The kernel data region should always be accessible to supervisory code,
+     * but it is only accessible to user mode in the kernel protection domain.
+     */
+    to_kern_data_pte.user_accessible = 1;
+    if(to_id == DOM_ID_kern) {
+      to_kern_data_pte.writable = 1;
+    }
+
+    set_ptes_identity_map((uintptr_t)&_sbss_kern_addr,
+                          (uintptr_t)&_ebss_syscall_addr,
+                          to_kern_data_pte);
+
+    if(to_id != DOM_ID_kern) {
+      to_kern_data_pte.user_accessible = 0;
+      to_kern_data_pte.writable = 0;
+    }
+
+    set_ptes_identity_map((uintptr_t)&_ebss_syscall_addr,
+                          (uintptr_t)&_ebss_kern_addr,
+                          to_kern_data_pte);
+  }
+
+  if(to->mmio_sz != 0) {
+    pte_t pte = { .raw = 0 };
+    pte.present = 1;
+    pte.exec_disable = 1;
+    pte.user_accessible = 1;
+    pte.writable = 1;
+    /* disable caching of MMIO accesses */
+    pte.pcd = 1;
+
+    set_ptes(PROT_DOMAINS_MMIO_LINEAR_BASE,
+             to->mmio,
+             to->mmio + to->mmio_sz,
+             pte);
+  }
+  if(to->mmio_sz < from->mmio_sz) {
+    pte_t pte = { .raw = 0 };
+
+    set_ptes_identity_map(PROT_DOMAINS_MMIO_LINEAR_BASE + to->mmio_sz,
+                          PROT_DOMAINS_MMIO_LINEAR_BASE + from->mmio_sz,
+                          pte);
+  }
+
+  if(to->meta_sz != 0) {
+    pte_t pte = { .raw = 0 };
+    pte.present = 1;
+    pte.exec_disable = 1;
+    pte.user_accessible = 1;
+    pte.writable = 1;
+
+    set_ptes(PROT_DOMAINS_META_LINEAR_BASE,
+             to->meta,
+             to->meta + to->meta_sz,
+             pte);
+  }
+  if(to->meta_sz < from->meta_sz) {
+    pte_t pte = { .raw = 0 };
+
+    set_ptes_identity_map(PROT_DOMAINS_META_LINEAR_BASE + to->mmio_sz,
+                          PROT_DOMAINS_META_LINEAR_BASE + from->mmio_sz,
+                          pte);
+  }
+
+#ifndef X86_CONF_USE_INVLPG
+  __asm__ __volatile__ ("mov %%cr3, %%eax\n\t"
+                        "mov %%eax, %%cr3\n\t" ::: "eax");
+#endif
+
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+void
+prot_domains_gdt_init(void)
+{
+  gdt_copy_desc_change_dpl(GDT_IDX_DATA, GDT_IDX_DATA_FLAT, PRIV_LVL_USER);
+  gdt_copy_desc_change_dpl(GDT_IDX_STK_INT, GDT_IDX_STK_EXC, PRIV_LVL_INT);
+}
+/*---------------------------------------------------------------------------*/
+void
+prot_domains_impl_init(void)
+{
+  pte_t pte = { .raw = 0 };
+
+  syscalls_int_init();
+
+  /* Initialize page table: */
+
+  pte.present = 1;
+  pte.addr = ((uint32_t)second_lvl_pgtbl) >> MIN_PAGE_SIZE_SHAMT;
+
+  root_pgtbl[0] = pte;
+
+  pte.writable = 1;
+  pte.user_accessible = 1;
+  pte.addr = ((uint32_t)leaf_pgtbl) >> MIN_PAGE_SIZE_SHAMT;
+
+  second_lvl_pgtbl[0] = pte;
+
+  /* Map code sections: */
+
+  pte.writable = 0;
+  set_ptes_identity_map((uintptr_t)&_stext_addr, (uintptr_t)&_etext_addr, pte);
+
+  /* Map data sections: */
+
+  pte.writable = 1;
+  pte.exec_disable = 1;
+  set_ptes_identity_map((uintptr_t)stacks_main,
+                        (uintptr_t)stacks_main +
+                        STACKS_SIZE_MAIN +
+                        STACKS_SIZE_EXC +
+                        STACKS_SIZE_INT,
+                        pte);
+  set_ptes_identity_map((uintptr_t)&_sdata_addr, (uintptr_t)&_edata_addr, pte);
+
+  /* Enable XD bit support */
+  __asm__ __volatile__ ("wrmsr" :: "c" (MSR_EFER), "a" (EFER_NXE), "d" (0));
+
+  /* Enable PAE */
+  __asm__ __volatile__ ("mov %%cr4, %%eax\n\t"
+                        "or %0, %%eax\n\t"
+                        "mov %%eax, %%cr4\n\t"
+                        :
+                        : "r" (CR4_PAE)
+                        : "eax");
+
+  /* Load CR3 */
+  __asm__ __volatile__ ("mov %0, %%cr3" :: "r" (root_pgtbl));
+}
+/*---------------------------------------------------------------------------*/
+uintptr_t
+prot_domains_lookup_meta_phys_base(dom_client_data_t *drv)
+{
+  return prot_domains_kern_data[drv->dom_id].meta;
+}
+/*---------------------------------------------------------------------------*/
+
+/* Enable inter-procedural optimization with procedures in the following file:
+ */
+#include "syscalls-int.c"
diff --git a/cpu/x86/mm/paging-prot-domains.h b/cpu/x86/mm/paging-prot-domains.h
new file mode 100644
index 000000000..0f7f54ea3
--- /dev/null
+++ b/cpu/x86/mm/paging-prot-domains.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_MM_PAGING_PROT_DOMAINS_H_
+#define CPU_X86_MM_PAGING_PROT_DOMAINS_H_
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include "dma.h"
+#include "helpers.h"
+#include "paging.h"
+#include "syscalls-int.h"
+
+struct dom_kern_data {
+  /** Base physical address of optional MMIO region */
+  uintptr_t mmio;
+  /** Number of (contiguous) pages in MMIO region */
+  size_t mmio_sz;
+  /** Base physical address of optional metadata region */
+  uintptr_t meta;
+  /** Number of (contiguous) pages in metadata region */
+  size_t meta_sz;
+  /** Flags are defined with the prefix PROT_DOMAINS_FLAG in prot-domains.h */
+  uint32_t flags;
+  /**
+   * Original return address from call stack when this protection domain
+   * invoked some other protection domain.  This serves to control the return
+   * entrypoint.  The callee is not permitted to modify this value (unless the
+   * callee is the kernel protection domain).
+   */
+  uintptr_t orig_ret_addr;
+
+  /* align to next-larger power of 2 to enable usage of shifting instead of
+   * multiplication to index an array of these structures.
+   */
+} __attribute__((aligned(32)));
+
+/** Linear base address at which to map the MMIO region. */
+#define PROT_DOMAINS_MMIO_LINEAR_BASE (MIN_PAGE_SIZE + (uintptr_t)&_ebss_kern_addr)
+
+/** Maximum supported size of MMIO region */
+#define PROT_DOMAINS_MAX_MMIO_SZ 0x4000
+
+/** Linear base address at which to map the metadata region */
+#define PROT_DOMAINS_META_LINEAR_BASE \
+  (MIN_PAGE_SIZE + (PROT_DOMAINS_MMIO_LINEAR_BASE + PROT_DOMAINS_MAX_MMIO_SZ))
+
+#define PROT_DOMAINS_META_OFF_TO_PHYS(off, meta_phys_base)                    \
+  ((meta_phys_base) + ((off) - PROT_DOMAINS_META_LINEAR_BASE))
+
+/** Any MMIO region mapping always starts at a particular linear address. */
+#define PROT_DOMAINS_MMIO(dcd) PROT_DOMAINS_MMIO_LINEAR_BASE
+/**
+ * Any metadata region mapping always starts at a particular linear address.
+ */
+#define PROT_DOMAINS_META(dcd) PROT_DOMAINS_META_LINEAR_BASE
+
+#define PROT_DOMAINS_ENTER_ISR(exc)                                           \
+  PROT_DOMAINS_ENTER_ISR_COMMON(exc)
+#define PROT_DOMAINS_LEAVE_ISR(exc) PROT_DOMAINS_LEAVE_ISR_COMMON(exc)
+
+/* Enable paging */
+#define CR0_PG BIT(31)
+/* Enable write protection in supervisor mode */
+#define CR0_WP BIT(16)
+/* Enable protected mode */
+#define CR0_PE BIT(0)
+
+/**
+ * \brief    Enable or disable write protection enforcement in supervisor mode.
+ *           When disabled, supervisory code (i.e. code running at ring levels
+ *           0-2) is permitted to write to pages that are marked read-only in
+ *           page tables.
+ *
+ * \param en Set to true to enable write protection enforcement.
+ */
+static inline void prot_domains_set_wp(bool en)
+{
+  uint32_t cr0_val = CR0_PG | CR0_PE;
+  if(en) {
+    cr0_val |= CR0_WP;
+  }
+  __asm__ __volatile__ ("mov %0, %%cr0" :: "r"(cr0_val));
+}
+
+#endif /* CPU_X86_MM_PAGING_PROT_DOMAINS_H_ */
diff --git a/cpu/x86/mm/paging.h b/cpu/x86/mm/paging.h
new file mode 100644
index 000000000..7882ceab2
--- /dev/null
+++ b/cpu/x86/mm/paging.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_MM_PAGING_H_
+#define CPU_X86_MM_PAGING_H_
+
+#include <stdint.h>
+
+/**
+ * Page table entry format for PAE mode page table.  See Intel Combined Manual,
+ * Vol. 3, Section 4.4 for more details.
+ */
+typedef union pte {
+  struct {
+    uint64_t present         : 1;
+    uint64_t writable        : 1;
+    uint64_t user_accessible : 1;
+    uint64_t pwt             : 1; /**< Specify write-through cache policy */
+    uint64_t pcd             : 1; /**< Disable caching */
+    uint64_t accessed        : 1;
+    uint64_t dirty           : 1;
+    uint64_t                 : 5;
+    uint64_t addr            : 51;
+    uint64_t exec_disable    : 1;
+  };
+  uint64_t raw;
+} pte_t;
+
+#define ENTRIES_PER_PDPT 4
+#define ENTRIES_PER_PAGE_TABLE 512
+
+typedef pte_t pdpt_t[ENTRIES_PER_PDPT];
+typedef pte_t page_table_t[ENTRIES_PER_PAGE_TABLE];
+
+#define MIN_PAGE_SIZE_SHAMT 12
+#define MIN_PAGE_SIZE (1 << MIN_PAGE_SIZE_SHAMT)
+
+#endif /* CPU_X86_MM_PAGING_H_ */
diff --git a/cpu/x86/mm/prot-domains.c b/cpu/x86/mm/prot-domains.c
new file mode 100644
index 000000000..593da98e2
--- /dev/null
+++ b/cpu/x86/mm/prot-domains.c
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+#include "prot-domains.h"
+
+#include "gdt.h"
+#include <stdio.h>
+#include "interrupt.h"
+#include <stdint.h>
+#include <assert.h>
+#include "syscalls.h"
+#include "stacks.h"
+
+static dom_kern_data_t __attribute__((section(".kern_prot_dom_bss")))
+  PROT_DOMAINS_PDCS_NM(kern_dcd);
+static dom_client_data_t ATTR_BSS_KERN kern_dcd;
+static dom_kern_data_t __attribute__((section(".app_prot_dom_bss")))
+  PROT_DOMAINS_PDCS_NM(app_dcd);
+static dom_client_data_t ATTR_BSS_KERN app_dcd;
+
+/*---------------------------------------------------------------------------*/
+void
+prot_domains_init(void)
+{
+  segment_desc_t desc;
+
+  gdt_lookup(GDT_IDX_CODE_EXC, &desc);
+
+  SEG_SET_FLAG(desc, DPL, PRIV_LVL_INT);
+  gdt_insert(GDT_IDX_CODE_INT, desc);
+
+  SEG_SET_FLAG(desc, DPL, PRIV_LVL_USER);
+  gdt_insert(GDT_IDX_CODE, desc);
+
+  PROT_DOMAINS_INIT_ID(kern_dcd);
+  prot_domains_reg(&kern_dcd, 0, 0, 0, 0, true);
+  PROT_DOMAINS_INIT_ID(app_dcd);
+  prot_domains_reg(&app_dcd, 0, 0, 0, 0, false);
+
+  prot_domains_impl_init();
+}
+/*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/mm/prot-domains.h b/cpu/x86/mm/prot-domains.h
new file mode 100644
index 000000000..f7dc84e3c
--- /dev/null
+++ b/cpu/x86/mm/prot-domains.h
@@ -0,0 +1,275 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_MM_PROT_DOMAINS_H_
+#define CPU_X86_MM_PROT_DOMAINS_H_
+
+#if !__ASSEMBLER__
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include "helpers.h"
+#endif
+
+#define X86_CONF_PROT_DOMAINS__NONE   0
+#define X86_CONF_PROT_DOMAINS__PAGING 1
+
+/** Privilege level (ring) for exception handlers and other supervisory code */
+#define PRIV_LVL_EXC  0
+#if X86_CONF_PROT_DOMAINS != X86_CONF_PROT_DOMAINS__NONE
+/** Privilege level for interrupt handlers */
+#define PRIV_LVL_INT  2
+/** Default privilege level */
+#define PRIV_LVL_USER 3
+#else
+#define PRIV_LVL_INT  PRIV_LVL_EXC
+#define PRIV_LVL_USER PRIV_LVL_EXC
+#endif
+
+#define DOM_ID_kern 0
+#define DOM_ID_app 1
+
+/** I/O Privilege Level */
+#define EFLAGS_IOPL(pl) ((pl) << 12)
+/** Interrupt Enable Flag */
+#define EFLAGS_IF (1u << 9)
+
+#if !__ASSEMBLER__
+
+/** Protection domain ID */
+typedef uint32_t dom_id_t;
+
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__PAGING
+#include "paging-prot-domains.h"
+#endif
+
+/* The following symbols are defined in the linker script */
+/** Bounds for .text section */
+extern uint32_t _stext_addr, _etext_addr;
+
+#if X86_CONF_PROT_DOMAINS != X86_CONF_PROT_DOMAINS__NONE
+
+/** Metadata that should not be DMA-accessible */
+#define ATTR_BSS_META __attribute__((section(".meta_bss")))
+/** Kernel-owned data */
+#define ATTR_BSS_KERN __attribute__((section(".kern_bss")))
+/** Code that should only be executable during bootup */
+#define ATTR_CODE_BOOT __attribute__((section(".boot_text")))
+
+/**
+ * Domain-defined metadata must be page-aligned, which is implemented by the
+ * linker script for variables with this attribute.
+ */
+#define ATTR_BSS_KERN_PAGE_ALIGNED                                            \
+  __attribute__((section(".page_aligned_kern_bss")))
+
+/** Bounds for .kern_data, .syscall_data, and .prot_dom_data sections */
+extern uint32_t _sbss_kern_addr, _ebss_kern_addr;
+/** End of .syscall_data section */
+extern uint32_t _ebss_syscall_addr;
+/** Bounds for other data sections */
+extern uint32_t _sdata_addr, _edata_addr;
+
+/**
+ * If set, this protection domain is already in the call stack and is not
+ * available for nested invocations.
+ */
+#define PROT_DOMAINS_FLAG_BUSY   BIT(0)
+/** If set, this protection domain requires port I/O access. */
+#define PROT_DOMAINS_FLAG_PIO    BIT(1)
+/** If set, this protection domain is initialized. */
+#define PROT_DOMAINS_FLAG_INITED BIT(2)
+
+/**
+ * Data associated with each protection domain that should be fully accessible
+ * only to the kernel, with limited accesses and modifications permitted from
+ * other domains.  Includes storage for system data structures.
+ */
+typedef struct dom_kern_data dom_kern_data_t;
+
+extern volatile dom_kern_data_t prot_domains_kern_data[];
+extern volatile dom_kern_data_t prot_domains_kern_data_end[];
+
+#define PROT_DOMAINS_ACTUAL_CNT                                               \
+  (prot_domains_kern_data_end - prot_domains_kern_data)
+
+#define PROT_DOMAINS_GET_DOM_ID(dkd)                                          \
+  ((dom_id_t)((dkd) - prot_domains_kern_data))
+
+void prot_domains_syscall_dispatcher(void);
+
+/**
+ * Data associated with each protection domain that is owned by clients of that
+ * domain and used to identify the domain.
+ */
+struct dom_client_data {
+  dom_id_t dom_id;
+} __attribute__((packed));
+
+/** Allocate the client-owned protection domain data structure. */
+#define PROT_DOMAINS_PDCS_NM(nm) _pdcs_##nm
+#define PROT_DOMAINS_ALLOC(typ, nm)                                           \
+  static dom_kern_data_t __attribute__((section(".prot_dom_bss")))            \
+    PROT_DOMAINS_PDCS_NM(nm);                                                 \
+  static typ ATTR_BSS_KERN nm
+#define PROT_DOMAINS_INIT_ID(nm)                                              \
+  (nm).dom_id = PROT_DOMAINS_GET_DOM_ID(&PROT_DOMAINS_PDCS_NM(nm))
+
+/**
+ * Perform early initialization during boot stage 0 to prepare for boot stage 1
+ */
+void prot_domains_gdt_init() ATTR_CODE_BOOT;
+/**
+ * Perform initialization during boot stage 1 to prepare for kernel launch
+ */
+void prot_domains_init();
+void prot_domains_impl_init();
+
+/* Return from cpu_boot_stage1 will invoke prot_domains_launch_kernel due to
+ * that return address being pushed on the stack by cpu_boot_stage0.
+ */
+#define prot_domains_leave_boot_stage1()
+
+/* Return from main will invoke prot_domains_launch_app due to that return
+ * address being pushed on the stack by cpu_boot_stage0.
+ */
+#define prot_domains_leave_main()
+
+void prot_domains_launch_kernel(void);
+
+/* Whenever changing this, update syscalls-int-asm.S:prot_domains_launch_kernel
+ * to match:
+ */
+#define PROT_DOMAINS_INIT_RET_ADDR_CNT 2
+
+void app_main(void);
+#define prot_domains_launch_app app_main
+
+#else
+
+#define ATTR_BSS_META
+#define ATTR_BSS_KERN
+#define ATTR_CODE_BOOT
+
+struct dom_client_data {
+  uintptr_t mmio; /**< MMIO range base address */
+  uintptr_t meta; /**< Domain-defined metadata base address */
+};
+
+/** Retrieve the MMIO base address for the specified protection domain. */
+#define PROT_DOMAINS_MMIO(dcd) ((dcd).mmio)
+
+/** Retrieve the metadata base address for the specified protection domain. */
+#define PROT_DOMAINS_META(dcd) ((dcd).meta)
+
+#define PROT_DOMAINS_ALLOC(typ, nm) static typ nm
+#define PROT_DOMAINS_INIT_ID(nm)
+
+#define prot_domains_gdt_init()
+
+#define prot_domains_init()
+
+int main(void);
+#define prot_domains_leave_boot_stage1 main
+#define prot_domains_leave_main ENABLE_IRQ(); app_main
+
+#define PROT_DOMAINS_INIT_RET_ADDR_CNT 0
+
+#endif
+
+/**
+ * Protection domain data readable by the client.  It is used to control
+ * execution, so it should be protected from modifications by clients.
+ * Otherwise, there is a risk that one client could modify one of these
+ * structures used by another client to issue a system call, which could then
+ * cause the latter client to perform an unintended system call.
+ */
+typedef struct dom_client_data dom_client_data_t;
+
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__NONE
+#define prot_domains_reg(dcd, mmio_, mmio_sz, meta_, meta_sz, pio) \
+  (dcd)->mmio = (mmio_); \
+  (dcd)->meta = (meta_)
+#else
+/**
+ * \brief         Register a protection domain, which involves creating the
+ *                necessary system data structures for it.
+ *
+ * \param dcd     Client-accessible domain information
+ * \param mmio    Optional base address for per-domain memory-mapped IO region
+ * \param mmio_sz Size of MMIO region
+ * \param meta    Optional base address for per-domain metadata
+ * \param meta_sz Size of metadata
+ * \param pio     Set to true if protection domain requires port IO access
+ */
+void prot_domains_reg(dom_client_data_t *dcd,
+                      uintptr_t mmio,
+                      size_t mmio_sz,
+                      uintptr_t meta,
+                      size_t meta_sz,
+                      bool pio);
+#endif
+
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__NONE
+#define prot_domains_lookup_meta_phys_base(drv) 0
+#else
+/** Lookup base physical address of metadata region for specified domain */
+uintptr_t prot_domains_lookup_meta_phys_base(dom_client_data_t *drv);
+#endif
+
+#if X86_CONF_PROT_DOMAINS != X86_CONF_PROT_DOMAINS__PAGING
+#define PROT_DOMAINS_META_OFF_TO_PHYS(off, meta_phys_base)                    \
+  ((meta_phys_base) + (off))
+#endif
+
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__NONE
+#define PROT_DOMAINS_ENTER_ISR(...)
+#define PROT_DOMAINS_LEAVE_ISR(...)
+#else
+#define PROT_DOMAINS_ENTER_ISR_COMMON(exc)                                    \
+  ".if !" #exc "\n\t"                                                         \
+  /* Save the current stack pointer into a callee-saved register. */          \
+  "mov %%esp, %%ebx\n\t"                                                      \
+  /* Pivot to the main stack of the interrupted context.                   */ \
+  /* Interrupts never have an error code, so the offset is always 44.      */ \
+  /* No interrupt handlers use anything from the original interrupt stack, */ \
+  /* so there is no need to copy anything from it to the main stack.       */ \
+  "mov 44(%%esp), %%esp\n\t"                                                  \
+  ".endif\n\t"
+#define PROT_DOMAINS_LEAVE_ISR_COMMON(exc)                                    \
+  /* Restore the interrupt/exception stack pointer. */                        \
+  ".if !" #exc "\n\t"                                                         \
+  "mov %%ebx, %%esp\n\t"                                                      \
+  ".endif\n\t"
+#endif
+
+#endif /* !__ASSEMBLER__ */
+
+#endif /* CPU_X86_MM_PROT_DOMAINS_H_ */
diff --git a/cpu/x86/mm/segmentation.h b/cpu/x86/mm/segmentation.h
new file mode 100644
index 000000000..57b1b8aea
--- /dev/null
+++ b/cpu/x86/mm/segmentation.h
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_MM_SEGMENTATION_H_
+#define CPU_X86_MM_SEGMENTATION_H_
+
+#include <stdint.h>
+
+#define SEG_FLAG(lbl, val)                                                    \
+  (((val) & (~0u >> (32 - SEG_WIDTH_##lbl))) << SEG_SHAMT_##lbl)
+
+#define SEG_SET_FLAG(desc, lbl, val)                                          \
+  (desc).flags = ((desc).flags & ~SEG_FLAG(lbl, ~0u)) | SEG_FLAG(lbl, val)
+
+#define SEG_WIDTH_TYPE       4
+#define SEG_SHAMT_TYPE       0
+#define SEG_WIDTH_DESCTYPE   1
+#define SEG_SHAMT_DESCTYPE   4
+#define SEG_WIDTH_DPL        2
+#define SEG_SHAMT_DPL        5
+#define SEG_WIDTH_PRESENT    1
+#define SEG_SHAMT_PRESENT    7
+#define SEG_WIDTH_LIMIT_HI   4
+#define SEG_SHAMT_LIMIT_HI   8
+#define SEG_WIDTH_AVL        1
+#define SEG_SHAMT_AVL        12
+#define SEG_WIDTH_LONG_MODE  1
+#define SEG_SHAMT_LONG_MODE  13
+/* also used to indicate default operand and address size */
+#define SEG_WIDTH_DIRECTION  1
+#define SEG_SHAMT_DIRECTION  14
+#define SEG_WIDTH_GRAN       1
+#define SEG_SHAMT_GRAN       15
+
+#define SEG_TYPE_DATA_RDWR   SEG_FLAG(TYPE, 0x02) /* Read/Write */
+#define SEG_TYPE_CODE_EXRD   SEG_FLAG(TYPE, 0x0A) /* Execute/Read */
+#define SEG_TYPE_TSS32_AVAIL SEG_FLAG(TYPE, 0x09)
+
+#define SEG_DESCTYPE_SYS     SEG_FLAG(DESCTYPE, 0)
+#define SEG_DESCTYPE_NSYS    SEG_FLAG(DESCTYPE, 1)
+
+#define SEG_PRESENT          SEG_FLAG(PRESENT, 1)
+
+#define SEG_DEFL_OPSZ_32BIT  SEG_FLAG(DIRECTION, 1)
+
+#define SEG_GRAN_BYTE        SEG_FLAG(GRAN, 0)
+#define SEG_GRAN_PAGE        SEG_FLAG(GRAN, 1)
+
+/**
+ * Segment descriptor.  See Intel Combined Manual,
+ * Vol. 3, Section 3.4.5 for more details.
+ */
+typedef union segment_desc {
+  struct {
+    uint32_t lim_lo     : 16;
+    uint32_t base_lo    : 16;
+    uint32_t base_mid   : 8;
+    uint32_t flags      : 16;
+    uint32_t base_hi    : 8;
+  };
+  struct {
+    uint32_t raw_lo, raw_hi;
+  };
+  uint64_t raw;
+} segment_desc_t;
+
+static inline void
+segment_desc_set_limit(segment_desc_t *c_this, uint32_t len)
+{
+  uint32_t limit = len - 1;
+
+  SEG_SET_FLAG(*c_this, LIMIT_HI, limit >> 16); /* set limit bits 19:16 */
+  c_this->lim_lo = limit; /* set limit bits 15:0 */
+}
+/**
+ * \brief        Initialize a segment descriptor.
+ * \param c_this Segment descriptor to be initialized.
+ * \param base   Base address of region to be covered by segment descriptor.
+ * \param len    Length to be specified by segment descriptor.  The units may
+ *               be bytes or pages, depending on the flags.
+ * \param flags  Flags to be added to the default flags: present, default
+ *               operand size of 32 bits, and high limit bits.
+ */
+static inline void
+segment_desc_init(segment_desc_t *c_this,
+                  uint32_t base, uint32_t len, uint16_t flags)
+{
+  c_this->raw = 0;
+
+  /* Create the high 32 bit segment */
+  c_this->base_mid = base >> 16; /* set base bits 23:16 */
+  c_this->base_hi = base >> 24; /* set base bits 31:24 */
+
+  /* Create the low 32 bit segment */
+  c_this->base_lo = base; /* set base bits 15:0 */
+
+  c_this->flags = SEG_FLAG(PRESENT, 1) | SEG_DEFL_OPSZ_32BIT | flags;
+
+  /* This must be done after setting the other flags, or else it
+   * would be partially overridden.
+   */
+  segment_desc_set_limit(c_this, len);
+}
+#endif /* CPU_X86_MM_SEGMENTATION_H_ */
diff --git a/cpu/x86/mm/stacks.c b/cpu/x86/mm/stacks.c
new file mode 100644
index 000000000..60ccb0ebc
--- /dev/null
+++ b/cpu/x86/mm/stacks.c
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+#include "stacks.h"
+
+uint8_t stacks_main[STACKS_SIZE_MAIN]
+  __attribute__((section(".main_stack"), aligned(4)));
+#if X86_CONF_PROT_DOMAINS != X86_CONF_PROT_DOMAINS__NONE
+uint8_t stacks_int[STACKS_SIZE_INT]
+  __attribute__((section(".int_stack"), aligned(4)));
+uint8_t stacks_exc[STACKS_SIZE_EXC]
+  __attribute__((section(".exc_stack"), aligned(4)));
+#endif
diff --git a/cpu/x86/mm/stacks.h b/cpu/x86/mm/stacks.h
new file mode 100644
index 000000000..a1005d8e0
--- /dev/null
+++ b/cpu/x86/mm/stacks.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_MM_STACKS_H_
+#define CPU_X86_MM_STACKS_H_
+
+#include "prot-domains.h"
+
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__NONE
+#define STACKS_SIZE_INT 0
+#else
+/**
+ * The necessary amount of space for the interrupt and exception stacks is
+ * determined by the amount of data pushed on the stack by the CPU when
+ * delivering an interrupt or exception, and by the additional data pushed
+ * on the stack by the interrupt dispatcher.  See interrupt.h for more details.
+ */
+#define STACKS_SIZE_INT (14 * 4)
+#endif
+
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__PAGING
+/**
+ * The system call and return dispatchers use this stack, so its size was
+ * determined by observing their behavior.  It is possible that the dispatchers
+ * could overflow the stack and overwrite data on the other stacks.  An
+ * alternative design that would facilitate detection of such overflows would
+ * place the exception handler stack on a separate page surrounded by guard
+ * bands, but that would consume a substantial amount of additional memory.
+ *
+ * All stack sizes should be a multiple of 4 to accommodate a 4-byte alignment.
+ */
+#ifdef __clang__
+#define STACKS_SIZE_EXC 512
+#else
+#define STACKS_SIZE_EXC 256
+#endif
+#else
+#define STACKS_SIZE_EXC STACKS_SIZE_INT
+#endif
+/**
+ * The combined size of the stacks should be an even multiple of the 4K page
+ * size so that they precisely fill some number of pages when paging-based
+ * protection domains are in use.  The stacks are arranged contiguously by
+ * the linker scripts.  See those and README.md for more details.
+ */
+#define STACKS_SIZE_MAIN (8192 - (STACKS_SIZE_INT + STACKS_SIZE_EXC))
+
+#if !__ASSEMBLER__
+/**
+ * Stack for exception handlers.  Also used for system call and return
+ * dispatchers when paging-based protection domains are enabled.
+ */
+extern uint8_t stacks_exc[STACKS_SIZE_EXC];
+/** Stack for interrupt handlers. */
+extern uint8_t stacks_int[STACKS_SIZE_INT];
+/** Main C stack. */
+extern uint8_t stacks_main[STACKS_SIZE_MAIN];
+
+#define STACKS_INIT_TOP \
+  ((uintptr_t)stacks_main + STACKS_SIZE_MAIN - \
+   (PROT_DOMAINS_INIT_RET_ADDR_CNT * sizeof(uintptr_t)))
+
+#endif
+
+#endif /* CPU_X86_MM_STACKS_H_ */
diff --git a/cpu/x86/mm/syscalls-int-asm.S b/cpu/x86/mm/syscalls-int-asm.S
new file mode 100644
index 000000000..1fe80310f
--- /dev/null
+++ b/cpu/x86/mm/syscalls-int-asm.S
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+#include "syscalls-int.h"
+#include "prot-domains.h"
+#include "gdt-layout.h"
+#include "stacks.h"
+
+.text
+
+/* Invoke the system call return dispatcher from the default privilege
+ * level
+ */
+.global prot_domains_sysret_stub
+prot_domains_sysret_stub:
+  int $PROT_DOMAINS_SYSRET_DISPATCH_INT
+
+/* Invoke the system call dispatcher C routine */
+.global prot_domains_syscall_dispatcher
+prot_domains_syscall_dispatcher:
+  mov %esp, %ecx /*< interrupt_stack_t *intr_stk */
+  /* EDX already set to "dom_client_data_t to_dcd" by syscall stub */
+  push %eax /*< syscalls_id_t syscall_id */
+  call prot_domains_syscall_dispatcher_impl
+  /* fastcall convention, so callee pops arguments */
+  iret
+
+/* Invoke the system call return dispatcher C routine */
+.global prot_domains_sysret_dispatcher
+prot_domains_sysret_dispatcher:
+  mov %esp, %ecx /*< interrupt_stack_t *intr_stk */
+  call prot_domains_sysret_dispatcher_impl
+  /* Zero caller-saved registers in case they contain secrets.  The system call
+   * handlers and dispatchers need to preserve the callee-saved registers.
+   */
+  xor %eax, %eax
+  xor %ecx, %ecx
+  xor %edx, %edx
+  iret
+
+.global prot_domains_launch_kernel
+prot_domains_launch_kernel:
+  mov $GDT_SEL_DATA, %eax
+  mov %eax, %ds
+  mov %eax, %es
+  mov %eax, %fs
+  mov %eax, %gs
+  /* init interrupt return stack: */
+  pushl $GDT_SEL_STK
+  lea stacks_main, %eax
+  /* matches STACKS_INIT_TOP, plus 4 since an address has been consumed: */
+  add $(STACKS_SIZE_MAIN - 4), %eax
+  pushl %eax
+  pushl $EFLAGS_IOPL(PRIV_LVL_INT)
+  pushl $GDT_SEL_CODE
+  pushl $0 /* will be overwritten by syscall_dispatcher_impl */
+  /* fastcall convention: */
+  mov %esp, %ecx
+  call prot_domains_launch_kernel_impl
+  iretl
diff --git a/cpu/x86/mm/syscalls-int.c b/cpu/x86/mm/syscalls-int.c
new file mode 100644
index 000000000..1d1c77efb
--- /dev/null
+++ b/cpu/x86/mm/syscalls-int.c
@@ -0,0 +1,298 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+#include "prot-domains.h"
+#include "tss.h"
+#include "helpers.h"
+#include "stacks.h"
+#include "idt.h"
+#include "syscalls.h"
+#include "gdt.h"
+#include "gdt-layout.h"
+#include "interrupt.h"
+
+/**
+ * Current protection domain.  Not protected, since it is just a convenience
+ * variable to avoid unneeded protection domain switches.
+ */
+dom_id_t cur_dom = DOM_ID_app;
+
+/* defined in syscalls-int-asm.S */
+void prot_domains_sysret_dispatcher(void);
+
+/* Maximum depth of inter-domain call stack */
+#define MAX_INTER_DOM_CALL_STK_SZ 4
+
+/* Protected call stack for inter-domain system calls.  The stack grows up. */
+static volatile dom_id_t ATTR_BSS_KERN
+  inter_dom_call_stk[MAX_INTER_DOM_CALL_STK_SZ];
+
+/* Pointer to the next (free) slot in the inter-domain call stack */
+static int ATTR_BSS_KERN inter_dom_call_stk_ptr;
+
+/*---------------------------------------------------------------------------*/
+static inline void __attribute__((always_inline))
+update_eflags(dom_id_t from_id, dom_id_t to_id, interrupt_stack_t *intr_stk)
+{
+  if((to_id == DOM_ID_app) &&
+     (DT_SEL_GET_RPL(intr_stk->cs) == PRIV_LVL_USER)) {
+    /* Only enable interrupts in the application protection domain cooperative
+     * scheduling context.
+     */
+    intr_stk->eflags |= EFLAGS_IF;
+  } else {
+    intr_stk->eflags &= ~EFLAGS_IF;
+  }
+}
+/*---------------------------------------------------------------------------*/
+static inline void __attribute__((always_inline))
+dispatcher_tail(dom_id_t from_id, dom_id_t to_id, interrupt_stack_t *intr_stk)
+{
+  cur_dom = to_id;
+
+  prot_domains_switch(from_id, to_id, intr_stk);
+
+  prot_domains_set_wp(true);
+
+  update_eflags(from_id, to_id, intr_stk);
+}
+/*---------------------------------------------------------------------------*/
+int main(void);
+static inline void __attribute__((always_inline))
+syscall_dispatcher_tail(interrupt_stack_t *intr_stk,
+                        dom_id_t to_id,
+                        uint32_t syscall_eip)
+{
+  dom_id_t from_id;
+  volatile dom_kern_data_t *from_dkd, *to_dkd;
+
+  to_dkd = prot_domains_kern_data + to_id;
+
+  /* This implementation of protection domains is non-reentrant.  For example,
+   * it stores the return address taken from the stack of a caller domain
+   * while dispatching a system call and stores it in a single field in the
+   * kernel data associated with that protection domain.  That model does not
+   * permit reentrancy.
+   */
+  if((to_dkd->flags & PROT_DOMAINS_FLAG_BUSY) == PROT_DOMAINS_FLAG_BUSY) {
+    halt();
+  }
+  to_dkd->flags |= PROT_DOMAINS_FLAG_BUSY;
+
+  /* Update the interrupt stack so that the IRET instruction will return to the
+   * system call entrypoint.
+   */
+  intr_stk->eip = syscall_eip;
+
+  /* Lookup the information for the caller */
+  from_id = inter_dom_call_stk[inter_dom_call_stk_ptr - 1];
+  from_dkd = prot_domains_kern_data + from_id;
+
+  /* Save the current return address from the unprivileged stack to a protected
+   * location in the kernel-owned data structure.  This enforces return
+   * entrypoint control.
+   */
+  from_dkd->orig_ret_addr = *(uintptr_t *)intr_stk->esp;
+  /* Update the unprivileged stack so that when the system call body is
+   * complete, it will invoke the system call return stub.
+   */
+  *((uintptr_t *)intr_stk->esp) = (uintptr_t)prot_domains_sysret_stub;
+
+  if(MAX_INTER_DOM_CALL_STK_SZ <= inter_dom_call_stk_ptr) {
+    halt();
+  }
+  inter_dom_call_stk[inter_dom_call_stk_ptr] = to_id;
+
+  inter_dom_call_stk_ptr++;
+
+  dispatcher_tail(from_id, to_id, intr_stk);
+}
+/*---------------------------------------------------------------------------*/
+void __attribute__((fastcall))
+prot_domains_syscall_dispatcher_impl(interrupt_stack_t *intr_stk,
+                                     dom_id_t to_id,
+                                     syscalls_entrypoint_t *syscall)
+{
+  uint32_t syscall_eip;
+
+  if(PROT_DOMAINS_ACTUAL_CNT <= to_id) {
+    halt();
+  }
+
+  /* Get the approved entrypoint for the system call being invoked */
+
+  if(!((((uintptr_t)syscalls_entrypoints) <= (uintptr_t)syscall) &&
+       (((uintptr_t)syscall) < (uintptr_t)syscalls_entrypoints_end) &&
+       (((((uintptr_t)syscall) - (uintptr_t)syscalls_entrypoints)
+           % sizeof(syscalls_entrypoint_t)) == 0))) {
+    /* Assert is not usable when switching protection domains */
+    halt();
+  }
+
+  if((BIT(to_id) & syscall->doms) == 0) {
+    halt();
+  }
+
+  syscall_eip = syscall->entrypoint;
+
+  prot_domains_set_wp(false);
+
+  syscall_dispatcher_tail(intr_stk, to_id, syscall_eip);
+}
+/*---------------------------------------------------------------------------*/
+int main(void);
+void __attribute__((fastcall))
+prot_domains_launch_kernel_impl(interrupt_stack_t *intr_stk)
+{
+  inter_dom_call_stk[0] = DOM_ID_app;
+
+  inter_dom_call_stk_ptr = 1;
+
+  syscall_dispatcher_tail(intr_stk, DOM_ID_kern, (uint32_t)main);
+}
+/*---------------------------------------------------------------------------*/
+void __attribute__((fastcall))
+prot_domains_sysret_dispatcher_impl(interrupt_stack_t *intr_stk)
+{
+  dom_id_t from_id, to_id;
+  if(inter_dom_call_stk_ptr <= 1) {
+    halt();
+  }
+
+  from_id = inter_dom_call_stk[inter_dom_call_stk_ptr - 1];
+  to_id = inter_dom_call_stk[inter_dom_call_stk_ptr - 2];
+
+  intr_stk->eip = prot_domains_kern_data[to_id].orig_ret_addr;
+
+  prot_domains_set_wp(false);
+
+  prot_domains_kern_data[from_id].flags &= ~PROT_DOMAINS_FLAG_BUSY;
+
+  inter_dom_call_stk_ptr--;
+
+  dispatcher_tail(from_id, to_id, intr_stk);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief  Lookup the current protection domain.
+ * \return Kernel data structure for the current protection domain.
+ */
+static volatile dom_kern_data_t *
+get_current_domain(void)
+{
+  dom_id_t id;
+  id = inter_dom_call_stk[inter_dom_call_stk_ptr - 1];
+  return prot_domains_kern_data + id;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief     Check whether the protection domain is authorized to perform port
+ *            I/O from the cooperative scheduling context.
+ * \param dkd Protection domain to check
+ * \return    Result of the check as a Boolean value
+ */
+static bool
+needs_port_io(volatile dom_kern_data_t *dkd)
+{
+  return (dkd->flags & PROT_DOMAINS_FLAG_PIO) == PROT_DOMAINS_FLAG_PIO;
+}
+/*---------------------------------------------------------------------------*/
+/* Mark the context parameter as volatile so that writes to it will not get
+ * optimized out.  This parameter is not handled like ordinary function
+ * parameters.  It actually partially includes the contents of the exception
+ * stack, so updates to those locations can affect the operation of the
+ * subsequent interrupt return.
+ */
+static void
+gp_fault_handler(volatile struct interrupt_context context)
+{
+  uint32_t cs_lim;
+  uint8_t opcode;
+
+  volatile dom_kern_data_t *dkd = get_current_domain();
+  if (needs_port_io(dkd)) {
+    __asm__ __volatile__ (
+      "mov %%cs, %0\n\t"
+      "lsl %0, %0\n\t"
+      : "=r"(cs_lim));
+
+    if (cs_lim < context.eip) {
+      halt();
+    }
+
+    /* Load first byte of faulting instruction */
+    __asm__ __volatile__ (
+      "movb %%cs:%1, %0"
+      : "=q"(opcode)
+      : "m"(*(uint8_t *)context.eip));
+
+    switch (opcode) {
+    case 0xEC: /* inb */
+      context.eax = (context.eax & ~0xFF) | inb((uint16_t)context.edx);
+      break;
+    case 0xED: /* inl */
+      context.eax = inl((uint16_t)context.edx);
+      break;
+    case 0xEE: /* outb */
+      outb((uint16_t)context.edx, (uint8_t)context.eax);
+      break;
+    case 0xEF: /* outl */
+      outl((uint16_t)context.edx, context.eax);
+      break;
+    default:
+      halt();
+    }
+
+    /* Skip the faulting port I/O instruction that was emulated. */
+    context.eip++;
+  } else {
+    halt();
+  }
+}
+/*---------------------------------------------------------------------------*/
+void
+syscalls_int_init(void)
+{
+  tss_init();
+
+  SET_EXCEPTION_HANDLER(13, 1, gp_fault_handler);
+
+  /* Register system call dispatchers: */
+
+  idt_set_intr_gate_desc(PROT_DOMAINS_SYSCALL_DISPATCH_INT,
+                         (uint32_t)prot_domains_syscall_dispatcher,
+                         GDT_SEL_CODE_EXC,
+                         PRIV_LVL_USER);
+  idt_set_intr_gate_desc(PROT_DOMAINS_SYSRET_DISPATCH_INT,
+                         (uint32_t)prot_domains_sysret_dispatcher,
+                         GDT_SEL_CODE_EXC,
+                         PRIV_LVL_USER);
+}
+/*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/mm/syscalls-int.h b/cpu/x86/mm/syscalls-int.h
new file mode 100644
index 000000000..7ee4bcb36
--- /dev/null
+++ b/cpu/x86/mm/syscalls-int.h
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_MM_SYSCALLS_INT_H_
+#define CPU_X86_MM_SYSCALLS_INT_H_
+
+/** Software interrupt number for dispatching a system call */
+#define PROT_DOMAINS_SYSCALL_DISPATCH_INT 100
+/** Software interrupt number for returning from a system call */
+#define PROT_DOMAINS_SYSRET_DISPATCH_INT  101
+
+#if !__ASSEMBLER__
+
+#include <stdint.h>
+
+extern dom_id_t cur_dom;
+
+#define SYSCALLS_STUB_EPILOGUE(nm)                                            \
+  /* Load the system call identifier into EAX, as required by */              \
+  /* prot_domains_syscall_dispatcher: */                                      \
+  "  mov $" EXP_STRINGIFY(_syscall_ent_##nm) ", %eax\n\t"                     \
+  /* Check whether the server protection domain is already active: */         \
+  "  cmp %edx, cur_dom\n\t"                                                   \
+  /* If so, skip the system call dispatcher and directly invoke the */        \
+  /* system call body: */                                                     \
+  "  je _syscall_" #nm "\n\t"                                                 \
+  "  int $" EXP_STRINGIFY(PROT_DOMAINS_SYSCALL_DISPATCH_INT) "\n\t"
+
+#define SYSCALLS_STUB(nm)                                                     \
+  SYSCALLS_ALLOC_ENTRYPOINT(nm);                                              \
+  asm (                                                                       \
+    ".text\n\t"                                                               \
+    ".global " #nm "\n\t"                                                     \
+    #nm ":\n\t"                                                               \
+    /* First, load server protection domain ID into EDX, as required by */    \
+    /* prot_domains_syscall_dispatcher: */                                    \
+    /* Skip past return address on stack to obtain address of protection */   \
+    /* domain ID parameter: */                                                \
+    "  mov 4(%esp), %edx\n\t"                                                 \
+    SYSCALLS_STUB_EPILOGUE(nm))
+
+#define SYSCALLS_STUB_SINGLETON(nm, dcd)                                      \
+  SYSCALLS_ALLOC_ENTRYPOINT(nm);                                              \
+  asm (                                                                       \
+    ".text\n\t"                                                               \
+    ".global " #nm "\n\t"                                                     \
+    #nm ":\n\t"                                                               \
+    /* First, load server protection domain ID into EDX, as required by */    \
+    /* prot_domains_syscall_dispatcher: */                                    \
+    "  mov " #dcd ", %edx\n\t"                                                \
+    SYSCALLS_STUB_EPILOGUE(nm))
+
+void syscalls_int_init(void);
+
+void prot_domains_sysret_stub(void);
+
+/* Inter-privilege level interrupt stack with no error code. */
+typedef struct interrupt_stack {
+  uint32_t eip;
+  uint32_t cs;
+  uint32_t eflags;
+  uint32_t esp;
+  uint32_t ss;
+} interrupt_stack_t;
+
+#if 0
+/* Declaration only included for documentation purposes: */
+/**
+ * \brief         Switch to a different protection domain.
+ * \param from_id Origin protection domain.
+ * \param to_id   Destination protection domain.
+ * \return        Segment selector for kernel data access (only used for
+ *                multi-segment implementations).
+ */
+uint32_t prot_domains_switch(dom_id_t from_id,
+                             dom_id_t to_id,
+                             interrupt_stack_t *intr_stk);
+#endif
+
+#endif
+
+#endif /* CPU_X86_MM_SYSCALLS_INT_H_ */
diff --git a/cpu/x86/mm/syscalls.h b/cpu/x86/mm/syscalls.h
new file mode 100644
index 000000000..83be7a47e
--- /dev/null
+++ b/cpu/x86/mm/syscalls.h
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2015-2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_MM_SYSCALLS_H_
+#define CPU_X86_MM_SYSCALLS_H_
+
+#include "helpers.h"
+#include "prot-domains.h"
+
+typedef uint32_t dom_id_bitmap_t;
+
+typedef struct syscalls_entrypoint {
+  uintptr_t entrypoint;
+  dom_id_bitmap_t doms;
+} syscalls_entrypoint_t;
+extern syscalls_entrypoint_t syscalls_entrypoints[];
+extern syscalls_entrypoint_t syscalls_entrypoints_end[];
+
+#define SYSCALLS_ACTUAL_CNT (syscalls_entrypoints_end - syscalls_entrypoints)
+
+#if X86_CONF_PROT_DOMAINS != X86_CONF_PROT_DOMAINS__NONE
+
+#define SYSCALLS_ALLOC_ENTRYPOINT(nm)                                         \
+  syscalls_entrypoint_t __attribute__((section(".syscall_bss")))              \
+    _syscall_ent_##nm
+
+#define SYSCALLS_INIT(nm)                                                     \
+  _syscall_ent_##nm.entrypoint = (uintptr_t)_syscall_##nm;                    \
+  _syscall_ent_##nm.doms = 0
+
+#define SYSCALLS_DEFINE(nm, ...)                                              \
+  void _syscall_##nm(__VA_ARGS__);                                            \
+  SYSCALLS_STUB(nm);                                                          \
+  void _syscall_##nm(__VA_ARGS__)
+
+#define SYSCALLS_DEFINE_SINGLETON(nm, dcd, ...)                               \
+  void _syscall_##nm(__VA_ARGS__);                                            \
+  SYSCALLS_STUB_SINGLETON(nm, dcd);                                           \
+  void _syscall_##nm(__VA_ARGS__)
+
+#define SYSCALLS_AUTHZ(nm, drv) _syscall_ent_##nm.doms |= BIT((drv).dom_id)
+#define SYSCALLS_DEAUTHZ(nm, drv) _syscall_ent_##nm.doms &= ~BIT((drv).dom_id)
+
+/**
+ * Check that any untrusted pointer that could have been influenced by a caller
+ * (i.e. a stack parameter or global variable) refers to a location at or above
+ * a certain stack boundary and halt otherwise.  This is used to prevent a
+ * protection domain from calling a different protection domain and passing a
+ * pointer that references a location in the callee's stack other than its
+ * parameters.
+ *
+ * This also checks that the pointer is either within the stack region or the
+ * shared data region, which is important for preventing redirection of data
+ * accesses to MMIO or metadata regions.
+ *
+ * The pointer is both validated and copied to a new storage location, which
+ * must be within the callee's local stack region (excluding the parameter
+ * region).  This is to mitigate scenarios such as two pointers being validated
+ * and an adversary later inducing a write through one of the pointers to the
+ * other pointer to corrupt the latter pointer before it is used.
+ *
+ * The frame address is adjusted to account for the first word pushed on the
+ * local frame and the return address, since neither of those should ever be
+ * referenced by an incoming pointer.  In particular, if an incoming pointer
+ * references the return address, it could potentially redirect execution with
+ * the privileges of the callee protection domain.
+ */
+#define PROT_DOMAINS_VALIDATE_PTR(validated, untrusted, sz)                   \
+  validated = untrusted;                                                      \
+  if((((uintptr_t)(validated)) <                                              \
+      ((2 * sizeof(uintptr_t)) + (uintptr_t)__builtin_frame_address(0))) ||   \
+     (((uintptr_t)&_edata_addr) <= (((uintptr_t)(validated)) + (sz)))) {      \
+    halt();                                                                   \
+  }
+
+#else
+
+#define SYSCALLS_ALLOC_ENTRYPOINT(nm)
+#define SYSCALLS_INIT(nm)
+#define SYSCALLS_DEFINE(nm, ...) void nm(__VA_ARGS__)
+#define SYSCALLS_DEFINE_SINGLETON(nm, dcd, ...) void nm(__VA_ARGS__)
+#define SYSCALLS_AUTHZ(nm, drv)
+#define SYSCALLS_DEAUTHZ(nm, drv)
+#define PROT_DOMAINS_VALIDATE_PTR(validated, untrusted, sz) validated = untrusted
+
+#endif
+
+#endif /* CPU_X86_MM_SYSCALLS_H_ */
diff --git a/cpu/x86/mm/tss.c b/cpu/x86/mm/tss.c
new file mode 100644
index 000000000..c3628fa8a
--- /dev/null
+++ b/cpu/x86/mm/tss.c
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2015-2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+#include "gdt.h"
+#include "gdt-layout.h"
+#include "prot-domains.h"
+#include "segmentation.h"
+#include "stacks.h"
+#include "tss.h"
+
+/* System-wide TSS */
+tss_t ATTR_BSS_KERN sys_tss;
+
+static segment_desc_t ATTR_BSS_GDT sys_tss_desc;
+
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Initialize system-wide TSS.
+ */
+void
+tss_init(void)
+{
+  sys_tss.iomap_base = sizeof(sys_tss);
+  sys_tss.esp2 = ((uint32_t)stacks_int) + STACKS_SIZE_INT;
+  sys_tss.ss2 = GDT_SEL_STK_INT;
+  sys_tss.esp0 = ((uint32_t)stacks_exc) + STACKS_SIZE_EXC;
+  sys_tss.ss0 = GDT_SEL_STK_EXC;
+
+  segment_desc_init(&sys_tss_desc, (uint32_t)&sys_tss, sizeof(sys_tss),
+                    SEG_FLAG(DPL, PRIV_LVL_EXC) |
+                    SEG_DESCTYPE_SYS | SEG_TYPE_TSS32_AVAIL);
+
+  __asm__ __volatile__ (
+    "ltr %0"
+    :
+    : "r" ((uint16_t)GDT_SEL_OF_DESC(&sys_tss_desc, 0)));
+}
+/*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/mm/tss.h b/cpu/x86/mm/tss.h
new file mode 100644
index 000000000..e8431d388
--- /dev/null
+++ b/cpu/x86/mm/tss.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_MM_TSS_H_
+#define CPU_X86_MM_TSS_H_
+
+#include <stdint.h>
+
+/**
+ * Task State Segment.  Used by the CPU to manage switching between
+ * different protection domains (tasks).  The current task is referenced
+ * by the Task Register.  When the CPU switches away from a task due to
+ * a far call, etc., it updates the associated in-memory TSS with the
+ * current state of the task.  It then loads CPU state from the TSS for
+ * the new task.  See Intel Combined Manual, Vol. 3, Chapter 7 for more
+ * details.
+ */
+typedef struct tss {
+  uint32_t prev_tsk; /**< The selector of the task that called this one, if applicable */
+  uint32_t esp0;     /**< Stack pointer for ring 0 code in this task */
+  uint32_t ss0;      /**< Stack segment selector for ring 0 code in this task */
+  uint32_t esp1;     /**< Stack pointer for ring 1 code in this task */
+  uint32_t ss1;      /**< Stack segment selector for ring 1 code in this task */
+  uint32_t esp2;     /**< Stack pointer for ring 2 code in this task */
+  uint32_t ss2;      /**< Stack segment selector for ring 2 code in this task */
+  uint32_t cr3;      /**< CR3 for this task when paging is enabled */
+  uint32_t eip;      /**< Stored instruction pointer value */
+  uint32_t eflags;   /**< Settings for EFLAGS register */
+  /** General purpose register values */
+  uint32_t eax, ecx, edx, ebx, esp, ebp, esi, edi;
+  /** Segment register selector values */
+  uint32_t es, cs, ss, ds, fs, gs;
+  /** Selector for Local Descriptor Table */
+  uint32_t ldt;
+  /** Debug-related flag */
+  uint16_t t;
+  /** Offset from base of TSS to base of IO permission bitmap, if one is installed */
+  uint16_t iomap_base;
+} tss_t;
+
+void tss_init(void);
+
+#endif /* CPU_X86_TSS_H_ */
diff --git a/cpu/x86/quarkX1000.ld b/cpu/x86/quarkX1000.ld
index a7f2c2555..2f90b7c70 100644
--- a/cpu/x86/quarkX1000.ld
+++ b/cpu/x86/quarkX1000.ld
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, Intel Corporation. All rights reserved.
+ * Copyright (C) 2015-2016, Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -55,6 +55,7 @@ SECTIONS {
     .text ALIGN (32) :
     {
         KEEP(*(.multiboot))
+        *(.boot_text)
         *(.text*)
     }
 
@@ -75,6 +76,15 @@ SECTIONS {
     .bss ALIGN (32) :
     {
         *(COMMON)
+        *(.main_stack)
         *(.bss*)
+
+        *(.gdt_bss_start)
+        /*
+           The other GDT-related sections defined in gdt.h are only used when
+           protection domain support is enabled.  Thus, they do not need to be
+           included here.
+        */
+        _ebss_gdt_addr = .;
     }
 }
diff --git a/cpu/x86/quarkX1000_dma.ld b/cpu/x86/quarkX1000_dma.ld
index 71ebd04b1..fe3b79861 100644
--- a/cpu/x86/quarkX1000_dma.ld
+++ b/cpu/x86/quarkX1000_dma.ld
@@ -37,8 +37,12 @@ SECTIONS {
        Using 1K-alignment perturbs the symbols, hindering debugging.  Thus,
        this section is simply padded out to the desired alignment and
        declared to have a section alignment of only 32 bytes.
+
+       The alignment directives used here suffice even when paging is in use,
+       because this is the last section and directly follows one (.bss.meta)
+       that is 4K-aligned.
     */
-    .bss.dma ALIGN (32) (NOLOAD) :
+    .bss.dma (NOLOAD) : ALIGN (32)
     {
         /* The IMR feature operates at 1K granularity. */
         . = ALIGN(1K);
diff --git a/cpu/x86/quarkX1000_paging.ld b/cpu/x86/quarkX1000_paging.ld
new file mode 100644
index 000000000..0352cbf64
--- /dev/null
+++ b/cpu/x86/quarkX1000_paging.ld
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2015-2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+OUTPUT_FORMAT("elf32-i386")
+
+ENTRY(start)
+
+SECTIONS {
+    /*
+       OS-Dev Wiki says it is common for kernels to start at 1M. Addresses before that
+       are used by BIOS/EFI, the bootloader and memory-mapped I/O.
+
+       The UEFI GenFw program inserts a 0x220-byte offset between the image base and
+       the .text section.  We add that same offset here to align the symbols in the
+       UEFI DLL with those in the final UEFI binary to make debugging easier.
+    */
+    . = 1M + 0x220;
+
+    .text.boot : ALIGN (32)
+    {
+        *(.multiboot)
+        *(.boot_text)
+
+        /*
+           Fill out the section to the next 4K boundary so that the UEFI GenFw
+           program does not shift the following .text section forward into the
+           gap and perturb the symbols.  This only works if the size of this
+           section is less than 4K - 0x220 bytes.
+        */
+        . = 4K - 0x220;
+    }
+
+    /*
+       It is actually desired that each of the following sections be page-
+       aligned.  However, the UEFI GenFw program ratchets up its alignment
+       granularity to the maximum granularity discovered in its input file.
+       Using page-alignment perturbs the symbols, hindering debugging.  Thus,
+       this file simply pads each section out to the desired page alignment and
+       declares a section alignment granularity of 32 bytes.
+    */
+
+    .text : ALIGN (32)
+    {
+        *(.text*)
+
+        . = ALIGN(4K);
+    }
+
+    _stext_addr = ADDR(.text);
+    _etext_addr = ADDR(.text) + SIZEOF(.text);
+
+    .data.stack : ALIGN (32)
+    {
+        /*
+           Introduce a guard band page before the stacks to facilitate stack
+           overflow detection.  This approach wastes a page of memory for each
+           guard band, but has the advantage of enabling an identity mapping
+           for all linear to physical addresses except those in the MMIO
+           regions.  The guard bands are marked not-present in the page tables
+           to facilitate stack overflow detection.
+
+           This padding must be placed inside of the section, or else it will
+           get dropped when the UEFI GenFw program generates the UEFI binary.
+        */
+        . += 4K;
+
+        /*
+           Place the main stack first so that an overflow is detected and does
+           not overwrite the interrupt or supervisor stacks.  Usage of the
+           interrupt and stack is predictable, since it is only used by short
+           trampoline code sequences that quickly pivot to the main stack.
+        */
+        *(.main_stack)
+        *(.int_stack)
+        *(.exc_stack)
+
+        /*
+           The combined sizes of the stacks is an even multiple of 4K, so there
+           is no need to align the location counter here.
+        */
+
+       /*
+           Introduce a guard band page after the stacks to detect stack underflow.
+           Note that an underflow that only affects the interrupt and supervisor
+           stacks will not generate a page fault.  Detecting such conditions by
+           placing the interrupt and supervisor stacks on separate pages would
+           substantially increase memory usage.
+        */
+        . += 4K;
+    }
+
+    .data : ALIGN (32)
+    {
+        /*
+           The UEFI GenFw program treats all sections that are alloc and read-
+           only as code sections.  By that criteria, .rodata would be a code
+           section, but making such data executable is undesirable.  Thus, this
+           script lumps in .rodata with other data.  It may be desirable in the
+           future to actually write-protect this data.
+        */
+        *(.rodata*)
+        *(.data*)
+
+        /*
+           These could also be treated as read-only data to prevent tampering
+           from the user privilege level.
+        */
+        _sdata_shared_isr = .;
+        KEEP(*(.shared_isr_data*))
+        _edata_shared_isr = .;
+
+        . = ALIGN(4K);
+    }
+
+    .bss : ALIGN (32)
+    {
+        *(COMMON)
+        *(.bss*)
+
+        . = ALIGN(4K);
+    }
+
+    _sdata_addr = ADDR(.data);
+    _edata_addr = ADDR(.bss) + SIZEOF(.bss);
+
+    .bss.kern (NOLOAD) : ALIGN (32)
+    {
+        /*
+           Page-aligned data is output first.
+           It is infeasible to apply a page-alignment attribute to them in the
+           source code, because that increases the alignment of this section to
+           be page-aligned, which causes problems when generating a UEFI binary
+           as described above.
+        */
+        *(.page_aligned_kern_bss)
+        *(.kern_bss)
+
+        syscalls_entrypoints = .;
+        *(.syscall_bss)
+        syscalls_entrypoints_end = .;
+
+        . = ALIGN(4K);
+    }
+
+    _ebss_syscall_addr = ADDR(.bss.kern) + SIZEOF(.bss.kern);
+
+    .bss.kern_priv (NOLOAD) : ALIGN (32)
+    {
+        prot_domains_kern_data = .;
+        /*
+            The kernel and app protection domain control structures must always
+            be placed in the first two slots in this order, so that they have
+            well-known protection domain IDs:
+         */
+        *(.kern_prot_dom_bss)
+        *(.app_prot_dom_bss)
+        *(.prot_dom_bss)
+        prot_domains_kern_data_end = .;
+
+        *(.gdt_bss_start)
+        *(.gdt_bss_mid)
+        *(.gdt_bss)
+        _ebss_gdt_addr = .;
+
+        . = ALIGN(4K);
+    }
+
+    _sbss_kern_addr = ADDR(.bss.kern);
+    _ebss_kern_addr = ADDR(.bss.kern_priv) + SIZEOF(.bss.kern_priv);
+
+    .bss.meta (NOLOAD) : ALIGN (32)
+    {
+        *(.meta_bss)
+
+        . = ALIGN(4K);
+    }
+}
diff --git a/cpu/x86/uefi/bootstrap_uefi.c b/cpu/x86/uefi/bootstrap_uefi.c
index f6981eb96..5ef778cca 100644
--- a/cpu/x86/uefi/bootstrap_uefi.c
+++ b/cpu/x86/uefi/bootstrap_uefi.c
@@ -35,7 +35,12 @@
 
 void start(void);
 
-EFI_STATUS EFIAPI
+/* The section attribute below is copied from ATTR_BOOT_CODE in prot-domains.h.
+ * prot-domains.h includes stdlib.h which defines NULL.  The UEFI headers also
+ * define NULL, which induces a warning when the compiler detects the conflict.
+ * To avoid that, we avoid including prot-domains.h from this file.
+ */
+EFI_STATUS EFIAPI __attribute__((section(".boot_text")))
 uefi_start(IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable)
 {
   EFI_MEMORY_DESCRIPTOR mem_map[MAX_MEM_DESC];
diff --git a/examples/galileo/Makefile b/examples/galileo/Makefile
index 94a327bfd..bc7b071ff 100644
--- a/examples/galileo/Makefile
+++ b/examples/galileo/Makefile
@@ -8,6 +8,10 @@ ifeq ($(filter $(EXAMPLE),$(KNOWN_EXAMPLES)),)
     $(error Unable to proceed)
 endif
 
+ifeq ($(EXAMPLE),print-imr)
+    CFLAGS += -DDBG_IMRS
+endif
+
 CONTIKI_PROJECT = $(EXAMPLE)
 
 all: $(CONTIKI_PROJECT)
diff --git a/platform/galileo/README.md b/platform/galileo/README.md
index 89e6f5711..e441876db 100644
--- a/platform/galileo/README.md
+++ b/platform/galileo/README.md
@@ -44,6 +44,9 @@ Standard APIs:
   * Stdio library (stdout and stderr only). Console output through UART 1
     device (connected to Galileo Gen2 FTDI header)
 
+Optional support for protection domains is also implemented and is
+described in cpu/x86/mm/README.md.
+
 Building
 --------
 
diff --git a/platform/galileo/contiki-main.c b/platform/galileo/contiki-main.c
index 42568d90a..7b31a9961 100644
--- a/platform/galileo/contiki-main.c
+++ b/platform/galileo/contiki-main.c
@@ -33,12 +33,17 @@
 #include "contiki.h"
 #include "contiki-net.h"
 #include "cpu.h"
+#include "eth.h"
 #include "eth-conf.h"
 #include "galileo-pinmux.h"
 #include "gpio.h"
+#include "helpers.h"
 #include "i2c.h"
 #include "imr-conf.h"
 #include "interrupt.h"
+#include "irq.h"
+#include "pci.h"
+#include "prot-domains.h"
 #include "shared-isr.h"
 #include "uart.h"
 
@@ -49,31 +54,12 @@ PROCINIT(  &etimer_process
 #endif
          );
 
-int
-main(void)
+/*---------------------------------------------------------------------------*/
+void
+app_main(void)
 {
-  cpu_init();
-#ifdef X86_CONF_RESTRICT_DMA
-  quarkX1000_imr_conf();
-#endif
-  /* Initialize UART connected to Galileo Gen2 FTDI header */
-  quarkX1000_uart_init(QUARK_X1000_UART_1);
-  clock_init();
-  rtimer_init();
-
   printf("Starting Contiki\n");
 
-  quarkX1000_i2c_init();
-  quarkX1000_i2c_configure(QUARKX1000_I2C_SPEED_STANDARD,
-                           QUARKX1000_I2C_ADDR_MODE_7BIT);
-  /* use default pinmux configuration */
-  if(galileo_pinmux_initialize() < 0) {
-    fprintf(stderr, "Failed to initialize pinmux\n");
-  }
-  quarkX1000_gpio_init();
-
-  ENABLE_IRQ();
-
   process_init();
   procinit_init();
   ctimer_init();
@@ -81,11 +67,45 @@ main(void)
 
   eth_init();
 
-  shared_isr_init();
-
   while(1) {
     process_run();
   }
 
+  halt();
+}
+/*---------------------------------------------------------------------------*/
+/* Kernel entrypoint */
+int
+main(void)
+{
+#ifdef X86_CONF_RESTRICT_DMA
+  quarkX1000_imr_conf();
+#endif
+  irq_init();
+  /* Initialize UART connected to Galileo Gen2 FTDI header */
+  quarkX1000_uart_init(QUARK_X1000_UART_1);
+  clock_init();
+  rtimer_init();
+
+  pci_root_complex_init();
+  quarkX1000_eth_init();
+  quarkX1000_i2c_init();
+  quarkX1000_i2c_configure(QUARKX1000_I2C_SPEED_STANDARD,
+                           QUARKX1000_I2C_ADDR_MODE_7BIT);
+  /* use default pinmux configuration */
+  if(galileo_pinmux_initialize() < 0) {
+    fprintf(stderr, "Failed to initialize pinmux\n");
+  }
+  quarkX1000_gpio_init();
+  shared_isr_init();
+
+  /* The ability to remap interrupts is not needed after this point and should
+   * thus be disabled according to the principle of least privilege.
+   */
+  pci_root_complex_lock();
+
+  prot_domains_leave_main();
+
   return 0;
 }
+/*---------------------------------------------------------------------------*/
diff --git a/platform/galileo/net/eth-conf.c b/platform/galileo/net/eth-conf.c
index ff3a771bf..061e0aae7 100644
--- a/platform/galileo/net/eth-conf.c
+++ b/platform/galileo/net/eth-conf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, Intel Corporation. All rights reserved.
+ * Copyright (C) 2015-2016, Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,7 +29,6 @@
  */
 
 #include "eth-conf.h"
-#include "eth.h"
 #include "net/eth-proc.h"
 #include "contiki-net.h"
 #include "net/linkaddr.h"
@@ -45,6 +44,7 @@ const linkaddr_t linkaddr_null = { { 0, 0, 0, 0, 0, 0 } };
 #define NAMESERVER_IP   GATEWAY_IP
 #endif
 
+/*---------------------------------------------------------------------------*/
 void
 eth_init(void)
 {
@@ -69,7 +69,6 @@ eth_init(void)
 #endif
 #endif
 
-  quarkX1000_eth_init();
-
   process_start(&eth_process, NULL);
 }
+/*---------------------------------------------------------------------------*/

From fb6e6d9ea3ae763c8a3a60a0bb868732a7d5be0c Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Tue, 22 Mar 2016 18:51:05 +0100
Subject: [PATCH 100/393] macros for MAC timer

---
 cpu/cc2538/dev/cc2538-rf.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/cpu/cc2538/dev/cc2538-rf.h b/cpu/cc2538/dev/cc2538-rf.h
index 5edb478ba..287147a92 100644
--- a/cpu/cc2538/dev/cc2538-rf.h
+++ b/cpu/cc2538/dev/cc2538-rf.h
@@ -129,6 +129,15 @@
   REG(RFCORE_SFR_RFST) = CC2538_RF_CSP_OP_ISFLUSHTX; \
   REG(RFCORE_SFR_RFST) = CC2538_RF_CSP_OP_ISFLUSHTX; \
 } while(0)
+/*---------------------------------------------------------------------------
+ * MAC timer
+ *---------------------------------------------------------------------------*/
+/* Timer conversion */
+#define RADIO_TO_RTIMER(X) ((X) * RTIMER_ARCH_SECOND / SYS_CTRL_32MHZ)
+
+#define CLOCK_STABLE() do {															\
+			while ( !(REG(SYS_CTRL_CLOCK_STA) & (SYS_CTRL_CLOCK_STA_XOSC_STB)));	\
+		} while(0)
 /*---------------------------------------------------------------------------*/
 /** The NETSTACK data structure for the cc2538 RF driver */
 extern const struct radio_driver cc2538_rf_driver;

From a4f575b8f03fca1f297409598fad1c5e05fea0a7 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Wed, 23 Mar 2016 09:08:54 +0100
Subject: [PATCH 101/393] use MAC timer instead of SFD interrupt

---
 cpu/cc2538/dev/cc2538-rf.c | 65 ++++++++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 20 deletions(-)

diff --git a/cpu/cc2538/dev/cc2538-rf.c b/cpu/cc2538/dev/cc2538-rf.c
index a07108e8b..0ecf7cb59 100644
--- a/cpu/cc2538/dev/cc2538-rf.c
+++ b/cpu/cc2538/dev/cc2538-rf.c
@@ -120,16 +120,15 @@ static const uint8_t magic[] = { 0x53, 0x6E, 0x69, 0x66 };      /** Snif */
 #define CC2538_RF_AUTOACK 1
 #endif
 /*---------------------------------------------------------------------------*/
-#if CC2538_RF_CONF_SFD_TIMESTAMPS
-static rtimer_clock_t volatile cc2538_sfd_rtime;
-#endif
-
 /* Are we currently in poll mode? Disabled by default */
 static uint8_t volatile poll_mode = 0;
 /* Do we perform a CCA before sending? Enabled by default. */
 static uint8_t send_on_cca = 1;
 static int8_t rssi;
 static uint8_t crc_corr;
+
+void mac_timer_init(void);
+uint32_t get_sfd_timestamp(void);
 /*---------------------------------------------------------------------------*/
 static uint8_t rf_flags;
 static uint8_t rf_channel = CC2538_RF_CHANNEL;
@@ -347,13 +346,14 @@ set_poll_mode(uint8_t enable)
   if(enable) {
     REG(RFCORE_XREG_RFIRQM0) &= ~RFCORE_XREG_RFIRQM0_FIFOP;	// mask out FIFOP interrupt source
     REG(RFCORE_SFR_RFIRQF0) &= ~RFCORE_SFR_RFIRQF0_FIFOP;	// clear pending FIFOP interrupt
-    REG(RFCORE_XREG_RFIRQM0) |= RFCORE_XREG_RFIRQM0_SFD;	// enable SFD interrupt source
+    REG(RFCORE_XREG_RFIRQM0) &= ~RFCORE_XREG_RFIRQM0_SFD;	// disable SFD interrupt source
+    nvic_interrupt_disable(NVIC_INT_RF_RXTX);
   } else {
     REG(RFCORE_XREG_RFIRQM0) |= RFCORE_XREG_RFIRQM0_FIFOP;	// enable FIFOP interrupt source
-    REG(RFCORE_XREG_RFIRQM0) &= ~RFCORE_XREG_RFIRQM0_SFD;	// mask out SFD interrupt source
-    REG(RFCORE_SFR_RFIRQF0) &= ~RFCORE_SFR_RFIRQF0_SFD;		// clear pending SFD interrupt
+    REG(RFCORE_XREG_RFIRQM0) &= ~RFCORE_XREG_RFIRQM0_SFD;   // mask out SFD interrupt source
+    REG(RFCORE_SFR_RFIRQF0) &= ~RFCORE_SFR_RFIRQF0_SFD;	    // clear pending SFD interrupt
+    nvic_interrupt_enable(NVIC_INT_RF_RXTX);			    // enable RF interrupts
   }
-  nvic_interrupt_enable(NVIC_INT_RF_RXTX);			        // enable RF interrupts
 }
 /*---------------------------------------------------------------------------*/
 static void
@@ -521,6 +521,8 @@ init(void)
     udma_set_channel_src(CC2538_RF_CONF_RX_DMA_CHAN, RFCORE_SFR_RFDATA);
   }
   
+  mac_timer_init();
+  
   set_poll_mode(poll_mode);
 
   process_start(&cc2538_rf_process, NULL);
@@ -956,15 +958,11 @@ get_object(radio_param_t param, void *dest, size_t size)
   }
   
   if(param == RADIO_PARAM_LAST_PACKET_TIMESTAMP) {
-#if CC2538_RF_CONF_SFD_TIMESTAMPS
     if(size != sizeof(rtimer_clock_t) || !dest) {
       return RADIO_RESULT_INVALID_VALUE;
     }
     *(rtimer_clock_t*)dest = cc2538_sfd_rtime;
     return RADIO_RESULT_OK;
-#else
-    return RADIO_RESULT_NOT_SUPPORTED;
-#endif
   }
   
   return RADIO_RESULT_NOT_SUPPORTED;
@@ -1071,14 +1069,6 @@ cc2538_rf_rx_tx_isr(void)
 {
   ENERGEST_ON(ENERGEST_TYPE_IRQ);
   
-#if CC2538_RF_CONF_SFD_TIMESTAMPS
-  if(poll_mode) {
-    if(REG(RFCORE_XREG_FSMSTAT1) & RFCORE_XREG_FSMSTAT1_RX_ACTIVE) {
-      cc2538_sfd_rtime = RTIMER_NOW();
-    }
-  }
-#endif
-
   if(!poll_mode) {
     process_poll(&cc2538_rf_process);
   }
@@ -1130,4 +1120,39 @@ cc2538_rf_set_promiscous_mode(char p)
   set_frame_filtering(p);
 }
 /*---------------------------------------------------------------------------*/
+uint32_t get_sfd_timestamp(void)
+{
+  uint32_t sfd, timer_val;
+
+  REG(RFCORE_SFR_MTMSEL) = (REG(RFCORE_SFR_MTMSEL) & ~RFCORE_SFR_MTMSEL_MTMSEL) | 0x00000000;
+  REG(RFCORE_SFR_MTCTRL) |= RFCORE_SFR_MTCTRL_LATCH_MODE;
+  timer_val = REG(RFCORE_SFR_MTM0) & RFCORE_SFR_MTM0_MTM0;
+  timer_val |= ((REG(RFCORE_SFR_MTM1) & RFCORE_SFR_MTM1_MTM1) << 8);
+  REG(RFCORE_SFR_MTMSEL) = (REG(RFCORE_SFR_MTMSEL) & ~RFCORE_SFR_MTMSEL_MTMOVFSEL) | 0x00000000;
+  timer_val |= ((REG(RFCORE_SFR_MTMOVF0) & RFCORE_SFR_MTMOVF0_MTMOVF0) << 16);
+  timer_val |= ((REG(RFCORE_SFR_MTMOVF1) & RFCORE_SFR_MTMOVF1_MTMOVF1) << 24);
+
+  REG(RFCORE_SFR_MTMSEL) = (REG(RFCORE_SFR_MTMSEL) & ~RFCORE_SFR_MTMSEL_MTMSEL) | 0x00000001;
+  REG(RFCORE_SFR_MTCTRL) |= RFCORE_SFR_MTCTRL_LATCH_MODE;
+  sfd = REG(RFCORE_SFR_MTM0) & RFCORE_SFR_MTM0_MTM0;
+  sfd |= ((REG(RFCORE_SFR_MTM1) & RFCORE_SFR_MTM1_MTM1) << 8);
+  REG(RFCORE_SFR_MTMSEL) = (REG(RFCORE_SFR_MTMSEL) & ~RFCORE_SFR_MTMSEL_MTMOVFSEL) | 0x00000010;
+  sfd |= ((REG(RFCORE_SFR_MTMOVF0) & RFCORE_SFR_MTMOVF0_MTMOVF0) << 16);
+  sfd |= ((REG(RFCORE_SFR_MTMOVF1) & RFCORE_SFR_MTMOVF1_MTMOVF1) << 24);
+
+  return (RTIMER_NOW() - RADIO_TO_RTIMER(timer_val - sfd));
+}
+/*---------------------------------------------------------------------------*/
+void mac_timer_init(void)
+{
+  CLOCK_STABLE();
+  REG(RFCORE_SFR_MTCTRL) |= RFCORE_SFR_MTCTRL_SYNC;
+  REG(RFCORE_SFR_MTCTRL) |= RFCORE_SFR_MTCTRL_RUN;
+  while(!(REG(RFCORE_SFR_MTCTRL) & RFCORE_SFR_MTCTRL_STATE));
+  REG(RFCORE_SFR_MTCTRL) &= ~RFCORE_SFR_MTCTRL_RUN;
+  while(REG(RFCORE_SFR_MTCTRL) & RFCORE_SFR_MTCTRL_STATE);
+  REG(RFCORE_SFR_MTCTRL) |= (RFCORE_SFR_MTCTRL_RUN | RFCORE_SFR_MTCTRL_SYNC);
+  while(!(REG(RFCORE_SFR_MTCTRL) & RFCORE_SFR_MTCTRL_STATE));
+}
+/*---------------------------------------------------------------------------*/
 /** @} */

From 199b1b531649b6276d07c96aaf13e4bab1f9e444 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Wed, 23 Mar 2016 09:10:19 +0100
Subject: [PATCH 102/393] remove define for SFD interrupt

not needed anymore when using MAC timer
---
 examples/ipv6/rpl-tsch/project-conf.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/examples/ipv6/rpl-tsch/project-conf.h b/examples/ipv6/rpl-tsch/project-conf.h
index 71a8e5425..81f7a01b6 100644
--- a/examples/ipv6/rpl-tsch/project-conf.h
+++ b/examples/ipv6/rpl-tsch/project-conf.h
@@ -67,10 +67,6 @@
 #define TSCH_CALLBACK_JOINING_NETWORK tsch_rpl_callback_joining_network
 #define TSCH_CALLBACK_LEAVING_NETWORK tsch_rpl_callback_leaving_network
 
-/* Needed for cc2538 platform only */
-/* Enable SFD timestamp (uses SFD interrupt) */
-#undef CC2538_RF_CONF_SFD_TIMESTAMPS
-#define CC2538_RF_CONF_SFD_TIMESTAMPS		1
 /* For TSCH we have to use the more accurate crystal oscillator
  * by default the RC oscillator is activated */
 #undef SYS_CTRL_CONF_OSC32K_USE_XTAL

From 4e446bc178c82b60ebc5fc6882f2ff52c0df6cca Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Wed, 23 Mar 2016 10:16:06 +0100
Subject: [PATCH 103/393] fix error

---
 cpu/cc2538/dev/cc2538-rf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpu/cc2538/dev/cc2538-rf.c b/cpu/cc2538/dev/cc2538-rf.c
index 0ecf7cb59..a9ea369d6 100644
--- a/cpu/cc2538/dev/cc2538-rf.c
+++ b/cpu/cc2538/dev/cc2538-rf.c
@@ -961,7 +961,7 @@ get_object(radio_param_t param, void *dest, size_t size)
     if(size != sizeof(rtimer_clock_t) || !dest) {
       return RADIO_RESULT_INVALID_VALUE;
     }
-    *(rtimer_clock_t*)dest = cc2538_sfd_rtime;
+    *(rtimer_clock_t*)dest = get_sfd_timestamp();
     return RADIO_RESULT_OK;
   }
   

From 946be772484697897af2ec5266f5d3cd1a2473eb Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Wed, 19 Aug 2015 15:50:20 +0200
Subject: [PATCH 104/393] Added support for end-to-end DAO ACK for Contiki RPL.
 This is a fix for Contiki RPL so that it fully supports DAO ACK in an
 end-to-end fashion. When DAO is sent it will be forwarded upwards as before.
 DAO ACK will be forwarded downwards until it reach the node that initiated
 the DAO ACK and unlike before it is not a single-hop DAO ACK but it is fully
 reaching the RPL ROOT before any DAO ACK is sent back. DAO ACK also now fully
 support different status messages (success / fail).

---
 core/net/ipv6/uip-ds6-route.h |  37 ++++-
 core/net/rpl/rpl-conf.h       |  10 ++
 core/net/rpl/rpl-dag.c        |   2 +-
 core/net/rpl/rpl-icmp6.c      | 256 +++++++++++++++++++++++++++++++---
 core/net/rpl/rpl-mrhof.c      |  16 +++
 core/net/rpl/rpl-of0.c        |   1 +
 core/net/rpl/rpl-private.h    |  12 +-
 core/net/rpl/rpl.c            |   2 +-
 core/net/rpl/rpl.h            |   7 +
 9 files changed, 316 insertions(+), 27 deletions(-)

diff --git a/core/net/ipv6/uip-ds6-route.h b/core/net/ipv6/uip-ds6-route.h
index 342bfeffa..8df18796b 100644
--- a/core/net/ipv6/uip-ds6-route.h
+++ b/core/net/ipv6/uip-ds6-route.h
@@ -97,11 +97,42 @@ void uip_ds6_notification_rm(struct uip_ds6_notification *n);
 #ifndef UIP_DS6_ROUTE_STATE_TYPE
 #define UIP_DS6_ROUTE_STATE_TYPE rpl_route_entry_t
 /* Needed for the extended route entry state when using ContikiRPL */
+#define RPL_ROUTE_ENTRY_NOPATH_RECEIVED   0x01
+#define RPL_ROUTE_ENTRY_DAO_PENDING       0x02
+#define RPL_ROUTE_ENTRY_DAO_NACK          0x04
+
+#define RPL_ROUTE_IS_NOPATH_RECEIVED(route)                             \
+  (((route)->state.state_flags & RPL_ROUTE_ENTRY_NOPATH_RECEIVED) != 0)
+#define RPL_ROUTE_SET_NOPATH_RECEIVED(route) do {                       \
+    (route)->state.state_flags |= RPL_ROUTE_ENTRY_NOPATH_RECEIVED;      \
+  } while(0)
+
+#define RPL_ROUTE_IS_DAO_PENDING(route)                                 \
+  ((route->state.state_flags & RPL_ROUTE_ENTRY_DAO_PENDING) != 0)
+#define RPL_ROUTE_SET_DAO_PENDING(route) do {                           \
+    (route)->state.state_flags |= RPL_ROUTE_ENTRY_DAO_PENDING;          \
+  } while(0)
+#define RPL_ROUTE_CLEAR_DAO_PENDING(route) do {                         \
+    (route)->state.state_flags &= ~RPL_ROUTE_ENTRY_DAO_PENDING;         \
+  } while(0)
+
+#define RPL_ROUTE_IS_DAO_NACKED(route)                                  \
+  ((route->state.state_flags & RPL_ROUTE_ENTRY_DAO_NACK) != 0)
+#define RPL_ROUTE_SET_DAO_NACKED(route) do {                            \
+    (route)->state.state_flags |= RPL_ROUTE_ENTRY_DAO_NACK;             \
+  } while(0)
+
+#define RPL_ROUTE_CLEAR_DAO(route) do {                                 \
+    (route)->state.state_flags &= ~(RPL_ROUTE_ENTRY_DAO_NACK|RPL_ROUTE_ENTRY_DAO_PENDING); \
+  } while(0)
+
+struct rpl_dag;
 typedef struct rpl_route_entry {
   uint32_t lifetime;
-  void *dag;
-  uint8_t learned_from;
-  uint8_t nopath_received;
+  struct rpl_dag *dag;
+  uint8_t dao_seqno_out;
+  uint8_t dao_seqno_in;
+  uint8_t state_flags;
 } rpl_route_entry_t;
 #endif /* UIP_DS6_ROUTE_STATE_TYPE */
 
diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h
index 5511b8289..2ff9fbf91 100644
--- a/core/net/rpl/rpl-conf.h
+++ b/core/net/rpl/rpl-conf.h
@@ -235,6 +235,16 @@
 #define RPL_INSERT_HBH_OPTION       1
 #endif
 
+/*
+ * RPL DAO ACK support. When enabled, DAO ACK will be sent and requested.
+ * This will also enable retransmission of DAO when no ack is received.
+ * */
+#ifdef RPL_CONF_WITH_DAO_ACK
+#define RPL_WITH_DAO_ACK RPL_CONF_WITH_DAO_ACK
+#else
+#define RPL_WITH_DAO_ACK 1
+#endif /* RPL_CONF_WITH_DAO_ACK */
+
 /*
  * RPL probing. When enabled, probes will be sent periodically to keep
  * parent link estimates up to date.
diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index 27a534b09..04c64a50d 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -1028,7 +1028,7 @@ rpl_join_instance(uip_ipaddr_t *from, rpl_dio_t *dio)
   rpl_set_default_route(instance, from);
 
   if(instance->mop != RPL_MOP_NO_DOWNWARD_ROUTES) {
-    rpl_schedule_dao(instance);
+    rpl_schedule_dao_immediately(instance);
   } else {
     PRINTF("RPL: The DIO does not meet the prerequisites for sending a DAO\n");
   }
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 14de349fe..e1ac899ba 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -76,6 +76,9 @@ static void dio_input(void);
 static void dao_input(void);
 static void dao_ack_input(void);
 
+static void dao_output_target_seq(rpl_parent_t *parent, uip_ipaddr_t *prefix,
+				  uint8_t lifetime, uint8_t seq_no);
+
 /* some debug callbacks useful when debugging RPL networks */
 #ifdef RPL_DEBUG_DIO_INPUT
 void RPL_DEBUG_DIO_INPUT(uip_ipaddr_t *, rpl_dio_t *);
@@ -85,6 +88,7 @@ void RPL_DEBUG_DIO_INPUT(uip_ipaddr_t *, rpl_dio_t *);
 void RPL_DEBUG_DAO_OUTPUT(rpl_parent_t *);
 #endif
 
+/* TODO: should these variables be a part of the instance? */
 static uint8_t dao_sequence = RPL_LOLLIPOP_INIT;
 
 extern rpl_of_t RPL_OF;
@@ -99,6 +103,37 @@ UIP_ICMP6_HANDLER(dio_handler, ICMP6_RPL, RPL_CODE_DIO, dio_input);
 UIP_ICMP6_HANDLER(dao_handler, ICMP6_RPL, RPL_CODE_DAO, dao_input);
 UIP_ICMP6_HANDLER(dao_ack_handler, ICMP6_RPL, RPL_CODE_DAO_ACK, dao_ack_input);
 /*---------------------------------------------------------------------------*/
+#if RPL_WITH_DAO_ACK
+static uip_ds6_route_t *
+find_route_entry_by_dao_ack(uint8_t seq)
+{
+  uip_ds6_route_t *re;
+  re = uip_ds6_route_head();
+  while(re != NULL) {
+    if(re->state.dao_seqno_out == seq && RPL_ROUTE_IS_DAO_PENDING(re)) {
+      /* found it! */
+      return re;
+    }
+    re = uip_ds6_route_next(re);
+  }
+  return NULL;
+}
+#endif /* RPL_WITH_DAO_ACK */
+
+/* prepare for forwarding of DAO */
+static uint8_t
+prepare_for_dao_fwd(uint8_t sequence, uip_ds6_route_t *rep)
+{
+  /* not pending - or pending but not a retransmission */
+  RPL_LOLLIPOP_INCREMENT(dao_sequence);
+
+  /* set DAO pending and sequence numbers */
+  rep->state.dao_seqno_in = sequence;
+  rep->state.dao_seqno_out = dao_sequence;
+  RPL_ROUTE_SET_DAO_PENDING(rep);
+  return dao_sequence;
+}
+/*---------------------------------------------------------------------------*/
 static int
 get_global_addr(uip_ipaddr_t *addr)
 {
@@ -723,28 +758,37 @@ dao_input(void)
     PRINTF("RPL: No-Path DAO received\n");
     /* No-Path DAO received; invoke the route purging routine. */
     if(rep != NULL &&
-       rep->state.nopath_received == 0 &&
+       !RPL_ROUTE_IS_NOPATH_RECEIVED(rep) &&
        rep->length == prefixlen &&
        uip_ds6_route_nexthop(rep) != NULL &&
        uip_ipaddr_cmp(uip_ds6_route_nexthop(rep), &dao_sender_addr)) {
       PRINTF("RPL: Setting expiration timer for prefix ");
       PRINT6ADDR(&prefix);
       PRINTF("\n");
-      rep->state.nopath_received = 1;
+      RPL_ROUTE_SET_NOPATH_RECEIVED(rep);
       rep->state.lifetime = RPL_NOPATH_REMOVAL_DELAY;
 
       /* We forward the incoming No-Path DAO to our parent, if we have
          one. */
       if(dag->preferred_parent != NULL &&
          rpl_get_parent_ipaddr(dag->preferred_parent) != NULL) {
-        PRINTF("RPL: Forwarding No-Path DAO to parent ");
+        uint8_t out_seq;
+        out_seq = prepare_for_dao_fwd(sequence, rep);
+
+        PRINTF("RPL: Forwarding no-path DAO to parent - out_seq:%d",
+	       out_seq);
         PRINT6ADDR(rpl_get_parent_ipaddr(dag->preferred_parent));
         PRINTF("\n");
+
+        buffer = UIP_ICMP_PAYLOAD;
+        buffer[3] = out_seq; /* add an outgoing seq no before fwd */
         uip_icmp6_send(rpl_get_parent_ipaddr(dag->preferred_parent),
                        ICMP6_RPL, RPL_CODE_DAO, buffer_length);
       }
       if(flags & RPL_DAO_K_FLAG) {
-        dao_ack_output(instance, &dao_sender_addr, sequence);
+        /* indicate that we accepted the no-path DAO */
+        dao_ack_output(instance, &dao_sender_addr, sequence,
+               RPL_DAO_ACK_UNCONDITIONAL_ACCEPT);
       }
     }
     goto discard;
@@ -781,28 +825,64 @@ dao_input(void)
   if(rep == NULL) {
     RPL_STAT(rpl_stats.mem_overflows++);
     PRINTF("RPL: Could not add a route after receiving a DAO\n");
+
+    if(flags & RPL_DAO_K_FLAG) {
+      /* signal the failure to add the node */
+      dao_ack_output(instance, &dao_sender_addr, sequence,
+             RPL_DAO_ACK_UNABLE_TO_ACCEPT);
+    }
     goto discard;
   }
 
   rep->state.lifetime = RPL_LIFETIME(instance, lifetime);
-  rep->state.learned_from = learned_from;
-  rep->state.nopath_received = 0;
+  /* rep->state.learned_from = learned_from; */
+  /* rep->state.nopath_received = 0; */
 
 #if RPL_CONF_MULTICAST
 fwd_dao:
 #endif
 
   if(learned_from == RPL_ROUTE_FROM_UNICAST_DAO) {
+    int should_ack = 0;
+
+    if(flags & RPL_DAO_K_FLAG) {
+      /* check if this route is already installed and we can ack now! */
+      /* not pending - and same seq-no means that we can ack.         */
+      if((!RPL_ROUTE_IS_DAO_PENDING(rep) &&
+          rep->state.dao_seqno_in == sequence) ||
+          dag->rank == ROOT_RANK(instance)) {
+        should_ack = 1;
+      }
+    }
+
     if(dag->preferred_parent != NULL &&
        rpl_get_parent_ipaddr(dag->preferred_parent) != NULL) {
+      uint8_t out_seq = 0;
+      /* if this is pending and we get the same seq no it is a retrans */
+      if(RPL_ROUTE_IS_DAO_PENDING(rep) &&
+         rep->state.dao_seqno_in == sequence) {
+        /* keep the same seq-no as before for parent also */
+        out_seq = rep->state.dao_seqno_out;
+      } else {
+        out_seq = prepare_for_dao_fwd(sequence, rep);
+      }
+
       PRINTF("RPL: Forwarding DAO to parent ");
       PRINT6ADDR(rpl_get_parent_ipaddr(dag->preferred_parent));
-      PRINTF("\n");
+      PRINTF(" in seq: %d out seq: %d\n", sequence, out_seq);
+
+      buffer = UIP_ICMP_PAYLOAD;
+      buffer[3] = out_seq; /* add an outgoing seq no before fwd */
       uip_icmp6_send(rpl_get_parent_ipaddr(dag->preferred_parent),
                      ICMP6_RPL, RPL_CODE_DAO, buffer_length);
     }
-    if(flags & RPL_DAO_K_FLAG) {
-      dao_ack_output(instance, &dao_sender_addr, sequence);
+
+    /* Ack sent immediately after forwarding (otherwise the packets is
+       corrupted. */
+    if(should_ack) {
+      PRINTF("RPL: sending DAO ACK\n");
+      dao_ack_output(instance, &dao_sender_addr, sequence,
+                     RPL_DAO_ACK_UNCONDITIONAL_ACCEPT);
     }
   }
 
@@ -810,23 +890,95 @@ fwd_dao:
   uip_clear_buf();
 }
 /*---------------------------------------------------------------------------*/
+#if RPL_WITH_DAO_ACK
+static void
+handle_dao_retransmission(void *ptr)
+{
+  rpl_parent_t *parent;
+  uip_ipaddr_t prefix;
+  rpl_instance_t *instance;
+  parent = ptr;
+
+  if(parent == NULL || parent->dag == NULL || parent->dag->instance == NULL) {
+    return;
+  }
+  instance = parent->dag->instance;
+
+  if(instance->my_dao_transmissions >= RPL_DAO_MAX_RETRANSMISSIONS) {
+    /* no more retransmissions - what now ??? */
+    if(instance->lifetime_unit == 0xffff && instance->default_lifetime == 0xff) {
+      /* RPL is using infinite lifetime for routes. This probably
+	 means that the root is running an old version that does not
+	 support DAO ack. Assume that everything is ok for now and
+	 let the normal repair mechanisms detect any problems. */
+      return;
+    }
+
+    if(instance->of->dao_ack_callback) {
+      /* Inform about the timeout for taking decision on punishment */
+      instance->of->dao_ack_callback(parent, RPL_DAO_ACK_TIMEOUT);
+    }
+
+    rpl_local_repair(instance);
+    /* give up this and hope to find another parent */
+    return;
+  }
+
+  PRINTF("Should retransmit DAO - seq:%d trans:%d\n", instance->my_dao_seqno,
+	 instance->my_dao_transmissions);
+
+  if(get_global_addr(&prefix) == 0) {
+    return;
+  }
+
+  ctimer_set(&instance->dao_retransmit_timer, RPL_DAO_RETRANSMISSION_TIMEOUT,
+	     handle_dao_retransmission, parent);
+
+  instance->my_dao_transmissions++;
+  dao_output_target_seq(parent, &prefix,
+			instance->default_lifetime, instance->my_dao_seqno);
+}
+#endif /* RPL_WITH_DAO_ACK */
+/*---------------------------------------------------------------------------*/
 void
 dao_output(rpl_parent_t *parent, uint8_t lifetime)
 {
   /* Destination Advertisement Object */
   uip_ipaddr_t prefix;
+  rpl_instance_t *instance;
 
   if(get_global_addr(&prefix) == 0) {
     PRINTF("RPL: No global address set for this node - suppressing DAO\n");
     return;
   }
 
+  if(parent == NULL || parent->dag == NULL || parent->dag->instance == NULL) {
+    return;
+  }
+  instance = parent->dag->instance;
+
   /* Sending a DAO with own prefix as target */
   dao_output_target(parent, &prefix, lifetime);
+  /* keep track of my own sending of DAO for handling ack and loss of ack */
+  instance->my_dao_seqno = dao_sequence;
+
+#if RPL_WITH_DAO_ACK
+  instance->my_dao_transmissions = 1;
+  ctimer_set(&instance->dao_retransmit_timer, RPL_DAO_RETRANSMISSION_TIMEOUT,
+	     handle_dao_retransmission, parent);
+#endif /* RPL_WITH_DAO_ACK */
 }
 /*---------------------------------------------------------------------------*/
 void
 dao_output_target(rpl_parent_t *parent, uip_ipaddr_t *prefix, uint8_t lifetime)
+{
+  RPL_LOLLIPOP_INCREMENT(dao_sequence);
+  dao_output_target_seq(parent, prefix, lifetime, dao_sequence);
+}
+/*---------------------------------------------------------------------------*/
+static void
+dao_output_target_seq(rpl_parent_t *parent, uip_ipaddr_t *prefix,
+		      uint8_t lifetime, uint8_t seq_no)
 {
   rpl_dag_t *dag;
   rpl_instance_t *instance;
@@ -867,8 +1019,6 @@ dao_output_target(rpl_parent_t *parent, uip_ipaddr_t *prefix, uint8_t lifetime)
 #endif
 
   buffer = UIP_ICMP_PAYLOAD;
-
-  RPL_LOLLIPOP_INCREMENT(dao_sequence);
   pos = 0;
 
   buffer[pos++] = instance->instance_id;
@@ -876,12 +1026,12 @@ dao_output_target(rpl_parent_t *parent, uip_ipaddr_t *prefix, uint8_t lifetime)
 #if RPL_DAO_SPECIFY_DAG
   buffer[pos] |= RPL_DAO_D_FLAG;
 #endif /* RPL_DAO_SPECIFY_DAG */
-#if RPL_CONF_DAO_ACK
+#if RPL_WITH_DAO_ACK
   buffer[pos] |= RPL_DAO_K_FLAG;
-#endif /* RPL_CONF_DAO_ACK */
+#endif /* RPL_WITH_DAO_ACK */
   ++pos;
   buffer[pos++] = 0; /* reserved */
-  buffer[pos++] = dao_sequence;
+  buffer[pos++] = seq_no;
 #if RPL_DAO_SPECIFY_DAG
   memcpy(buffer + pos, &dag->dag_id, sizeof(dag->dag_id));
   pos+=sizeof(dag->dag_id);
@@ -918,41 +1068,105 @@ dao_output_target(rpl_parent_t *parent, uip_ipaddr_t *prefix, uint8_t lifetime)
 static void
 dao_ack_input(void)
 {
-#if DEBUG
-  unsigned char *buffer;
+#if RPL_WITH_DAO_ACK
+
+  uint8_t *buffer;
+  uint8_t instance_id;
   uint8_t sequence;
   uint8_t status;
+  rpl_instance_t *instance;
+  rpl_parent_t *parent;
 
   buffer = UIP_ICMP_PAYLOAD;
 
   sequence = buffer[2];
   status = buffer[3];
 
-  PRINTF("RPL: Received a DAO ACK with sequence number %d and status %d from ",
-    sequence, status);
+  instance = rpl_get_instance(instance_id);
+  if(instance == NULL) {
+    return;
+  }
+
+  parent = rpl_find_parent(instance->current_dag, &UIP_IP_BUF->srcipaddr);
+  if(parent == NULL) {
+    /* not a known instance - did we switch?? */
+    //    PRINTF("RPL: Received a DAO ACK from a not joined instance: %d",
+    //	   instance_id);
+    return;
+  }
+
+  PRINTF("RPL: Received a DAO ACK with sequence number %d (%d) and status %d from ",
+	 sequence, instance->my_dao_seqno, status);
   PRINT6ADDR(&UIP_IP_BUF->srcipaddr);
   PRINTF("\n");
 #endif /* DEBUG */
+
+  if(sequence == instance->my_dao_seqno) {
+    PRINTF("RPL: DAO ACK for me!\n");
+
+    /* always stop the retransmit timer when the ACK arrived */
+    ctimer_stop(&instance->dao_retransmit_timer);
+
+    /* Inform objective function on status of the DAO ACK */
+    if(instance->of->dao_ack_callback) {
+      instance->of->dao_ack_callback(parent, status);
+    }
+
+    if(status >= RPL_DAO_ACK_UNABLE_TO_ACCEPT) {
+      /* failed the DAO transmission - need to remove the default route. */
+      /* Trigger a local repair since we can not get our DAO in... */
+      rpl_local_repair(instance);
+    }
+  } else {
+    /* this DAO should be forwarded to another recently registered route */
+    uip_ds6_route_t *re;
+    uip_ipaddr_t *nexthop;
+    if((re = find_route_entry_by_dao_ack(sequence)) != NULL) {
+      /* pick the recorded seq no from that node and forward DAO ACK - and
+         clear the pending flag*/
+      RPL_ROUTE_CLEAR_DAO_PENDING(re);
+
+      nexthop = uip_ds6_route_nexthop(re);
+      if(nexthop == NULL) {
+        PRINTF("No next hop to fwd DAO ACK to\n");
+      } else {
+        PRINTF("Fwd DAO ACK\n");
+        buffer[2] = re->state.dao_seqno_in;
+        uip_icmp6_send(nexthop, ICMP6_RPL, RPL_CODE_DAO_ACK, 4);
+      }
+
+      if(status >= RPL_DAO_ACK_UNABLE_TO_ACCEPT) {
+        /* this node did not get in to the routing tables above... - remove */
+        uip_ds6_route_rm(re);
+      }
+    } else {
+      PRINTF("No route entry to fwd DAO ACK to\n");
+    }
+  }
+#endif /* RPL_WITH_DAO_ACK */
   uip_clear_buf();
 }
 /*---------------------------------------------------------------------------*/
 void
-dao_ack_output(rpl_instance_t *instance, uip_ipaddr_t *dest, uint8_t sequence)
+dao_ack_output(rpl_instance_t *instance, uip_ipaddr_t *dest, uint8_t sequence,
+	       uint8_t status)
 {
+#if RPL_WITH_DAO_ACK
   unsigned char *buffer;
 
   PRINTF("RPL: Sending a DAO ACK with sequence number %d to ", sequence);
   PRINT6ADDR(dest);
-  PRINTF("\n");
+  PRINTF(" with status %d\n", status);
 
   buffer = UIP_ICMP_PAYLOAD;
 
   buffer[0] = instance->instance_id;
   buffer[1] = 0;
   buffer[2] = sequence;
-  buffer[3] = 0;
+  buffer[3] = status;
 
   uip_icmp6_send(dest, ICMP6_RPL, RPL_CODE_DAO_ACK, 4);
+#endif /* RPL_WITH_DAO_ACK */
 }
 /*---------------------------------------------------------------------------*/
 void
diff --git a/core/net/rpl/rpl-mrhof.c b/core/net/rpl/rpl-mrhof.c
index 47314917f..acf2b1d54 100644
--- a/core/net/rpl/rpl-mrhof.c
+++ b/core/net/rpl/rpl-mrhof.c
@@ -54,6 +54,7 @@
 
 static void reset(rpl_dag_t *);
 static void neighbor_link_callback(rpl_parent_t *, int, int);
+static void dao_ack_callback(rpl_parent_t *, int);
 static rpl_parent_t *best_parent(rpl_parent_t *, rpl_parent_t *);
 static rpl_dag_t *best_dag(rpl_dag_t *, rpl_dag_t *);
 static rpl_rank_t calculate_rank(rpl_parent_t *, rpl_rank_t);
@@ -62,6 +63,7 @@ static void update_metric_container(rpl_instance_t *);
 rpl_of_t rpl_mrhof = {
   reset,
   neighbor_link_callback,
+  dao_ack_callback,
   best_parent,
   best_dag,
   calculate_rank,
@@ -117,6 +119,20 @@ reset(rpl_dag_t *dag)
   PRINTF("RPL: Reset MRHOF\n");
 }
 
+static void
+dao_ack_callback(rpl_parent_t *p, int status)
+{
+  /* here we need to handle failed DAO's and other stuff */
+  PRINTF("RPL: MRHOF - DAO ACK received with status: %d", status);
+  if(status >= RPL_DAO_ACK_UNABLE_TO_ACCEPT) {
+    /* punish the ETX as if this was 10 packets lost */
+    neighbor_link_callback(p, MAC_TX_OK, 10);
+  } else if(status == RPL_DAO_ACK_TIMEOUT) { /* timeout = no ack */
+    /* punish the total lack of ACK with a similar punishment */
+    neighbor_link_callback(p, MAC_TX_OK, 10);
+  }
+}
+
 static void
 neighbor_link_callback(rpl_parent_t *p, int status, int numtx)
 {
diff --git a/core/net/rpl/rpl-of0.c b/core/net/rpl/rpl-of0.c
index ca73169fc..ed76bac4b 100644
--- a/core/net/rpl/rpl-of0.c
+++ b/core/net/rpl/rpl-of0.c
@@ -55,6 +55,7 @@ static void update_metric_container(rpl_instance_t *);
 rpl_of_t rpl_of0 = {
   reset,
   NULL,
+  NULL,
   best_parent,
   best_dag,
   calculate_rank,
diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h
index e1d95697b..5a7a9be94 100644
--- a/core/net/rpl/rpl-private.h
+++ b/core/net/rpl/rpl-private.h
@@ -90,6 +90,13 @@
 
 #define RPL_DAO_K_FLAG                   0x80 /* DAO ACK requested */
 #define RPL_DAO_D_FLAG                   0x40 /* DODAG ID present */
+
+#define RPL_DAO_ACK_UNCONDITIONAL_ACCEPT 0
+#define RPL_DAO_ACK_ACCEPT               1   /* 1 - 127 is OK but not good */
+#define RPL_DAO_ACK_UNABLE_TO_ACCEPT     128 /* >127 is fail */
+
+#define RPL_DAO_ACK_TIMEOUT              -1
+
 /*---------------------------------------------------------------------------*/
 /* RPL IPv6 extension header option. */
 #define RPL_HDR_OPT_LEN			4
@@ -117,6 +124,9 @@
 #define RPL_NOPATH_REMOVAL_DELAY          60
 #endif /* RPL_CONF_NOPATH_REMOVAL_DELAY */
 
+#define RPL_DAO_MAX_RETRANSMISSIONS     5
+#define RPL_DAO_RETRANSMISSION_TIMEOUT  (5 * CLOCK_SECOND)
+
 /* Special value indicating immediate removal. */
 #define RPL_ZERO_LIFETIME               0
 
@@ -268,7 +278,7 @@ void dis_output(uip_ipaddr_t *addr);
 void dio_output(rpl_instance_t *, uip_ipaddr_t *uc_addr);
 void dao_output(rpl_parent_t *, uint8_t lifetime);
 void dao_output_target(rpl_parent_t *, uip_ipaddr_t *, uint8_t lifetime);
-void dao_ack_output(rpl_instance_t *, uip_ipaddr_t *, uint8_t);
+void dao_ack_output(rpl_instance_t *, uip_ipaddr_t *, uint8_t, uint8_t);
 void rpl_icmp6_register_handlers(void);
 
 /* RPL logic functions. */
diff --git a/core/net/rpl/rpl.c b/core/net/rpl/rpl.c
index 7e7947e34..da5822757 100644
--- a/core/net/rpl/rpl.c
+++ b/core/net/rpl/rpl.c
@@ -238,7 +238,7 @@ rpl_add_route(rpl_dag_t *dag, uip_ipaddr_t *prefix, int prefix_len,
 
   rep->state.dag = dag;
   rep->state.lifetime = RPL_LIFETIME(dag->instance, dag->instance->default_lifetime);
-  rep->state.learned_from = RPL_ROUTE_FROM_INTERNAL;
+  /* rep->state.learned_from = RPL_ROUTE_FROM_INTERNAL; */
 
   PRINTF("RPL: Added a route to ");
   PRINT6ADDR(prefix);
diff --git a/core/net/rpl/rpl.h b/core/net/rpl/rpl.h
index 54b63c875..b7d7757c2 100644
--- a/core/net/rpl/rpl.h
+++ b/core/net/rpl/rpl.h
@@ -185,6 +185,7 @@ typedef struct rpl_instance rpl_instance_t;
 struct rpl_of {
   void (*reset)(struct rpl_dag *);
   void (*neighbor_link_callback)(rpl_parent_t *, int, int);
+  void (*dao_ack_callback)(rpl_parent_t *, int status);
   rpl_parent_t *(*best_parent)(rpl_parent_t *, rpl_parent_t *);
   rpl_dag_t *(*best_dag)(rpl_dag_t *, rpl_dag_t *);
   rpl_rank_t (*calculate_rank)(rpl_parent_t *, rpl_rank_t);
@@ -216,6 +217,9 @@ struct rpl_instance {
   uint8_t dio_intcurrent;
   uint8_t dio_send; /* for keeping track of which mode the timer is in */
   uint8_t dio_counter;
+  /* my last registered DAO that I might be waiting for ACK on */
+  uint8_t my_dao_seqno;
+  uint8_t my_dao_transmissions;
   rpl_rank_t max_rankinc;
   rpl_rank_t min_hoprankinc;
   uint16_t lifetime_unit; /* lifetime in seconds = l_u * d_l */
@@ -233,6 +237,9 @@ struct rpl_instance {
   struct ctimer dao_lifetime_timer;
   struct ctimer unicast_dio_timer;
   rpl_parent_t *unicast_dio_target;
+#if RPL_WITH_DAO_ACK
+  struct ctimer dao_retransmit_timer;
+#endif /* RPL_WITH_DAO_ACK */
 };
 
 /*---------------------------------------------------------------------------*/

From 513393db54f0e393569d7fead52727bfa9513065 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Thu, 20 Aug 2015 16:56:50 +0200
Subject: [PATCH 105/393] added return value so that caller know if a nbr was
 removed or not

---
 core/net/ipv6/uip-ds6-nbr.c | 6 +++---
 core/net/ipv6/uip-ds6-nbr.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/net/ipv6/uip-ds6-nbr.c b/core/net/ipv6/uip-ds6-nbr.c
index b793ab9f0..5905993a5 100644
--- a/core/net/ipv6/uip-ds6-nbr.c
+++ b/core/net/ipv6/uip-ds6-nbr.c
@@ -115,7 +115,7 @@ uip_ds6_nbr_add(const uip_ipaddr_t *ipaddr, const uip_lladdr_t *lladdr,
 }
 
 /*---------------------------------------------------------------------------*/
-void
+int
 uip_ds6_nbr_rm(uip_ds6_nbr_t *nbr)
 {
   if(nbr != NULL) {
@@ -123,9 +123,9 @@ uip_ds6_nbr_rm(uip_ds6_nbr_t *nbr)
     uip_packetqueue_free(&nbr->packethandle);
 #endif /* UIP_CONF_IPV6_QUEUE_PKT */
     NEIGHBOR_STATE_CHANGED(nbr);
-    nbr_table_remove(ds6_neighbors, nbr);
+    return nbr_table_remove(ds6_neighbors, nbr);
   }
-  return;
+  return 0;
 }
 
 /*---------------------------------------------------------------------------*/
diff --git a/core/net/ipv6/uip-ds6-nbr.h b/core/net/ipv6/uip-ds6-nbr.h
index 24e3f7aaf..b0dd84d4a 100644
--- a/core/net/ipv6/uip-ds6-nbr.h
+++ b/core/net/ipv6/uip-ds6-nbr.h
@@ -88,7 +88,7 @@ void uip_ds6_neighbors_init(void);
 /** \brief Neighbor Cache basic routines */
 uip_ds6_nbr_t *uip_ds6_nbr_add(const uip_ipaddr_t *ipaddr, const uip_lladdr_t *lladdr,
                                uint8_t isrouter, uint8_t state);
-void uip_ds6_nbr_rm(uip_ds6_nbr_t *nbr);
+int uip_ds6_nbr_rm(uip_ds6_nbr_t *nbr);
 const uip_lladdr_t *uip_ds6_nbr_get_ll(const uip_ds6_nbr_t *nbr);
 const uip_ipaddr_t *uip_ds6_nbr_get_ipaddr(const uip_ds6_nbr_t *nbr);
 uip_ds6_nbr_t *uip_ds6_nbr_lookup(const uip_ipaddr_t *ipaddr);

From d181bd9e6ff8b5468522c0370177ee895fecf4f2 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Thu, 20 Aug 2015 17:00:47 +0200
Subject: [PATCH 106/393] added config for enabling/disabling removal of oldest
 route and added support function for checking if lladdress is used as nexthop

---
 core/net/ipv6/uip-ds6-route.c | 17 ++++++++++++++---
 core/net/ipv6/uip-ds6-route.h |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/core/net/ipv6/uip-ds6-route.c b/core/net/ipv6/uip-ds6-route.c
index 3f4ac81e7..3113986a1 100644
--- a/core/net/ipv6/uip-ds6-route.c
+++ b/core/net/ipv6/uip-ds6-route.c
@@ -207,6 +207,12 @@ uip_ds6_route_next(uip_ds6_route_t *r)
 }
 /*---------------------------------------------------------------------------*/
 int
+uip_ds6_route_is_nexthop(const uip_lladdr_t *lladdr)
+{
+  return nbr_table_get_from_lladdr(nbr_routes, (linkaddr_t *)lladdr) != NULL;
+}
+/*---------------------------------------------------------------------------*/
+int
 uip_ds6_route_num_routes(void)
 {
   return num_routes;
@@ -307,11 +313,16 @@ uip_ds6_route_add(uip_ipaddr_t *ipaddr, uint8_t length,
        least recently used one we have. */
 
     if(uip_ds6_route_num_routes() == UIP_DS6_ROUTE_NB) {
+      uip_ds6_route_t *oldest;
+      oldest = NULL;
+#if UIP_DS6_ROUTE_REMOVE_LEAST_RECENTLY_USED
       /* Removing the oldest route entry from the route table. The
          least recently used route is the first route on the list. */
-      uip_ds6_route_t *oldest;
-
-      oldest = list_tail(routelist); /* uip_ds6_route_head(); */
+      oldest = list_tail(routelist);
+#endif
+      if(oldest == NULL) {
+        return NULL;
+      }
       PRINTF("uip_ds6_route_add: dropping route to ");
       PRINT6ADDR(&oldest->ipaddr);
       PRINTF("\n");
diff --git a/core/net/ipv6/uip-ds6-route.h b/core/net/ipv6/uip-ds6-route.h
index 8df18796b..3324a8e08 100644
--- a/core/net/ipv6/uip-ds6-route.h
+++ b/core/net/ipv6/uip-ds6-route.h
@@ -197,7 +197,7 @@ uip_ipaddr_t *uip_ds6_route_nexthop(uip_ds6_route_t *);
 int uip_ds6_route_num_routes(void);
 uip_ds6_route_t *uip_ds6_route_head(void);
 uip_ds6_route_t *uip_ds6_route_next(uip_ds6_route_t *);
-
+int uip_ds6_route_is_nexthop(const uip_lladdr_t *lladdr);
 /** @} */
 
 #endif /* UIP_DS6_ROUTE_H */

From 3fd8c4db2da52040f4a26aa398fbe41609e8f681 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Thu, 20 Aug 2015 17:09:32 +0200
Subject: [PATCH 107/393] added nbr policy for Contiki RPL that avoids
 thrashing the nbr table with new entries all the time

---
 core/net/rpl/rpl-conf.h       |  12 ++
 core/net/rpl/rpl-dag.c        |  34 ++++-
 core/net/rpl/rpl-icmp6.c      | 132 +++++++++---------
 core/net/rpl/rpl-nbr-policy.c | 244 ++++++++++++++++++++++++++++++++++
 core/net/rpl/rpl-private.h    |  28 ++++
 core/net/rpl/rpl.c            |   1 -
 6 files changed, 383 insertions(+), 68 deletions(-)
 create mode 100644 core/net/rpl/rpl-nbr-policy.c

diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h
index 2ff9fbf91..831765974 100644
--- a/core/net/rpl/rpl-conf.h
+++ b/core/net/rpl/rpl-conf.h
@@ -245,6 +245,18 @@
 #define RPL_WITH_DAO_ACK 1
 #endif /* RPL_CONF_WITH_DAO_ACK */
 
+/*
+ * Setting the DIO_REFRESH_DAO_ROUTES will make RPL always increase
+ * the DTSN (Destination Advertisement Trigger Sequence Number) when
+ * sending broadcast DIO. This is to get all children to re-register
+ * their DAO route.
+ * */
+#ifdef RPL_CONF_DIO_REFRESH_DAO_ROUTES
+#define RPL_DIO_REFRESH_DAO_ROUTES RPL_CONF_DIO_REFRESH_DAO_ROUTES
+#else
+#define RPL_DIO_REFRESH_DAO_ROUTES 0
+#endif /* RPL_CONF_DIO_REFRESH_DAO_ROUTES */
+
 /*
  * RPL probing. When enabled, probes will be sent periodically to keep
  * parent link estimates up to date.
diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index 04c64a50d..79f83a84e 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -1174,6 +1174,8 @@ rpl_local_repair(rpl_instance_t *instance)
   }
 
   rpl_reset_dio_timer(instance);
+  /* Request refresh of DAO registrations next DIO */
+  RPL_LOLLIPOP_INCREMENT(instance->dtsn_out);
 
   RPL_STAT(rpl_stats.local_repairs++);
 }
@@ -1250,6 +1252,23 @@ rpl_process_parent_event(rpl_instance_t *instance, rpl_parent_t *p)
   return return_value;
 }
 /*---------------------------------------------------------------------------*/
+static int
+add_nbr_from_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
+{
+  /* check if it is ok to add this nbr based on this DIO */
+  if(RPL_NBR_POLICY.check_add_from_dio(from, dio)) {
+    /* add this to the neighbor cache if not already there */
+    if(rpl_icmp6_update_nbr_table(from) == NULL) {
+      PRINTF("RPL: Out of memory, dropping DIO from ");
+      PRINT6ADDR(from);
+      PRINTF("\n");
+      return 0;
+    }
+    return 1;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
 void
 rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
 {
@@ -1303,7 +1322,11 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
 
   if(instance == NULL) {
     PRINTF("RPL: New instance detected (ID=%u): Joining...\n", dio->instance_id);
-    rpl_join_instance(from, dio);
+    if(add_nbr_from_dio(from, dio)) {
+      rpl_join_instance(from, dio);
+    } else {
+      PRINTF("RPL: Not joining since could not add parent\n");
+    }
     return;
   }
 
@@ -1315,6 +1338,10 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
   if(dag == NULL) {
 #if RPL_MAX_DAG_PER_INSTANCE > 1
     PRINTF("RPL: Adding new DAG to known instance.\n");
+    if(!add_nbr_from_dio(from, dio)) {
+      PRINTF("RPL: Could not add new DAG, could not add parent\n");
+      return;
+    }
     dag = rpl_add_dag(from, dio);
     if(dag == NULL) {
       PRINTF("RPL: Failed to add DAG.\n");
@@ -1363,6 +1390,11 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
    * whether to keep it in the set.
    */
 
+  if(!add_nbr_from_dio(from, dio)) {
+    PRINTF("RPL: Could not add parent based on DIO\n");
+    return;
+  }
+
   p = rpl_find_parent(dag, from);
   if(p == NULL) {
     previous_dag = find_parent_dag(instance, from);
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index e1ac899ba..b0ab53de4 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -88,7 +88,6 @@ void RPL_DEBUG_DIO_INPUT(uip_ipaddr_t *, rpl_dio_t *);
 void RPL_DEBUG_DAO_OUTPUT(rpl_parent_t *);
 #endif
 
-/* TODO: should these variables be a part of the instance? */
 static uint8_t dao_sequence = RPL_LOLLIPOP_INIT;
 
 extern rpl_of_t RPL_OF;
@@ -182,6 +181,32 @@ set16(uint8_t *buffer, int pos, uint16_t value)
   buffer[pos++] = value & 0xff;
 }
 /*---------------------------------------------------------------------------*/
+uip_ds6_nbr_t *
+rpl_icmp6_update_nbr_table(uip_ipaddr_t *from)
+{
+  uip_ds6_nbr_t *nbr;
+
+  if((nbr = uip_ds6_nbr_lookup(from)) == NULL) {
+    if((nbr = uip_ds6_nbr_add(from, (uip_lladdr_t *)
+                              packetbuf_addr(PACKETBUF_ADDR_SENDER),
+                              0, NBR_REACHABLE)) != NULL) {
+      PRINTF("RPL: Neighbor added to neighbor cache ");
+      PRINT6ADDR(from);
+      PRINTF(", ");
+      PRINTLLADDR((uip_lladdr_t *)packetbuf_addr(PACKETBUF_ADDR_SENDER));
+      PRINTF("\n");
+    }
+  }
+
+  if(nbr != NULL) {
+#if UIP_ND6_SEND_NA
+    /* set reachable timer if we added or found the nbr entry */
+    stimer_set(&nbr->reachable, UIP_ND6_REACHABLE_TIME / 1000);
+#endif /* UIP_ND6_SEND_NA */
+  }
+  return nbr;
+ }
+/*---------------------------------------------------------------------------*/
 static void
 dis_input(void)
 {
@@ -205,8 +230,20 @@ dis_input(void)
         rpl_reset_dio_timer(instance);
       } else {
 #endif /* !RPL_LEAF_ONLY */
-        PRINTF("RPL: Unicast DIS, reply to sender\n");
-        dio_output(instance, &UIP_IP_BUF->srcipaddr);
+	/* Check if this neighbor should be added according to the policy. */
+	if(RPL_NBR_POLICY.check_add_from_dis(&UIP_IP_BUF->srcipaddr)) {
+	  /* Add this to the neighbor cache if not already there */
+	  if(rpl_icmp6_update_nbr_table(&UIP_IP_BUF->srcipaddr) == NULL) {
+	    PRINTF("RPL: Out of Memory, not sending unicast DIO, DIS from ");
+	    PRINT6ADDR(&UIP_IP_BUF->srcipaddr);
+	    PRINTF(", ");
+	    PRINTLLADDR((uip_lladdr_t *)packetbuf_addr(PACKETBUF_ADDR_SENDER));
+	    PRINTF("\n");
+	    return;
+	  }
+	  PRINTF("RPL: Unicast DIS, reply to sender\n");
+	  dio_output(instance, &UIP_IP_BUF->srcipaddr);
+	}
       }
     }
   }
@@ -253,7 +290,6 @@ dio_input(void)
   int i;
   int len;
   uip_ipaddr_t from;
-  uip_ds6_nbr_t *nbr;
 
   memset(&dio, 0, sizeof(dio));
 
@@ -274,32 +310,6 @@ dio_input(void)
   PRINT6ADDR(&from);
   PRINTF("\n");
 
-  if((nbr = uip_ds6_nbr_lookup(&from)) == NULL) {
-    if((nbr = uip_ds6_nbr_add(&from, (uip_lladdr_t *)
-                              packetbuf_addr(PACKETBUF_ADDR_SENDER),
-                              0, NBR_REACHABLE)) != NULL) {
-#if UIP_ND6_SEND_NA
-      /* set reachable timer */
-      stimer_set(&nbr->reachable, UIP_ND6_REACHABLE_TIME / 1000);
-#endif /* UIP_ND6_SEND_NA */
-      PRINTF("RPL: Neighbor added to neighbor cache ");
-      PRINT6ADDR(&from);
-      PRINTF(", ");
-      PRINTLLADDR((uip_lladdr_t *)packetbuf_addr(PACKETBUF_ADDR_SENDER));
-      PRINTF("\n");
-    } else {
-      PRINTF("RPL: Out of memory, dropping DIO from ");
-      PRINT6ADDR(&from);
-      PRINTF(", ");
-      PRINTLLADDR((uip_lladdr_t *)packetbuf_addr(PACKETBUF_ADDR_SENDER));
-      PRINTF("\n");
-
-      goto discard;
-    }
-  } else {
-    PRINTF("RPL: Neighbor already in neighbor cache\n");
-  }
-
   buffer_length = uip_len - uip_l3_icmp_hdr_len;
 
   /* Process the DIO base option. */
@@ -796,29 +806,19 @@ dao_input(void)
 
   PRINTF("RPL: adding DAO route\n");
 
-  if((nbr = uip_ds6_nbr_lookup(&dao_sender_addr)) == NULL) {
-    if((nbr = uip_ds6_nbr_add(&dao_sender_addr,
-                              (uip_lladdr_t *)packetbuf_addr(PACKETBUF_ADDR_SENDER),
-                              0, NBR_REACHABLE)) != NULL) {
-#if UIP_ND6_SEND_NA
-      /* set reachable timer */
-      stimer_set(&nbr->reachable, UIP_ND6_REACHABLE_TIME / 1000);
-#endif /* UIP_ND6_SEND_NA */
-      PRINTF("RPL: Neighbor added to neighbor cache ");
-      PRINT6ADDR(&dao_sender_addr);
-      PRINTF(", ");
-      PRINTLLADDR((uip_lladdr_t *)packetbuf_addr(PACKETBUF_ADDR_SENDER));
-      PRINTF("\n");
-    } else {
-      PRINTF("RPL: Out of Memory, dropping DAO from ");
-      PRINT6ADDR(&dao_sender_addr);
-      PRINTF(", ");
-      PRINTLLADDR((uip_lladdr_t *)packetbuf_addr(PACKETBUF_ADDR_SENDER));
-      PRINTF("\n");
-      goto discard;
-    }
-  } else {
-    PRINTF("RPL: Neighbor already in neighbor cache\n");
+  /* Check if we should add another neighbor based on DAO. */
+  if(!RPL_NBR_POLICY.check_add_from_dao(&dao_sender_addr)) {
+    /* Do not add the neighbor. */
+    return;
+  }
+  /* Update and add neighbor - if no room - fail. */
+  if((nbr = rpl_icmp6_update_nbr_table(&dao_sender_addr)) == NULL) {
+    PRINTF("RPL: Out of Memory, dropping DAO from ");
+    PRINT6ADDR(&dao_sender_addr);
+    PRINTF(", ");
+    PRINTLLADDR((uip_lladdr_t *)packetbuf_addr(PACKETBUF_ADDR_SENDER));
+    PRINTF("\n");
+    goto discard;
   }
 
   rep = rpl_add_route(dag, &prefix, prefixlen, &dao_sender_addr);
@@ -834,9 +834,8 @@ dao_input(void)
     goto discard;
   }
 
+  /* State is all zeroes, set lifetime but no need for other initialization. */
   rep->state.lifetime = RPL_LIFETIME(instance, lifetime);
-  /* rep->state.learned_from = learned_from; */
-  /* rep->state.nopath_received = 0; */
 
 #if RPL_CONF_MULTICAST
 fwd_dao:
@@ -877,8 +876,6 @@ fwd_dao:
                      ICMP6_RPL, RPL_CODE_DAO, buffer_length);
     }
 
-    /* Ack sent immediately after forwarding (otherwise the packets is
-       corrupted. */
     if(should_ack) {
       PRINTF("RPL: sending DAO ACK\n");
       dao_ack_output(instance, &dao_sender_addr, sequence,
@@ -897,30 +894,33 @@ handle_dao_retransmission(void *ptr)
   rpl_parent_t *parent;
   uip_ipaddr_t prefix;
   rpl_instance_t *instance;
-  parent = ptr;
 
+  parent = ptr;
   if(parent == NULL || parent->dag == NULL || parent->dag->instance == NULL) {
     return;
   }
   instance = parent->dag->instance;
 
   if(instance->my_dao_transmissions >= RPL_DAO_MAX_RETRANSMISSIONS) {
-    /* no more retransmissions - what now ??? */
+    /* No more retransmissions - give up. */
     if(instance->lifetime_unit == 0xffff && instance->default_lifetime == 0xff) {
-      /* RPL is using infinite lifetime for routes. This probably
-	 means that the root is running an old version that does not
-	 support DAO ack. Assume that everything is ok for now and
-	 let the normal repair mechanisms detect any problems. */
+      /*
+       * ContikiRPL was previously using infinite lifetime for routes
+       * and no DAO_ACK configured. This probably means that the root
+       * and possibly other nodes might be running an old version that
+       * does not support DAO ack. Assume that everything is ok for
+       * now and let the normal repair mechanisms detect any problems.
+       */
       return;
     }
 
     if(instance->of->dao_ack_callback) {
-      /* Inform about the timeout for taking decision on punishment */
+      /* Inform the objective function about the timeout. */
       instance->of->dao_ack_callback(parent, RPL_DAO_ACK_TIMEOUT);
     }
 
+    /* Perform local repair and hope to find another parent. */
     rpl_local_repair(instance);
-    /* give up this and hope to find another parent */
     return;
   }
 
@@ -1102,7 +1102,7 @@ dao_ack_input(void)
 #endif /* DEBUG */
 
   if(sequence == instance->my_dao_seqno) {
-    PRINTF("RPL: DAO ACK for me!\n");
+    PRINTF("RPL: DAO %s for me!\n", status < 128 ? "ACK" : "NACK");
 
     /* always stop the retransmit timer when the ACK arrived */
     ctimer_stop(&instance->dao_retransmit_timer);
diff --git a/core/net/rpl/rpl-nbr-policy.c b/core/net/rpl/rpl-nbr-policy.c
new file mode 100644
index 000000000..8c9a2ff21
--- /dev/null
+++ b/core/net/rpl/rpl-nbr-policy.c
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 2014-2015, Yanzi Networks AB.
+ * 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 copyright holders 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 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 HOLDERS 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.
+ *
+ */
+/**
+ * \addtogroup uip6
+ * @{
+ */
+
+
+/**
+ * \file
+ *
+ * Default RPL NBR policy
+ * decides when to add a new discovered node to the nbr table from RPL.
+ *
+ * \author Joakim Eriksson <joakime@sics.se>
+ * Contributors: Niclas Finne <nfi@sics.se>, Oriol Piñol <oriol@yanzi.se>,
+ *
+ */
+
+#include "net/rpl/rpl-private.h"
+#include "net/nbr-table.h"
+#include "net/ipv6/uip-ds6-nbr.h"
+#include "net/ipv6/uip-ds6-route.h"
+
+#define DEBUG DEBUG_NONE
+#include "net/ip/uip-debug.h"
+
+/*
+ * Policy for neighbor adds
+ * - one node is locked (default route)
+ * - max X children (nexthops)
+ * - max Y "best parents"
+ * => at least MAX_NBRS - (Y + X + 1) free slots for other.
+ */
+
+#define MAX_CHILDREN (NBR_TABLE_MAX_NEIGHBORS - 3)
+
+static int num_parents; /* any node that are possible parents */
+static int num_children;  /* all children that we have as nexthop */
+static int num_free;
+static uip_ds6_nbr_t *worst_rank_nbr; /* the parent that has the worst rank */
+static rpl_rank_t worst_rank;
+/*---------------------------------------------------------------------------*/
+static void
+update_nbr(void)
+{
+  uip_ds6_nbr_t *nbr;
+  rpl_parent_t *parent;
+  int num_used;
+  int is_used;
+  rpl_rank_t rank;
+
+  worst_rank = 0;
+  worst_rank_nbr = NULL;
+  num_used = 0;
+  num_parents = 0;
+  num_children = 0;
+
+  nbr = nbr_table_head(ds6_neighbors);
+  while(nbr != NULL) {
+    linkaddr_t *lladdr = nbr_table_get_lladdr(ds6_neighbors, nbr);
+    is_used = 0;
+
+    parent = rpl_get_parent((uip_lladdr_t *)lladdr);
+    if(parent != NULL) {
+      num_parents++;
+      is_used++;
+
+      if(parent->dag != NULL && parent->dag->preferred_parent == parent) {
+        /* This is the preferred parent for the DAG and must not be removed */
+
+        /* Note: this assumes that only RPL adds default routes. */
+
+      } else if(worst_rank < INFINITE_RANK &&
+                parent->rank > 0 &&
+                parent->dag != NULL &&
+                parent->dag->instance != NULL &&
+                (rank = parent->dag->instance->of->calculate_rank(parent, 0)) > worst_rank) {
+        /* This is the worst-rank neighbor - this is a good candidate for removal */
+        worst_rank = rank;
+        worst_rank_nbr = nbr;
+      }
+    }
+
+    /* Check if this neighbor is used as nexthop and therefor being a
+       RPL child. */
+    if(uip_ds6_route_is_nexthop((uip_lladdr_t *)lladdr) != 0) {
+      is_used++;
+      num_children++;
+    }
+
+    if(is_used == 0) {
+      /* This neighbor is neither parent or child and can be safely removed */
+      worst_rank_nbr = nbr;
+      worst_rank = INFINITE_RANK;
+    } else if(is_used > 1) {
+      /* Both parent and child - this should never happen! */
+      PRINTF("NBR-POLICY: *** Neighbor is both child and candidate parent: ");
+      PRINTLLADDR((uip_lladdr_t *)lladdr);
+      PRINTF("\n");
+    }
+
+    nbr = nbr_table_next(ds6_neighbors, nbr);
+    num_used++;
+  }
+  /* how many more IP neighbors can be have? */
+  num_free = NBR_TABLE_MAX_NEIGHBORS - num_used;
+
+  PRINTF("NBR-POLICY: Free: %d, Children: %d, Parents: %d Routes: %d\n",
+	 num_free, num_children, num_parents, uip_ds6_route_num_routes());
+}
+/*---------------------------------------------------------------------------*/
+static int
+remove_worst_nbr(void)
+{
+  /* we assume that it is possible to remove the worst parent at the moment */
+  if(worst_rank_nbr != NULL) {
+    PRINTF("Removing worst ranked nbr ");
+    PRINTLLADDR((uip_lladdr_t*)nbr_table_get_lladdr(ds6_neighbors, worst_rank_nbr));
+    PRINTF(" with rank %d\n", worst_rank);
+    if(uip_ds6_nbr_rm(worst_rank_nbr)) {
+      worst_rank_nbr = NULL;
+      return 1;
+    }
+    PRINTF("FAILED to remove worst ranked nbr!\n");
+    return 0;
+  }
+  PRINTF("FAILED to remove worst rank nbr - no found\n");
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+/* Called whenever we get a unicast DIS - e.g. someone that already
+   have this node in its table - since it is a unicast */
+static int
+check_add_from_dis(uip_ipaddr_t *from)
+{
+
+  /* do a lookup to see if it is alread there - then allow add/update */
+  if(uip_ds6_nbr_lookup(from)) {
+    return 1;
+  }
+  update_nbr();
+  if(num_free > 0) {
+    return 1;
+  }
+  if(num_children < MAX_CHILDREN) {
+    return remove_worst_nbr();
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+check_add_from_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
+{
+  rpl_instance_t *instance;
+  rpl_rank_t rank;
+
+  /* Do a lookup to see if it is already there - then allow add/update. */
+  if(uip_ds6_nbr_lookup(from)) {
+    return 1;
+  }
+
+  update_nbr();
+
+  /* If there is room for this neighbor just add it. */
+  if(num_free > 0) {
+    return 1;
+  }
+
+  instance = rpl_get_instance(dio->instance_id);
+  if(instance == NULL || instance->current_dag == NULL) {
+    PRINTF("Did not find instance id: %d\n", dio->instance_id);
+    return 0;
+  }
+
+  /* Add the new neighbor only if it is better than the preferred parent. */
+  rank = instance->of->calculate_rank(NULL, dio->rank);
+  if(rank < worst_rank - instance->min_hoprankinc / 2) {
+    /* Found *great* neighbor - add! */
+    PRINTF("Found better neighbor %d < %d - add to cache...\n",
+           rank, worst_rank);
+
+    return remove_worst_nbr();
+  }
+
+  PRINTF("Found worse neighbor with new %d and old %d - NOT add to cache.\n",
+         rank, worst_rank);
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+check_add_from_dao(uip_ipaddr_t *from)
+{
+  /* Do a lookup to see if it is alread there - then allow add/update. */
+  if(uip_ds6_nbr_lookup(from)) {
+    return 1;
+  }
+
+  update_nbr();
+
+  /* Check if this DAO sender is not yet neighbor and there is already too
+     many children. */
+  if(num_children >= MAX_CHILDREN) {
+    PRINTF("Can not add another child - already at max.\n");
+    return 0;
+  }
+
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+const struct nbr_policy rpl_nbr_policy = {
+  check_add_from_dis,
+  check_add_from_dio,
+  check_add_from_dao
+};
+/*---------------------------------------------------------------------------*/
+/** @}*/
diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h
index 5a7a9be94..0eecca0e0 100644
--- a/core/net/rpl/rpl-private.h
+++ b/core/net/rpl/rpl-private.h
@@ -124,8 +124,17 @@
 #define RPL_NOPATH_REMOVAL_DELAY          60
 #endif /* RPL_CONF_NOPATH_REMOVAL_DELAY */
 
+#ifdef RPL_CONF_DAO_MAX_RETRANSMISSIONS
+#define RPL_DAO_MAX_RETRANSMISSIONS RPL_CONF_DAO_MAX_RETRANSMISSIONS
+#else
 #define RPL_DAO_MAX_RETRANSMISSIONS     5
+#endif /* RPL_CONF_DAO_MAX_RETRANSMISSIONS */
+
+#ifdef RPL_CONF_DAO_RETRANSMISSION_TIMEOUT
+#define RPL_DAO_RETRANSMISSION_TIMEOUT RPL_CONF_DAO_RETRANSMISSION_TIMEOUT
+#else
 #define RPL_DAO_RETRANSMISSION_TIMEOUT  (5 * CLOCK_SECOND)
+#endif /* RPL_CONF_DAO_RETRANSMISSION_TIMEOUT */
 
 /* Special value indicating immediate removal. */
 #define RPL_ZERO_LIFETIME               0
@@ -260,6 +269,24 @@ typedef struct rpl_stats rpl_stats_t;
 
 extern rpl_stats_t rpl_stats;
 #endif
+
+struct nbr_policy {
+  /** check if it is ok to add a nbr via UC DIS - positive => ok */
+  int (* check_add_from_dis)(uip_ipaddr_t *from);
+  int (* check_add_from_dio)(uip_ipaddr_t *from, rpl_dio_t *dio);
+  int (* check_add_from_dao)(uip_ipaddr_t *from);
+};
+
+
+#ifdef RPL_CONF_NBR_POLICY
+#define RPL_NBR_POLICY RPL_CONF_NBR_POLICY
+#else /* RPL_CONF_NBR_POLICY */
+#define RPL_NBR_POLICY rpl_nbr_policy
+#endif /* RPL_CONF_NBR_POLICY */
+
+extern const struct nbr_policy RPL_NBR_POLICY;
+
+
 /*---------------------------------------------------------------------------*/
 /* RPL macros. */
 
@@ -280,6 +307,7 @@ void dao_output(rpl_parent_t *, uint8_t lifetime);
 void dao_output_target(rpl_parent_t *, uip_ipaddr_t *, uint8_t lifetime);
 void dao_ack_output(rpl_instance_t *, uip_ipaddr_t *, uint8_t, uint8_t);
 void rpl_icmp6_register_handlers(void);
+uip_ds6_nbr_t *rpl_icmp6_update_nbr_table(uip_ipaddr_t *from);
 
 /* RPL logic functions. */
 void rpl_join_dag(uip_ipaddr_t *from, rpl_dio_t *dio);
diff --git a/core/net/rpl/rpl.c b/core/net/rpl/rpl.c
index da5822757..90b434102 100644
--- a/core/net/rpl/rpl.c
+++ b/core/net/rpl/rpl.c
@@ -238,7 +238,6 @@ rpl_add_route(rpl_dag_t *dag, uip_ipaddr_t *prefix, int prefix_len,
 
   rep->state.dag = dag;
   rep->state.lifetime = RPL_LIFETIME(dag->instance, dag->instance->default_lifetime);
-  /* rep->state.learned_from = RPL_ROUTE_FROM_INTERNAL; */
 
   PRINTF("RPL: Added a route to ");
   PRINT6ADDR(prefix);

From f4255fad0fa548dda48c76725aa34f83295d7ab5 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Thu, 20 Aug 2015 17:13:46 +0200
Subject: [PATCH 108/393] updated rpl-udp example with scalability test

---
 examples/ipv6/rpl-udp/Makefile          |   3 +-
 examples/ipv6/rpl-udp/project-conf.h    |  59 ++
 examples/ipv6/rpl-udp/rpl-udp-scale.csc | 729 ++++++++++++++++++++++++
 examples/ipv6/rpl-udp/rpl-udp.csc       | 167 +++++-
 examples/ipv6/rpl-udp/udp-client.c      |  76 ++-
 examples/ipv6/rpl-udp/udp-server.c      |   3 +-
 6 files changed, 1009 insertions(+), 28 deletions(-)
 create mode 100644 examples/ipv6/rpl-udp/project-conf.h
 create mode 100644 examples/ipv6/rpl-udp/rpl-udp-scale.csc

diff --git a/examples/ipv6/rpl-udp/Makefile b/examples/ipv6/rpl-udp/Makefile
index 9670d71e3..fbf9a589e 100644
--- a/examples/ipv6/rpl-udp/Makefile
+++ b/examples/ipv6/rpl-udp/Makefile
@@ -1,7 +1,8 @@
 all: udp-client udp-server
-APPS=servreg-hack
 CONTIKI=../../..
 
+CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
+
 ifdef WITH_COMPOWER
 APPS+=powertrace
 CFLAGS+= -DCONTIKIMAC_CONF_COMPOWER=1 -DWITH_COMPOWER=1 -DQUEUEBUF_CONF_NUM=4
diff --git a/examples/ipv6/rpl-udp/project-conf.h b/examples/ipv6/rpl-udp/project-conf.h
new file mode 100644
index 000000000..4b39f7de9
--- /dev/null
+++ b/examples/ipv6/rpl-udp/project-conf.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2015, 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_CONF_H_
+#define PROJECT_CONF_H_
+
+#undef NBR_TABLE_CONF_MAX_NEIGHBORS
+#undef UIP_CONF_MAX_ROUTES
+
+#ifdef TEST_MORE_ROUTES
+/* configure number of neighbors and routes */
+#define NBR_TABLE_CONF_MAX_NEIGHBORS     10
+#define UIP_CONF_MAX_ROUTES   30
+#else
+/* configure number of neighbors and routes */
+#define NBR_TABLE_CONF_MAX_NEIGHBORS     10
+#define UIP_CONF_MAX_ROUTES   10
+#endif /* TEST_MORE_ROUTES */
+
+#undef NETSTACK_CONF_RDC
+#define NETSTACK_CONF_RDC     nullrdc_driver
+#undef NULLRDC_CONF_802154_AUTOACK
+#define NULLRDC_CONF_802154_AUTOACK       1
+
+/* Define as minutes */
+#define RPL_CONF_DEFAULT_LIFETIME_UNIT   60
+
+/* 10 minutes lifetime of routes */
+#define RPL_CONF_DEFAULT_LIFETIME        10
+
+#define RPL_CONF_DEFAULT_ROUTE_INFINITE_LIFETIME 1
+
+#endif /* PROJECT_CONF_H_ */
diff --git a/examples/ipv6/rpl-udp/rpl-udp-scale.csc b/examples/ipv6/rpl-udp/rpl-udp-scale.csc
new file mode 100644
index 000000000..292e442c1
--- /dev/null
+++ b/examples/ipv6/rpl-udp/rpl-udp-scale.csc
@@ -0,0 +1,729 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>RPL up and downstream scaleability test network using IPv6 and RPL</title>
+    <randomseed>generated</randomseed>
+    <motedelay_us>5000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.mspmote.SkyMoteType
+      <identifier>sky1</identifier>
+      <description>Sky Mote Type #sky1</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-server.c</source>
+      <commands EXPORT="discard">make SERVER_REPLY=1 clean udp-server.sky TARGET=sky DEFINES=TEST_MORE_ROUTES=1</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-server.sky</firmware>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspSerial</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyLED</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyTemperature</moteinterface>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.mspmote.SkyMoteType
+      <identifier>sky2</identifier>
+      <description>Sky Mote Type #sky2</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-client.c</source>
+      <commands EXPORT="discard">make SERVER_REPLY=1 clean udp-client.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-client.sky</firmware>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspSerial</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyLED</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyTemperature</moteinterface>
+    </motetype>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>48.435974731198804</x>
+        <y>-66.16503914182063</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>1</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-39.78380986481406</x>
+        <y>-48.10655064098382</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>2</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>127.9689727848476</x>
+        <y>91.71883780610729</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>3</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>154.92605604103275</x>
+        <y>40.97896551774433</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>4</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspSerial
+        <history>r~;</history>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>47.34887596588397</x>
+        <y>-30.341495695501195</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>5</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>47.13486576528276</x>
+        <y>32.944481932122315</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>6</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-11.42091423859419</x>
+        <y>17.879870626121914</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>7</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>118.92746659954325</x>
+        <y>57.05973076244069</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>8</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>53.68872892015448</x>
+        <y>59.887319605093715</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>9</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>16.45706316609417</x>
+        <y>23.9075414163248</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>10</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-13.423161364506493</x>
+        <y>-38.483037144768275</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>11</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-9.034961217472201</x>
+        <y>44.411389162165406</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>12</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-39.298891643282545</x>
+        <y>-3.9704359883635574</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>13</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>66.93880603404335</x>
+        <y>-42.39683727590697</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>14</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>94.81678343873172</x>
+        <y>26.921376811426246</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>15</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-43.06618588715935</x>
+        <y>30.68867105530305</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>16</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-34.02467970185502</x>
+        <y>-24.313824905298304</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>17</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-28.750467760427494</x>
+        <y>48.01822457713635</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>18</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>124.95513738974614</x>
+        <y>20.140247172447996</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>19</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>15.703604317318808</x>
+        <y>-47.6710492173345</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>20</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>154.43072661267115</x>
+        <y>-3.279765376986134</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>21</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>121.18784314586934</x>
+        <y>-24.313824905298304</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>22</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>88.4612185198951</x>
+        <y>-49.763990463932714</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>23</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>24.745110502623138</x>
+        <y>-1.7100594420374744</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>24</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>94.06332458995635</x>
+        <y>-2.4635182908128352</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>25</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-4.639784599615941</x>
+        <y>-9.998106778566445</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>26</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>2.4901685804620115</x>
+        <y>-60.89843789583528</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>27</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>103.10483077526068</x>
+        <y>96.99304974753483</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>28</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>8.922474678340558</x>
+        <y>59.320107308766765</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>29</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>58.650758697514384</x>
+        <y>2.8106936506146916</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>30</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>90.59867707439</x>
+        <y>67.97632874312737</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>31</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>289</width>
+    <z>1</z>
+    <height>184</height>
+    <location_x>31</location_x>
+    <location_y>41</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.AttributeVisualizerSkin</skin>
+      <viewport>2.349818846983307 0.0 0.0 2.349818846983307 187.19773526533345 190.95275613586946</viewport>
+    </plugin_config>
+    <width>659</width>
+    <z>3</z>
+    <height>523</height>
+    <location_x>296</location_x>
+    <location_y>11</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>937</width>
+    <z>4</z>
+    <height>349</height>
+    <location_x>21</location_x>
+    <location_y>464</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>TIMEOUT(12000000, log.log("Total PRR " + totalPRR + "\n"));
+packetsReceived= new Array();
+packetsSent = new Array();
+serverID = 1;
+nodeCount = 31;
+totalPRR = 0;
+
+for(i = 0; i &lt;= nodeCount; i++) {
+	packetsReceived[i] = 0;
+	packetsSent[i] = 0;
+}
+
+while(1) {
+	YIELD();
+
+	msgArray = msg.split(' ');
+	if(msgArray[0].equals("#A")) {
+		if(msgArray[1].charAt(0) == 'r') {
+			// Received packet
+			senderID = id;
+            arr2 = msgArray[1].split(',')[0].slice(2).split('/');
+            recv = parseInt(arr2[0]);
+            sent = parseInt(arr2[1]);
+            log.log("Sent:" + sent + " Recv:" + recv + "\n");
+            packetsSent[senderID] = sent;
+			packetsReceived[senderID] = recv;
+
+			log.log("SenderID " + senderID + " PRR " + packetsReceived[senderID] / packetsSent[senderID] + "\n");
+			totalReceived = totalSent = 0;
+			for(i = serverID + 1; i &lt;= nodeCount; i++) {
+				totalReceived += packetsReceived[i];
+				totalSent += packetsSent[i];
+			}
+			totalPRR = totalReceived / totalSent;
+			log.log("Total PRR " + totalPRR + " recv " + totalReceived + " sent " + totalSent + "\n");
+		}
+	}
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>600</width>
+    <z>0</z>
+    <height>700</height>
+    <location_x>946</location_x>
+    <location_y>6</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.MoteInterfaceViewer
+    <mote_arg>3</mote_arg>
+    <plugin_config>
+      <interface>Serial port</interface>
+      <scrollpos>0,0</scrollpos>
+    </plugin_config>
+    <width>350</width>
+    <z>2</z>
+    <height>300</height>
+    <location_x>976</location_x>
+    <location_y>36</location_y>
+  </plugin>
+</simconf>
diff --git a/examples/ipv6/rpl-udp/rpl-udp.csc b/examples/ipv6/rpl-udp/rpl-udp.csc
index cf7c049f1..3aa9b270e 100644
--- a/examples/ipv6/rpl-udp/rpl-udp.csc
+++ b/examples/ipv6/rpl-udp/rpl-udp.csc
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
-  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mrm</project>
-  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mspsim</project>
-  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/avrora</project>
-  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mobility</project>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
   <simulation>
     <title>Data collection network using IPv6 and RPL</title>
-    <delaytime>0</delaytime>
     <randomseed>generated</randomseed>
     <motedelay_us>5000000</motedelay_us>
     <radiomedium>
@@ -24,7 +25,7 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #sky1</description>
       <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-server.c</source>
-      <commands EXPORT="discard">make udp-server.sky TARGET=sky</commands>
+      <commands EXPORT="discard">make clean udp-server.sky TARGET=sky DEFINES=TEST_MORE_ROUTES=1</commands>
       <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-server.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
@@ -47,7 +48,7 @@
       <identifier>sky2</identifier>
       <description>Sky Mote Type #sky2</description>
       <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-client.c</source>
-      <commands EXPORT="discard">make udp-client.sky TARGET=sky</commands>
+      <commands EXPORT="discard">make clean udp-client.sky TARGET=sky</commands>
       <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-client.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
@@ -73,6 +74,10 @@
         <y>-66.16503914182063</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>1</id>
@@ -87,6 +92,10 @@
         <y>98.28771308774003</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>2</id>
@@ -101,6 +110,10 @@
         <y>91.71883780610729</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>3</id>
@@ -115,6 +128,10 @@
         <y>92.47229665488265</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>4</id>
@@ -129,6 +146,10 @@
         <y>-30.341495695501195</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>5</id>
@@ -143,6 +164,10 @@
         <y>32.944481932122315</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>6</id>
@@ -157,6 +182,10 @@
         <y>17.879870626121914</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>7</id>
@@ -171,6 +200,10 @@
         <y>57.05973076244069</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>8</id>
@@ -185,6 +218,10 @@
         <y>59.887319605093715</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>9</id>
@@ -199,6 +236,10 @@
         <y>23.9075414163248</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>10</id>
@@ -213,6 +254,10 @@
         <y>75.14274313304935</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>11</id>
@@ -227,6 +272,10 @@
         <y>85.6911670159044</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>12</id>
@@ -241,6 +290,10 @@
         <y>-3.9704359883635574</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>13</id>
@@ -255,6 +308,10 @@
         <y>-42.39683727590697</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>14</id>
@@ -269,6 +326,10 @@
         <y>26.921376811426246</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>15</id>
@@ -283,6 +344,10 @@
         <y>30.68867105530305</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>16</id>
@@ -297,6 +362,10 @@
         <y>-24.313824905298304</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>17</id>
@@ -311,6 +380,10 @@
         <y>48.01822457713635</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>18</id>
@@ -325,6 +398,10 @@
         <y>20.140247172447996</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>19</id>
@@ -339,6 +416,10 @@
         <y>-47.6710492173345</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>20</id>
@@ -353,6 +434,10 @@
         <y>92.47229665488265</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>21</id>
@@ -367,6 +452,10 @@
         <y>-24.313824905298304</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>22</id>
@@ -381,6 +470,10 @@
         <y>-44.657213822233054</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>23</id>
@@ -395,6 +488,10 @@
         <y>-1.7100594420374744</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>24</id>
@@ -409,6 +506,10 @@
         <y>-2.4635182908128352</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>25</id>
@@ -423,6 +524,10 @@
         <y>-9.998106778566445</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>26</id>
@@ -437,6 +542,10 @@
         <y>-50.684884612435944</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>27</id>
@@ -451,6 +560,10 @@
         <y>96.99304974753483</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>28</id>
@@ -465,6 +578,10 @@
         <y>59.320107308766765</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>29</id>
@@ -479,6 +596,10 @@
         <y>2.8106936506146916</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>30</id>
@@ -493,6 +614,10 @@
         <y>67.97632874312737</y>
         <z>0.0</z>
       </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
       <interface_config>
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>31</id>
@@ -503,10 +628,10 @@
   <plugin>
     org.contikios.cooja.plugins.SimControl
     <width>259</width>
-    <z>1</z>
+    <z>3</z>
     <height>184</height>
-    <location_x>0</location_x>
-    <location_y>0</location_y>
+    <location_x>3</location_x>
+    <location_y>15</location_y>
   </plugin>
   <plugin>
     org.contikios.cooja.plugins.Visualizer
@@ -517,21 +642,23 @@
       <viewport>2.349818846983307 0.0 0.0 2.349818846983307 150.19773526533348 176.95275613586946</viewport>
     </plugin_config>
     <width>520</width>
-    <z>3</z>
+    <z>2</z>
     <height>523</height>
-    <location_x>269</location_x>
-    <location_y>14</location_y>
+    <location_x>14</location_x>
+    <location_y>210</location_y>
   </plugin>
   <plugin>
     org.contikios.cooja.plugins.LogListener
     <plugin_config>
       <filter />
+      <formatted_time />
+      <coloring />
     </plugin_config>
     <width>937</width>
     <z>0</z>
     <height>213</height>
-    <location_x>21</location_x>
-    <location_y>464</location_y>
+    <location_x>265</location_x>
+    <location_y>16</location_y>
   </plugin>
   <plugin>
     org.contikios.cooja.plugins.ScriptRunner
@@ -574,11 +701,11 @@ while(1) {
 }</script>
       <active>true</active>
     </plugin_config>
-    <width>600</width>
-    <z>2</z>
-    <height>700</height>
-    <location_x>665</location_x>
-    <location_y>6</location_y>
+    <width>651</width>
+    <z>1</z>
+    <height>550</height>
+    <location_x>547</location_x>
+    <location_y>181</location_y>
   </plugin>
 </simconf>
 
diff --git a/examples/ipv6/rpl-udp/udp-client.c b/examples/ipv6/rpl-udp/udp-client.c
index 279703880..e5339fc3d 100644
--- a/examples/ipv6/rpl-udp/udp-client.c
+++ b/examples/ipv6/rpl-udp/udp-client.c
@@ -40,12 +40,17 @@
 #include <stdio.h>
 #include <string.h>
 
+/* Only for TMOTE Sky? */
+#include "dev/serial-line.h"
+#include "dev/uart1.h"
+#include "net/ipv6/uip-ds6-route.h"
+
 #define UDP_CLIENT_PORT 8765
 #define UDP_SERVER_PORT 5678
 
 #define UDP_EXAMPLE_ID  190
 
-#define DEBUG DEBUG_PRINT
+#define DEBUG DEBUG_FULL
 #include "net/ip/uip-debug.h"
 
 #ifndef PERIOD
@@ -64,6 +69,9 @@ static uip_ipaddr_t server_ipaddr;
 PROCESS(udp_client_process, "UDP client process");
 AUTOSTART_PROCESSES(&udp_client_process);
 /*---------------------------------------------------------------------------*/
+static int seq_id;
+static int reply;
+
 static void
 tcpip_handler(void)
 {
@@ -72,16 +80,32 @@ tcpip_handler(void)
   if(uip_newdata()) {
     str = uip_appdata;
     str[uip_datalen()] = '\0';
-    printf("DATA recv '%s'\n", str);
+    reply++;
+    printf("DATA recv '%s' (s:%d, r:%d)\n", str, seq_id, reply);
   }
 }
 /*---------------------------------------------------------------------------*/
 static void
 send_packet(void *ptr)
 {
-  static int seq_id;
   char buf[MAX_PAYLOAD_LEN];
 
+#ifdef SERVER_REPLY
+  uint8_t num_used = 0;
+  uip_ds6_nbr_t *nbr;
+
+  nbr = nbr_table_head(ds6_neighbors);
+  while(nbr != NULL) {
+    nbr = nbr_table_next(ds6_neighbors, nbr);
+    num_used++;
+  }
+
+  if(seq_id > 0) {
+    ANNOTATE("#A r=%d/%d,color=%s,n=%d %d\n", reply, seq_id,
+             reply == seq_id ? "GREEN" : "RED", uip_ds6_route_num_routes(), num_used);
+  }
+#endif /* SERVER_REPLY */
+
   seq_id++;
   PRINTF("DATA send to %d 'Hello %d'\n",
          server_ipaddr.u8[sizeof(server_ipaddr.u8) - 1], seq_id);
@@ -156,8 +180,9 @@ PROCESS_THREAD(udp_client_process, ev, data)
   PROCESS_PAUSE();
 
   set_global_address();
-  
-  PRINTF("UDP client process started\n");
+
+  PRINTF("UDP client process started nbr:%d routes:%d\n",
+         NBR_TABLE_CONF_MAX_NEIGHBORS, UIP_CONF_MAX_ROUTES);
 
   print_local_addresses();
 
@@ -174,6 +199,11 @@ PROCESS_THREAD(udp_client_process, ev, data)
   PRINTF(" local/remote port %u/%u\n",
 	UIP_HTONS(client_conn->lport), UIP_HTONS(client_conn->rport));
 
+  /* initialize serial line */
+  uart1_set_input(serial_line_input_byte);
+  serial_line_init();
+
+
 #if WITH_COMPOWER
   powertrace_sniff(POWERTRACE_ON);
 #endif
@@ -184,7 +214,41 @@ PROCESS_THREAD(udp_client_process, ev, data)
     if(ev == tcpip_event) {
       tcpip_handler();
     }
-    
+
+    if(ev == serial_line_event_message && data != NULL) {
+      char *str;
+      str = data;
+      if(str[0] == 'r') {
+        uip_ds6_route_t *r;
+        uip_ipaddr_t *nexthop;
+        uip_ds6_defrt_t *defrt;
+        uip_ipaddr_t *ipaddr;
+        defrt = NULL;
+        if((ipaddr = uip_ds6_defrt_choose()) != NULL) {
+          defrt = uip_ds6_defrt_lookup(ipaddr);
+        }
+        if(defrt != NULL) {
+          PRINTF("DefRT: :: -> %02d", defrt->ipaddr.u8[15]);
+          PRINTF(" lt:%lu inf:%d\n", stimer_remaining(&defrt->lifetime),
+                 defrt->isinfinite);
+        } else {
+          PRINTF("DefRT: :: -> NULL\n");
+        }
+
+        for(r = uip_ds6_route_head();
+            r != NULL;
+            r = uip_ds6_route_next(r)) {
+          nexthop = uip_ds6_route_nexthop(r);
+          PRINTF("Route: %02d -> %02d", r->ipaddr.u8[15], nexthop->u8[15]);
+          /* PRINT6ADDR(&r->ipaddr); */
+          /* PRINTF(" -> "); */
+          /* PRINT6ADDR(nexthop); */
+          PRINTF(" lt:%lu\n", r->state.lifetime);
+
+        }
+      }
+    }
+
     if(etimer_expired(&periodic)) {
       etimer_reset(&periodic);
       ctimer_set(&backoff_timer, SEND_TIME, send_packet, NULL);
diff --git a/examples/ipv6/rpl-udp/udp-server.c b/examples/ipv6/rpl-udp/udp-server.c
index 17c1b1fb8..ce87d3b8f 100644
--- a/examples/ipv6/rpl-udp/udp-server.c
+++ b/examples/ipv6/rpl-udp/udp-server.c
@@ -107,7 +107,8 @@ PROCESS_THREAD(udp_server_process, ev, data)
 
   SENSORS_ACTIVATE(button_sensor);
 
-  PRINTF("UDP server started\n");
+  PRINTF("UDP server started. nbr:%d routes:%d\n",
+         NBR_TABLE_CONF_MAX_NEIGHBORS, UIP_CONF_MAX_ROUTES);
 
 #if UIP_CONF_ROUTER
 /* The choice of server address determines its 6LoPAN header compression.

From fa1b70b723f2eb188fa8a4ece19f801b3d0c2bef Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Mon, 24 Aug 2015 11:13:05 +0200
Subject: [PATCH 109/393] added configuration of DAO route refresh for
 broadcast DIOs

---
 core/net/rpl/rpl-icmp6.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index b0ab53de4..e043b87a2 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -515,7 +515,7 @@ dio_output(rpl_instance_t *instance, uip_ipaddr_t *uc_addr)
 
   buffer[pos++] = instance->dtsn_out;
 
-  if(uc_addr == NULL) {
+  if(RPL_DIO_REFRESH_DAO_ROUTES && uc_addr == NULL) {
     /* Request new DAO to refresh route. We do not do this for unicast DIO
      * in order to avoid DAO messages after a DIS-DIO update,
      * or upon unicast DIO probing. */

From cd98b8b40ec6b238c4faf28b7f72038ec248851d Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Mon, 24 Aug 2015 11:42:50 +0200
Subject: [PATCH 110/393] added periodic debug printout of number of used
 neighbors and routes

---
 core/net/rpl/rpl-nbr-policy.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/core/net/rpl/rpl-nbr-policy.c b/core/net/rpl/rpl-nbr-policy.c
index 8c9a2ff21..34e67f946 100644
--- a/core/net/rpl/rpl-nbr-policy.c
+++ b/core/net/rpl/rpl-nbr-policy.c
@@ -68,6 +68,18 @@ static int num_free;
 static uip_ds6_nbr_t *worst_rank_nbr; /* the parent that has the worst rank */
 static rpl_rank_t worst_rank;
 /*---------------------------------------------------------------------------*/
+#if DEBUG == DEBUG_FULL
+static void update_nbr(void);
+static struct ctimer periodic_timer;
+static int timer_init = 0;
+static void
+handle_periodic_timer(void *ptr)
+{
+  update_nbr();
+  ctimer_restart(&periodic_timer);
+}
+#endif /* DEBUG == DEBUG_FULL */
+/*---------------------------------------------------------------------------*/
 static void
 update_nbr(void)
 {
@@ -77,6 +89,14 @@ update_nbr(void)
   int is_used;
   rpl_rank_t rank;
 
+#if DEBUG == DEBUG_FULL
+  if(!timer_init) {
+    timer_init = 1;
+    ctimer_set(&periodic_timer, 60 * CLOCK_SECOND,
+               &handle_periodic_timer, NULL);
+  }
+#endif /* DEBUG == DEBUG_FULL */
+
   worst_rank = 0;
   worst_rank_nbr = NULL;
   num_used = 0;

From 60dc6503e585e5833410e308d3493052577f9a3b Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Mon, 24 Aug 2015 15:10:14 +0200
Subject: [PATCH 111/393] disabled DAO ACK and configured for only one DAG per
 instance to save memory for er-example

---
 examples/er-rest-example/project-conf.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/examples/er-rest-example/project-conf.h b/examples/er-rest-example/project-conf.h
index 53662619a..3d894a5d4 100644
--- a/examples/er-rest-example/project-conf.h
+++ b/examples/er-rest-example/project-conf.h
@@ -60,6 +60,9 @@
 #undef NETSTACK_CONF_RDC
 #define NETSTACK_CONF_RDC              nullrdc_driver
 
+#undef RPL_CONF_MAX_DAG_PER_INSTANCE
+#define RPL_CONF_MAX_DAG_PER_INSTANCE     1
+
 /* Disabling TCP on CoAP nodes. */
 #undef UIP_CONF_TCP
 #define UIP_CONF_TCP                   0
@@ -93,6 +96,10 @@
 #undef COAP_PROXY_OPTION_PROCESSING
 #define COAP_PROXY_OPTION_PROCESSING   0
 
+/* Turn of DAO ACK to make code smaller */
+#undef RPL_CONF_WITH_DAO_ACK
+#define RPL_CONF_WITH_DAO_ACK          0
+
 /* Enable client-side support for COAP observe */
 #define COAP_OBSERVE_CLIENT 1
 #endif /* __PROJECT_ERBIUM_CONF_H__ */

From 1d92359e72adc44ec32e0e8a9987fd2a6b27ffb7 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Mon, 24 Aug 2015 15:27:38 +0200
Subject: [PATCH 112/393] Replaced MRHof with OF-0 for getting code-size down
 for er-example

---
 examples/er-rest-example/project-conf.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/examples/er-rest-example/project-conf.h b/examples/er-rest-example/project-conf.h
index 3d894a5d4..adcb75ee1 100644
--- a/examples/er-rest-example/project-conf.h
+++ b/examples/er-rest-example/project-conf.h
@@ -100,6 +100,9 @@
 #undef RPL_CONF_WITH_DAO_ACK
 #define RPL_CONF_WITH_DAO_ACK          0
 
+#undef RPL_CONF_OF
+#define RPL_CONF_OF                    rpl_of0
+
 /* Enable client-side support for COAP observe */
 #define COAP_OBSERVE_CLIENT 1
 #endif /* __PROJECT_ERBIUM_CONF_H__ */

From 37c5f741e91b1f1ab5fe6f5089dcc442009ce5a0 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Mon, 24 Aug 2015 16:22:07 +0200
Subject: [PATCH 113/393] removed viztool usage of learned-from routing state
 that was removed

---
 platform/cc2530dk/viztool.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/cc2530dk/viztool.c b/platform/cc2530dk/viztool.c
index e6b2fbed3..1901e9f74 100644
--- a/platform/cc2530dk/viztool.c
+++ b/platform/cc2530dk/viztool.c
@@ -127,8 +127,8 @@ process_request() CC_NON_BANKED
       if(rt != NULL) {
         entry_size = sizeof(i) + sizeof(rt->ipaddr)
           + sizeof(rt->length)
-          + sizeof(rt->state.lifetime)
-          + sizeof(rt->state.learned_from);
+          + sizeof(rt->state.lifetime);
+          /* + sizeof(rt->state.learned_from); */
 
         memcpy(buf + len, &i, sizeof(i));
         len += sizeof(i);
@@ -147,11 +147,11 @@ process_request() CC_NON_BANKED
         len += sizeof(flip);
         PRINTF(" - %08lx", rt->state.lifetime);
 
-        memcpy(buf + len, &rt->state.learned_from,
-               sizeof(rt->state.learned_from));
-        len += sizeof(rt->state.learned_from);
+        /* memcpy(buf + len, &rt->state.learned_from, */
+        /*        sizeof(rt->state.learned_from)); */
+        /* len += sizeof(rt->state.learned_from); */
 
-        PRINTF(" - %02x [%u]\n", rt->state.learned_from, entry_size);
+        PRINTF(" - [%u]\n", entry_size);
 
         count++;
         left -= entry_size;

From ad0e624d01637072d23bb4985f32fe5320b179ca Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Mon, 24 Aug 2015 20:49:50 +0200
Subject: [PATCH 114/393] increased number of routes in root node so that it
 can hold all routes in the simulation

---
 regression-tests/12-rpl/04-rpl-large-network.csc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regression-tests/12-rpl/04-rpl-large-network.csc b/regression-tests/12-rpl/04-rpl-large-network.csc
index 8b3ca0d8a..88d3774bf 100644
--- a/regression-tests/12-rpl/04-rpl-large-network.csc
+++ b/regression-tests/12-rpl/04-rpl-large-network.csc
@@ -1,3 +1,4 @@
+<<<<<<< 1d90b9290e293eedcb6451dd86c474ec168f688c
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
   <project EXPORT="discard">[APPS_DIR]/mrm</project>
@@ -7058,4 +7059,3 @@ while(true) {&#xD;
     <location_y>43</location_y>
   </plugin>
 </simconf>
-

From 01930d4a649b7628a6c4917ad3f4b31bacc31b2c Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Tue, 25 Aug 2015 09:05:14 +0200
Subject: [PATCH 115/393] changed default configuration of RPL route lifetime

---
 core/net/rpl/rpl-conf.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h
index 831765974..baba6aa6c 100644
--- a/core/net/rpl/rpl-conf.h
+++ b/core/net/rpl/rpl-conf.h
@@ -118,7 +118,7 @@
 #ifdef RPL_CONF_DEFAULT_ROUTE_INFINITE_LIFETIME
 #define RPL_DEFAULT_ROUTE_INFINITE_LIFETIME                    RPL_CONF_DEFAULT_ROUTE_INFINITE_LIFETIME
 #else
-#define RPL_DEFAULT_ROUTE_INFINITE_LIFETIME                    0
+#define RPL_DEFAULT_ROUTE_INFINITE_LIFETIME                    1
 #endif /* RPL_CONF_DEFAULT_ROUTE_INFINITE_LIFETIME */
 
 /*
@@ -200,7 +200,7 @@
  * used in RPL lifetime values, in seconds.
  */
 #ifndef RPL_CONF_DEFAULT_LIFETIME_UNIT
-#define RPL_DEFAULT_LIFETIME_UNIT       0xffff
+#define RPL_DEFAULT_LIFETIME_UNIT       0x60
 #else
 #define RPL_DEFAULT_LIFETIME_UNIT       RPL_CONF_DEFAULT_LIFETIME_UNIT
 #endif
@@ -209,7 +209,7 @@
  * Default route lifetime as a multiple of the lifetime unit.
  */
 #ifndef RPL_CONF_DEFAULT_LIFETIME
-#define RPL_DEFAULT_LIFETIME            0xff
+#define RPL_DEFAULT_LIFETIME            0x30
 #else
 #define RPL_DEFAULT_LIFETIME            RPL_CONF_DEFAULT_LIFETIME
 #endif

From be81d1d2c60e96d42a52894cec1dba4887e3da75 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Thu, 27 Aug 2015 20:07:13 +0200
Subject: [PATCH 116/393] added uip_clear_buf to avoid the risk of sending
 received packets

---
 core/net/rpl/rpl-icmp6.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index e043b87a2..5233c1fdd 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -1084,6 +1084,7 @@ dao_ack_input(void)
 
   instance = rpl_get_instance(instance_id);
   if(instance == NULL) {
+    uip_clear_buf();
     return;
   }
 
@@ -1092,6 +1093,7 @@ dao_ack_input(void)
     /* not a known instance - did we switch?? */
     //    PRINTF("RPL: Received a DAO ACK from a not joined instance: %d",
     //	   instance_id);
+    uip_clear_buf();
     return;
   }
 
@@ -1099,7 +1101,6 @@ dao_ack_input(void)
 	 sequence, instance->my_dao_seqno, status);
   PRINT6ADDR(&UIP_IP_BUF->srcipaddr);
   PRINTF("\n");
-#endif /* DEBUG */
 
   if(sequence == instance->my_dao_seqno) {
     PRINTF("RPL: DAO %s for me!\n", status < 128 ? "ACK" : "NACK");

From 444015df675dcdab22ed5043c4085b3932bfb7d9 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Sun, 20 Sep 2015 21:02:30 +0200
Subject: [PATCH 117/393] refactored the rpl-nbr-policy to be called from
 nbr-table module

---
 core/contiki-default-conf.h            |   7 ++
 core/net/ipv6/uip-ds6-nbr.c            |   6 +-
 core/net/ipv6/uip-ds6-nbr.h            |   6 +-
 core/net/ipv6/uip-ds6-route.c          |   3 +-
 core/net/llsec/noncoresec/noncoresec.c |   2 +-
 core/net/mac/phase.c                   |   2 +-
 core/net/nbr-table.c                   | 115 +++++++++++++++++--------
 core/net/nbr-table.h                   |  13 ++-
 core/net/rpl/rpl-dag.c                 |  25 +++---
 core/net/rpl/rpl-icmp6.c               |  50 ++++++-----
 core/net/rpl/rpl-nbr-policy.c          | 109 ++++++++++-------------
 core/net/rpl/rpl-private.h             |  19 +---
 core/net/rpl/rpl-timers.c              |   2 +
 13 files changed, 198 insertions(+), 161 deletions(-)

diff --git a/core/contiki-default-conf.h b/core/contiki-default-conf.h
index 0083f7e10..7b001bd58 100644
--- a/core/contiki-default-conf.h
+++ b/core/contiki-default-conf.h
@@ -148,6 +148,13 @@
 #define UIP_CONF_IPV6_RPL 1
 #endif /* UIP_CONF_IPV6_RPL */
 
+/* If RPL is enabled also enable the RPL NBR Policy */
+#if UIP_CONF_IPV6_RPL
+#ifndef NBR_TABLE_FIND_REMOVABLE
+#define NBR_TABLE_FIND_REMOVABLE rpl_nbr_policy_find_removable
+#endif /* NBR_TABLE_FIND_REMOVABLE */
+#endif /* UIP_CONF_IPV6_RPL */
+
 /* UIP_CONF_MAX_ROUTES specifies the maximum number of routes that each
    node will be able to handle. */
 #ifndef UIP_CONF_MAX_ROUTES
diff --git a/core/net/ipv6/uip-ds6-nbr.c b/core/net/ipv6/uip-ds6-nbr.c
index 5905993a5..b8666a14a 100644
--- a/core/net/ipv6/uip-ds6-nbr.c
+++ b/core/net/ipv6/uip-ds6-nbr.c
@@ -79,9 +79,11 @@ uip_ds6_neighbors_init(void)
 /*---------------------------------------------------------------------------*/
 uip_ds6_nbr_t *
 uip_ds6_nbr_add(const uip_ipaddr_t *ipaddr, const uip_lladdr_t *lladdr,
-                uint8_t isrouter, uint8_t state)
+                uint8_t isrouter, uint8_t state, nbr_table_reason_t reason,
+                void *data)
 {
-  uip_ds6_nbr_t *nbr = nbr_table_add_lladdr(ds6_neighbors, (linkaddr_t*)lladdr);
+  uip_ds6_nbr_t *nbr = nbr_table_add_lladdr(ds6_neighbors, (linkaddr_t*)lladdr
+                                            ,reason, data);
   if(nbr) {
     uip_ipaddr_copy(&nbr->ipaddr, ipaddr);
 #if UIP_ND6_SEND_NA || UIP_ND6_SEND_RA || !UIP_CONF_ROUTER
diff --git a/core/net/ipv6/uip-ds6-nbr.h b/core/net/ipv6/uip-ds6-nbr.h
index b0dd84d4a..2f3a51d28 100644
--- a/core/net/ipv6/uip-ds6-nbr.h
+++ b/core/net/ipv6/uip-ds6-nbr.h
@@ -86,8 +86,10 @@ typedef struct uip_ds6_nbr {
 void uip_ds6_neighbors_init(void);
 
 /** \brief Neighbor Cache basic routines */
-uip_ds6_nbr_t *uip_ds6_nbr_add(const uip_ipaddr_t *ipaddr, const uip_lladdr_t *lladdr,
-                               uint8_t isrouter, uint8_t state);
+uip_ds6_nbr_t *uip_ds6_nbr_add(const uip_ipaddr_t *ipaddr,
+                               const uip_lladdr_t *lladdr,
+                               uint8_t isrouter, uint8_t state,
+                               nbr_table_reason_t reason, void *data);
 int uip_ds6_nbr_rm(uip_ds6_nbr_t *nbr);
 const uip_lladdr_t *uip_ds6_nbr_get_ll(const uip_ds6_nbr_t *nbr);
 const uip_ipaddr_t *uip_ds6_nbr_get_ipaddr(const uip_ds6_nbr_t *nbr);
diff --git a/core/net/ipv6/uip-ds6-route.c b/core/net/ipv6/uip-ds6-route.c
index 3113986a1..21ce38f64 100644
--- a/core/net/ipv6/uip-ds6-route.c
+++ b/core/net/ipv6/uip-ds6-route.c
@@ -348,7 +348,8 @@ uip_ds6_route_add(uip_ipaddr_t *ipaddr, uint8_t length,
          initialize this pointer with the list of routing entries that
          are attached to this neighbor. */
       routes = nbr_table_add_lladdr(nbr_routes,
-                                    (linkaddr_t *)nexthop_lladdr);
+                                    (linkaddr_t *)nexthop_lladdr,
+                                    NBR_TABLE_REASON_ROUTE, NULL);
       if(routes == NULL) {
         /* This should not happen, as we explicitly deallocated one
            route table entry above. */
diff --git a/core/net/llsec/noncoresec/noncoresec.c b/core/net/llsec/noncoresec/noncoresec.c
index e18a7d734..860f7e613 100644
--- a/core/net/llsec/noncoresec/noncoresec.c
+++ b/core/net/llsec/noncoresec/noncoresec.c
@@ -188,7 +188,7 @@ parse(void)
   
   info = nbr_table_get_from_lladdr(anti_replay_table, sender);
   if(!info) {
-    info = nbr_table_add_lladdr(anti_replay_table, sender);
+    info = nbr_table_add_lladdr(anti_replay_table, sender, NBR_TABLE_REASON_LLSEC, NULL);
     if(!info) {
       PRINTF("noncoresec: could not get nbr_table_item\n");
       return FRAMER_FAILED;
diff --git a/core/net/mac/phase.c b/core/net/mac/phase.c
index 47b7e7cf3..d7ded2428 100644
--- a/core/net/mac/phase.c
+++ b/core/net/mac/phase.c
@@ -122,7 +122,7 @@ phase_update(const linkaddr_t *neighbor, rtimer_clock_t time,
   } else {
     /* No matching phase was found, so we allocate a new one. */
     if(mac_status == MAC_TX_OK && e == NULL) {
-      e = nbr_table_add_lladdr(nbr_phase, neighbor);
+      e = nbr_table_add_lladdr(nbr_phase, neighbor, NBR_TABLE_REASON_MAC, NULL);
       if(e) {
         e->time = time;
 #if PHASE_DRIFT_CORRECT
diff --git a/core/net/nbr-table.c b/core/net/nbr-table.c
index 6b990a020..42597c598 100644
--- a/core/net/nbr-table.c
+++ b/core/net/nbr-table.c
@@ -47,11 +47,20 @@
 static void handle_periodic_timer(void *ptr);
 static struct ctimer periodic_timer;
 static uint8_t initialized = 0;
+static void print_table();
 #define PRINTF(...) printf(__VA_ARGS__)
 #else
 #define PRINTF(...)
 #endif
 
+/* This is the callback function that will be called when there is a
+ *  nbr-policy active
+ **/
+#ifdef NBR_TABLE_FIND_REMOVABLE
+const linkaddr_t *NBR_TABLE_FIND_REMOVABLE(nbr_table_reason_t reason, void *data);
+#endif /* NBR_TABLE_FIND_REMOVABLE */
+
+
 /* List of link-layer addresses of the neighbors, used as key in the tables */
 typedef struct nbr_table_key {
   struct nbr_table_key *next;
@@ -170,7 +179,7 @@ nbr_set_bit(uint8_t *bitmap, nbr_table_t *table, nbr_table_item_t *item, int val
 }
 /*---------------------------------------------------------------------------*/
 static nbr_table_key_t *
-nbr_table_allocate(void)
+nbr_table_allocate(nbr_table_reason_t reason, void *data)
 {
   nbr_table_key_t *key;
   int least_used_count = 0;
@@ -179,39 +188,66 @@ nbr_table_allocate(void)
   key = memb_alloc(&neighbor_addr_mem);
   if(key != NULL) {
     return key;
-  } else { /* No more space, try to free a neighbor.
-            * The replacement policy is the following: remove neighbor that is:
-            * (1) not locked
-            * (2) used by fewest tables
-            * (3) oldest (the list is ordered by insertion time)
-            * */
-    /* Get item from first key */
-    key = list_head(nbr_table_keys);
-    while(key != NULL) {
-      int item_index = index_from_key(key);
-      int locked = locked_map[item_index];
-      /* Never delete a locked item */
-      if(!locked) {
-        int used = used_map[item_index];
-        int used_count = 0;
-        /* Count how many tables are using this item */
-        while(used != 0) {
-          if((used & 1) == 1) {
-            used_count++;
-          }
-          used >>= 1;
-        }
-        /* Find least used item */
-        if(least_used_key == NULL || used_count < least_used_count) {
-          least_used_key = key;
-          least_used_count = used_count;
-          if(used_count == 0) { /* We won't find any least used item */
-            break;
-          }
-        }
+  } else {
+#ifdef NBR_TABLE_FIND_REMOVABLE
+    const linkaddr_t *lladdr;
+    lladdr = NBR_TABLE_FIND_REMOVABLE(reason, data);
+    if(lladdr == NULL) {
+      /* Nothing found that can be deleted - return NULL to indicate failure */
+      PRINTF("*** Not removing entry to allocate new\n");
+      return NULL;
+    } else {
+      /* used least_used_key to indicate what is the least useful entry */
+      int index;
+      int locked;
+      if((index = index_from_lladdr(lladdr)) != -1) {
+        least_used_key = key_from_index(index);
+        locked = locked_map[index];
+      }
+      /* Allow delete of locked item? */
+      if(least_used_key != NULL && locked) {
+        PRINTF("Deleting locked item!\n");
+        locked_map[index] = 0;
       }
-      key = list_item_next(key);
     }
+#endif /* NBR_TABLE_FIND_REMOVABLE */
+
+    if(least_used_key == NULL) {
+      /* No more space, try to free a neighbor.
+       * The replacement policy is the following: remove neighbor that is:
+       * (1) not locked
+       * (2) used by fewest tables
+       * (3) oldest (the list is ordered by insertion time)
+       * */
+      /* Get item from first key */
+      key = list_head(nbr_table_keys);
+      while(key != NULL) {
+        int item_index = index_from_key(key);
+        int locked = locked_map[item_index];
+        /* Never delete a locked item */
+        if(!locked) {
+          int used = used_map[item_index];
+          int used_count = 0;
+          /* Count how many tables are using this item */
+          while(used != 0) {
+            if((used & 1) == 1) {
+              used_count++;
+            }
+          used >>= 1;
+          }
+          /* Find least used item */
+          if(least_used_key == NULL || used_count < least_used_count) {
+            least_used_key = key;
+            least_used_count = used_count;
+            if(used_count == 0) { /* We won't find any least used item */
+              break;
+            }
+          }
+        }
+        key = list_item_next(key);
+      }
+    }
+
     if(least_used_key == NULL) {
       /* We haven't found any unlocked item, allocation fails */
       return NULL;
@@ -289,7 +325,7 @@ nbr_table_next(nbr_table_t *table, nbr_table_item_t *item)
 /*---------------------------------------------------------------------------*/
 /* Add a neighbor indexed with its link-layer address */
 nbr_table_item_t *
-nbr_table_add_lladdr(nbr_table_t *table, const linkaddr_t *lladdr)
+nbr_table_add_lladdr(nbr_table_t *table, const linkaddr_t *lladdr, nbr_table_reason_t reason, void *data)
 {
   int index;
   nbr_table_item_t *item;
@@ -303,7 +339,7 @@ nbr_table_add_lladdr(nbr_table_t *table, const linkaddr_t *lladdr)
 
   if((index = index_from_lladdr(lladdr)) == -1) {
      /* Neighbor not yet in table, let's try to allocate one */
-    key = nbr_table_allocate();
+    key = nbr_table_allocate(reason, data);
 
     /* No space available for new entry */
     if(key == NULL) {
@@ -327,6 +363,9 @@ nbr_table_add_lladdr(nbr_table_t *table, const linkaddr_t *lladdr)
   memset(item, 0, table->item_size);
   nbr_set_bit(used_map, table, item, 1);
 
+#if DEBUG
+  print_table();
+#endif
   return item;
 }
 /*---------------------------------------------------------------------------*/
@@ -379,7 +418,7 @@ nbr_table_get_lladdr(nbr_table_t *table, const void *item)
 /*---------------------------------------------------------------------------*/
 #if DEBUG
 static void
-handle_periodic_timer(void *ptr)
+print_table()
 {
   int i, j;
   /* Printout all neighbors and which tables they are used in */
@@ -394,6 +433,12 @@ handle_periodic_timer(void *ptr)
       PRINTF("\n");
     }
   }
+}
+/*---------------------------------------------------------------------------*/
+static void
+handle_periodic_timer(void *ptr)
+{
+  print_table();
   ctimer_reset(&periodic_timer);
 }
 #endif
diff --git a/core/net/nbr-table.h b/core/net/nbr-table.h
index 516901fe3..cc58c2f80 100644
--- a/core/net/nbr-table.h
+++ b/core/net/nbr-table.h
@@ -75,6 +75,17 @@ typedef struct nbr_table {
 /** \brief Declaration of non-static neighbor tables */
 #define NBR_TABLE_DECLARE(name) extern nbr_table_t *name
 
+typedef enum {
+	NBR_TABLE_REASON_UNDEFINED,
+	NBR_TABLE_REASON_RPL_DIO,
+	NBR_TABLE_REASON_RPL_DAO,
+	NBR_TABLE_REASON_RPL_DIS,
+	NBR_TABLE_REASON_ROUTE,
+	NBR_TABLE_REASON_IPV6_ND,
+	NBR_TABLE_REASON_MAC,
+        NBR_TABLE_REASON_LLSEC
+} nbr_table_reason_t;
+
 /** \name Neighbor tables: register and loop through table elements */
 /** @{ */
 int nbr_table_register(nbr_table_t *table, nbr_table_callback *callback);
@@ -84,7 +95,7 @@ nbr_table_item_t *nbr_table_next(nbr_table_t *table, nbr_table_item_t *item);
 
 /** \name Neighbor tables: add and get data */
 /** @{ */
-nbr_table_item_t *nbr_table_add_lladdr(nbr_table_t *table, const linkaddr_t *lladdr);
+nbr_table_item_t *nbr_table_add_lladdr(nbr_table_t *table, const linkaddr_t *lladdr, nbr_table_reason_t reason, void *data);
 nbr_table_item_t *nbr_table_get_from_lladdr(nbr_table_t *table, const linkaddr_t *lladdr);
 /** @} */
 
diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index 79f83a84e..9d32c2773 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -634,8 +634,9 @@ rpl_add_parent(rpl_dag_t *dag, rpl_dio_t *dio, uip_ipaddr_t *addr)
   PRINT6ADDR(addr);
   PRINTF("\n");
   if(lladdr != NULL) {
-    /* Add parent in rpl_parents */
-    p = nbr_table_add_lladdr(rpl_parents, (linkaddr_t *)lladdr);
+    /* Add parent in rpl_parents - again this is due to DIO */
+    p = nbr_table_add_lladdr(rpl_parents, (linkaddr_t *)lladdr,
+                             NBR_TABLE_REASON_RPL_DIO, dio);
     if(p == NULL) {
       PRINTF("RPL: rpl_add_parent p NULL\n");
     } else {
@@ -1028,7 +1029,7 @@ rpl_join_instance(uip_ipaddr_t *from, rpl_dio_t *dio)
   rpl_set_default_route(instance, from);
 
   if(instance->mop != RPL_MOP_NO_DOWNWARD_ROUTES) {
-    rpl_schedule_dao_immediately(instance);
+    rpl_schedule_dao(instance);
   } else {
     PRINTF("RPL: The DIO does not meet the prerequisites for sending a DAO\n");
   }
@@ -1255,18 +1256,14 @@ rpl_process_parent_event(rpl_instance_t *instance, rpl_parent_t *p)
 static int
 add_nbr_from_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
 {
-  /* check if it is ok to add this nbr based on this DIO */
-  if(RPL_NBR_POLICY.check_add_from_dio(from, dio)) {
-    /* add this to the neighbor cache if not already there */
-    if(rpl_icmp6_update_nbr_table(from) == NULL) {
-      PRINTF("RPL: Out of memory, dropping DIO from ");
-      PRINT6ADDR(from);
-      PRINTF("\n");
-      return 0;
-    }
-    return 1;
+  /* add this to the neighbor cache if not already there */
+  if(rpl_icmp6_update_nbr_table(from, NBR_TABLE_REASON_RPL_DIO, dio) == NULL) {
+    PRINTF("RPL: Out of memory, dropping DIO from ");
+    PRINT6ADDR(from);
+    PRINTF("\n");
+    return 0;
   }
-  return 0;
+  return 1;
 }
 /*---------------------------------------------------------------------------*/
 void
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 5233c1fdd..83dd71897 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -182,14 +182,14 @@ set16(uint8_t *buffer, int pos, uint16_t value)
 }
 /*---------------------------------------------------------------------------*/
 uip_ds6_nbr_t *
-rpl_icmp6_update_nbr_table(uip_ipaddr_t *from)
+rpl_icmp6_update_nbr_table(uip_ipaddr_t *from, nbr_table_reason_t reason, void *data)
 {
   uip_ds6_nbr_t *nbr;
 
   if((nbr = uip_ds6_nbr_lookup(from)) == NULL) {
     if((nbr = uip_ds6_nbr_add(from, (uip_lladdr_t *)
                               packetbuf_addr(PACKETBUF_ADDR_SENDER),
-                              0, NBR_REACHABLE)) != NULL) {
+                              0, NBR_REACHABLE, reason, data)) != NULL) {
       PRINTF("RPL: Neighbor added to neighbor cache ");
       PRINT6ADDR(from);
       PRINTF(", ");
@@ -231,19 +231,18 @@ dis_input(void)
       } else {
 #endif /* !RPL_LEAF_ONLY */
 	/* Check if this neighbor should be added according to the policy. */
-	if(RPL_NBR_POLICY.check_add_from_dis(&UIP_IP_BUF->srcipaddr)) {
-	  /* Add this to the neighbor cache if not already there */
-	  if(rpl_icmp6_update_nbr_table(&UIP_IP_BUF->srcipaddr) == NULL) {
-	    PRINTF("RPL: Out of Memory, not sending unicast DIO, DIS from ");
-	    PRINT6ADDR(&UIP_IP_BUF->srcipaddr);
-	    PRINTF(", ");
-	    PRINTLLADDR((uip_lladdr_t *)packetbuf_addr(PACKETBUF_ADDR_SENDER));
-	    PRINTF("\n");
-	    return;
-	  }
-	  PRINTF("RPL: Unicast DIS, reply to sender\n");
-	  dio_output(instance, &UIP_IP_BUF->srcipaddr);
-	}
+        if(rpl_icmp6_update_nbr_table(&UIP_IP_BUF->srcipaddr,
+                                      NBR_TABLE_REASON_RPL_DIS, NULL) == NULL) {
+          PRINTF("RPL: Out of Memory, not sending unicast DIO, DIS from ");
+          PRINT6ADDR(&UIP_IP_BUF->srcipaddr);
+          PRINTF(", ");
+          PRINTLLADDR((uip_lladdr_t *)packetbuf_addr(PACKETBUF_ADDR_SENDER));
+          PRINTF("\n");
+        } else {
+          PRINTF("RPL: Unicast DIS, reply to sender\n");
+          dio_output(instance, &UIP_IP_BUF->srcipaddr);
+        }
+	/* } */
       }
     }
   }
@@ -806,18 +805,18 @@ dao_input(void)
 
   PRINTF("RPL: adding DAO route\n");
 
-  /* Check if we should add another neighbor based on DAO. */
-  if(!RPL_NBR_POLICY.check_add_from_dao(&dao_sender_addr)) {
-    /* Do not add the neighbor. */
-    return;
-  }
   /* Update and add neighbor - if no room - fail. */
-  if((nbr = rpl_icmp6_update_nbr_table(&dao_sender_addr)) == NULL) {
+  if((nbr = rpl_icmp6_update_nbr_table(&dao_sender_addr, NBR_TABLE_REASON_RPL_DAO, NULL)) == NULL) {
     PRINTF("RPL: Out of Memory, dropping DAO from ");
     PRINT6ADDR(&dao_sender_addr);
     PRINTF(", ");
     PRINTLLADDR((uip_lladdr_t *)packetbuf_addr(PACKETBUF_ADDR_SENDER));
     PRINTF("\n");
+    if(flags & RPL_DAO_K_FLAG) {
+      /* signal the failure to add the node */
+      dao_ack_output(instance, &dao_sender_addr, sequence,
+             RPL_DAO_ACK_UNABLE_TO_ACCEPT);
+    }
     goto discard;
   }
 
@@ -931,7 +930,9 @@ handle_dao_retransmission(void *ptr)
     return;
   }
 
-  ctimer_set(&instance->dao_retransmit_timer, RPL_DAO_RETRANSMISSION_TIMEOUT,
+  ctimer_set(&instance->dao_retransmit_timer,
+             RPL_DAO_RETRANSMISSION_TIMEOUT / 2 +
+             (random_rand() % (RPL_DAO_RETRANSMISSION_TIMEOUT / 2)),
 	     handle_dao_retransmission, parent);
 
   instance->my_dao_transmissions++;
@@ -1079,6 +1080,7 @@ dao_ack_input(void)
 
   buffer = UIP_ICMP_PAYLOAD;
 
+  instance_id = buffer[0];
   sequence = buffer[2];
   status = buffer[3];
 
@@ -1131,7 +1133,9 @@ dao_ack_input(void)
       if(nexthop == NULL) {
         PRINTF("No next hop to fwd DAO ACK to\n");
       } else {
-        PRINTF("Fwd DAO ACK\n");
+        PRINTF("Fwd DAO ACK to:");
+        PRINT6ADDR(nexthop);
+        PRINTF("\n");
         buffer[2] = re->state.dao_seqno_in;
         uip_icmp6_send(nexthop, ICMP6_RPL, RPL_CODE_DAO_ACK, 4);
       }
diff --git a/core/net/rpl/rpl-nbr-policy.c b/core/net/rpl/rpl-nbr-policy.c
index 34e67f946..51d0df8db 100644
--- a/core/net/rpl/rpl-nbr-policy.c
+++ b/core/net/rpl/rpl-nbr-policy.c
@@ -49,7 +49,7 @@
 #include "net/ipv6/uip-ds6-nbr.h"
 #include "net/ipv6/uip-ds6-route.h"
 
-#define DEBUG DEBUG_NONE
+#define DEBUG DEBUG_FULL
 #include "net/ip/uip-debug.h"
 
 /*
@@ -58,14 +58,18 @@
  * - max X children (nexthops)
  * - max Y "best parents"
  * => at least MAX_NBRS - (Y + X + 1) free slots for other.
+ *
+ * NOTE: this policy assumes that all neighbors end up being IPv6
+ * neighbors and are not only MAC neighbors.
  */
 
 #define MAX_CHILDREN (NBR_TABLE_MAX_NEIGHBORS - 3)
+#define UIP_IP_BUF       ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
 
 static int num_parents; /* any node that are possible parents */
 static int num_children;  /* all children that we have as nexthop */
 static int num_free;
-static uip_ds6_nbr_t *worst_rank_nbr; /* the parent that has the worst rank */
+static linkaddr_t *worst_rank_nbr; /* the parent that has the worst rank */
 static rpl_rank_t worst_rank;
 /*---------------------------------------------------------------------------*/
 #if DEBUG == DEBUG_FULL
@@ -124,8 +128,12 @@ update_nbr(void)
                 parent->dag->instance != NULL &&
                 (rank = parent->dag->instance->of->calculate_rank(parent, 0)) > worst_rank) {
         /* This is the worst-rank neighbor - this is a good candidate for removal */
-        worst_rank = rank;
-        worst_rank_nbr = nbr;
+        if(uip_ds6_route_is_nexthop((uip_lladdr_t *)lladdr) == 0) {
+          worst_rank = rank;
+          worst_rank_nbr = lladdr;
+        } else {
+          printf("*** Can not use this as worst rank as it is a next hop\n");
+        }
       }
     }
 
@@ -138,10 +146,9 @@ update_nbr(void)
 
     if(is_used == 0) {
       /* This neighbor is neither parent or child and can be safely removed */
-      worst_rank_nbr = nbr;
+      worst_rank_nbr = lladdr;
       worst_rank = INFINITE_RANK;
     } else if(is_used > 1) {
-      /* Both parent and child - this should never happen! */
       PRINTF("NBR-POLICY: *** Neighbor is both child and candidate parent: ");
       PRINTLLADDR((uip_lladdr_t *)lladdr);
       PRINTF("\n");
@@ -157,67 +164,36 @@ update_nbr(void)
 	 num_free, num_children, num_parents, uip_ds6_route_num_routes());
 }
 /*---------------------------------------------------------------------------*/
-static int
-remove_worst_nbr(void)
-{
-  /* we assume that it is possible to remove the worst parent at the moment */
-  if(worst_rank_nbr != NULL) {
-    PRINTF("Removing worst ranked nbr ");
-    PRINTLLADDR((uip_lladdr_t*)nbr_table_get_lladdr(ds6_neighbors, worst_rank_nbr));
-    PRINTF(" with rank %d\n", worst_rank);
-    if(uip_ds6_nbr_rm(worst_rank_nbr)) {
-      worst_rank_nbr = NULL;
-      return 1;
-    }
-    PRINTF("FAILED to remove worst ranked nbr!\n");
-    return 0;
-  }
-  PRINTF("FAILED to remove worst rank nbr - no found\n");
-  return 0;
-}
-/*---------------------------------------------------------------------------*/
 /* Called whenever we get a unicast DIS - e.g. someone that already
    have this node in its table - since it is a unicast */
-static int
-check_add_from_dis(uip_ipaddr_t *from)
+const linkaddr_t *
+find_removable_dis(uip_ipaddr_t *from)
 {
 
-  /* do a lookup to see if it is alread there - then allow add/update */
-  if(uip_ds6_nbr_lookup(from)) {
-    return 1;
-  }
   update_nbr();
   if(num_free > 0) {
-    return 1;
+    printf("num-free > 0 = %d", num_free);
+    printf("**** Should remove unused elements but can not... \n");
+    /*    return 1; */
   }
   if(num_children < MAX_CHILDREN) {
-    return remove_worst_nbr();
+    return worst_rank_nbr;
   }
-  return 0;
+  return NULL;
 }
 /*---------------------------------------------------------------------------*/
-static int
-check_add_from_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
+const linkaddr_t *
+find_removable_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
 {
   rpl_instance_t *instance;
   rpl_rank_t rank;
 
-  /* Do a lookup to see if it is already there - then allow add/update. */
-  if(uip_ds6_nbr_lookup(from)) {
-    return 1;
-  }
-
   update_nbr();
 
-  /* If there is room for this neighbor just add it. */
-  if(num_free > 0) {
-    return 1;
-  }
-
   instance = rpl_get_instance(dio->instance_id);
   if(instance == NULL || instance->current_dag == NULL) {
     PRINTF("Did not find instance id: %d\n", dio->instance_id);
-    return 0;
+    return NULL;
   }
 
   /* Add the new neighbor only if it is better than the preferred parent. */
@@ -227,38 +203,43 @@ check_add_from_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
     PRINTF("Found better neighbor %d < %d - add to cache...\n",
            rank, worst_rank);
 
-    return remove_worst_nbr();
+    return worst_rank_nbr;
   }
 
   PRINTF("Found worse neighbor with new %d and old %d - NOT add to cache.\n",
          rank, worst_rank);
-  return 0;
+  return NULL;
 }
 /*---------------------------------------------------------------------------*/
-static int
-check_add_from_dao(uip_ipaddr_t *from)
+const linkaddr_t *
+find_removable_dao(uip_ipaddr_t *from)
 {
-  /* Do a lookup to see if it is alread there - then allow add/update. */
-  if(uip_ds6_nbr_lookup(from)) {
-    return 1;
-  }
-
   update_nbr();
 
   /* Check if this DAO sender is not yet neighbor and there is already too
      many children. */
   if(num_children >= MAX_CHILDREN) {
     PRINTF("Can not add another child - already at max.\n");
-    return 0;
+    return NULL;
   }
-
-  return 1;
+  /* remove the worst ranked nbr */
+  return worst_rank_nbr;
 }
 /*---------------------------------------------------------------------------*/
-const struct nbr_policy rpl_nbr_policy = {
-  check_add_from_dis,
-  check_add_from_dio,
-  check_add_from_dao
-};
+const linkaddr_t *
+rpl_nbr_policy_find_removable(nbr_table_reason_t reason,void * data) {
+  /* When we get the DIO/DAO/DIS we know that UIP contains the
+     incoming packet */
+  switch(reason) {
+  case NBR_TABLE_REASON_RPL_DIO:
+    return find_removable_dio(&UIP_IP_BUF->srcipaddr, data);
+  case NBR_TABLE_REASON_RPL_DAO:
+    return find_removable_dao(&UIP_IP_BUF->srcipaddr);
+  case NBR_TABLE_REASON_RPL_DIS:
+    return find_removable_dis(&UIP_IP_BUF->srcipaddr);
+  default:
+    return NULL;
+  }
+}
 /*---------------------------------------------------------------------------*/
 /** @}*/
diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h
index 0eecca0e0..017efb474 100644
--- a/core/net/rpl/rpl-private.h
+++ b/core/net/rpl/rpl-private.h
@@ -270,22 +270,6 @@ typedef struct rpl_stats rpl_stats_t;
 extern rpl_stats_t rpl_stats;
 #endif
 
-struct nbr_policy {
-  /** check if it is ok to add a nbr via UC DIS - positive => ok */
-  int (* check_add_from_dis)(uip_ipaddr_t *from);
-  int (* check_add_from_dio)(uip_ipaddr_t *from, rpl_dio_t *dio);
-  int (* check_add_from_dao)(uip_ipaddr_t *from);
-};
-
-
-#ifdef RPL_CONF_NBR_POLICY
-#define RPL_NBR_POLICY RPL_CONF_NBR_POLICY
-#else /* RPL_CONF_NBR_POLICY */
-#define RPL_NBR_POLICY rpl_nbr_policy
-#endif /* RPL_CONF_NBR_POLICY */
-
-extern const struct nbr_policy RPL_NBR_POLICY;
-
 
 /*---------------------------------------------------------------------------*/
 /* RPL macros. */
@@ -307,7 +291,8 @@ void dao_output(rpl_parent_t *, uint8_t lifetime);
 void dao_output_target(rpl_parent_t *, uip_ipaddr_t *, uint8_t lifetime);
 void dao_ack_output(rpl_instance_t *, uip_ipaddr_t *, uint8_t, uint8_t);
 void rpl_icmp6_register_handlers(void);
-uip_ds6_nbr_t *rpl_icmp6_update_nbr_table(uip_ipaddr_t *from);
+uip_ds6_nbr_t *rpl_icmp6_update_nbr_table(uip_ipaddr_t *from,
+                                          nbr_table_reason_t r, void *data);
 
 /* RPL logic functions. */
 void rpl_join_dag(uip_ipaddr_t *from, rpl_dio_t *dio);
diff --git a/core/net/rpl/rpl-timers.c b/core/net/rpl/rpl-timers.c
index ac993691d..158f5fd74 100644
--- a/core/net/rpl/rpl-timers.c
+++ b/core/net/rpl/rpl-timers.c
@@ -224,6 +224,8 @@ set_dao_lifetime_timer(rpl_instance_t *instance)
     expiration_time = (clock_time_t)instance->default_lifetime *
       (clock_time_t)instance->lifetime_unit *
       CLOCK_SECOND / 2;
+    /* make the time for the re registration be betwen 1/2 - 3/4 of lifetime */
+    expiration_time = expiration_time + (random_rand() % (expiration_time / 2));
     PRINTF("RPL: Scheduling DAO lifetime timer %u ticks in the future\n",
            (unsigned)expiration_time);
     ctimer_set(&instance->dao_lifetime_timer, expiration_time,

From 4246a8fbe63231518373325083a138b7c49e7581 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Sun, 20 Sep 2015 21:17:32 +0200
Subject: [PATCH 118/393] updated more nbr_add calls

---
 core/net/ip/tcpip.c     |  2 +-
 core/net/ipv6/uip-nd6.c | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/net/ip/tcpip.c b/core/net/ip/tcpip.c
index 00607ba14..09d182db3 100644
--- a/core/net/ip/tcpip.c
+++ b/core/net/ip/tcpip.c
@@ -644,7 +644,7 @@ tcpip_ipv6_output(void)
     nbr = uip_ds6_nbr_lookup(nexthop);
     if(nbr == NULL) {
 #if UIP_ND6_SEND_NA
-      if((nbr = uip_ds6_nbr_add(nexthop, NULL, 0, NBR_INCOMPLETE)) == NULL) {
+      if((nbr = uip_ds6_nbr_add(nexthop, NULL, 0, NBR_INCOMPLETE, NBR_TABLE_REASON_IPV6_ND, NULL)) == NULL) {
         uip_clear_buf();
         return;
       } else {
diff --git a/core/net/ipv6/uip-nd6.c b/core/net/ipv6/uip-nd6.c
index 143cfe369..ffad6260e 100644
--- a/core/net/ipv6/uip-nd6.c
+++ b/core/net/ipv6/uip-nd6.c
@@ -201,9 +201,8 @@ ns_input(void)
 #endif /*UIP_CONF_IPV6_CHECKS */
         nbr = uip_ds6_nbr_lookup(&UIP_IP_BUF->srcipaddr);
         if(nbr == NULL) {
-          uip_lladdr_t lladdr_aligned;
-          extract_lladdr_aligned(&lladdr_aligned);
-          uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned, 0, NBR_STALE);
+          uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned,
+			  0, NBR_STALE, NBR_TABLE_REASON_IPV6_ND, NULL);
         } else {
           uip_lladdr_t *lladdr = (uip_lladdr_t *)uip_ds6_nbr_get_ll(nbr);
           if(memcmp(&nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET],
@@ -634,14 +633,17 @@ rs_input(void)
       extract_lladdr_aligned(&lladdr_aligned);
       if((nbr = uip_ds6_nbr_lookup(&UIP_IP_BUF->srcipaddr)) == NULL) {
         /* we need to add the neighbor */
-        uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned, 0, NBR_STALE);
+        uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned,
+                        0, NBR_STALE, NBR_TABLE_REASON_IPV6_ND, NULL);
       } else {
         /* If LL address changed, set neighbor state to stale */
         if(memcmp(&nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET],
             uip_ds6_nbr_get_ll(nbr), UIP_LLADDR_LEN) != 0) {
           uip_ds6_nbr_t nbr_data = *nbr;
           uip_ds6_nbr_rm(nbr);
-          nbr = uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned, 0, NBR_STALE);
+          nbr = uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned,
+          nbr = uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, 0, NBR_STALE,
+                                NBR_TABLE_REASON_IPV6_ND, NULL);
           nbr->reachable = nbr_data.reachable;
           nbr->sendns = nbr_data.sendns;
           nbr->nscount = nbr_data.nscount;
@@ -870,7 +872,8 @@ ra_input(void)
       if(nbr == NULL) {
         uip_lladdr_t lladdr_aligned;
         extract_lladdr_aligned(&lladdr_aligned);
-        nbr = uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned, 1, NBR_STALE);
+        nbr = uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned, 1,
+                              NBR_STALE, NBR_TABLE_REASON_IPV6_ND, NULL);
       } else {
         uip_lladdr_t *lladdr = (uip_lladdr_t *)uip_ds6_nbr_get_ll(nbr);
         if(nbr->state == NBR_INCOMPLETE) {

From baa8f3c6f5a1407c5b38059a5c5aba20153c9fa9 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Tue, 22 Sep 2015 20:13:31 +0200
Subject: [PATCH 119/393] minor fixes to the simulation files

---
 .../21-large-rpl/code/node/client.c           | 20 ++++++--
 .../21-large-rpl/code/router/router.c         | 46 ++++++++++++++++++-
 2 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/regression-tests/21-large-rpl/code/node/client.c b/regression-tests/21-large-rpl/code/node/client.c
index 386f18529..3616c1aad 100644
--- a/regression-tests/21-large-rpl/code/node/client.c
+++ b/regression-tests/21-large-rpl/code/node/client.c
@@ -10,6 +10,7 @@ static struct http_socket s;
 static int bytes_received = 0;
 static int restarts;
 static struct ctimer reconnect_timer;
+static int connect = 0;
 
 static void callback(struct http_socket *s, void *ptr,
                      http_socket_event_t e,
@@ -22,9 +23,9 @@ AUTOSTART_PROCESSES(&http_example_process);
 static void
 reconnect(void *dummy)
 {
+  printf("#A color=orange\n");
   rpl_set_mode(RPL_MODE_MESH);
-  http_socket_get(&s, "http://www.contiki-os.org/", 0, 0,
-                  callback, NULL);
+  connect = 1;
 }
 /*---------------------------------------------------------------------------*/
 static void
@@ -33,6 +34,8 @@ restart(void)
   int scale;
   restarts++;
   printf("restart %d\n", restarts);
+  rpl_set_mode(RPL_MODE_FEATHER);
+  printf("#A color=red\n");
 
   scale = restarts;
   if(scale > 5) {
@@ -62,6 +65,7 @@ callback(struct http_socket *s, void *ptr,
     if(bytes_received > 0) {
       printf("HTTP socket closed, %d bytes received\n", bytes_received);
       leds_off(LEDS_RED);
+      printf("#A color=blue\n");
       rpl_set_mode(RPL_MODE_FEATHER);
     } else {
       restart();
@@ -72,6 +76,7 @@ callback(struct http_socket *s, void *ptr,
   }
 }
 /*---------------------------------------------------------------------------*/
+
 PROCESS_THREAD(http_example_process, ev, data)
 {
   static struct etimer et;
@@ -88,14 +93,19 @@ PROCESS_THREAD(http_example_process, ev, data)
   PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
 
   http_socket_init(&s);
-  http_socket_get(&s, "http://www.contiki-os.org/", 0, 0,
-                  callback, NULL);
+  connect = 1;
   leds_on(LEDS_RED);
   restarts = 0;
-  etimer_set(&et, CLOCK_SECOND);
+  etimer_set(&et, CLOCK_SECOND * 5);
   while(1) {
     PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
     etimer_reset(&et);
+    if(connect && rpl_has_downward_link()) {
+      printf("#A color=green\n");
+      http_socket_get(&s, "http://www.contiki-os.org/", 0, 0,
+		      callback, NULL);
+      connect = 0;
+    }
   }
 
   PROCESS_END();
diff --git a/regression-tests/21-large-rpl/code/router/router.c b/regression-tests/21-large-rpl/code/router/router.c
index 844afdc1c..65882c36c 100644
--- a/regression-tests/21-large-rpl/code/router/router.c
+++ b/regression-tests/21-large-rpl/code/router/router.c
@@ -3,13 +3,23 @@
 #include "ip64.h"
 #include "net/netstack.h"
 #include "net/rpl/rpl-dag-root.h"
-
+#include "net/rpl/rpl.h"
+#include "net/ipv6/uip-ds6-route.h"
+#include <stdio.h>
 /*---------------------------------------------------------------------------*/
 PROCESS(router_node_process, "Router node");
 AUTOSTART_PROCESSES(&router_node_process);
 /*---------------------------------------------------------------------------*/
+uip_lladdr_t * uip_ds6_route_nexthop_lladdr(uip_ds6_route_t *route);
+
+
 PROCESS_THREAD(router_node_process, ev, data)
 {
+  uip_ipaddr_t *nexthop = NULL;
+  uip_ds6_defrt_t *defrt;
+  uip_ipaddr_t *ipaddr;
+  uip_ds6_route_t *r;
+  static struct etimer et;
   PROCESS_BEGIN();
 
   /* Set us up as a RPL root node. */
@@ -18,9 +28,41 @@ PROCESS_THREAD(router_node_process, ev, data)
   /* Initialize the IP64 module so we'll start translating packets */
   ip64_init();
 
+  /* etimer_set(&et, CLOCK_SECOND * 60); */
+  /* PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et)); */
+
   /* ... and do nothing more. */
   while(1) {
-    PROCESS_WAIT_EVENT();
+    etimer_set(&et, CLOCK_SECOND * 20);
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+
+    defrt = NULL;
+    if((ipaddr = uip_ds6_defrt_choose()) != NULL) {
+      defrt = uip_ds6_defrt_lookup(ipaddr);
+    }
+    if(defrt != NULL) {
+      printf("DefRT: :: -> %02d", defrt->ipaddr.u8[15]);
+      printf(" lt:%lu inf:%d\n", stimer_remaining(&defrt->lifetime),
+    	     defrt->isinfinite);
+    } else {
+      printf("DefRT: :: -> NULL\n");
+    }
+
+    if(uip_ds6_route_head() != NULL) {
+      printf("found head\n");
+      for(r = uip_ds6_route_head();
+    	  r != NULL;
+    	  r = uip_ds6_route_next(r)) {
+    	nexthop = uip_ds6_route_nexthop(r);
+    	if(nexthop != NULL) {
+	  printf("Route: %02d -> %02d", r->ipaddr.u8[15], nexthop->u8[15]);
+    	} else {
+    	  //printf("Route: %p %02d -> ? nbr-routes:%p", r, r->ipaddr.u8[15],
+	  //r->neighbor_routes);
+    	}
+    	printf(" lt:%lu\n", r->state.lifetime);
+      }
+    }
   }
 
   PROCESS_END();

From ee65a3982cb8420ab5cde4a35fbf3d2a7c89c9c9 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Tue, 22 Sep 2015 20:14:29 +0200
Subject: [PATCH 120/393] configure short routing lifetime in the RPL ROOT /
 router

---
 regression-tests/21-large-rpl/code/router/project-conf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/regression-tests/21-large-rpl/code/router/project-conf.h b/regression-tests/21-large-rpl/code/router/project-conf.h
index eb0b0b1a7..bec41cd5e 100644
--- a/regression-tests/21-large-rpl/code/router/project-conf.h
+++ b/regression-tests/21-large-rpl/code/router/project-conf.h
@@ -7,5 +7,5 @@
 #undef NBR_TABLE_CONF_MAX_NEIGHBORS
 #define NBR_TABLE_CONF_MAX_NEIGHBORS             8
 
-/*#define RPL_CONF_DEFAULT_LIFETIME_UNIT           10
-  #define RPL_CONF_DEFAULT_LIFETIME                10*/
+#define RPL_CONF_DEFAULT_LIFETIME_UNIT           60
+#define RPL_CONF_DEFAULT_LIFETIME                5

From 1fcef0f90df20a19dd386aef6ce83f2a5beaa901 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Tue, 22 Sep 2015 21:01:55 +0200
Subject: [PATCH 121/393] added function for checking downward route and added
 configuration for DAO NACK repair - default off

---
 core/net/rpl/rpl-conf.h       | 11 +++++++++++
 core/net/rpl/rpl-dag.c        |  6 ++++++
 core/net/rpl/rpl-icmp6.c      | 26 ++++++++++++++++++++++++++
 core/net/rpl/rpl-nbr-policy.c |  4 ++--
 core/net/rpl/rpl.h            |  8 ++++++++
 5 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h
index baba6aa6c..6822ff550 100644
--- a/core/net/rpl/rpl-conf.h
+++ b/core/net/rpl/rpl-conf.h
@@ -245,6 +245,17 @@
 #define RPL_WITH_DAO_ACK 1
 #endif /* RPL_CONF_WITH_DAO_ACK */
 
+/*
+ * RPL REPAIR ON DAO NACK. When enabled, DAO NACK will trigger a local
+ * repair in order to quickly find a new parent to send DAO's to.
+ * NOTE: this is too agressive in some cases so use with care.
+ * */
+#ifdef RPL_CONF_RPL_REPAIR_ON_DAO_NACK
+#define RPL_REPAIR_ON_DAO_NACK RPL_CONF_RPL_REPAIR_ON_DAO_NACK
+#else
+#define RPL_REPAIR_ON_DAO_NACK 0
+#endif /* RPL_CONF_RPL_REPAIR_ON_DAO_NACK */
+
 /*
  * Setting the DIO_REFRESH_DAO_ROUTES will make RPL always increase
  * the DTSN (Destination Advertisement Trigger Sequence Number) when
diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index 9d32c2773..034678ff5 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -1156,6 +1156,9 @@ global_repair(uip_ipaddr_t *from, rpl_dag_t *dag, rpl_dio_t *dio)
 
   RPL_STAT(rpl_stats.global_repairs++);
 }
+
+void rpl_set_downward_link(uint8_t link);
+
 /*---------------------------------------------------------------------------*/
 void
 rpl_local_repair(rpl_instance_t *instance)
@@ -1174,6 +1177,9 @@ rpl_local_repair(rpl_instance_t *instance)
     }
   }
 
+  /* no downward link anymore */
+  rpl_set_downward_link(0);
+
   rpl_reset_dio_timer(instance);
   /* Request refresh of DAO registrations next DIO */
   RPL_LOLLIPOP_INCREMENT(instance->dtsn_out);
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 83dd71897..af7a05d67 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -89,6 +89,7 @@ void RPL_DEBUG_DAO_OUTPUT(rpl_parent_t *);
 #endif
 
 static uint8_t dao_sequence = RPL_LOLLIPOP_INIT;
+static uint8_t downward = 0;
 
 extern rpl_of_t RPL_OF;
 
@@ -102,6 +103,19 @@ UIP_ICMP6_HANDLER(dio_handler, ICMP6_RPL, RPL_CODE_DIO, dio_input);
 UIP_ICMP6_HANDLER(dao_handler, ICMP6_RPL, RPL_CODE_DAO, dao_input);
 UIP_ICMP6_HANDLER(dao_ack_handler, ICMP6_RPL, RPL_CODE_DAO_ACK, dao_ack_input);
 /*---------------------------------------------------------------------------*/
+
+void
+rpl_set_downward_link(uint8_t link)
+{
+  downward = link;
+}
+
+int
+rpl_has_downward_link()
+{
+  return downward;
+}
+
 #if RPL_WITH_DAO_ACK
 static uip_ds6_route_t *
 find_route_entry_by_dao_ack(uint8_t seq)
@@ -967,6 +981,13 @@ dao_output(rpl_parent_t *parent, uint8_t lifetime)
   instance->my_dao_transmissions = 1;
   ctimer_set(&instance->dao_retransmit_timer, RPL_DAO_RETRANSMISSION_TIMEOUT,
 	     handle_dao_retransmission, parent);
+  if(lifetime == RPL_ZERO_LIFETIME) {
+    rpl_set_downward_link(0);
+  }
+#else
+  /* We know that we have tried to register so now we are assuming
+     that we have a down-link - unless this is a zero lifetime one */
+  rpl_set_downward_link(lifetime != RPL_ZERO_LIFETIME);
 #endif /* RPL_WITH_DAO_ACK */
 }
 /*---------------------------------------------------------------------------*/
@@ -1107,6 +1128,8 @@ dao_ack_input(void)
   if(sequence == instance->my_dao_seqno) {
     PRINTF("RPL: DAO %s for me!\n", status < 128 ? "ACK" : "NACK");
 
+    rpl_set_downward_link(status < 128);
+
     /* always stop the retransmit timer when the ACK arrived */
     ctimer_stop(&instance->dao_retransmit_timer);
 
@@ -1115,11 +1138,14 @@ dao_ack_input(void)
       instance->of->dao_ack_callback(parent, status);
     }
 
+#if RPL_REPAIR_ON_DAO_NACK
     if(status >= RPL_DAO_ACK_UNABLE_TO_ACCEPT) {
       /* failed the DAO transmission - need to remove the default route. */
       /* Trigger a local repair since we can not get our DAO in... */
       rpl_local_repair(instance);
     }
+#endif
+
   } else {
     /* this DAO should be forwarded to another recently registered route */
     uip_ds6_route_t *re;
diff --git a/core/net/rpl/rpl-nbr-policy.c b/core/net/rpl/rpl-nbr-policy.c
index 51d0df8db..7b0e28ff1 100644
--- a/core/net/rpl/rpl-nbr-policy.c
+++ b/core/net/rpl/rpl-nbr-policy.c
@@ -49,7 +49,7 @@
 #include "net/ipv6/uip-ds6-nbr.h"
 #include "net/ipv6/uip-ds6-route.h"
 
-#define DEBUG DEBUG_FULL
+#define DEBUG DEBUG_NONE
 #include "net/ip/uip-debug.h"
 
 /*
@@ -63,7 +63,7 @@
  * neighbors and are not only MAC neighbors.
  */
 
-#define MAX_CHILDREN (NBR_TABLE_MAX_NEIGHBORS - 3)
+#define MAX_CHILDREN (NBR_TABLE_MAX_NEIGHBORS - 2)
 #define UIP_IP_BUF       ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
 
 static int num_parents; /* any node that are possible parents */
diff --git a/core/net/rpl/rpl.h b/core/net/rpl/rpl.h
index b7d7757c2..dfc081d4b 100644
--- a/core/net/rpl/rpl.h
+++ b/core/net/rpl/rpl.h
@@ -300,5 +300,13 @@ enum rpl_mode rpl_set_mode(enum rpl_mode mode);
  */
 enum rpl_mode rpl_get_mode(void);
 
+
+/**
+ * Get the RPL's best guess on if we have downward link or not.
+ *
+ * \retval 1 if we have a downward link, 0 if not.
+ */
+int rpl_has_downward_link(void);
+
 /*---------------------------------------------------------------------------*/
 #endif /* RPL_H */

From 13b8c04c6f603030b484ba455d690719f49e86fa Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Tue, 22 Sep 2015 22:12:06 +0200
Subject: [PATCH 122/393] fixed so that nbr policy for RPL Root do not save
 room for parents

---
 core/net/rpl/rpl-icmp6.c      |  2 +-
 core/net/rpl/rpl-nbr-policy.c | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index af7a05d67..6ff0dcfee 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -820,7 +820,7 @@ dao_input(void)
   PRINTF("RPL: adding DAO route\n");
 
   /* Update and add neighbor - if no room - fail. */
-  if((nbr = rpl_icmp6_update_nbr_table(&dao_sender_addr, NBR_TABLE_REASON_RPL_DAO, NULL)) == NULL) {
+  if((nbr = rpl_icmp6_update_nbr_table(&dao_sender_addr, NBR_TABLE_REASON_RPL_DAO, instance)) == NULL) {
     PRINTF("RPL: Out of Memory, dropping DAO from ");
     PRINT6ADDR(&dao_sender_addr);
     PRINTF(", ");
diff --git a/core/net/rpl/rpl-nbr-policy.c b/core/net/rpl/rpl-nbr-policy.c
index 7b0e28ff1..9c750a7e0 100644
--- a/core/net/rpl/rpl-nbr-policy.c
+++ b/core/net/rpl/rpl-nbr-policy.c
@@ -62,7 +62,6 @@
  * NOTE: this policy assumes that all neighbors end up being IPv6
  * neighbors and are not only MAC neighbors.
  */
-
 #define MAX_CHILDREN (NBR_TABLE_MAX_NEIGHBORS - 2)
 #define UIP_IP_BUF       ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
 
@@ -212,13 +211,21 @@ find_removable_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
 }
 /*---------------------------------------------------------------------------*/
 const linkaddr_t *
-find_removable_dao(uip_ipaddr_t *from)
+find_removable_dao(uip_ipaddr_t *from, rpl_instance_t *instance)
 {
+  int max = MAX_CHILDREN;
   update_nbr();
 
+  if(instance != NULL) {
+    /* No need to reserve space for parents for RPL ROOT */
+    if(instance->current_dag->rank == ROOT_RANK(instance)) {
+      max = NBR_TABLE_MAX_NEIGHBORS;
+    }
+  }
+  
   /* Check if this DAO sender is not yet neighbor and there is already too
      many children. */
-  if(num_children >= MAX_CHILDREN) {
+  if(num_children >= max) {
     PRINTF("Can not add another child - already at max.\n");
     return NULL;
   }
@@ -234,7 +241,7 @@ rpl_nbr_policy_find_removable(nbr_table_reason_t reason,void * data) {
   case NBR_TABLE_REASON_RPL_DIO:
     return find_removable_dio(&UIP_IP_BUF->srcipaddr, data);
   case NBR_TABLE_REASON_RPL_DAO:
-    return find_removable_dao(&UIP_IP_BUF->srcipaddr);
+    return find_removable_dao(&UIP_IP_BUF->srcipaddr, data);
   case NBR_TABLE_REASON_RPL_DIS:
     return find_removable_dis(&UIP_IP_BUF->srcipaddr);
   default:

From dae21fcb76fbed260cd1dd7f618d40d04e5a1643 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Tue, 22 Sep 2015 23:21:03 +0200
Subject: [PATCH 123/393] made ZERO LIFETIME routes live 30 seconds instead of
 60 and shortened route lifetime in travis test

---
 regression-tests/21-large-rpl/code/router/project-conf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regression-tests/21-large-rpl/code/router/project-conf.h b/regression-tests/21-large-rpl/code/router/project-conf.h
index bec41cd5e..7f338deca 100644
--- a/regression-tests/21-large-rpl/code/router/project-conf.h
+++ b/regression-tests/21-large-rpl/code/router/project-conf.h
@@ -8,4 +8,4 @@
 #define NBR_TABLE_CONF_MAX_NEIGHBORS             8
 
 #define RPL_CONF_DEFAULT_LIFETIME_UNIT           60
-#define RPL_CONF_DEFAULT_LIFETIME                5
+#define RPL_CONF_DEFAULT_LIFETIME                3

From 8afe3fb9b79c6b39130e52f1188c4900557e3154 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Wed, 23 Sep 2015 09:12:35 +0200
Subject: [PATCH 124/393] fixed so that DAO NACK now is either for the path or
 for RPL root - if from root then do not try to switch parent since that will
 not help

---
 core/net/rpl/rpl-icmp6.c   | 10 +++++++---
 core/net/rpl/rpl-mrhof.c   |  5 ++++-
 core/net/rpl/rpl-private.h |  1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 6ff0dcfee..0851cd9a2 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -663,6 +663,7 @@ dao_input(void)
   int learned_from;
   rpl_parent_t *parent;
   uip_ds6_nbr_t *nbr;
+  int is_root;
 
   prefixlen = 0;
   parent = NULL;
@@ -695,6 +696,8 @@ dao_input(void)
   sequence = buffer[pos++];
 
   dag = instance->current_dag;
+  is_root = (dag->rank == ROOT_RANK(instance));
+
   /* Is the DAG ID present? */
   if(flags & RPL_DAO_D_FLAG) {
     if(memcmp(&dag->dag_id, &buffer[pos], sizeof(dag->dag_id))) {
@@ -829,7 +832,8 @@ dao_input(void)
     if(flags & RPL_DAO_K_FLAG) {
       /* signal the failure to add the node */
       dao_ack_output(instance, &dao_sender_addr, sequence,
-             RPL_DAO_ACK_UNABLE_TO_ACCEPT);
+		     is_root ? RPL_DAO_ACK_UNABLE_TO_ACCEPT_ROOT :
+		     RPL_DAO_ACK_UNABLE_TO_ACCEPT);
     }
     goto discard;
   }
@@ -838,11 +842,11 @@ dao_input(void)
   if(rep == NULL) {
     RPL_STAT(rpl_stats.mem_overflows++);
     PRINTF("RPL: Could not add a route after receiving a DAO\n");
-
     if(flags & RPL_DAO_K_FLAG) {
       /* signal the failure to add the node */
       dao_ack_output(instance, &dao_sender_addr, sequence,
-             RPL_DAO_ACK_UNABLE_TO_ACCEPT);
+		     is_root ? RPL_DAO_ACK_UNABLE_TO_ACCEPT_ROOT :
+		     RPL_DAO_ACK_UNABLE_TO_ACCEPT);
     }
     goto discard;
   }
diff --git a/core/net/rpl/rpl-mrhof.c b/core/net/rpl/rpl-mrhof.c
index acf2b1d54..6da2ec304 100644
--- a/core/net/rpl/rpl-mrhof.c
+++ b/core/net/rpl/rpl-mrhof.c
@@ -122,8 +122,11 @@ reset(rpl_dag_t *dag)
 static void
 dao_ack_callback(rpl_parent_t *p, int status)
 {
+  if(status == RPL_DAO_ACK_UNABLE_TO_ACCEPT_ROOT) {
+    return;
+  }
   /* here we need to handle failed DAO's and other stuff */
-  PRINTF("RPL: MRHOF - DAO ACK received with status: %d", status);
+  PRINTF("RPL: MRHOF - DAO ACK received with status: %d\n", status);
   if(status >= RPL_DAO_ACK_UNABLE_TO_ACCEPT) {
     /* punish the ETX as if this was 10 packets lost */
     neighbor_link_callback(p, MAC_TX_OK, 10);
diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h
index 017efb474..161cdc532 100644
--- a/core/net/rpl/rpl-private.h
+++ b/core/net/rpl/rpl-private.h
@@ -94,6 +94,7 @@
 #define RPL_DAO_ACK_UNCONDITIONAL_ACCEPT 0
 #define RPL_DAO_ACK_ACCEPT               1   /* 1 - 127 is OK but not good */
 #define RPL_DAO_ACK_UNABLE_TO_ACCEPT     128 /* >127 is fail */
+#define RPL_DAO_ACK_UNABLE_TO_ACCEPT_ROOT 255 /* root can not accept */
 
 #define RPL_DAO_ACK_TIMEOUT              -1
 

From 09c624dcd39653a26f0687805df4368d6956903c Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Fri, 2 Oct 2015 07:38:52 +0200
Subject: [PATCH 125/393] fixed clearing of state flag and avoid starting
 retransmission timer

---
 core/net/ipv6/uip-ds6-route.h |  3 +++
 core/net/ipv6/uip-nd6.c       | 11 ++++++-----
 core/net/rpl/rpl-icmp6.c      | 29 +++++++++++++++--------------
 core/net/rpl/rpl.c            |  2 ++
 4 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/core/net/ipv6/uip-ds6-route.h b/core/net/ipv6/uip-ds6-route.h
index 3324a8e08..7a5d805f0 100644
--- a/core/net/ipv6/uip-ds6-route.h
+++ b/core/net/ipv6/uip-ds6-route.h
@@ -106,6 +106,9 @@ void uip_ds6_notification_rm(struct uip_ds6_notification *n);
 #define RPL_ROUTE_SET_NOPATH_RECEIVED(route) do {                       \
     (route)->state.state_flags |= RPL_ROUTE_ENTRY_NOPATH_RECEIVED;      \
   } while(0)
+#define RPL_ROUTE_CLEAR_NOPATH_RECEIVED(route) do {                       \
+    (route)->state.state_flags &= ~RPL_ROUTE_ENTRY_NOPATH_RECEIVED;      \
+  } while(0)
 
 #define RPL_ROUTE_IS_DAO_PENDING(route)                                 \
   ((route->state.state_flags & RPL_ROUTE_ENTRY_DAO_PENDING) != 0)
diff --git a/core/net/ipv6/uip-nd6.c b/core/net/ipv6/uip-nd6.c
index ffad6260e..107e66369 100644
--- a/core/net/ipv6/uip-nd6.c
+++ b/core/net/ipv6/uip-nd6.c
@@ -201,6 +201,8 @@ ns_input(void)
 #endif /*UIP_CONF_IPV6_CHECKS */
         nbr = uip_ds6_nbr_lookup(&UIP_IP_BUF->srcipaddr);
         if(nbr == NULL) {
+          uip_lladdr_t lladdr_aligned;
+          extract_lladdr_aligned(&lladdr_aligned);
           uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned,
 			  0, NBR_STALE, NBR_TABLE_REASON_IPV6_ND, NULL);
         } else {
@@ -638,12 +640,11 @@ rs_input(void)
       } else {
         /* If LL address changed, set neighbor state to stale */
         if(memcmp(&nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET],
-            uip_ds6_nbr_get_ll(nbr), UIP_LLADDR_LEN) != 0) {
+                  uip_ds6_nbr_get_ll(nbr), UIP_LLADDR_LEN) != 0) {
           uip_ds6_nbr_t nbr_data = *nbr;
           uip_ds6_nbr_rm(nbr);
           nbr = uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned,
-          nbr = uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, 0, NBR_STALE,
-                                NBR_TABLE_REASON_IPV6_ND, NULL);
+                                0, NBR_STALE, NBR_TABLE_REASON_IPV6_ND, NULL);
           nbr->reachable = nbr_data.reachable;
           nbr->sendns = nbr_data.sendns;
           nbr->nscount = nbr_data.nscount;
@@ -872,8 +873,8 @@ ra_input(void)
       if(nbr == NULL) {
         uip_lladdr_t lladdr_aligned;
         extract_lladdr_aligned(&lladdr_aligned);
-        nbr = uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned, 1,
-                              NBR_STALE, NBR_TABLE_REASON_IPV6_ND, NULL);
+        nbr = uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned,
+                              1, NBR_STALE, NBR_TABLE_REASON_IPV6_ND, NULL);
       } else {
         uip_lladdr_t *lladdr = (uip_lladdr_t *)uip_ds6_nbr_get_ll(nbr);
         if(nbr->state == NBR_INCOMPLETE) {
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 0851cd9a2..4320181e8 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -53,6 +53,7 @@
 #include "net/rpl/rpl-private.h"
 #include "net/packetbuf.h"
 #include "net/ipv6/multicast/uip-mcast6.h"
+#include "random.h"
 
 #include <limits.h>
 #include <string.h>
@@ -811,11 +812,12 @@ dao_input(void)
         uip_icmp6_send(rpl_get_parent_ipaddr(dag->preferred_parent),
                        ICMP6_RPL, RPL_CODE_DAO, buffer_length);
       }
-      if(flags & RPL_DAO_K_FLAG) {
-        /* indicate that we accepted the no-path DAO */
-        dao_ack_output(instance, &dao_sender_addr, sequence,
-               RPL_DAO_ACK_UNCONDITIONAL_ACCEPT);
-      }
+    } 
+    /* independent if we remove or not - ACK the request */
+    if(flags & RPL_DAO_K_FLAG) {
+      /* indicate that we accepted the no-path DAO */
+      dao_ack_output(instance, &dao_sender_addr, sequence,
+                     RPL_DAO_ACK_UNCONDITIONAL_ACCEPT);
     }
     goto discard;
   }
@@ -851,8 +853,9 @@ dao_input(void)
     goto discard;
   }
 
-  /* State is all zeroes, set lifetime but no need for other initialization. */
+  /* set lifetime and clear NOPATH bit */
   rep->state.lifetime = RPL_LIFETIME(instance, lifetime);
+  RPL_ROUTE_CLEAR_NOPATH_RECEIVED(rep);
 
 #if RPL_CONF_MULTICAST
 fwd_dao:
@@ -978,15 +981,13 @@ dao_output(rpl_parent_t *parent, uint8_t lifetime)
 
   /* Sending a DAO with own prefix as target */
   dao_output_target(parent, &prefix, lifetime);
-  /* keep track of my own sending of DAO for handling ack and loss of ack */
-  instance->my_dao_seqno = dao_sequence;
-
 #if RPL_WITH_DAO_ACK
-  instance->my_dao_transmissions = 1;
-  ctimer_set(&instance->dao_retransmit_timer, RPL_DAO_RETRANSMISSION_TIMEOUT,
-	     handle_dao_retransmission, parent);
-  if(lifetime == RPL_ZERO_LIFETIME) {
-    rpl_set_downward_link(0);
+  /* keep track of my own sending of DAO for handling ack and loss of ack */
+  if(lifetime != RPL_ZERO_LIFETIME) {
+    instance->my_dao_seqno = dao_sequence;
+    instance->my_dao_transmissions = 1;
+    ctimer_set(&instance->dao_retransmit_timer, RPL_DAO_RETRANSMISSION_TIMEOUT,
+	       handle_dao_retransmission, parent);
   }
 #else
   /* We know that we have tried to register so now we are assuming
diff --git a/core/net/rpl/rpl.c b/core/net/rpl/rpl.c
index 90b434102..c541463d4 100644
--- a/core/net/rpl/rpl.c
+++ b/core/net/rpl/rpl.c
@@ -238,6 +238,8 @@ rpl_add_route(rpl_dag_t *dag, uip_ipaddr_t *prefix, int prefix_len,
 
   rep->state.dag = dag;
   rep->state.lifetime = RPL_LIFETIME(dag->instance, dag->instance->default_lifetime);
+  /* always clear state flags for the no-path received when adding/refreshing */
+  RPL_ROUTE_CLEAR_NOPATH_RECEIVED(rep);
 
   PRINTF("RPL: Added a route to ");
   PRINT6ADDR(prefix);

From ab4a0e08c7c175d317f785802176a97a760f5c8a Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Fri, 2 Oct 2015 07:41:57 +0200
Subject: [PATCH 126/393] fixed simulation files to be closer to defaults in
 configuration

---
 regression-tests/12-rpl/04-rpl-large-network.csc         | 3 +--
 regression-tests/21-large-rpl/code/node/client.c         | 7 +++++++
 regression-tests/21-large-rpl/code/router/project-conf.h | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/regression-tests/12-rpl/04-rpl-large-network.csc b/regression-tests/12-rpl/04-rpl-large-network.csc
index 88d3774bf..145cad14c 100644
--- a/regression-tests/12-rpl/04-rpl-large-network.csc
+++ b/regression-tests/12-rpl/04-rpl-large-network.csc
@@ -1,4 +1,3 @@
-<<<<<<< 1d90b9290e293eedcb6451dd86c474ec168f688c
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
   <project EXPORT="discard">[APPS_DIR]/mrm</project>
@@ -7058,4 +7057,4 @@ while(true) {&#xD;
     <location_x>603</location_x>
     <location_y>43</location_y>
   </plugin>
-</simconf>
+</simconf>
\ No newline at end of file
diff --git a/regression-tests/21-large-rpl/code/node/client.c b/regression-tests/21-large-rpl/code/node/client.c
index 3616c1aad..36dc40923 100644
--- a/regression-tests/21-large-rpl/code/node/client.c
+++ b/regression-tests/21-large-rpl/code/node/client.c
@@ -105,6 +105,13 @@ PROCESS_THREAD(http_example_process, ev, data)
       http_socket_get(&s, "http://www.contiki-os.org/", 0, 0,
 		      callback, NULL);
       connect = 0;
+    } else if(connect) {
+      connect++;
+      /* If connect have been "tried" 5 timer we quit trying now... */
+      if(connect > 5)  {
+	restart();
+	connect = 0;
+      }
     }
   }
 
diff --git a/regression-tests/21-large-rpl/code/router/project-conf.h b/regression-tests/21-large-rpl/code/router/project-conf.h
index 7f338deca..857ab6929 100644
--- a/regression-tests/21-large-rpl/code/router/project-conf.h
+++ b/regression-tests/21-large-rpl/code/router/project-conf.h
@@ -7,5 +7,5 @@
 #undef NBR_TABLE_CONF_MAX_NEIGHBORS
 #define NBR_TABLE_CONF_MAX_NEIGHBORS             8
 
-#define RPL_CONF_DEFAULT_LIFETIME_UNIT           60
-#define RPL_CONF_DEFAULT_LIFETIME                3
+/* #define RPL_CONF_DEFAULT_LIFETIME_UNIT           60 */
+/* #define RPL_CONF_DEFAULT_LIFETIME                10 */

From 6fa3479aa89f1ed279c688cdbdd2e5622922ad21 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Wed, 18 Nov 2015 15:25:13 +0100
Subject: [PATCH 127/393] RPL: improved debug messages for No-Path DAOs

Conflicts:
	core/net/rpl/rpl-icmp6.c
---
 core/net/rpl/rpl-icmp6.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 4320181e8..050a894da 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -802,7 +802,7 @@ dao_input(void)
         uint8_t out_seq;
         out_seq = prepare_for_dao_fwd(sequence, rep);
 
-        PRINTF("RPL: Forwarding no-path DAO to parent - out_seq:%d",
+        PRINTF("RPL: Forwarding No-path DAO to parent - out_seq:%d",
 	       out_seq);
         PRINT6ADDR(rpl_get_parent_ipaddr(dag->preferred_parent));
         PRINTF("\n");

From 19b04098d55ebdaaa16657f0c8a643af49e9577c Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Mon, 23 Nov 2015 13:38:48 +0100
Subject: [PATCH 128/393] Improved RPL debug logs

---
 core/net/rpl/rpl-icmp6.c | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 050a894da..c7e4cbc8a 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -671,11 +671,6 @@ dao_input(void)
 
   uip_ipaddr_copy(&dao_sender_addr, &UIP_IP_BUF->srcipaddr);
 
-  /* Destination Advertisement Object */
-  PRINTF("RPL: Received a DAO from ");
-  PRINT6ADDR(&dao_sender_addr);
-  PRINTF("\n");
-
   buffer = UIP_ICMP_PAYLOAD;
   buffer_length = uip_len - uip_l3_icmp_hdr_len;
 
@@ -711,8 +706,12 @@ dao_input(void)
   learned_from = uip_is_addr_mcast(&dao_sender_addr) ?
                  RPL_ROUTE_FROM_MULTICAST_DAO : RPL_ROUTE_FROM_UNICAST_DAO;
 
-  PRINTF("RPL: DAO from %s\n",
-         learned_from == RPL_ROUTE_FROM_UNICAST_DAO? "unicast": "multicast");
+  /* Destination Advertisement Object */
+  PRINTF("RPL: Received a (%s) DAO with sequence number %u from ",
+      learned_from == RPL_ROUTE_FROM_UNICAST_DAO? "unicast": "multicast", sequence);
+  PRINT6ADDR(&dao_sender_addr);
+  PRINTF("\n");
+
   if(learned_from == RPL_ROUTE_FROM_UNICAST_DAO) {
     /* Check whether this is a DAO forwarding loop. */
     parent = rpl_find_parent(dag, &dao_sender_addr);
@@ -822,7 +821,7 @@ dao_input(void)
     goto discard;
   }
 
-  PRINTF("RPL: adding DAO route\n");
+  PRINTF("RPL: Adding DAO route\n");
 
   /* Update and add neighbor - if no room - fail. */
   if((nbr = rpl_icmp6_update_nbr_table(&dao_sender_addr, NBR_TABLE_REASON_RPL_DAO, instance)) == NULL) {
@@ -897,7 +896,7 @@ fwd_dao:
     }
 
     if(should_ack) {
-      PRINTF("RPL: sending DAO ACK\n");
+      PRINTF("RPL: Sending DAO ACK\n");
       dao_ack_output(instance, &dao_sender_addr, sequence,
                      RPL_DAO_ACK_UNCONDITIONAL_ACCEPT);
     }
@@ -1081,7 +1080,8 @@ dao_output_target_seq(rpl_parent_t *parent, uip_ipaddr_t *prefix,
   buffer[pos++] = 0; /* path seq - ignored */
   buffer[pos++] = lifetime;
 
-  PRINTF("RPL: Sending %sDAO with prefix ", lifetime == RPL_ZERO_LIFETIME ? "No-Path " : "");
+  PRINTF("RPL: Sending a %sDAO with sequence number %u, lifetime %u, prefix ",
+      lifetime == RPL_ZERO_LIFETIME ? "No-Path " : "", seq_no, lifetime);
   PRINT6ADDR(prefix);
   PRINTF(" to ");
   PRINT6ADDR(rpl_get_parent_ipaddr(parent));
@@ -1125,14 +1125,13 @@ dao_ack_input(void)
     return;
   }
 
-  PRINTF("RPL: Received a DAO ACK with sequence number %d (%d) and status %d from ",
+  PRINTF("RPL: Received a DAO %s with sequence number %d (%d) and status %d from ",
+   status < 128 ? "ACK" : "NACK",
 	 sequence, instance->my_dao_seqno, status);
   PRINT6ADDR(&UIP_IP_BUF->srcipaddr);
   PRINTF("\n");
 
   if(sequence == instance->my_dao_seqno) {
-    PRINTF("RPL: DAO %s for me!\n", status < 128 ? "ACK" : "NACK");
-
     rpl_set_downward_link(status < 128);
 
     /* always stop the retransmit timer when the ACK arrived */
@@ -1152,7 +1151,7 @@ dao_ack_input(void)
 #endif
 
   } else {
-    /* this DAO should be forwarded to another recently registered route */
+    /* this DAO ACK should be forwarded to another recently registered route */
     uip_ds6_route_t *re;
     uip_ipaddr_t *nexthop;
     if((re = find_route_entry_by_dao_ack(sequence)) != NULL) {
@@ -1162,9 +1161,9 @@ dao_ack_input(void)
 
       nexthop = uip_ds6_route_nexthop(re);
       if(nexthop == NULL) {
-        PRINTF("No next hop to fwd DAO ACK to\n");
+        PRINTF("RPL: No next hop to fwd DAO ACK to\n");
       } else {
-        PRINTF("Fwd DAO ACK to:");
+        PRINTF("RPL: Fwd DAO ACK to:");
         PRINT6ADDR(nexthop);
         PRINTF("\n");
         buffer[2] = re->state.dao_seqno_in;
@@ -1176,7 +1175,7 @@ dao_ack_input(void)
         uip_ds6_route_rm(re);
       }
     } else {
-      PRINTF("No route entry to fwd DAO ACK to\n");
+      PRINTF("RPL: No route entry to fwd DAO ACK to\n");
     }
   }
 #endif /* RPL_WITH_DAO_ACK */
@@ -1190,7 +1189,7 @@ dao_ack_output(rpl_instance_t *instance, uip_ipaddr_t *dest, uint8_t sequence,
 #if RPL_WITH_DAO_ACK
   unsigned char *buffer;
 
-  PRINTF("RPL: Sending a DAO ACK with sequence number %d to ", sequence);
+  PRINTF("RPL: Sending a DAO %s with sequence number %d to ", status < 128 ? "ACK" : "NACK", sequence);
   PRINT6ADDR(dest);
   PRINTF(" with status %d\n", status);
 

From e1f9369a091c5c17e8ed2de3a0e3cba6d7b42786 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Mon, 23 Nov 2015 13:39:49 +0100
Subject: [PATCH 129/393] RPL DAO-ACK: move initialization of current ougoing
 DAO from da_output to dao_output_target_seq

---
 core/net/rpl/rpl-icmp6.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index c7e4cbc8a..566aa8b93 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -966,7 +966,6 @@ dao_output(rpl_parent_t *parent, uint8_t lifetime)
 {
   /* Destination Advertisement Object */
   uip_ipaddr_t prefix;
-  rpl_instance_t *instance;
 
   if(get_global_addr(&prefix) == 0) {
     PRINTF("RPL: No global address set for this node - suppressing DAO\n");
@@ -976,23 +975,9 @@ dao_output(rpl_parent_t *parent, uint8_t lifetime)
   if(parent == NULL || parent->dag == NULL || parent->dag->instance == NULL) {
     return;
   }
-  instance = parent->dag->instance;
 
   /* Sending a DAO with own prefix as target */
   dao_output_target(parent, &prefix, lifetime);
-#if RPL_WITH_DAO_ACK
-  /* keep track of my own sending of DAO for handling ack and loss of ack */
-  if(lifetime != RPL_ZERO_LIFETIME) {
-    instance->my_dao_seqno = dao_sequence;
-    instance->my_dao_transmissions = 1;
-    ctimer_set(&instance->dao_retransmit_timer, RPL_DAO_RETRANSMISSION_TIMEOUT,
-	       handle_dao_retransmission, parent);
-  }
-#else
-  /* We know that we have tried to register so now we are assuming
-     that we have a down-link - unless this is a zero lifetime one */
-  rpl_set_downward_link(lifetime != RPL_ZERO_LIFETIME);
-#endif /* RPL_WITH_DAO_ACK */
 }
 /*---------------------------------------------------------------------------*/
 void
@@ -1089,6 +1074,19 @@ dao_output_target_seq(rpl_parent_t *parent, uip_ipaddr_t *prefix,
 
   if(rpl_get_parent_ipaddr(parent) != NULL) {
     uip_icmp6_send(rpl_get_parent_ipaddr(parent), ICMP6_RPL, RPL_CODE_DAO, pos);
+#if RPL_WITH_DAO_ACK
+    if(lifetime != RPL_ZERO_LIFETIME) {
+      /* keep track of my own sending of DAO for handling ack and loss of ack */
+      instance->my_dao_seqno = dao_sequence;
+      instance->my_dao_transmissions = 1;
+      ctimer_set(&instance->dao_retransmit_timer, RPL_DAO_RETRANSMISSION_TIMEOUT,
+          handle_dao_retransmission, parent);
+    }
+#else /* RPL_WITH_DAO_ACK */
+    /* We know that we have tried to register so now we are assuming
+    that we have a down-link - unless this is a zero lifetime one */
+    rpl_set_downward_link(lifetime != RPL_ZERO_LIFETIME);
+#endif /* RPL_WITH_DAO_ACK */
   }
 }
 /*---------------------------------------------------------------------------*/

From ffb10094ab1f81cfd4d8b0ba28063eed33ddf03e Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Thu, 18 Feb 2016 15:19:32 +0100
Subject: [PATCH 130/393] added init value of locked variable

---
 core/net/nbr-table.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/nbr-table.c b/core/net/nbr-table.c
index 42597c598..ddae06fca 100644
--- a/core/net/nbr-table.c
+++ b/core/net/nbr-table.c
@@ -199,7 +199,7 @@ nbr_table_allocate(nbr_table_reason_t reason, void *data)
     } else {
       /* used least_used_key to indicate what is the least useful entry */
       int index;
-      int locked;
+      int locked = 0;
       if((index = index_from_lladdr(lladdr)) != -1) {
         least_used_key = key_from_index(index);
         locked = locked_map[index];

From ee97dc4bcd4aae89f4819711d90326d1c2495990 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Thu, 18 Feb 2016 15:52:35 +0100
Subject: [PATCH 131/393] tuned configuration for rpl-collect and micaz
 platform

---
 examples/ipv6/rpl-collect/Makefile       |  2 +
 examples/ipv6/rpl-collect/project-conf.h | 59 ++++++++++++++++++++++++
 platform/micaz/contiki-conf.h            | 11 +++--
 3 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 examples/ipv6/rpl-collect/project-conf.h

diff --git a/examples/ipv6/rpl-collect/Makefile b/examples/ipv6/rpl-collect/Makefile
index ce20c79e2..e2a1021a0 100644
--- a/examples/ipv6/rpl-collect/Makefile
+++ b/examples/ipv6/rpl-collect/Makefile
@@ -3,6 +3,8 @@ APPS = powertrace collect-view
 CONTIKI_PROJECT = udp-sender udp-sink
 PROJECT_SOURCEFILES += collect-common.c
 
+CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
+
 ifdef PERIOD
 CFLAGS=-DPERIOD=$(PERIOD)
 endif
diff --git a/examples/ipv6/rpl-collect/project-conf.h b/examples/ipv6/rpl-collect/project-conf.h
new file mode 100644
index 000000000..4b39f7de9
--- /dev/null
+++ b/examples/ipv6/rpl-collect/project-conf.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2015, 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_CONF_H_
+#define PROJECT_CONF_H_
+
+#undef NBR_TABLE_CONF_MAX_NEIGHBORS
+#undef UIP_CONF_MAX_ROUTES
+
+#ifdef TEST_MORE_ROUTES
+/* configure number of neighbors and routes */
+#define NBR_TABLE_CONF_MAX_NEIGHBORS     10
+#define UIP_CONF_MAX_ROUTES   30
+#else
+/* configure number of neighbors and routes */
+#define NBR_TABLE_CONF_MAX_NEIGHBORS     10
+#define UIP_CONF_MAX_ROUTES   10
+#endif /* TEST_MORE_ROUTES */
+
+#undef NETSTACK_CONF_RDC
+#define NETSTACK_CONF_RDC     nullrdc_driver
+#undef NULLRDC_CONF_802154_AUTOACK
+#define NULLRDC_CONF_802154_AUTOACK       1
+
+/* Define as minutes */
+#define RPL_CONF_DEFAULT_LIFETIME_UNIT   60
+
+/* 10 minutes lifetime of routes */
+#define RPL_CONF_DEFAULT_LIFETIME        10
+
+#define RPL_CONF_DEFAULT_ROUTE_INFINITE_LIFETIME 1
+
+#endif /* PROJECT_CONF_H_ */
diff --git a/platform/micaz/contiki-conf.h b/platform/micaz/contiki-conf.h
index 16e74567a..04aaccf6b 100644
--- a/platform/micaz/contiki-conf.h
+++ b/platform/micaz/contiki-conf.h
@@ -125,10 +125,11 @@
 #define UIP_CONF_ROUTER                 0
 
 /* configure number of neighbors and routes */
-#define NBR_TABLE_CONF_MAX_NEIGHBORS     5
-#define UIP_CONF_MAX_ROUTES   5
+#define NBR_TABLE_CONF_MAX_NEIGHBORS    5
+#define UIP_CONF_MAX_ROUTES             5
 
-#define RPL_CONF_MAX_PARENTS         4
+#define RPL_CONF_MAX_PARENTS            4
+#define RPL_CONF_MAX_DAG_PER_INSTANCE   1
 
 #define UIP_CONF_ND6_SEND_RA		0
 #define UIP_CONF_ND6_REACHABLE_TIME     600000
@@ -140,12 +141,12 @@
 #define UIP_CONF_IPV6_REASSEMBLY        0
 #define UIP_CONF_NETIF_MAX_ADDRESSES    3
 #define UIP_CONF_IP_FORWARD             0
-#define UIP_CONF_BUFFER_SIZE		    240
+#define UIP_CONF_BUFFER_SIZE            200
 
 #define SICSLOWPAN_CONF_COMPRESSION             SICSLOWPAN_COMPRESSION_HC06
 #ifndef SICSLOWPAN_CONF_FRAG
 #define SICSLOWPAN_CONF_FRAG                    1
-#define SICSLOWPAN_CONF_FRAGMENT_BUFFERS        4
+#define SICSLOWPAN_CONF_FRAGMENT_BUFFERS        3
 #define SICSLOWPAN_CONF_MAXAGE                  8
 #endif /* SICSLOWPAN_CONF_FRAG */
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS       2

From 12ac02650bf9af8490f1f4713b35f5ec09d4ab1a Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Thu, 18 Feb 2016 22:40:30 +0100
Subject: [PATCH 132/393] fixed a bug in nbr policy and DAO retransmission
 handling and added new wismote simulation

---
 core/net/rpl/rpl-icmp6.c                      |  32 +-
 core/net/rpl/rpl-nbr-policy.c                 |  25 +-
 .../ipv6/rpl-udp/rpl-udp-scale-wismote.csc    | 721 ++++++++++++++++++
 3 files changed, 751 insertions(+), 27 deletions(-)
 create mode 100644 examples/ipv6/rpl-udp/rpl-udp-scale-wismote.csc

diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 566aa8b93..2296f0d97 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -976,6 +976,25 @@ dao_output(rpl_parent_t *parent, uint8_t lifetime)
     return;
   }
 
+#if RPL_WITH_DAO_ACK
+  /* set up the state since this will be the first transmission of DAO */
+  /* retransmissions will call directly to dao_output_target_seq */
+  /* keep track of my own sending of DAO for handling ack and loss of ack */
+  if(lifetime != RPL_ZERO_LIFETIME) {
+    rpl_instance_t *instance;
+    instance = parent->dag->instance;
+
+    instance->my_dao_seqno = dao_sequence;
+    instance->my_dao_transmissions = 1;
+    ctimer_set(&instance->dao_retransmit_timer, RPL_DAO_RETRANSMISSION_TIMEOUT,
+ 	       handle_dao_retransmission, parent);
+  }
+#else
+   /* We know that we have tried to register so now we are assuming
+      that we have a down-link - unless this is a zero lifetime one */
+  rpl_set_downward_link(lifetime != RPL_ZERO_LIFETIME);
+#endif /* RPL_WITH_DAO_ACK */
+
   /* Sending a DAO with own prefix as target */
   dao_output_target(parent, &prefix, lifetime);
 }
@@ -1074,19 +1093,6 @@ dao_output_target_seq(rpl_parent_t *parent, uip_ipaddr_t *prefix,
 
   if(rpl_get_parent_ipaddr(parent) != NULL) {
     uip_icmp6_send(rpl_get_parent_ipaddr(parent), ICMP6_RPL, RPL_CODE_DAO, pos);
-#if RPL_WITH_DAO_ACK
-    if(lifetime != RPL_ZERO_LIFETIME) {
-      /* keep track of my own sending of DAO for handling ack and loss of ack */
-      instance->my_dao_seqno = dao_sequence;
-      instance->my_dao_transmissions = 1;
-      ctimer_set(&instance->dao_retransmit_timer, RPL_DAO_RETRANSMISSION_TIMEOUT,
-          handle_dao_retransmission, parent);
-    }
-#else /* RPL_WITH_DAO_ACK */
-    /* We know that we have tried to register so now we are assuming
-    that we have a down-link - unless this is a zero lifetime one */
-    rpl_set_downward_link(lifetime != RPL_ZERO_LIFETIME);
-#endif /* RPL_WITH_DAO_ACK */
   }
 }
 /*---------------------------------------------------------------------------*/
diff --git a/core/net/rpl/rpl-nbr-policy.c b/core/net/rpl/rpl-nbr-policy.c
index 9c750a7e0..6f0dd9ca3 100644
--- a/core/net/rpl/rpl-nbr-policy.c
+++ b/core/net/rpl/rpl-nbr-policy.c
@@ -111,36 +111,33 @@ update_nbr(void)
     linkaddr_t *lladdr = nbr_table_get_lladdr(ds6_neighbors, nbr);
     is_used = 0;
 
+    /* Check if this neighbor is used as nexthop and therefor being a
+       RPL child. */
+    if(uip_ds6_route_is_nexthop((uip_lladdr_t *)lladdr) != 0) {
+      is_used++;
+      num_children++;
+    }
+
     parent = rpl_get_parent((uip_lladdr_t *)lladdr);
     if(parent != NULL) {
       num_parents++;
-      is_used++;
 
       if(parent->dag != NULL && parent->dag->preferred_parent == parent) {
         /* This is the preferred parent for the DAG and must not be removed */
 
         /* Note: this assumes that only RPL adds default routes. */
 
-      } else if(worst_rank < INFINITE_RANK &&
+      } else if(is_used == 0 && worst_rank < INFINITE_RANK &&
                 parent->rank > 0 &&
                 parent->dag != NULL &&
                 parent->dag->instance != NULL &&
                 (rank = parent->dag->instance->of->calculate_rank(parent, 0)) > worst_rank) {
         /* This is the worst-rank neighbor - this is a good candidate for removal */
-        if(uip_ds6_route_is_nexthop((uip_lladdr_t *)lladdr) == 0) {
-          worst_rank = rank;
-          worst_rank_nbr = lladdr;
-        } else {
-          printf("*** Can not use this as worst rank as it is a next hop\n");
-        }
+        worst_rank = rank;
+        worst_rank_nbr = lladdr;
       }
-    }
-
-    /* Check if this neighbor is used as nexthop and therefor being a
-       RPL child. */
-    if(uip_ds6_route_is_nexthop((uip_lladdr_t *)lladdr) != 0) {
+      /* add to is_used after evaluation of is_used above */
       is_used++;
-      num_children++;
     }
 
     if(is_used == 0) {
diff --git a/examples/ipv6/rpl-udp/rpl-udp-scale-wismote.csc b/examples/ipv6/rpl-udp/rpl-udp-scale-wismote.csc
new file mode 100644
index 000000000..3aea07ab0
--- /dev/null
+++ b/examples/ipv6/rpl-udp/rpl-udp-scale-wismote.csc
@@ -0,0 +1,721 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>RPL up and downstream scaleability test network using IPv6 and RPL</title>
+    <randomseed>generated</randomseed>
+    <motedelay_us>5000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>150.0</transmitting_range>
+      <interference_range>150.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.mspmote.WismoteMoteType
+      <identifier>sky1</identifier>
+      <description>WisMote Type #sky1</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-server.c</source>
+      <commands EXPORT="discard">make SERVER_REPLY=1 clean udp-server.wismote TARGET=wismote DEFINES=TEST_MORE_ROUTES=1</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-server.wismote</firmware>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspButton</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspDefaultSerial</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspLED</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.mspmote.WismoteMoteType
+      <identifier>sky2</identifier>
+      <description>WisMote Type #sky2</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-client.c</source>
+      <commands EXPORT="discard">make SERVER_REPLY=1 clean udp-client.wismote TARGET=wismote</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-client.wismote</firmware>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspButton</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspDefaultSerial</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspLED</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
+    </motetype>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>48.435974731198804</x>
+        <y>-66.16503914182063</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>1</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-65.3176930733124</x>
+        <y>17.4304162608286</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>2</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>127.9689727848476</x>
+        <y>91.71883780610729</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>3</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>154.92605604103275</x>
+        <y>40.97896551774433</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>4</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>47.34887596588397</x>
+        <y>-30.341495695501195</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>5</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>47.13486576528276</x>
+        <y>32.944481932122315</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>6</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-11.42091423859419</x>
+        <y>17.879870626121914</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>7</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>118.92746659954325</x>
+        <y>57.05973076244069</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>8</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>56.66768196114595</x>
+        <y>74.35652008990945</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>9</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>16.45706316609417</x>
+        <y>23.9075414163248</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>10</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-13.423161364506493</x>
+        <y>-38.483037144768275</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>11</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-9.034961217472201</x>
+        <y>44.411389162165406</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>12</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>35.60049910164592</x>
+        <y>87.95154356223047</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>13</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>66.93880603404335</x>
+        <y>-42.39683727590697</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>14</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>94.81678343873172</x>
+        <y>26.921376811426246</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>15</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-49.449656689283934</x>
+        <y>57.924813144367945</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>16</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-34.02467970185502</x>
+        <y>-24.313824905298304</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>17</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-28.750467760427494</x>
+        <y>48.01822457713635</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>18</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>124.95513738974614</x>
+        <y>20.140247172447996</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>19</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>14.85247487703553</x>
+        <y>-34.478542892943686</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>20</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>154.43072661267115</x>
+        <y>-3.279765376986134</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>21</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>99.90960713878738</x>
+        <y>-21.76043658444847</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>22</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>88.4612185198951</x>
+        <y>-49.763990463932714</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>23</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>24.745110502623138</x>
+        <y>-1.7100594420374744</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>24</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>94.06332458995635</x>
+        <y>-2.4635182908128352</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>25</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-4.639784599615941</x>
+        <y>-10.849236218849724</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>26</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>2.4901685804620115</x>
+        <y>-60.89843789583528</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>27</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>100.55144245441083</x>
+        <y>97.41861446767646</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>28</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-12.355761328741393</x>
+        <y>82.72616691655692</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>29</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>57.79962925723111</x>
+        <y>0.6828700499064966</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>30</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>76.5550413097159</x>
+        <y>77.33875258624342</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspClock
+        <deviation>1.0</deviation>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>31</id>
+      </interface_config>
+      <motetype_identifier>sky2</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>289</width>
+    <z>4</z>
+    <height>184</height>
+    <location_x>31</location_x>
+    <location_y>41</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <moterelations>true</moterelations>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.AttributeVisualizerSkin</skin>
+      <viewport>2.349818846983307 0.0 0.0 2.349818846983307 187.19773526533345 190.95275613586946</viewport>
+    </plugin_config>
+    <width>659</width>
+    <z>2</z>
+    <height>622</height>
+    <location_x>296</location_x>
+    <location_y>11</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter>ID:22.*DAO</filter>
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>937</width>
+    <z>3</z>
+    <height>442</height>
+    <location_x>20</location_x>
+    <location_y>297</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>TIMEOUT(12000000, log.log("Total PRR " + totalPRR + "\n"));
+packetsReceived= new Array();
+packetsSent = new Array();
+serverID = 1;
+nodeCount = 31;
+totalPRR = 0;
+
+for(i = 0; i &lt;= nodeCount; i++) {
+	packetsReceived[i] = 0;
+	packetsSent[i] = 0;
+}
+
+while(1) {
+	YIELD();
+
+	msgArray = msg.split(' ');
+	if(msgArray[0].equals("#A")) {
+		if(msgArray[1].charAt(0) == 'r') {
+			// Received packet
+			senderID = id;
+            arr2 = msgArray[1].split(',')[0].slice(2).split('/');
+            recv = parseInt(arr2[0]);
+            sent = parseInt(arr2[1]);
+            log.log("Sent:" + sent + " Recv:" + recv + "\n");
+            packetsSent[senderID] = sent;
+			packetsReceived[senderID] = recv;
+
+			log.log("SenderID " + senderID + " PRR " + packetsReceived[senderID] / packetsSent[senderID] + "\n");
+			totalReceived = totalSent = 0;
+			for(i = serverID + 1; i &lt;= nodeCount; i++) {
+				totalReceived += packetsReceived[i];
+				totalSent += packetsSent[i];
+			}
+			totalPRR = totalReceived / totalSent;
+			log.log("Total PRR " + totalPRR + " recv " + totalReceived + " sent " + totalSent + "\n");
+		}
+	}
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>600</width>
+    <z>5</z>
+    <height>700</height>
+    <location_x>946</location_x>
+    <location_y>6</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.MoteInterfaceViewer
+    <mote_arg>3</mote_arg>
+    <plugin_config>
+      <interface>Position</interface>
+      <scrollpos>0,0</scrollpos>
+    </plugin_config>
+    <width>350</width>
+    <z>6</z>
+    <height>300</height>
+    <location_x>976</location_x>
+    <location_y>36</location_y>
+  </plugin>
+</simconf>
+

From 12a75c3e4325d960eb62bc3f7ff78b4c3b1dd667 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Sat, 26 Mar 2016 20:12:52 +0100
Subject: [PATCH 133/393] fixed codestyle, improved APIs, and cleaned up
 comments

---
 core/net/ipv6/uip-ds6-nbr.c                   |  2 +-
 core/net/ipv6/uip-ds6-route.c                 |  9 +++-
 core/net/ipv6/uip-ds6-route.h                 |  5 ++-
 core/net/nbr-table.h                          |  2 +-
 core/net/rpl/rpl-dag.c                        | 18 ++++++--
 core/net/rpl/rpl-icmp6.c                      | 43 ++++++++-----------
 core/net/rpl/rpl-mrhof.c                      |  8 +++-
 core/net/rpl/rpl-nbr-policy.c                 | 33 ++++++++------
 core/net/rpl/rpl-of0.c                        |  2 +
 core/net/rpl/rpl-private.h                    |  2 +-
 core/net/rpl/rpl.h                            | 16 +++++--
 .../21-large-rpl/code/node/client.c           |  2 +-
 12 files changed, 91 insertions(+), 51 deletions(-)

diff --git a/core/net/ipv6/uip-ds6-nbr.c b/core/net/ipv6/uip-ds6-nbr.c
index b8666a14a..e5c6167e5 100644
--- a/core/net/ipv6/uip-ds6-nbr.c
+++ b/core/net/ipv6/uip-ds6-nbr.c
@@ -83,7 +83,7 @@ uip_ds6_nbr_add(const uip_ipaddr_t *ipaddr, const uip_lladdr_t *lladdr,
                 void *data)
 {
   uip_ds6_nbr_t *nbr = nbr_table_add_lladdr(ds6_neighbors, (linkaddr_t*)lladdr
-                                            ,reason, data);
+                                            , reason, data);
   if(nbr) {
     uip_ipaddr_copy(&nbr->ipaddr, ipaddr);
 #if UIP_ND6_SEND_NA || UIP_ND6_SEND_RA || !UIP_CONF_ROUTER
diff --git a/core/net/ipv6/uip-ds6-route.c b/core/net/ipv6/uip-ds6-route.c
index 21ce38f64..043ca78d4 100644
--- a/core/net/ipv6/uip-ds6-route.c
+++ b/core/net/ipv6/uip-ds6-route.c
@@ -207,8 +207,15 @@ uip_ds6_route_next(uip_ds6_route_t *r)
 }
 /*---------------------------------------------------------------------------*/
 int
-uip_ds6_route_is_nexthop(const uip_lladdr_t *lladdr)
+uip_ds6_route_is_nexthop(const uip_ipaddr_t *ipaddr)
 {
+  const uip_lladdr_t *lladdr;
+  lladdr = uip_ds6_nbr_lladdr_from_ipaddr(ipaddr);
+
+  if(lladdr == NULL) {
+    return 0;
+  }
+
   return nbr_table_get_from_lladdr(nbr_routes, (linkaddr_t *)lladdr) != NULL;
 }
 /*---------------------------------------------------------------------------*/
diff --git a/core/net/ipv6/uip-ds6-route.h b/core/net/ipv6/uip-ds6-route.h
index 7a5d805f0..6ca533c9b 100644
--- a/core/net/ipv6/uip-ds6-route.h
+++ b/core/net/ipv6/uip-ds6-route.h
@@ -124,6 +124,9 @@ void uip_ds6_notification_rm(struct uip_ds6_notification *n);
 #define RPL_ROUTE_SET_DAO_NACKED(route) do {                            \
     (route)->state.state_flags |= RPL_ROUTE_ENTRY_DAO_NACK;             \
   } while(0)
+#define RPL_ROUTE_CLEAR_DAO_NACKED(route) do {                          \
+    (route)->state.state_flags &= ~RPL_ROUTE_ENTRY_DAO_NACK;            \
+  } while(0)
 
 #define RPL_ROUTE_CLEAR_DAO(route) do {                                 \
     (route)->state.state_flags &= ~(RPL_ROUTE_ENTRY_DAO_NACK|RPL_ROUTE_ENTRY_DAO_PENDING); \
@@ -200,7 +203,7 @@ uip_ipaddr_t *uip_ds6_route_nexthop(uip_ds6_route_t *);
 int uip_ds6_route_num_routes(void);
 uip_ds6_route_t *uip_ds6_route_head(void);
 uip_ds6_route_t *uip_ds6_route_next(uip_ds6_route_t *);
-int uip_ds6_route_is_nexthop(const uip_lladdr_t *lladdr);
+int uip_ds6_route_is_nexthop(const uip_ipaddr_t *ipaddr);
 /** @} */
 
 #endif /* UIP_DS6_ROUTE_H */
diff --git a/core/net/nbr-table.h b/core/net/nbr-table.h
index cc58c2f80..88a90a46c 100644
--- a/core/net/nbr-table.h
+++ b/core/net/nbr-table.h
@@ -83,7 +83,7 @@ typedef enum {
 	NBR_TABLE_REASON_ROUTE,
 	NBR_TABLE_REASON_IPV6_ND,
 	NBR_TABLE_REASON_MAC,
-        NBR_TABLE_REASON_LLSEC
+	NBR_TABLE_REASON_LLSEC
 } nbr_table_reason_t;
 
 /** \name Neighbor tables: register and loop through table elements */
diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index 034678ff5..27f781bdf 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -899,6 +899,18 @@ rpl_move_parent(rpl_dag_t *dag_src, rpl_dag_t *dag_dst, rpl_parent_t *parent)
   parent->dag = dag_dst;
 }
 /*---------------------------------------------------------------------------*/
+int
+rpl_has_downward_route(void)
+{
+  int i;
+  for(i = 0; i < RPL_MAX_INSTANCES; ++i) {
+    if(instance_table[i].used && instance_table[i].has_downward_route) {
+      return 1;
+    }
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
 rpl_dag_t *
 rpl_get_any_dag(void)
 {
@@ -1157,8 +1169,6 @@ global_repair(uip_ipaddr_t *from, rpl_dag_t *dag, rpl_dio_t *dio)
   RPL_STAT(rpl_stats.global_repairs++);
 }
 
-void rpl_set_downward_link(uint8_t link);
-
 /*---------------------------------------------------------------------------*/
 void
 rpl_local_repair(rpl_instance_t *instance)
@@ -1177,8 +1187,8 @@ rpl_local_repair(rpl_instance_t *instance)
     }
   }
 
-  /* no downward link anymore */
-  rpl_set_downward_link(0);
+  /* no downward route anymore */
+  instance->has_downward_route = 0;
 
   rpl_reset_dio_timer(instance);
   /* Request refresh of DAO registrations next DIO */
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 2296f0d97..0f20ddb67 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -90,7 +90,6 @@ void RPL_DEBUG_DAO_OUTPUT(rpl_parent_t *);
 #endif
 
 static uint8_t dao_sequence = RPL_LOLLIPOP_INIT;
-static uint8_t downward = 0;
 
 extern rpl_of_t RPL_OF;
 
@@ -105,18 +104,6 @@ UIP_ICMP6_HANDLER(dao_handler, ICMP6_RPL, RPL_CODE_DAO, dao_input);
 UIP_ICMP6_HANDLER(dao_ack_handler, ICMP6_RPL, RPL_CODE_DAO_ACK, dao_ack_input);
 /*---------------------------------------------------------------------------*/
 
-void
-rpl_set_downward_link(uint8_t link)
-{
-  downward = link;
-}
-
-int
-rpl_has_downward_link()
-{
-  return downward;
-}
-
 #if RPL_WITH_DAO_ACK
 static uip_ds6_route_t *
 find_route_entry_by_dao_ack(uint8_t seq)
@@ -215,8 +202,10 @@ rpl_icmp6_update_nbr_table(uip_ipaddr_t *from, nbr_table_reason_t reason, void *
 
   if(nbr != NULL) {
 #if UIP_ND6_SEND_NA
-    /* set reachable timer if we added or found the nbr entry */
+    /* set reachable timer if we added or found the nbr entry - and update
+       neighbor entry to reachable to avoid sending NS/NA, etc.  */
     stimer_set(&nbr->reachable, UIP_ND6_REACHABLE_TIME / 1000);
+    nbr->state = NBR_REACHABLE;
 #endif /* UIP_ND6_SEND_NA */
   }
   return nbr;
@@ -833,7 +822,7 @@ dao_input(void)
     if(flags & RPL_DAO_K_FLAG) {
       /* signal the failure to add the node */
       dao_ack_output(instance, &dao_sender_addr, sequence,
-		     is_root ? RPL_DAO_ACK_UNABLE_TO_ACCEPT_ROOT :
+		     is_root ? RPL_DAO_ACK_UNABLE_TO_ADD_ROUTE_AT_ROOT :
 		     RPL_DAO_ACK_UNABLE_TO_ACCEPT);
     }
     goto discard;
@@ -846,7 +835,7 @@ dao_input(void)
     if(flags & RPL_DAO_K_FLAG) {
       /* signal the failure to add the node */
       dao_ack_output(instance, &dao_sender_addr, sequence,
-		     is_root ? RPL_DAO_ACK_UNABLE_TO_ACCEPT_ROOT :
+		     is_root ? RPL_DAO_ACK_UNABLE_TO_ADD_ROUTE_AT_ROOT :
 		     RPL_DAO_ACK_UNABLE_TO_ACCEPT);
     }
     goto discard;
@@ -864,8 +853,12 @@ fwd_dao:
     int should_ack = 0;
 
     if(flags & RPL_DAO_K_FLAG) {
-      /* check if this route is already installed and we can ack now! */
-      /* not pending - and same seq-no means that we can ack.         */
+      /*
+       * check if this route is already installed and we can ack now!
+       * not pending - and same seq-no means that we can ack.
+       * (e.g. the route is installed already so it will not take any
+       * more room that it already takes - so should be ok!)
+       */
       if((!RPL_ROUTE_IS_DAO_PENDING(rep) &&
           rep->state.dao_seqno_in == sequence) ||
           dag->rank == ROOT_RANK(instance)) {
@@ -992,7 +985,7 @@ dao_output(rpl_parent_t *parent, uint8_t lifetime)
 #else
    /* We know that we have tried to register so now we are assuming
       that we have a down-link - unless this is a zero lifetime one */
-  rpl_set_downward_link(lifetime != RPL_ZERO_LIFETIME);
+  parent->dag->instance->has_downward_route = lifetime != RPL_ZERO_LIFETIME;
 #endif /* RPL_WITH_DAO_ACK */
 
   /* Sending a DAO with own prefix as target */
@@ -1122,9 +1115,7 @@ dao_ack_input(void)
 
   parent = rpl_find_parent(instance->current_dag, &UIP_IP_BUF->srcipaddr);
   if(parent == NULL) {
-    /* not a known instance - did we switch?? */
-    //    PRINTF("RPL: Received a DAO ACK from a not joined instance: %d",
-    //	   instance_id);
+    /* not a known instance - drop the packet and ignore */
     uip_clear_buf();
     return;
   }
@@ -1136,7 +1127,7 @@ dao_ack_input(void)
   PRINTF("\n");
 
   if(sequence == instance->my_dao_seqno) {
-    rpl_set_downward_link(status < 128);
+    instance->has_downward_route = status < 128;
 
     /* always stop the retransmit timer when the ACK arrived */
     ctimer_stop(&instance->dao_retransmit_timer);
@@ -1148,8 +1139,10 @@ dao_ack_input(void)
 
 #if RPL_REPAIR_ON_DAO_NACK
     if(status >= RPL_DAO_ACK_UNABLE_TO_ACCEPT) {
-      /* failed the DAO transmission - need to remove the default route. */
-      /* Trigger a local repair since we can not get our DAO in... */
+      /*
+       * Failed the DAO transmission - need to remove the default route.
+       * Trigger a local repair since we can not get our DAO in.
+       */
       rpl_local_repair(instance);
     }
 #endif
diff --git a/core/net/rpl/rpl-mrhof.c b/core/net/rpl/rpl-mrhof.c
index 6da2ec304..f9ea76080 100644
--- a/core/net/rpl/rpl-mrhof.c
+++ b/core/net/rpl/rpl-mrhof.c
@@ -54,7 +54,9 @@
 
 static void reset(rpl_dag_t *);
 static void neighbor_link_callback(rpl_parent_t *, int, int);
+#if RPL_WITH_DAO_ACK
 static void dao_ack_callback(rpl_parent_t *, int);
+#endif
 static rpl_parent_t *best_parent(rpl_parent_t *, rpl_parent_t *);
 static rpl_dag_t *best_dag(rpl_dag_t *, rpl_dag_t *);
 static rpl_rank_t calculate_rank(rpl_parent_t *, rpl_rank_t);
@@ -63,7 +65,9 @@ static void update_metric_container(rpl_instance_t *);
 rpl_of_t rpl_mrhof = {
   reset,
   neighbor_link_callback,
+#if RPL_WITH_DAO_ACK
   dao_ack_callback,
+#endif
   best_parent,
   best_dag,
   calculate_rank,
@@ -119,10 +123,11 @@ reset(rpl_dag_t *dag)
   PRINTF("RPL: Reset MRHOF\n");
 }
 
+#if RPL_WITH_DAO_ACK
 static void
 dao_ack_callback(rpl_parent_t *p, int status)
 {
-  if(status == RPL_DAO_ACK_UNABLE_TO_ACCEPT_ROOT) {
+  if(status == RPL_DAO_ACK_UNABLE_TO_ADD_ROUTE_AT_ROOT) {
     return;
   }
   /* here we need to handle failed DAO's and other stuff */
@@ -135,6 +140,7 @@ dao_ack_callback(rpl_parent_t *p, int status)
     neighbor_link_callback(p, MAC_TX_OK, 10);
   }
 }
+#endif /* RPL_WITH_DAO_ACK */
 
 static void
 neighbor_link_callback(rpl_parent_t *p, int status, int numtx)
diff --git a/core/net/rpl/rpl-nbr-policy.c b/core/net/rpl/rpl-nbr-policy.c
index 6f0dd9ca3..87849af40 100644
--- a/core/net/rpl/rpl-nbr-policy.c
+++ b/core/net/rpl/rpl-nbr-policy.c
@@ -72,6 +72,10 @@ static linkaddr_t *worst_rank_nbr; /* the parent that has the worst rank */
 static rpl_rank_t worst_rank;
 /*---------------------------------------------------------------------------*/
 #if DEBUG == DEBUG_FULL
+/*
+ * This create a periodic call of the update_nbr function that will print
+ * useful debugging information when in DEBUG_FULL mode
+ */
 static void update_nbr(void);
 static struct ctimer periodic_timer;
 static int timer_init = 0;
@@ -111,9 +115,12 @@ update_nbr(void)
     linkaddr_t *lladdr = nbr_table_get_lladdr(ds6_neighbors, nbr);
     is_used = 0;
 
-    /* Check if this neighbor is used as nexthop and therefor being a
-       RPL child. */
-    if(uip_ds6_route_is_nexthop((uip_lladdr_t *)lladdr) != 0) {
+    /*
+     * Check if this neighbor is used as nexthop and therefor being a
+     * RPL child.
+    */
+
+    if(uip_ds6_route_is_nexthop(&nbr->ipaddr) != 0) {
       is_used++;
       num_children++;
     }
@@ -123,10 +130,10 @@ update_nbr(void)
       num_parents++;
 
       if(parent->dag != NULL && parent->dag->preferred_parent == parent) {
-        /* This is the preferred parent for the DAG and must not be removed */
-
-        /* Note: this assumes that only RPL adds default routes. */
-
+        /*
+         * This is the preferred parent for the DAG and must not be removed
+         * Note: this assumes that only RPL adds default routes.
+         */
       } else if(is_used == 0 && worst_rank < INFINITE_RANK &&
                 parent->rank > 0 &&
                 parent->dag != NULL &&
@@ -168,9 +175,10 @@ find_removable_dis(uip_ipaddr_t *from)
 
   update_nbr();
   if(num_free > 0) {
-    printf("num-free > 0 = %d", num_free);
-    printf("**** Should remove unused elements but can not... \n");
-    /*    return 1; */
+    /* there are free entries (e.g. unsused by RPL and ND6) but since it is
+       used by other modules we can not pick these entries for removal. */
+    PRINTF("Num-free > 0 = %d - Other for RPL/ND6 unused NBR entry exists .",
+           num_free);
   }
   if(num_children < MAX_CHILDREN) {
     return worst_rank_nbr;
@@ -192,7 +200,7 @@ find_removable_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
     return NULL;
   }
 
-  /* Add the new neighbor only if it is better than the preferred parent. */
+  /* Add the new neighbor only if it is better than the worst parent. */
   rank = instance->of->calculate_rank(NULL, dio->rank);
   if(rank < worst_rank - instance->min_hoprankinc / 2) {
     /* Found *great* neighbor - add! */
@@ -231,7 +239,8 @@ find_removable_dao(uip_ipaddr_t *from, rpl_instance_t *instance)
 }
 /*---------------------------------------------------------------------------*/
 const linkaddr_t *
-rpl_nbr_policy_find_removable(nbr_table_reason_t reason,void * data) {
+rpl_nbr_policy_find_removable(nbr_table_reason_t reason,void * data)
+{
   /* When we get the DIO/DAO/DIS we know that UIP contains the
      incoming packet */
   switch(reason) {
diff --git a/core/net/rpl/rpl-of0.c b/core/net/rpl/rpl-of0.c
index ed76bac4b..b0a909a4d 100644
--- a/core/net/rpl/rpl-of0.c
+++ b/core/net/rpl/rpl-of0.c
@@ -55,7 +55,9 @@ static void update_metric_container(rpl_instance_t *);
 rpl_of_t rpl_of0 = {
   reset,
   NULL,
+#if RPL_WITH_DAO_ACK
   NULL,
+#endif
   best_parent,
   best_dag,
   calculate_rank,
diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h
index 161cdc532..ec885eaea 100644
--- a/core/net/rpl/rpl-private.h
+++ b/core/net/rpl/rpl-private.h
@@ -94,7 +94,7 @@
 #define RPL_DAO_ACK_UNCONDITIONAL_ACCEPT 0
 #define RPL_DAO_ACK_ACCEPT               1   /* 1 - 127 is OK but not good */
 #define RPL_DAO_ACK_UNABLE_TO_ACCEPT     128 /* >127 is fail */
-#define RPL_DAO_ACK_UNABLE_TO_ACCEPT_ROOT 255 /* root can not accept */
+#define RPL_DAO_ACK_UNABLE_TO_ADD_ROUTE_AT_ROOT 255 /* root can not accept */
 
 #define RPL_DAO_ACK_TIMEOUT              -1
 
diff --git a/core/net/rpl/rpl.h b/core/net/rpl/rpl.h
index dfc081d4b..532df4b3a 100644
--- a/core/net/rpl/rpl.h
+++ b/core/net/rpl/rpl.h
@@ -181,11 +181,19 @@ typedef struct rpl_instance rpl_instance_t;
  *  Updates the metric container for outgoing DIOs in a certain DAG.
  *  If the objective function of the DAG does not use metric containers,
  *  the function should set the object type to RPL_DAG_MC_NONE.
+ *
+ * dao_ack_callback(parent, status)
+ *
+ * A callback on the result of the DAO ACK. Similar to the neighbor link
+ * callback. A failed DAO_ACK (NACK) can be used for switching to another
+ * parent via changed link metric or other mechanisms.
  */
 struct rpl_of {
   void (*reset)(struct rpl_dag *);
   void (*neighbor_link_callback)(rpl_parent_t *, int, int);
+#if RPL_WITH_DAO_ACK
   void (*dao_ack_callback)(rpl_parent_t *, int status);
+#endif
   rpl_parent_t *(*best_parent)(rpl_parent_t *, rpl_parent_t *);
   rpl_dag_t *(*best_dag)(rpl_dag_t *, rpl_dag_t *);
   rpl_rank_t (*calculate_rank)(rpl_parent_t *, rpl_rank_t);
@@ -220,6 +228,8 @@ struct rpl_instance {
   /* my last registered DAO that I might be waiting for ACK on */
   uint8_t my_dao_seqno;
   uint8_t my_dao_transmissions;
+  /* this is intended to keep track if this instance have a route downward */
+  uint8_t has_downward_route;
   rpl_rank_t max_rankinc;
   rpl_rank_t min_hoprankinc;
   uint16_t lifetime_unit; /* lifetime in seconds = l_u * d_l */
@@ -302,11 +312,11 @@ enum rpl_mode rpl_get_mode(void);
 
 
 /**
- * Get the RPL's best guess on if we have downward link or not.
+ * Get the RPL's best guess on if we have downward route or not.
  *
- * \retval 1 if we have a downward link, 0 if not.
+ * \retval 1 if we have a downward route from RPL Root, 0 if not.
  */
-int rpl_has_downward_link(void);
+int rpl_has_downward_route(void);
 
 /*---------------------------------------------------------------------------*/
 #endif /* RPL_H */
diff --git a/regression-tests/21-large-rpl/code/node/client.c b/regression-tests/21-large-rpl/code/node/client.c
index 36dc40923..1e82e2df0 100644
--- a/regression-tests/21-large-rpl/code/node/client.c
+++ b/regression-tests/21-large-rpl/code/node/client.c
@@ -100,7 +100,7 @@ PROCESS_THREAD(http_example_process, ev, data)
   while(1) {
     PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
     etimer_reset(&et);
-    if(connect && rpl_has_downward_link()) {
+    if(connect && rpl_has_downward_route()) {
       printf("#A color=green\n");
       http_socket_get(&s, "http://www.contiki-os.org/", 0, 0,
 		      callback, NULL);

From 4f28289df2b411154d4f5cf8d3235b54da515d94 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <ol.sc@web.de>
Date: Mon, 28 Mar 2016 14:06:47 +0200
Subject: [PATCH 134/393] Added a pfs_remove() function and a pfs_seek() stub
 to the Commodore platforms.

- "Normalized" some Assembly code.
- Implemented CFS_APPEND in pfs_open().
- Made CFS_WRITE work in VICE's virtual disk/file system.
---
 .gitignore                     |   2 +-
 cpu/6502/lib/pfs.h             |  16 +-
 platform/c128/Makefile.c128    |   2 +-
 platform/c128/lib/pfs.S        | 521 +++++++++++++++++----------------
 platform/c128/lib/pfs_remove.S |  59 ++++
 platform/c128/lib/pfs_seek.S   |  46 +++
 platform/c128/lib/pfs_write.S  |  47 +--
 platform/c64/Makefile.c64      |   2 +-
 platform/c64/lib/pfs.S         | 521 +++++++++++++++++----------------
 platform/c64/lib/pfs_remove.S  |  59 ++++
 platform/c64/lib/pfs_seek.S    |  46 +++
 platform/c64/lib/pfs_write.S   |  47 +--
 12 files changed, 818 insertions(+), 550 deletions(-)
 create mode 100644 platform/c128/lib/pfs_remove.S
 create mode 100644 platform/c128/lib/pfs_seek.S
 create mode 100644 platform/c64/lib/pfs_remove.S
 create mode 100644 platform/c64/lib/pfs_seek.S

diff --git a/.gitignore b/.gitignore
index c166681da..f4905fca9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,7 +80,7 @@ contiki-cc2530dk.lib
 *.dsc
 
 #cc65 build artifacts
-*.S
+*.s
 *.eth
 *.dsk
 *.po
diff --git a/cpu/6502/lib/pfs.h b/cpu/6502/lib/pfs.h
index 25c62e8bf..73102ce55 100644
--- a/cpu/6502/lib/pfs.h
+++ b/cpu/6502/lib/pfs.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE. 
  *
  * This file is part of the Contiki operating system.
- * 
+ *
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
  */
@@ -35,11 +35,13 @@
 #ifndef PFS_H_
 #define PFS_H_
 
-int  __fastcall__ pfs_open(const char* name, int flags);
-void __fastcall__ pfs_close(int fd);
-int  __fastcall__ pfs_read(int fd, void* buf, unsigned int len);
-int  __fastcall__ pfs_write(int fd, void* buf, unsigned int len);
-int  __fastcall__ pfs_seek(int fd, int offset, int whence);
-int  __fastcall__ pfs_remove(const char *name);
+#include <sys/types.h>
+
+int   __fastcall__ pfs_open(const char *name, int flags);
+void  __fastcall__ pfs_close(int fd);
+int   __fastcall__ pfs_read(int fd, void *buf, unsigned int len);
+int   __fastcall__ pfs_write(int fd, const void *buf, unsigned int len);
+off_t __fastcall__ pfs_seek(int fd, off_t offset, int whence);
+int   __fastcall__ pfs_remove(const char *name);
 
 #endif /* PFS_H_ */
diff --git a/platform/c128/Makefile.c128 b/platform/c128/Makefile.c128
index b186fac60..55889d4ab 100644
--- a/platform/c128/Makefile.c128
+++ b/platform/c128/Makefile.c128
@@ -31,7 +31,7 @@
 # Author: Oliver Schmidt <ol.sc@web.de>
 #
 
-CONTIKI_TARGET_SOURCEFILES += lseek.c pfs.S pfs_write.S
+CONTIKI_TARGET_SOURCEFILES += lseek.c pfs.S pfs_remove.S pfs_seek.S pfs_write.S
 
 CONTIKI_CPU = $(CONTIKI)/cpu/6502
 include $(CONTIKI_CPU)/Makefile.6502
diff --git a/platform/c128/lib/pfs.S b/platform/c128/lib/pfs.S
index 62a2a7840..7947b67d8 100644
--- a/platform/c128/lib/pfs.S
+++ b/platform/c128/lib/pfs.S
@@ -29,99 +29,212 @@
 ; This file is part of the Contiki operating system.
 ; 
 ; Author: Kajtar Zsolt <soci@c64.rulez.org>
+; Author: Greg King <gregdk@users.sf.net>
 ;
 ;---------------------------------------------------------------------
-	.define F_IDE64 0	; support IDE64, not on C128
+.define	F_IDE64		0	; C128 doesn't have IDE64
 
-	.constructor init_pfs
-        .destructor  done_pfs
-	.importzp    ptr1, ptr2, ptr3, sp
-	.import	     curunit, __filetype, popax, addysp, subysp
-	.export	     pfs_rwcommon, pfs_rwsetflags, pfs_rwcommonend
-	.if	F_IDE64
-	.export      ide64_rwprepare, ide64_rwfinish
-	.endif	
-	.export	     _pfs_open, _pfs_read, _pfs_close
+	.constructor	init_pfs
+	.destructor	done_pfs
+	.importzp	sp, ptr1, ptr2, ptr3
+	.import		curunit, __filetype, popax, addysp, subysp
+	.export		pfs_rwcommon, pfs_rwsetflags, pfs_rwcommonend
+.if	F_IDE64
+	.export		ide64_rwprepare, ide64_rwfinish
+.endif
+	.export		cmdc, flags
+	.export		pfs_makename, pfs_scratch
+
+	.export		_pfs_open, _pfs_read, _pfs_close
 ;---------------------------------------------------------------------
-F_EOF		= $80
-F_NBLK		= $40
-F_OPEN		= $20
-F_MAXLEN	= 80	;max filename length
-ST		= $90	;status
-FN		= $BB	;filename
-FNL		= $B7	;filenamelength
-LF		= $B8	;logical file number
-SA		= $B9	;secondary address
-OPEN		= $FFC0
-CLOSE		= $FFC3
-CHKIN		= $FFC6
-CHKOUT		= $FFC9
-CLRCHN		= $FFCC
-CHRIN		= $FFCF
-CHROUT		= $FFD2
-SETLFS		= $FFBA
-SETNAM		= $FFBD
-CLALL		= $FFE7
-WRITE		= $DEF1
-READ		= $DEF4
+MAXLEN	=	80		;maximum filename length
+
+; Flag bits
+F_EOF	=	%10000000	;end of file
+F_NBLK	=	%01000000	;block read/write not available
+F_OPEN	=	%00100000
+
+; Kernal variables
+ST	:=	$90		;status
+FN	:=	$BB		;filename
+FNL	:=	$B7		;filename length
+LF	:=	$B8		;logical file number
+
+OPNVec	:=	$031A		;address vector to OPEN function's code
+
+; IDEDOS function
+READ	:=	$DEF4
+
+; Kernal functions
+SETLFS	:=	$FFBA
+SETNAM	:=	$FFBD
+OPEN	:=	$FFC0
+CLOSE	:=	$FFC3
+CHKIN	:=	$FFC6
+CHKOUT	:=	$FFC9
+CLRCHN	:=	$FFCC
+CHRIN	:=	$FFCF
+CHROUT	:=	$FFD2
 ;---------------------------------------------------------------------
 	.data
 
-illchr:	.byte	$3A, $2A, $3F, $3D	;illegal chars
-pw:	.byte	$2C, $50, $2C, $57	;,p,w
+; illchr and sw must stay together because the comma, also, is illegal in names.
+illchr:	.byte	"*?:="		;illegal chars
+sw:	.byte	",s,w"
 cmdc:	.byte	0
-flags:	.res	10
+flags:	.res	10		;(Kernal allows only ten open files)
 ;---------------------------------------------------------------------
 	.segment	"ONCE"
 
 init_pfs:
-	ldy	#F_MAXLEN+8
-	jsr	subysp	;allocate
-	lda	#0
-	sta	FNL	;no name
-	ldy	#15-1
-	jsr	open2	;open command channel
+	ldy	#MAXLEN + 8
+	jsr	subysp		;allocate because open2 will free it
+	lda	#0		;no name, file number 1
+	sta	FNL
+	ldy	#15 - 1		;secondary address 15
+	jsr	open2		;open command channel
 	sta	cmdc
 	rts
 ;---------------------------------------------------------------------
 	.code
 
-error3: jmp error
-
 _pfs_open:
-	sta	ptr2
-	; Pop and store name
+	sta	ptr2		;save open-mode flags
+
+	; Get and store name
 	jsr	popax
+	jsr	pfs_makename
+	lda	FNL
+	beq	error		;must have a filename
+
+	lda	#2 - 1		;file number
+	tay			;secondary address
+open2:	sta	ptr2
+	sty	ptr2 + 1
+
+next:	inc	ptr2		;next file number
+	ldx	ptr2		;file number
+	cpx	#.sizeof(flags) + 1
+	bcs	error		;no more files
+	lda	flags - 1,x
+	bne	next		;already used
+	lda	ptr2 + 1
+	bne	nextsa
+	inx
+	stx	ptr2 + 1
+nextsa:	inc	ptr2 + 1	;next channel
+retr:	lda	ptr2		;file number
+	ldx	curunit
+	ldy	ptr2 + 1	;secondary address (channel number)
+	jsr	SETLFS
+	jsr	OPEN		;open a pair of files (in computer and drive)
+	bcs	oerr		;branch if could not open computer file
+	ldx	cmdc
+	beq	opok		;branch if error channel just was openned
+	jsr	CHKIN
+	bcs	error
+	jsr	CHRIN
+	pha			;first digit of error code
+	jsr	CHRIN
+	sta	ptr1		;second digit
+@L4:	jsr	CHRIN		;flush status message
+	lda	ST
+	beq	@L4
+	jsr	CLRCHN
+	pla
+	cmp	#'2'
+	bcc	opok		;no serious error
+	pha
+	lda	ptr2
+	jsr	CLOSE		;close computer file
+	pla
+	ldx	ptr1
+	cmp	#'7'		;no channel?
+	bne	nnoc
+	cpx	#'0'
+	bne	error		;not "no channel"
+	lda	ptr2 + 1
+	cmp	#14
+	bcc	nextsa		;try next channel
+	bcs	error		;give up
+
+opok:	ldx	ptr2
+	lda	#F_OPEN
+	sta	flags - 1,x
+	txa			;OK, return file number
+ret0:	ldx	#>$0000
+ret:	ldy	#MAXLEN + 8	;free filename space
+	jmp	addysp
+
+oerr:	dec	ptr2 + 1
+	cmp	#2		;already open,
+	beq	next		;retry with next
+
+error:	lda	#<-1
+	tax			;failed
+	bne	ret
+
+nnoc:	inc	ptr3
+	bne	error		;no retry
+	cmp	#'6'
+	bne	error		;not "file exists"
+	cpx	#'3'
+	bne	error
+	jsr	pfs_scratch
+	bcc	retr
+	bcs	error		;branch always
+
+pfs_scratch:
+	ldx	cmdc
+	jsr	CHKOUT
+	bcs	@L5
+	ldy	#1
+	lda	#'s'		;scratch
+@L4:	jsr	CHROUT
+	lda	(FN),y
+	iny
+	cmp	#','
+	bne	@L4
+	lda	#$0D		;carriage return
+	jsr	CHROUT
+	jsr	CLRCHN
+	clc			;carry = 0: OK
+@L5:	rts			;carry = 1: error
+
+pfs_makename:
 	sta	FN
-	stx	FN+1	;filename (kernal)
-	ldy	#F_MAXLEN+8
-	jsr	subysp	;allocate name
-	ldy	#255
+	stx	FN+1		;Kernal filename pointer
+	ldy	#MAXLEN + 8
+	jsr	subysp		;allocate name space
+
+	; Validate the name; and, find its length
+	ldy	#<-1
 	sty	ptr3
 	sty	ptr1
 @L10:	iny
-	cpy	#F_MAXLEN
-	bcs	error3	;too long...
-	ldx	#4	;4+1 (comma)
+	cpy	#MAXLEN
+	bcs	badchr		;too long
+	lda	(FN),y
+	ldx	#.sizeof(illchr); 4 + 1 (includes comma)
 @L12:	cmp	illchr,x
-	beq	error3	;illegal char?
+	beq	badchr		;illegal char
 	dex
 	bpl	@L12
-	cmp	#$2F
+	cmp	#'/'
 	bne 	@L11
-	sty	ptr1	;last slash
-@L11:	lda	(FN),y
+	sty	ptr1		;last slash
+@L11:	tax			;test for '\0'
 	bne	@L10
-	sty	FNL
+	cpy	#0
+	beq	badchr		;no name
 
-	tay
-	tax
-	lda	#$30	;this partition
+	tay			;zero index reg.
+	lda	#'0'		;drive 0 or current partition
 	sta	(sp),y
 	iny
 	inc	ptr1
 	beq	nopath
-	lda	#$2F
+	lda	#'/'
 @L13:	sta	(sp),y
 	iny
 	lda	(FN,x)
@@ -130,158 +243,67 @@ _pfs_open:
 	inc	FN+1
 @L14:	cpy	ptr1
 	bcc	@L13
-	lda	#$2F
+	;lda	#'/'		; (.A already has a slash)
 	sta	(sp),y
 	iny
-nopath: lda	#$3A
+nopath: lda	#':'
 @L16:	sta	(sp),y
 	iny
 	lda	(FN,x)
 	inc	FN
 	bne	@L15
 	inc	FN+1
-@L15:	ora	#0
+@L15:	ora	#$00		;test for '\0'
 	bne	@L16
 	lsr	ptr2
-	bcs	ro	;read only
+	bcs	ro		;read-only (read-write not supported)
 	lda	__filetype
-	sta	pw+1	;set filetype
-	ldx	#252
-@L20:	lda	pw-252,x
-	sta	(sp),y	;write
+	sta	sw + 1		;set filetype
+	lsr	ptr2
+	lda	#'w'		;write-only
+	lsr	ptr2
+	bcc	write
+	lda	#'a'		;append
+write:	sta	sw + 3		;set mode
+	ldx	#$0100 - .sizeof(sw)
+@L20:	lda	sw - ($0100 - .sizeof(sw)),x
+	sta	(sp),y
 	iny
 	inx
 	bne	@L20
-ro:	tya		;name length (kernal)
+ro:	tya			;pathname length
 	ldx	sp
 	ldy	sp+1
-	jsr	SETNAM
+namset:	jmp	SETNAM
 
-	lda	#0	;file number
-	tay		;secondary address
-open2:	sta	ptr2
-	sty	ptr2+1
-
-next:	inc	ptr2	;next file number
-	ldx	ptr2	;file number
-	cpx	#11
-	bcs	error	;no more files
-	lda	flags-1,x
-	bne	next	;already used
-	lda	ptr2+1
-	bne	nextsa
-	inx
-	stx	ptr2+1
-nextsa:	inc	ptr2+1	;next channel
-retr:	lda	ptr2	;file number
-	ldx	curunit
-	ldy	ptr2+1	;secondary address
-	jsr	SETLFS
-	jsr	OPEN	;open
-	bcs	oerr
-	ldx	cmdc
-	beq	opok	;error channel open
-	jsr	CHKIN
-	bcs	error
-	jsr	CHRIN
-	pha
-	jsr	CHRIN
-	sta	ptr1
-@L4:	jsr	CHRIN
-	lda	ST
-	beq	@L4
-	jsr	CLRCHN
-	pla
-	tax
-	lsr
-	cmp	#$18	;no serious error
-	beq	opok
-	txa
-	pha
-	lda	ptr2
-	jsr	CLOSE	;close
-	pla
-	ldx	ptr1
-	cmp	#$37	;no channel?
-	bne	nnoc
-	cpx	#$30
-	bne	error	;not no channel
-	lda	ptr2+1
-	cmp	#14
-	bcc	nextsa	;try next channel
-	bcs	error	;give up
-
-opok:	ldx	ptr2
-	lda	#F_OPEN
-	sta	flags-1,x
-	txa		;ok, return file number
-	ldx	#0
-ret:	ldy	#F_MAXLEN+8	; free filename
-	jmp	addysp
-
-oerr:	dec	ptr2+1
-	cmp	#2	;already open,
-	beq	next	;retry with next
-
-error:	lda	#$FF
-	tax		;failed
-	bne	ret
-
-nnoc:	inc	ptr3
-	bne	error	;no retry
-	cmp	#$36
-	bne	error	;no exists
-	cpx	#$33
-	bne	error
-	ldx	cmdc
-	jsr	CHKOUT
-	bcs	error
-	lda	FNL
-	sec
-	sbc	#5
-	tax
-	lda	#$53	;scratch
-	jsr	CHROUT
-	ldy	#1
-@L4:	lda	(FN),y
-	iny
-	jsr	CHROUT
-	dex
-	bne	@L4
-	lda	#$3D
-	jsr	CHROUT
-	iny
-	lda	(FN),y
-	jsr	CHROUT
-	lda	#$0d
-	jsr	CHROUT
-	jsr	CLRCHN
-	jmp	retr
+badchr:	lda	#0
+	beq	namset
 
 .proc   _pfs_read
         jsr     pfs_rwcommon    ; pop params, check handle
 	beq	error2		; not open
 
 	bmi	eof
-	.if	F_IDE64
-	asl
+
+.if	F_IDE64
+	asl	a
         bmi     nblk		; no block operation
 
         jsr     CHKIN
         bcs     error2
-        
+
         ; check support
         jsr     ide64_rwprepare
         bcs     norm
-        
-        ; read
+
+        ; do a block read
         jsr     READ
         bcs     nosup
         jmp     ide64_rwfinish
 
 nosup:  lda     #F_NBLK
 	jsr	pfs_rwsetflags
-	.endif
+.endif
 
         ; Valid lfn. Make it the input file
 nblk:   jsr     CHKIN
@@ -292,15 +314,15 @@ norm:	ldy	#0
 @L3:    inc     ptr1
         bne     @L0
         inc     ptr1+1
-        beq     done            ; branch always
+        beq     done
 
         ; Read the next byte
 @L0:    jsr     CHRIN
         tax                     ; save the input byte
 
-        lda	ST              ; read the IEEE status
-        cmp     #1              ; save it
-        and     #%10111111      ; check anything but the EOI bit
+        lda	ST              ; read the file status
+        cmp     #$01            ; save it
+        and     #%10111111      ; check anything but the EOF bit
         bne     error5          ; assume device not present
 
         ; Store the byte just read
@@ -310,45 +332,60 @@ norm:	ldy	#0
         bne     @L1
         inc     ptr2+1          ; *buf++ = A;
 
-        ; Get the status again and check the EOI bit
-@L1:    bcc     @L3             ; loop if no end of file
+        ; Get the status again; and, check the EOF bit
+@L1:    bcc     @L3             ; loop if not end of file
 
-        ; Set the EOI flag and bail out
+        ; Set the EOF flag; and, bail out
         lda     #F_EOF
         jsr     pfs_rwsetflags
 
-        ; Read done, close the input channel
-done:   jsr     CLRCHN		; clrchn
+        ; Read done; cancel the input channel
+done:   jsr     CLRCHN
 
         ; Return the number of chars read
-eof:    jmp     pfs_rwcommonend
+eof:
+;       jmp     pfs_rwcommonend ; (fall through)
+.endproc
+
+.proc   pfs_rwcommonend
+        lda     ptr2
+        sec
+        sbc     ptr3
+        pha
+        lda     ptr2+1
+        sbc     ptr3+1
+        tax
+        pla
+        rts
 .endproc
 
-        ; Error entry, file is not open
 done_pfs:
-	ldx	#10
-@L2:	ldy	flags-1,x	; file open?
+	ldx	#.sizeof(flags)
+@L2:	ldy	flags - 1,x	; file open?
 	beq	@L1
 	txa
-	jsr     _pfs_close
+	jsr     close1
 @L1:	dex
-	bne @L2
+	bne	@L2
 	rts
 
-error5: jsr     CLRCHN		; clrchn
+error5: jsr     CLRCHN
 
-error2:	ldx	#255
+        ; Error entry, file is not open
+error2:	ldx	#>-1
 	txa
 	rts
 
 _pfs_close:
-	pha
-	jsr	CLOSE	;close
+	cmp	#.sizeof(flags) + 1
+	bcs	close0		; don't close if not valid file number
+close1:	pha
+	jsr	CLOSE
 	pla
 	tax
-	lda	#0
-	sta	flags-1,x
-	rts
+	lda	#$00
+	sta	flags - 1,x
+close0:	rts			; .X = file number
 
 .proc   pfs_rwcommon
         eor     #$FF
@@ -366,70 +403,56 @@ _pfs_close:
 
         jsr     popax           ; get the handle
         sta	LF
-        lda	#0
-        beq	pfs_rwsetflags
+        lda	#$00
+;       beq	pfs_rwsetflags  ; (fall through)
 .endproc
 
-	.if	F_IDE64
-.proc   ide64_rwprepare
-        sec
-        lda     ptr1+1
-        eor     #255
-        beq 	small		; too small, not worth it
-        tay
-        lda     ptr1            ; setup registers
-        eor     #255
-        tax
-        lda     $031B
-        eor     #$DE
-        bne     noide           ; open vector set?
-        lda     $DE60
-        eor     #$49
-        bne     noide           ; check identification
-        lda     $DE61
-        eor     #$44
-        bne     noide
-        lda     $DE62
-        eor     #$45
-        bne     noide
-        clc
-        lda     #ptr2
-small:  rts
-        
-noide:  lda     #F_NBLK
-	bne	pfs_rwsetflags
-.endproc
-	.endif
-
 .proc	pfs_rwsetflags
 	ldx 	LF
-	ora 	flags-1,x
-	sta 	flags-1,x
+	ora 	flags - 1,x
+	sta 	flags - 1,x
 	rts
 .endproc
 
-	.if	F_IDE64
+.if	F_IDE64
+.proc   ide64_rwprepare
+        sec                     ; assume it won't use IDEDOS
+        lda     ptr1+1
+        eor     #$FF		; convert -count-1 back to count
+        beq 	small		; too small, not worth it
+        tay
+        lda     ptr1            ; set up registers
+        eor     #$FF
+        tax
+        lda     OPNVec+1
+        eor     #>$DE00
+        bne     noide           ; is OPEN vector set to IDEDOS?
+        lda     $DE60
+        eor     #'i'
+        bne     noide           ; check identification
+        lda     $DE61
+        eor     #'d'
+        bne     noide
+        lda     $DE62
+        eor     #'e'
+        bne     noide
+        clc                     ; it will use IDEDOS
+        lda     #ptr2
+small:  rts
+
+noide:  lda     #F_NBLK
+	bne	pfs_rwsetflags
+.endproc
+
 .proc   ide64_rwfinish
-        txa
+        txa                     ; push .YX
         pha
         tya
         pha
         jsr     CLRCHN
-        pla
-        tax
-        pla
-        rts
-.endproc
-	.endif
-
-.proc   pfs_rwcommonend
-        lda     ptr2
-        sec
-        sbc     ptr3
-        pha
-        lda     ptr2+1
-        sbc     ptr3+1
+        pla                     ; pull .XA
         tax
         pla
         rts
 .endproc
+.endif
diff --git a/platform/c128/lib/pfs_remove.S b/platform/c128/lib/pfs_remove.S
new file mode 100644
index 000000000..7477e4314
--- /dev/null
+++ b/platform/c128/lib/pfs_remove.S
@@ -0,0 +1,59 @@
+;
+; Copyright (c) 2016, Greg King
+; 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 author 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 AUTHOR 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 AUTHOR 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.
+;
+; Author: Greg King <gregdk@users.sf.net>
+;
+;---------------------------------------------------------------------
+	.importzp	ptr2
+	.import		addysp
+	.import		pfs_makename, pfs_scratch
+
+	.export		_pfs_remove
+;---------------------------------------------------------------------
+MAXLEN	=	80		; max. filename length
+
+FNL	:=	$B7		; filename length
+;---------------------------------------------------------------------
+.proc	_pfs_remove
+	asl	ptr2		; force pfs_makename to format for pfs_scratch
+	jsr	pfs_makename
+	ldx	FNL
+	beq	error		; no name
+
+	jsr	pfs_scratch
+	ldx	#>$0000
+	bcs	error
+ret:	txa
+	ldy	#MAXLEN + 8	; free filename space
+	jmp	addysp
+
+error:	dex			;(ldx #>-1)
+	bne	ret
+.endproc
diff --git a/platform/c128/lib/pfs_seek.S b/platform/c128/lib/pfs_seek.S
new file mode 100644
index 000000000..4ef0014d1
--- /dev/null
+++ b/platform/c128/lib/pfs_seek.S
@@ -0,0 +1,46 @@
+;
+; Copyright (c) 2016, Greg King
+; 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 author 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 AUTHOR 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 AUTHOR 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.
+;
+; Author: Greg King <gregdk@users.sf.net>
+;
+;---------------------------------------------------------------------
+	.importzp	sp, sreg, ptr1, ptr2, ptr3
+	.import		popax, incsp6
+	.import		cmdc, flags
+
+	.export		_pfs_seek
+;---------------------------------------------------------------------
+.proc	_pfs_seek
+	lda	#<-1		; seek not implemented
+	tax
+	stx	sreg		; return long data type
+	stx	sreg+1
+	jmp	incsp6		; drop int and long arguments from stack
+.endproc
diff --git a/platform/c128/lib/pfs_write.S b/platform/c128/lib/pfs_write.S
index 0fc8e3160..e17ff91b7 100644
--- a/platform/c128/lib/pfs_write.S
+++ b/platform/c128/lib/pfs_write.S
@@ -31,27 +31,33 @@
 ; Author: Kajtar Zsolt <soci@c64.rulez.org>
 ;
 ;---------------------------------------------------------------------
-	.define F_IDE64 0	; support IDE64, 100 byte only
+.define	F_IDE64		0	; c128 doesn't have IDE64
 
-	.importzp    ptr1, ptr2
-	.import	     pfs_rwcommon, pfs_rwsetflags, pfs_rwcommonend
-	.if	F_IDE64
-	.import      ide64_rwprepare, ide64_rwfinish
-	.endif	
-	.export	     _pfs_write
+	.importzp	ptr1, ptr2
+	.import		pfs_rwcommon, pfs_rwsetflags, pfs_rwcommonend
+.if	F_IDE64
+	.import		ide64_rwprepare, ide64_rwfinish
+.endif
+
+	.export		_pfs_write
 ;---------------------------------------------------------------------
-F_NBLK		= $40
-ST		= $90	;status
-CHKOUT		= $FFC9
-CLRCHN		= $FFCC
-CHROUT		= $FFD2
-WRITE		= $DEF1
+F_NBLK	=	%01000000	;block read/write not available
+
+ST	:=	$90		;status
+
+; IDEDOS function
+WRITE	:=	$DEF1
+
+; Kernal functions
+CHKOUT	:=	$FFC9
+CLRCHN	:=	$FFCC
+CHROUT	:=	$FFD2
 ;---------------------------------------------------------------------
 	.code
 
-error5: jsr     CLRCHN		; clrchn
+error5: jsr     CLRCHN
 
-error2:	ldx	#255
+error2:	ldx	#>-1
 	txa
 	rts
 
@@ -59,8 +65,8 @@ error2:	ldx	#255
         jsr     pfs_rwcommon    ; pop params, check handle
         beq	error2		; not open
 
-	.if	F_IDE64
-	asl
+.if	F_IDE64
+	asl	a
         bmi     nblk		; no block operation
 
         jsr     CHKOUT
@@ -70,7 +76,7 @@ error2:	ldx	#255
         jsr     ide64_rwprepare
         bcs     norm
 
-        ; write
+        ; do a block write
         jsr     WRITE
         bcs     nosup
         jmp     ide64_rwfinish
@@ -98,10 +104,9 @@ norm:	ldy	#0
 	lda	ST
 	beq	@L3
         bne     error5          ; bail out on errors
-@L2:
 
-        ; Wrote all chars, close the output channel
-        jsr     CLRCHN
+        ; Wrote all chars.; cancel the output channel
+@L2:    jsr     CLRCHN
 
         ; Return the number of chars written
         jmp     pfs_rwcommonend
diff --git a/platform/c64/Makefile.c64 b/platform/c64/Makefile.c64
index bf0197565..5dce702a8 100644
--- a/platform/c64/Makefile.c64
+++ b/platform/c64/Makefile.c64
@@ -31,7 +31,7 @@
 # Author: Oliver Schmidt <ol.sc@web.de>
 #
 
-CONTIKI_TARGET_SOURCEFILES += lseek.c pfs.S pfs_write.S
+CONTIKI_TARGET_SOURCEFILES += lseek.c pfs.S pfs_remove.S pfs_seek.S pfs_write.S
 
 CONTIKI_CPU = $(CONTIKI)/cpu/6502
 include $(CONTIKI_CPU)/Makefile.6502
diff --git a/platform/c64/lib/pfs.S b/platform/c64/lib/pfs.S
index c63d08d2e..49ef496ec 100644
--- a/platform/c64/lib/pfs.S
+++ b/platform/c64/lib/pfs.S
@@ -29,99 +29,212 @@
 ; This file is part of the Contiki operating system.
 ; 
 ; Author: Kajtar Zsolt <soci@c64.rulez.org>
+; Author: Greg King <gregdk@users.sf.net>
 ;
 ;---------------------------------------------------------------------
-	.define F_IDE64 1	; support IDE64, 100 byte only
+.define	F_IDE64		1	; support IDE64, >= $0100 bytes only
 
-	.constructor init_pfs
-        .destructor  done_pfs
-	.importzp    ptr1, ptr2, ptr3, sp
-	.import	     curunit, __filetype, popax, addysp, subysp
-	.export	     pfs_rwcommon, pfs_rwsetflags, pfs_rwcommonend
-	.if	F_IDE64
-	.export      ide64_rwprepare, ide64_rwfinish
-	.endif	
-	.export	     _pfs_open, _pfs_read, _pfs_close
+	.constructor	init_pfs
+	.destructor	done_pfs
+	.importzp	sp, ptr1, ptr2, ptr3
+	.import		curunit, __filetype, popax, addysp, subysp
+	.export		pfs_rwcommon, pfs_rwsetflags, pfs_rwcommonend
+.if	F_IDE64
+	.export		ide64_rwprepare, ide64_rwfinish
+.endif
+	.export		cmdc, flags
+	.export		pfs_makename, pfs_scratch
+
+	.export		_pfs_open, _pfs_read, _pfs_close
 ;---------------------------------------------------------------------
-F_EOF		= $80
-F_NBLK		= $40
-F_OPEN		= $20
-F_MAXLEN	= 80	;max filename length
-ST		= $90	;status
-FN		= $BB	;filename
-FNL		= $B7	;filenamelength
-LF		= $B8	;logical file number
-SA		= $B9	;secondary address
-OPEN		= $FFC0
-CLOSE		= $FFC3
-CHKIN		= $FFC6
-CHKOUT		= $FFC9
-CLRCHN		= $FFCC
-CHRIN		= $FFCF
-CHROUT		= $FFD2
-SETLFS		= $FFBA
-SETNAM		= $FFBD
-CLALL		= $FFE7
-WRITE		= $DEF1
-READ		= $DEF4
+MAXLEN	=	80		;maximum filename length
+
+; Flag bits
+F_EOF	=	%10000000	;end of file
+F_NBLK	=	%01000000	;block read/write not available
+F_OPEN	=	%00100000
+
+; Kernal variables
+ST	:=	$90		;status
+FN	:=	$BB		;filename
+FNL	:=	$B7		;filename length
+LF	:=	$B8		;logical file number
+
+OPNVec	:=	$031A		;address vector to OPEN function's code
+
+; IDEDOS function
+READ	:=	$DEF4
+
+; Kernal functions
+SETLFS	:=	$FFBA
+SETNAM	:=	$FFBD
+OPEN	:=	$FFC0
+CLOSE	:=	$FFC3
+CHKIN	:=	$FFC6
+CHKOUT	:=	$FFC9
+CLRCHN	:=	$FFCC
+CHRIN	:=	$FFCF
+CHROUT	:=	$FFD2
 ;---------------------------------------------------------------------
 	.data
 
-illchr:	.byte	$3A, $2A, $3F, $3D	;illegal chars
-pw:	.byte	$2C, $50, $2C, $57	;,p,w
+; illchr and sw must stay together because the comma, also, is illegal in names.
+illchr:	.byte	"*?:="		;illegal chars
+sw:	.byte	",s,w"
 cmdc:	.byte	0
-flags:	.res	10
+flags:	.res	10		;(Kernal allows only ten open files)
 ;---------------------------------------------------------------------
 	.segment	"ONCE"
 
 init_pfs:
-	ldy	#F_MAXLEN+8
-	jsr	subysp	;allocate
-	lda	#0
-	sta	FNL	;no name
-	ldy	#15-1
-	jsr	open2	;open command channel
+	ldy	#MAXLEN + 8
+	jsr	subysp		;allocate because open2 will free it
+	lda	#0		;no name, file number 1
+	sta	FNL
+	ldy	#15 - 1		;secondary address 15
+	jsr	open2		;open command channel
 	sta	cmdc
 	rts
 ;---------------------------------------------------------------------
 	.code
 
-error3: jmp error
-
 _pfs_open:
-	sta	ptr2
-	; Pop and store name
+	sta	ptr2		;save open-mode flags
+
+	; Get and store name
 	jsr	popax
+	jsr	pfs_makename
+	lda	FNL
+	beq	error		;must have a filename
+
+	lda	#2 - 1		;file number
+	tay			;secondary address
+open2:	sta	ptr2
+	sty	ptr2 + 1
+
+next:	inc	ptr2		;next file number
+	ldx	ptr2		;file number
+	cpx	#.sizeof(flags) + 1
+	bcs	error		;no more files
+	lda	flags - 1,x
+	bne	next		;already used
+	lda	ptr2 + 1
+	bne	nextsa
+	inx
+	stx	ptr2 + 1
+nextsa:	inc	ptr2 + 1	;next channel
+retr:	lda	ptr2		;file number
+	ldx	curunit
+	ldy	ptr2 + 1	;secondary address (channel number)
+	jsr	SETLFS
+	jsr	OPEN		;open a pair of files (in computer and drive)
+	bcs	oerr		;branch if could not open computer file
+	ldx	cmdc
+	beq	opok		;branch if error channel just was openned
+	jsr	CHKIN
+	bcs	error
+	jsr	CHRIN
+	pha			;first digit of error code
+	jsr	CHRIN
+	sta	ptr1		;second digit
+@L4:	jsr	CHRIN		;flush status message
+	lda	ST
+	beq	@L4
+	jsr	CLRCHN
+	pla
+	cmp	#'2'
+	bcc	opok		;no serious error
+	pha
+	lda	ptr2
+	jsr	CLOSE		;close computer file
+	pla
+	ldx	ptr1
+	cmp	#'7'		;no channel?
+	bne	nnoc
+	cpx	#'0'
+	bne	error		;not "no channel"
+	lda	ptr2 + 1
+	cmp	#14
+	bcc	nextsa		;try next channel
+	bcs	error		;give up
+
+opok:	ldx	ptr2
+	lda	#F_OPEN
+	sta	flags - 1,x
+	txa			;OK, return file number
+ret0:	ldx	#>$0000
+ret:	ldy	#MAXLEN + 8	;free filename space
+	jmp	addysp
+
+oerr:	dec	ptr2 + 1
+	cmp	#2		;already open,
+	beq	next		;retry with next
+
+error:	lda	#<-1
+	tax			;failed
+	bne	ret
+
+nnoc:	inc	ptr3
+	bne	error		;no retry
+	cmp	#'6'
+	bne	error		;not "file exists"
+	cpx	#'3'
+	bne	error
+	jsr	pfs_scratch
+	bcc	retr
+	bcs	error		;branch always
+
+pfs_scratch:
+	ldx	cmdc
+	jsr	CHKOUT
+	bcs	@L5
+	ldy	#1
+	lda	#'s'		;scratch
+@L4:	jsr	CHROUT
+	lda	(FN),y
+	iny
+	cmp	#','
+	bne	@L4
+	lda	#$0D		;carriage return
+	jsr	CHROUT
+	jsr	CLRCHN
+	clc			;carry = 0: OK
+@L5:	rts			;carry = 1: error
+
+pfs_makename:
 	sta	FN
-	stx	FN+1	;filename (kernal)
-	ldy	#F_MAXLEN+8
-	jsr	subysp	;allocate name
-	ldy	#255
+	stx	FN+1		;Kernal filename pointer
+	ldy	#MAXLEN + 8
+	jsr	subysp		;allocate name space
+
+	; Validate the name; and, find its length
+	ldy	#<-1
 	sty	ptr3
 	sty	ptr1
 @L10:	iny
-	cpy	#F_MAXLEN
-	bcs	error3	;too long...
-	ldx	#4	;4+1 (comma)
+	cpy	#MAXLEN
+	bcs	badchr		;too long
+	lda	(FN),y
+	ldx	#.sizeof(illchr); 4 + 1 (includes comma)
 @L12:	cmp	illchr,x
-	beq	error3	;illegal char?
+	beq	badchr		;illegal char
 	dex
 	bpl	@L12
-	cmp	#$2F
+	cmp	#'/'
 	bne 	@L11
-	sty	ptr1	;last slash
-@L11:	lda	(FN),y
+	sty	ptr1		;last slash
+@L11:	tax			;test for '\0'
 	bne	@L10
-	sty	FNL
+	cpy	#0
+	beq	badchr		;no name
 
-	tay
-	tax
-	lda	#$30	;this partition
+	tay			;zero index reg.
+	lda	#'0'		;drive 0 or current partition
 	sta	(sp),y
 	iny
 	inc	ptr1
 	beq	nopath
-	lda	#$2F
+	lda	#'/'
 @L13:	sta	(sp),y
 	iny
 	lda	(FN,x)
@@ -130,158 +243,67 @@ _pfs_open:
 	inc	FN+1
 @L14:	cpy	ptr1
 	bcc	@L13
-	lda	#$2F
+	;lda	#'/'		; (.A already has a slash)
 	sta	(sp),y
 	iny
-nopath: lda	#$3A
+nopath: lda	#':'
 @L16:	sta	(sp),y
 	iny
 	lda	(FN,x)
 	inc	FN
 	bne	@L15
 	inc	FN+1
-@L15:	ora	#0
+@L15:	ora	#$00		;test for '\0'
 	bne	@L16
 	lsr	ptr2
-	bcs	ro	;read only
+	bcs	ro		;read-only (read-write not supported)
 	lda	__filetype
-	sta	pw+1	;set filetype
-	ldx	#252
-@L20:	lda	pw-252,x
-	sta	(sp),y	;write
+	sta	sw + 1		;set filetype
+	lsr	ptr2
+	lda	#'w'		;write-only
+	lsr	ptr2
+	bcc	write
+	lda	#'a'		;append
+write:	sta	sw + 3		;set mode
+	ldx	#$0100 - .sizeof(sw)
+@L20:	lda	sw - ($0100 - .sizeof(sw)),x
+	sta	(sp),y
 	iny
 	inx
 	bne	@L20
-ro:	tya		;name length (kernal)
+ro:	tya			;pathname length
 	ldx	sp
 	ldy	sp+1
-	jsr	SETNAM
+namset:	jmp	SETNAM
 
-	lda	#0	;file number
-	tay		;secondary address
-open2:	sta	ptr2
-	sty	ptr2+1
-
-next:	inc	ptr2	;next file number
-	ldx	ptr2	;file number
-	cpx	#11
-	bcs	error	;no more files
-	lda	flags-1,x
-	bne	next	;already used
-	lda	ptr2+1
-	bne	nextsa
-	inx
-	stx	ptr2+1
-nextsa:	inc	ptr2+1	;next channel
-retr:	lda	ptr2	;file number
-	ldx	curunit
-	ldy	ptr2+1	;secondary address
-	jsr	SETLFS
-	jsr	OPEN	;open
-	bcs	oerr
-	ldx	cmdc
-	beq	opok	;error channel open
-	jsr	CHKIN
-	bcs	error
-	jsr	CHRIN
-	pha
-	jsr	CHRIN
-	sta	ptr1
-@L4:	jsr	CHRIN
-	lda	ST
-	beq	@L4
-	jsr	CLRCHN
-	pla
-	tax
-	lsr
-	cmp	#$18	;no serious error
-	beq	opok
-	txa
-	pha
-	lda	ptr2
-	jsr	CLOSE	;close
-	pla
-	ldx	ptr1
-	cmp	#$37	;no channel?
-	bne	nnoc
-	cpx	#$30
-	bne	error	;not no channel
-	lda	ptr2+1
-	cmp	#14
-	bcc	nextsa	;try next channel
-	bcs	error	;give up
-
-opok:	ldx	ptr2
-	lda	#F_OPEN
-	sta	flags-1,x
-	txa		;ok, return file number
-	ldx	#0
-ret:	ldy	#F_MAXLEN+8	; free filename
-	jmp	addysp
-
-oerr:	dec	ptr2+1
-	cmp	#2	;already open,
-	beq	next	;retry with next
-
-error:	lda	#$FF
-	tax		;failed
-	bne	ret
-
-nnoc:	inc	ptr3
-	bne	error	;no retry
-	cmp	#$36
-	bne	error	;no exists
-	cpx	#$33
-	bne	error
-	ldx	cmdc
-	jsr	CHKOUT
-	bcs	error
-	lda	FNL
-	sec
-	sbc	#5
-	tax
-	lda	#$53	;scratch
-	jsr	CHROUT
-	ldy	#1
-@L4:	lda	(FN),y
-	iny
-	jsr	CHROUT
-	dex
-	bne	@L4
-	lda	#$3D
-	jsr	CHROUT
-	iny
-	lda	(FN),y
-	jsr	CHROUT
-	lda	#$0d
-	jsr	CHROUT
-	jsr	CLRCHN
-	jmp	retr
+badchr:	lda	#0
+	beq	namset
 
 .proc   _pfs_read
         jsr     pfs_rwcommon    ; pop params, check handle
 	beq	error2		; not open
 
 	bmi	eof
-	.if	F_IDE64
-	asl
+
+.if	F_IDE64
+	asl	a
         bmi     nblk		; no block operation
 
         jsr     CHKIN
         bcs     error2
-        
+
         ; check support
         jsr     ide64_rwprepare
         bcs     norm
-        
-        ; read
+
+        ; do a block read
         jsr     READ
         bcs     nosup
         jmp     ide64_rwfinish
 
 nosup:  lda     #F_NBLK
 	jsr	pfs_rwsetflags
-	.endif
+.endif
 
         ; Valid lfn. Make it the input file
 nblk:   jsr     CHKIN
@@ -292,15 +314,15 @@ norm:	ldy	#0
 @L3:    inc     ptr1
         bne     @L0
         inc     ptr1+1
-        beq     done            ; branch always
+        beq     done
 
         ; Read the next byte
 @L0:    jsr     CHRIN
         tax                     ; save the input byte
 
-        lda	ST              ; read the IEEE status
-        cmp     #1              ; save it
-        and     #%10111111      ; check anything but the EOI bit
+        lda	ST              ; read the file status
+        cmp     #$01            ; save it
+        and     #%10111111      ; check anything but the EOF bit
         bne     error5          ; assume device not present
 
         ; Store the byte just read
@@ -310,45 +332,60 @@ norm:	ldy	#0
         bne     @L1
         inc     ptr2+1          ; *buf++ = A;
 
-        ; Get the status again and check the EOI bit
-@L1:    bcc     @L3             ; loop if no end of file
+        ; Get the status again; and, check the EOF bit
+@L1:    bcc     @L3             ; loop if not end of file
 
-        ; Set the EOI flag and bail out
+        ; Set the EOF flag; and, bail out
         lda     #F_EOF
         jsr     pfs_rwsetflags
 
-        ; Read done, close the input channel
-done:   jsr     CLRCHN		; clrchn
+        ; Read done; cancel the input channel
+done:   jsr     CLRCHN
 
         ; Return the number of chars read
-eof:    jmp     pfs_rwcommonend
+eof:
+;       jmp     pfs_rwcommonend ; (fall through)
+.endproc
+
+.proc   pfs_rwcommonend
+        lda     ptr2
+        sec
+        sbc     ptr3
+        pha
+        lda     ptr2+1
+        sbc     ptr3+1
+        tax
+        pla
+        rts
 .endproc
 
-        ; Error entry, file is not open
 done_pfs:
-	ldx	#10
-@L2:	ldy	flags-1,x	; file open?
+	ldx	#.sizeof(flags)
+@L2:	ldy	flags - 1,x	; file open?
 	beq	@L1
 	txa
-	jsr     _pfs_close
+	jsr     close1
 @L1:	dex
-	bne @L2
+	bne	@L2
 	rts
 
-error5: jsr     CLRCHN		; clrchn
+error5: jsr     CLRCHN
 
-error2:	ldx	#255
+        ; Error entry, file is not open
+error2:	ldx	#>-1
 	txa
 	rts
 
 _pfs_close:
-	pha
-	jsr	CLOSE	;close
+	cmp	#.sizeof(flags) + 1
+	bcs	close0		; don't close if not valid file number
+close1:	pha
+	jsr	CLOSE
 	pla
 	tax
-	lda	#0
-	sta	flags-1,x
-	rts
+	lda	#$00
+	sta	flags - 1,x
+close0:	rts			; .X = file number
 
 .proc   pfs_rwcommon
         eor     #$FF
@@ -366,70 +403,56 @@ _pfs_close:
 
         jsr     popax           ; get the handle
         sta	LF
-        lda	#0
-        beq	pfs_rwsetflags
+        lda	#$00
+;       beq	pfs_rwsetflags  ; (fall through)
 .endproc
 
-	.if	F_IDE64
-.proc   ide64_rwprepare
-        sec
-        lda     ptr1+1
-        eor     #255
-        beq 	small		; too small, not worth it
-        tay
-        lda     ptr1            ; setup registers
-        eor     #255
-        tax
-        lda     $031B
-        eor     #$DE
-        bne     noide           ; open vector set?
-        lda     $DE60
-        eor     #$49
-        bne     noide           ; check identification
-        lda     $DE61
-        eor     #$44
-        bne     noide
-        lda     $DE62
-        eor     #$45
-        bne     noide
-        clc
-        lda     #ptr2
-small:  rts
-        
-noide:  lda     #F_NBLK
-	bne	pfs_rwsetflags
-.endproc
-	.endif
-
 .proc	pfs_rwsetflags
 	ldx 	LF
-	ora 	flags-1,x
-	sta 	flags-1,x
+	ora 	flags - 1,x
+	sta 	flags - 1,x
 	rts
 .endproc
 
-	.if	F_IDE64
+.if	F_IDE64
+.proc   ide64_rwprepare
+        sec                     ; assume it won't use IDEDOS
+        lda     ptr1+1
+        eor     #$FF		; convert -count-1 back to count
+        beq 	small		; too small, not worth it
+        tay
+        lda     ptr1            ; set up registers
+        eor     #$FF
+        tax
+        lda     OPNVec+1
+        eor     #>$DE00
+        bne     noide           ; is OPEN vector set to IDEDOS?
+        lda     $DE60
+        eor     #'i'
+        bne     noide           ; check identification
+        lda     $DE61
+        eor     #'d'
+        bne     noide
+        lda     $DE62
+        eor     #'e'
+        bne     noide
+        clc                     ; it will use IDEDOS
+        lda     #ptr2
+small:  rts
+
+noide:  lda     #F_NBLK
+	bne	pfs_rwsetflags
+.endproc
+
 .proc   ide64_rwfinish
-        txa
+        txa                     ; push .YX
         pha
         tya
         pha
         jsr     CLRCHN
-        pla
-        tax
-        pla
-        rts
-.endproc
-	.endif
-
-.proc   pfs_rwcommonend
-        lda     ptr2
-        sec
-        sbc     ptr3
-        pha
-        lda     ptr2+1
-        sbc     ptr3+1
+        pla                     ; pull .XA
         tax
         pla
         rts
 .endproc
+.endif
diff --git a/platform/c64/lib/pfs_remove.S b/platform/c64/lib/pfs_remove.S
new file mode 100644
index 000000000..7477e4314
--- /dev/null
+++ b/platform/c64/lib/pfs_remove.S
@@ -0,0 +1,59 @@
+;
+; Copyright (c) 2016, Greg King
+; 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 author 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 AUTHOR 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 AUTHOR 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.
+;
+; Author: Greg King <gregdk@users.sf.net>
+;
+;---------------------------------------------------------------------
+	.importzp	ptr2
+	.import		addysp
+	.import		pfs_makename, pfs_scratch
+
+	.export		_pfs_remove
+;---------------------------------------------------------------------
+MAXLEN	=	80		; max. filename length
+
+FNL	:=	$B7		; filename length
+;---------------------------------------------------------------------
+.proc	_pfs_remove
+	asl	ptr2		; force pfs_makename to format for pfs_scratch
+	jsr	pfs_makename
+	ldx	FNL
+	beq	error		; no name
+
+	jsr	pfs_scratch
+	ldx	#>$0000
+	bcs	error
+ret:	txa
+	ldy	#MAXLEN + 8	; free filename space
+	jmp	addysp
+
+error:	dex			;(ldx #>-1)
+	bne	ret
+.endproc
diff --git a/platform/c64/lib/pfs_seek.S b/platform/c64/lib/pfs_seek.S
new file mode 100644
index 000000000..4ef0014d1
--- /dev/null
+++ b/platform/c64/lib/pfs_seek.S
@@ -0,0 +1,46 @@
+;
+; Copyright (c) 2016, Greg King
+; 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 author 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 AUTHOR 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 AUTHOR 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.
+;
+; Author: Greg King <gregdk@users.sf.net>
+;
+;---------------------------------------------------------------------
+	.importzp	sp, sreg, ptr1, ptr2, ptr3
+	.import		popax, incsp6
+	.import		cmdc, flags
+
+	.export		_pfs_seek
+;---------------------------------------------------------------------
+.proc	_pfs_seek
+	lda	#<-1		; seek not implemented
+	tax
+	stx	sreg		; return long data type
+	stx	sreg+1
+	jmp	incsp6		; drop int and long arguments from stack
+.endproc
diff --git a/platform/c64/lib/pfs_write.S b/platform/c64/lib/pfs_write.S
index 7e511e513..82632df8f 100644
--- a/platform/c64/lib/pfs_write.S
+++ b/platform/c64/lib/pfs_write.S
@@ -31,27 +31,33 @@
 ; Author: Kajtar Zsolt <soci@c64.rulez.org>
 ;
 ;---------------------------------------------------------------------
-	.define F_IDE64 1	; support IDE64, 100 byte only
+.define	F_IDE64		1	; support IDE64, >= $0100 bytes only
 
-	.importzp    ptr1, ptr2
-	.import	     pfs_rwcommon, pfs_rwsetflags, pfs_rwcommonend
-	.if	F_IDE64
-	.import      ide64_rwprepare, ide64_rwfinish
-	.endif	
-	.export	     _pfs_write
+	.importzp	ptr1, ptr2
+	.import		pfs_rwcommon, pfs_rwsetflags, pfs_rwcommonend
+.if	F_IDE64
+	.import		ide64_rwprepare, ide64_rwfinish
+.endif
+
+	.export		_pfs_write
 ;---------------------------------------------------------------------
-F_NBLK		= $40
-ST		= $90	;status
-CHKOUT		= $FFC9
-CLRCHN		= $FFCC
-CHROUT		= $FFD2
-WRITE		= $DEF1
+F_NBLK	=	%01000000	;block read/write not available
+
+ST	:=	$90		;status
+
+; IDEDOS function
+WRITE	:=	$DEF1
+
+; Kernal functions
+CHKOUT	:=	$FFC9
+CLRCHN	:=	$FFCC
+CHROUT	:=	$FFD2
 ;---------------------------------------------------------------------
 	.code
 
-error5: jsr     CLRCHN		; clrchn
+error5: jsr     CLRCHN
 
-error2:	ldx	#255
+error2:	ldx	#>-1
 	txa
 	rts
 
@@ -59,8 +65,8 @@ error2:	ldx	#255
         jsr     pfs_rwcommon    ; pop params, check handle
         beq	error2		; not open
 
-	.if	F_IDE64
-	asl
+.if	F_IDE64
+	asl	a
         bmi     nblk		; no block operation
 
         jsr     CHKOUT
@@ -70,7 +76,7 @@ error2:	ldx	#255
         jsr     ide64_rwprepare
         bcs     norm
 
-        ; write
+        ; do a block write
         jsr     WRITE
         bcs     nosup
         jmp     ide64_rwfinish
@@ -98,10 +104,9 @@ norm:	ldy	#0
 	lda	ST
 	beq	@L3
         bne     error5          ; bail out on errors
-@L2:
 
-        ; Wrote all chars, close the output channel
-        jsr     CLRCHN
+        ; Wrote all chars.; cancel the output channel
+@L2:    jsr     CLRCHN
 
         ; Return the number of chars written
         jmp     pfs_rwcommonend

From 111a976f1e8ef8f31929184403e63a985db8e645 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <ol.sc@web.de>
Date: Mon, 28 Mar 2016 14:39:16 +0200
Subject: [PATCH 135/393] Explicitly mark constant as 'unsigned' to avoid
 unnecessary promotion to 'long'.

Long constants trigger the performance warning "Constant is long" with cc65.
---
 core/net/mac/tsch/tsch-conf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/mac/tsch/tsch-conf.h b/core/net/mac/tsch/tsch-conf.h
index bd9726042..3f877884a 100644
--- a/core/net/mac/tsch/tsch-conf.h
+++ b/core/net/mac/tsch/tsch-conf.h
@@ -135,7 +135,7 @@
 #define TSCH_DEFAULT_TS_MAX_TX             4256
 #define TSCH_DEFAULT_TS_TIMESLOT_LENGTH    15000
 
-#elif TSCH_CONF_DEFAULT_TIMESLOT_LENGTH == 65000
+#elif TSCH_CONF_DEFAULT_TIMESLOT_LENGTH == 65000U
 /* 65ms timeslot, i.e. nearly the max length allowed by standard (16-bit unsigned in micro-seconds).
  * Useful for running link-layer security on sky or z1 in Cooja, where only S/W security is supported.
  * Note: this slot timing would require a total of 120ms. If a slot overlaps with the next active slot,

From b287351d9959dd11956966b547605f02fb363f40 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <ol.sc@web.de>
Date: Mon, 28 Mar 2016 19:43:51 +0200
Subject: [PATCH 136/393] Activated CBM PFS for the C64 Telnet server.

Now that the CBM PFS supports file removal (and a file seek stub) it is possible to have the Telnet server leverage the IDE64 support of the CBM PFS.

Note: Using the CBM PFS for the Telnet server does _not_ reduce the code size since the POSIX I/O functions are additionally still linked in because the POSIX directory functions internally use the POSIX I/O functions. And that's the very reason why the CBM PFS is _not_ activated for the C128 Telnet server: The CBM PFS for the C128 doesn't bring IDE64 support but is supposed to be used to reduce code size - but this isn't possible for the Telnet server.
---
 examples/telnet-server/Makefile.c64.defines | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/telnet-server/Makefile.c64.defines b/examples/telnet-server/Makefile.c64.defines
index bcd39d550..caf0dfa69 100644
--- a/examples/telnet-server/Makefile.c64.defines
+++ b/examples/telnet-server/Makefile.c64.defines
@@ -1 +1 @@
-DEFINES = CONNECTIONS=3,WITH_LOGGING,WITH_CLIENT,WITH_DNS
+DEFINES = CONNECTIONS=3,WITH_LOGGING,WITH_CLIENT,WITH_DNS,WITH_PFS

From 7a5249b0666caa6f515502466327f5416b4fdda1 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <ol.sc@web.de>
Date: Mon, 28 Mar 2016 20:03:47 +0200
Subject: [PATCH 137/393] Added a Contiki version of the CBM exec() system
 file; it uses PFS instead of POSIX.

It reduces the webbrowsers' size by 735 bytes.
---
 platform/c128/Makefile.c128 |   2 +-
 platform/c128/lib/exec.c    | 139 ++++++++++++++++++++++++++++++++++++
 platform/c64/Makefile.c64   |   2 +-
 platform/c64/lib/exec.c     | 139 ++++++++++++++++++++++++++++++++++++
 4 files changed, 280 insertions(+), 2 deletions(-)
 create mode 100644 platform/c128/lib/exec.c
 create mode 100644 platform/c64/lib/exec.c

diff --git a/platform/c128/Makefile.c128 b/platform/c128/Makefile.c128
index 55889d4ab..fbbcf8eda 100644
--- a/platform/c128/Makefile.c128
+++ b/platform/c128/Makefile.c128
@@ -31,7 +31,7 @@
 # Author: Oliver Schmidt <ol.sc@web.de>
 #
 
-CONTIKI_TARGET_SOURCEFILES += lseek.c pfs.S pfs_remove.S pfs_seek.S pfs_write.S
+CONTIKI_TARGET_SOURCEFILES += exec.c lseek.c pfs.S pfs_remove.S pfs_seek.S pfs_write.S
 
 CONTIKI_CPU = $(CONTIKI)/cpu/6502
 include $(CONTIKI_CPU)/Makefile.6502
diff --git a/platform/c128/lib/exec.c b/platform/c128/lib/exec.c
new file mode 100644
index 000000000..5a633d45d
--- /dev/null
+++ b/platform/c128/lib/exec.c
@@ -0,0 +1,139 @@
+/*
+** Program-chaining function for Commodore platforms.
+**
+** This copy of the cc65 system library function makes smaller code by using
+** Contiki's Personal File System (instead of POSIX) functions.
+**
+** 2016-03-16, Greg King
+**
+** This function exploits the program-chaining feature in CBM BASIC's ROM.
+**
+** CC65's CBM programs have a BASIC program stub.  We start those programs by
+** RUNning that stub; it SYSes to the Machine Language code.  Normally, after
+** the ML code exits, the BASIC ROM continues running the stub.  But, it has
+** no more statements; so, the program stops.
+**
+** This function puts the desired program's name and device number into a LOAD
+** statement.  Then, it points BASIC to that statement, so that the ROM will run
+** that statement after this program quits.  The ROM will load the next program,
+** and will execute it (because the LOAD will be seen in a running program).
+*/
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <device.h>
+
+#include "cfs.h"
+
+
+/* The struct below is a line of BASIC code.  It sits in the LOWCODE segment
+** to make sure that it won't be hidden by a ROM when BASIC is re-enabled.
+** The line is:
+**  0 CLR:LOAD""+""                    ,01
+** After this function has written into the line, it might look like this:
+**  0 CLR:LOAD""+"program name"        ,08
+**
+** When BASIC's LOAD command asks the Kernal to load a file, it gives the
+** Kernal a pointer to a file-name string.  CC65's CBM programs use that
+** pointer to give a copy of the program's name to main()'s argv[0] parameter.
+** But, when BASIC uses a string literal that is in a program, it points
+** directly to that literal -- in the models that don't use banked RAM
+** (Pet/CBM, VIC-20, and 64).  The literal is overwritten by the next program
+** that is loaded.  So, argv[0] would point to machine code.  String operations
+** create a new result string -- even when that operation changes nothing.  The
+** result is put in the string space at the top of BASIC's memory.  So, the ""+
+** in this BASIC line guarantees that argv[0] will get a name from a safe place.
+*/
+#pragma data-name(push, "LOWCODE")
+static struct line {
+  const char end_of_line;               /* fake previous line */
+  const struct line* const next;
+  const unsigned line_num;
+  const char CLR_token, colon, LOAD_token, quotes[2], add_token, quote;
+  char name[21];
+  const char comma;
+  char unit[3];
+} basic = {
+  '\0', &basic + 1,                     /* high byte of link must be non-zero */
+  0, 0x9C, ':', 0x93, "\"\"", 0xAA, '\"',
+  "\"                    ",             /* format: "123:1234567890123456\"" */
+  ',', "01"
+};
+#pragma data-name(pop)
+
+/* These values are platform-specific. */
+extern const void* vartab;              /* points to BASIC program variables */
+#pragma zpsym("vartab")
+extern const void* memsize;             /* points to top of BASIC RAM */
+#pragma zpsym("memsize")
+extern const struct line* txtptr;       /* points to BASIC code */
+#pragma zpsym("txtptr")
+extern char basbuf[];                   /* BASIC's input buffer */
+extern void basbuf_len[];
+#pragma zpsym("basbuf_len")
+
+
+int __fastcall__
+exec(const char *progname, const char *cmdline)
+{
+  static int fd;
+  static unsigned char dv, n;
+
+  /* Exclude devices that can't load files. */
+  /* (Use hand optimization, to make smaller code.) */
+  dv = getcurrentdevice();
+  if(dv < 8 && __AX__ != 1 || __AX__ > 30) {
+    return _mappederrno(9);             /* illegal device number */
+  }
+  utoa(dv, basic.unit, 10);
+
+  /* Tape files can be openned only once; skip this test for the Datasette. */
+  if(dv != 1) {
+    /* Don't try to run a program that can't be found. */
+    fd = cfs_open(progname, CFS_READ);
+    if(fd < 0) {
+      return -1;
+    }
+    cfs_close(fd);
+  }
+
+  n = 0;
+  do {
+    if((basic.name[n] = progname[n]) == '\0') {
+      break;
+    }
+  } while(++n < 20);                    /* truncate long names */
+  basic.name[n] = '\"';
+
+/* This next part isn't needed by machines that put
+** BASIC source and variables in different RAM banks.
+*/
+#if !defined(__C128__)
+  /* cc65 program loads might extend beyond the end of the RAM that is allowed
+  ** for BASIC.  Then, the LOAD statement would complain that it is "out of
+  ** memory".  Some pointers that say where to put BASIC program variables
+  ** must be changed, so that we do not get that error.  One pointer is
+  ** changed here; a BASIC CLR statement changes the others.  Some space is
+  ** needed for the file-name string.  Subtracting an entire RAM page allows
+  ** better optimization of this expression.
+  */
+  vartab = (char*)memsize - 0x0100;
+#endif
+
+  /* Build the next program's argument list. */
+  basbuf[0] = 0x8F;                     /* REM token */
+  basbuf[1] = '\0';
+  if(cmdline != NULL) {
+    strncat(basbuf, cmdline, (size_t)basbuf_len - 2);
+  }
+
+  /* Tell the ROM where to find that BASIC program. */
+  txtptr = &basic;
+
+  /* (The return code, in ST [status], will be destroyed by LOAD.
+  ** So, don't bother to set it here.)
+  */
+  exit(__AX__);
+}
diff --git a/platform/c64/Makefile.c64 b/platform/c64/Makefile.c64
index 5dce702a8..7769b6ceb 100644
--- a/platform/c64/Makefile.c64
+++ b/platform/c64/Makefile.c64
@@ -31,7 +31,7 @@
 # Author: Oliver Schmidt <ol.sc@web.de>
 #
 
-CONTIKI_TARGET_SOURCEFILES += lseek.c pfs.S pfs_remove.S pfs_seek.S pfs_write.S
+CONTIKI_TARGET_SOURCEFILES += exec.c lseek.c pfs.S pfs_remove.S pfs_seek.S pfs_write.S
 
 CONTIKI_CPU = $(CONTIKI)/cpu/6502
 include $(CONTIKI_CPU)/Makefile.6502
diff --git a/platform/c64/lib/exec.c b/platform/c64/lib/exec.c
new file mode 100644
index 000000000..5a633d45d
--- /dev/null
+++ b/platform/c64/lib/exec.c
@@ -0,0 +1,139 @@
+/*
+** Program-chaining function for Commodore platforms.
+**
+** This copy of the cc65 system library function makes smaller code by using
+** Contiki's Personal File System (instead of POSIX) functions.
+**
+** 2016-03-16, Greg King
+**
+** This function exploits the program-chaining feature in CBM BASIC's ROM.
+**
+** CC65's CBM programs have a BASIC program stub.  We start those programs by
+** RUNning that stub; it SYSes to the Machine Language code.  Normally, after
+** the ML code exits, the BASIC ROM continues running the stub.  But, it has
+** no more statements; so, the program stops.
+**
+** This function puts the desired program's name and device number into a LOAD
+** statement.  Then, it points BASIC to that statement, so that the ROM will run
+** that statement after this program quits.  The ROM will load the next program,
+** and will execute it (because the LOAD will be seen in a running program).
+*/
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <device.h>
+
+#include "cfs.h"
+
+
+/* The struct below is a line of BASIC code.  It sits in the LOWCODE segment
+** to make sure that it won't be hidden by a ROM when BASIC is re-enabled.
+** The line is:
+**  0 CLR:LOAD""+""                    ,01
+** After this function has written into the line, it might look like this:
+**  0 CLR:LOAD""+"program name"        ,08
+**
+** When BASIC's LOAD command asks the Kernal to load a file, it gives the
+** Kernal a pointer to a file-name string.  CC65's CBM programs use that
+** pointer to give a copy of the program's name to main()'s argv[0] parameter.
+** But, when BASIC uses a string literal that is in a program, it points
+** directly to that literal -- in the models that don't use banked RAM
+** (Pet/CBM, VIC-20, and 64).  The literal is overwritten by the next program
+** that is loaded.  So, argv[0] would point to machine code.  String operations
+** create a new result string -- even when that operation changes nothing.  The
+** result is put in the string space at the top of BASIC's memory.  So, the ""+
+** in this BASIC line guarantees that argv[0] will get a name from a safe place.
+*/
+#pragma data-name(push, "LOWCODE")
+static struct line {
+  const char end_of_line;               /* fake previous line */
+  const struct line* const next;
+  const unsigned line_num;
+  const char CLR_token, colon, LOAD_token, quotes[2], add_token, quote;
+  char name[21];
+  const char comma;
+  char unit[3];
+} basic = {
+  '\0', &basic + 1,                     /* high byte of link must be non-zero */
+  0, 0x9C, ':', 0x93, "\"\"", 0xAA, '\"',
+  "\"                    ",             /* format: "123:1234567890123456\"" */
+  ',', "01"
+};
+#pragma data-name(pop)
+
+/* These values are platform-specific. */
+extern const void* vartab;              /* points to BASIC program variables */
+#pragma zpsym("vartab")
+extern const void* memsize;             /* points to top of BASIC RAM */
+#pragma zpsym("memsize")
+extern const struct line* txtptr;       /* points to BASIC code */
+#pragma zpsym("txtptr")
+extern char basbuf[];                   /* BASIC's input buffer */
+extern void basbuf_len[];
+#pragma zpsym("basbuf_len")
+
+
+int __fastcall__
+exec(const char *progname, const char *cmdline)
+{
+  static int fd;
+  static unsigned char dv, n;
+
+  /* Exclude devices that can't load files. */
+  /* (Use hand optimization, to make smaller code.) */
+  dv = getcurrentdevice();
+  if(dv < 8 && __AX__ != 1 || __AX__ > 30) {
+    return _mappederrno(9);             /* illegal device number */
+  }
+  utoa(dv, basic.unit, 10);
+
+  /* Tape files can be openned only once; skip this test for the Datasette. */
+  if(dv != 1) {
+    /* Don't try to run a program that can't be found. */
+    fd = cfs_open(progname, CFS_READ);
+    if(fd < 0) {
+      return -1;
+    }
+    cfs_close(fd);
+  }
+
+  n = 0;
+  do {
+    if((basic.name[n] = progname[n]) == '\0') {
+      break;
+    }
+  } while(++n < 20);                    /* truncate long names */
+  basic.name[n] = '\"';
+
+/* This next part isn't needed by machines that put
+** BASIC source and variables in different RAM banks.
+*/
+#if !defined(__C128__)
+  /* cc65 program loads might extend beyond the end of the RAM that is allowed
+  ** for BASIC.  Then, the LOAD statement would complain that it is "out of
+  ** memory".  Some pointers that say where to put BASIC program variables
+  ** must be changed, so that we do not get that error.  One pointer is
+  ** changed here; a BASIC CLR statement changes the others.  Some space is
+  ** needed for the file-name string.  Subtracting an entire RAM page allows
+  ** better optimization of this expression.
+  */
+  vartab = (char*)memsize - 0x0100;
+#endif
+
+  /* Build the next program's argument list. */
+  basbuf[0] = 0x8F;                     /* REM token */
+  basbuf[1] = '\0';
+  if(cmdline != NULL) {
+    strncat(basbuf, cmdline, (size_t)basbuf_len - 2);
+  }
+
+  /* Tell the ROM where to find that BASIC program. */
+  txtptr = &basic;
+
+  /* (The return code, in ST [status], will be destroyed by LOAD.
+  ** So, don't bother to set it here.)
+  */
+  exit(__AX__);
+}

From bc2f1b5a2ac2f83594b587d1efa6bbff2ee48206 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Tue, 29 Mar 2016 10:24:38 +0200
Subject: [PATCH 138/393] update delay constants

---
 platform/cc2538dk/contiki-conf.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/platform/cc2538dk/contiki-conf.h b/platform/cc2538dk/contiki-conf.h
index ae7c3275d..22891f5ba 100644
--- a/platform/cc2538dk/contiki-conf.h
+++ b/platform/cc2538dk/contiki-conf.h
@@ -42,9 +42,10 @@ typedef uint32_t rtimer_clock_t;
 /*---------------------------------------------------------------------------*/
 #define TSCH_CONF_HW_FRAME_FILTERING	0
 
-/* TODO: measure the delays, this are only estimations */
-#define RADIO_DELAY_BEFORE_TX     ((unsigned)US_TO_RTIMERTICKS(300))
-#define RADIO_DELAY_BEFORE_RX     ((unsigned)US_TO_RTIMERTICKS(100))
+/* 352us from calling transmit() until the SFD byte has been sent */
+#define RADIO_DELAY_BEFORE_TX     ((unsigned)US_TO_RTIMERTICKS(352))
+/* 192us as in datasheet but ACKs are not always received, so adjusted to 250us */
+#define RADIO_DELAY_BEFORE_RX     ((unsigned)US_TO_RTIMERTICKS(250))
 #define RADIO_DELAY_BEFORE_DETECT 0
 /*---------------------------------------------------------------------------*/
 /**

From 855703e93627e571f7172085c848ec5abbf2188b Mon Sep 17 00:00:00 2001
From: Carlo Vallati <carlo.vallati@iet.unipi.it>
Date: Thu, 31 Mar 2016 10:09:47 +0200
Subject: [PATCH 139/393] Fixed a bug into tsch-schedule -
 tsch_schedule_add_link that causes deadlock if a new link cannot be created

---
 core/net/mac/tsch/tsch-schedule.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/net/mac/tsch/tsch-schedule.c b/core/net/mac/tsch/tsch-schedule.c
index 8b15e0faf..e0028c492 100644
--- a/core/net/mac/tsch/tsch-schedule.c
+++ b/core/net/mac/tsch/tsch-schedule.c
@@ -191,6 +191,7 @@ tsch_schedule_add_link(struct tsch_slotframe *slotframe,
       l = memb_alloc(&link_memb);
       if(l == NULL) {
         PRINTF("TSCH-schedule:! add_link memb_alloc failed\n");
+        tsch_release_lock();
       } else {
         static int current_link_handle = 0;
         struct tsch_neighbor *n;

From 871c725144210b0d85c153e64fa6f19403aba5cd Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Thu, 31 Mar 2016 11:24:57 +0200
Subject: [PATCH 140/393] spaces instead of tabs

---
 core/net/mac/tsch/tsch-conf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/net/mac/tsch/tsch-conf.h b/core/net/mac/tsch/tsch-conf.h
index b23355539..43e50d7c3 100644
--- a/core/net/mac/tsch/tsch-conf.h
+++ b/core/net/mac/tsch/tsch-conf.h
@@ -177,9 +177,9 @@
 
 /* HW frame filtering enabled */
 #ifdef TSCH_CONF_HW_FRAME_FILTERING
-#define TSCH_HW_FRAME_FILTERING	TSCH_CONF_HW_FRAME_FILTERING
+#define TSCH_HW_FRAME_FILTERING TSCH_CONF_HW_FRAME_FILTERING
 #else /* TSCH_CONF_HW_FRAME_FILTERING */
 #define TSCH_HW_FRAME_FILTERING	1
-#endif
+#endif /* TSCH_CONF_HW_FRAME_FILTERING */
 
 #endif /* __TSCH_CONF_H__ */

From c7c3ef3b9cac5d71f50e602ea10b5777ee77d75c Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Thu, 31 Mar 2016 13:41:08 +0300
Subject: [PATCH 141/393] Cooja: add Msp802154BitErrorRadio interface

The interface more accurately models bit errors due to signal fading as observed in IEEE 802.15.4-compatible radios, such as CC2420 and CC2520.
---
 .../interfaces/Msp802154BitErrorRadio.java    | 370 ++++++++++++++++++
 .../mspmote/interfaces/Msp802154Radio.java    |   8 +-
 2 files changed, 374 insertions(+), 4 deletions(-)
 create mode 100644 tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/Msp802154BitErrorRadio.java

diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/Msp802154BitErrorRadio.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/Msp802154BitErrorRadio.java
new file mode 100644
index 000000000..53b971755
--- /dev/null
+++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/Msp802154BitErrorRadio.java
@@ -0,0 +1,370 @@
+/*
+ * Copyright (c) 2014, Uppsala University
+ * 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.
+ *
+ */
+
+package org.contikios.cooja.mspmote.interfaces;
+
+import java.util.Random;
+
+import org.apache.log4j.Logger;
+
+import org.contikios.cooja.ClassDescription;
+import org.contikios.cooja.Mote;
+import org.contikios.cooja.Simulation;
+import org.contikios.cooja.radiomediums.AbstractRadioMedium;
+
+import org.contikios.cooja.mspmote.MspMoteTimeEvent;
+import org.contikios.cooja.mspmote.interfaces.Msp802154Radio;
+
+
+/**
+ * Extension of MSPSim 802.15.4 radio wrapper with bit-level errors.
+ *
+ * Only errors due to signal fading are supported (as opposed to errors to interference).
+ * Interesting modelling effects can obtained if this is used together with a dynamic
+ * channel fading model.
+ *
+ * @author Atis Elsts
+ */
+@ClassDescription("IEEE 802.15.4 Bit Error Radio")
+public class Msp802154BitErrorRadio extends Msp802154Radio {
+  private static Logger logger = Logger.getLogger(Msp802154Radio.class);
+
+  private static final double NOISE_FLOOR = AbstractRadioMedium.SS_WEAK;
+  private static final double GOOD_SIGNAL = NOISE_FLOOR + 15.0;
+
+  private Random random = null;
+
+  public Msp802154BitErrorRadio(Mote m) {
+    super(m);
+
+    random = getMote().getSimulation().getRandomGenerator();
+  }
+
+  /* The MSK-transformed symbol-to-codeword table.
+   * It's used for mapping between symbols and codeword by some popular
+   * 802.15.4 radios such as CC2420 and CC2520. */
+  private static final int[] mskEncodeTable = {
+    1618456172,
+    1309113062,
+    1826650030,
+    1724778362,
+    778887287,
+    2061946375,
+    2007919840,
+    125494990,
+    529027475,
+    838370585,
+    320833617,
+    422705285,
+    1368596360,
+    85537272,
+    139563807,
+    2021988657
+  };
+
+  /* Calculates the Hamming distance between two words */
+  private int hammingDistance(int x1, int x2) {
+    return Integer.bitCount(x1 ^ x2);
+  }
+
+  /* Send a symbol over the air with a specific bit error rate */
+  private int transceiveSymbolWithErrors(int txSymbol, double bitErrorRate) {
+    /* First, transmit (encode and randomly corrupt) it */
+    int chipSequence = mskEncodeTable[txSymbol];
+    /* Note: loop until 31, not until 32 here, as the highest bit in the codeword
+     * is irrelevant for MSK encoded data, and therefore should not come into
+     * the Hamming distance calculations. */
+    for (int i = 0; i < 31; ++i) {
+      double p = random.nextDouble();
+      if (p < bitErrorRate) {
+        chipSequence ^= (1 << i);
+      }
+    }
+
+    /* Now receive (decode) it */
+    int bestRxSymbol = 0;
+    int bestHammingDistance = 32;
+    for (byte i = 0; i < 16; ++i) {
+      /* Resolve ties in a specific order:
+       *  s7, s6, ... , s0, s15, s14 , ..., s8 */
+      int rxSymbol = i < 8 ? 7 - i : 15 - i + 8;
+
+      int hd = hammingDistance(chipSequence, mskEncodeTable[rxSymbol]);
+      if (hd < bestHammingDistance) {
+        bestRxSymbol = rxSymbol;
+        bestHammingDistance = hd;
+        if (hd == 0) {
+          break;
+        }
+      }
+    }
+    return bestRxSymbol;
+  }
+
+  /* This is the probability that a bit will received incorrectly, for
+   * -95.0, -94.9, -94.8, ..., -80.0 dBm signal levels.
+   * It is modelled as Additive White Gaussian Noise (AWGN) channel
+   * with constellation size = 4, and log2(4) = 2 bits per over-the-air symbol.
+   * (See "Digital Communications" by Proakis, page 311)
+   *
+   * The table was generated with the following Python code:
+   *
+   * noise_floor = -95.0
+   * good_signal = noise_floor + 15.0
+   *
+   * # chips per second / carrier frequency
+   * # In this case:
+   * #  250 kbps * symbols_per_bit / 5 MHz 802.15.4 channel bandwidth
+   * spectral_efficiency = 250000 * (32 / 4) / 5000000.
+   *
+   * def snr_from_rssi(signal):
+   *     return signal - noise_floor
+   *
+   * def combinations(n, k):
+   *     return math.factorial(n) / (math.factorial(k) * math.factorial(n - k))
+   *
+   * def chip_error_rate(signal):
+   *    M_sk = 4 # constellation size
+   *    K_b = 2  # bits per symbol
+   *    snr = snr_from_rssi(signal) * spectral_efficiency  # signal-noise ratio
+   *    result = 0.0
+   *    for k in range(1, M_sk):
+   *       result += ((-1)**(k + 1) / (k + 1.0)) * combinations(M_sk - 1, k) * math.exp(- (k / (k + 1.0)) * K_b * snr)
+   *    return result * (M_sk / 2) / (M_sk - 1)
+   *
+   * for signal in range(int(noise_floor), int(good_signal + 1)):
+   *     for decimal_part in range(10):
+   *         s = signal + decimal_part / 10.0
+   *         print("{}: {:.16}".format(s, chip_error_rate(s)))
+   */
+  private static final double[] bitErrorRateTable = {
+    0.5000000000000000,
+    0.4857075690874351,
+    0.4717195981917559,
+    0.4580362793082289,
+    0.4446572346573086,
+    0.4315815642818357,
+    0.4188078906959320,
+    0.4063344007440545,
+    0.3941588848209507,
+    0.3822787735959348,
+    0.3706911723779558,
+    0.3593928932511307,
+    0.3483804851041035,
+    0.3376502616704103,
+    0.3271983276911817,
+    0.3170206033059785,
+    0.3071128467721474,
+    0.2974706756080624,
+    0.2880895862507204,
+    0.2789649723135144,
+    0.2700921415256470,
+    0.2614663314303489,
+    0.2530827239151328,
+    0.2449364586434322,
+    0.2370226454533358,
+    0.2293363757856961,
+    0.2218727332005190,
+    0.2146268030374602,
+    0.2075936812732179,
+    0.2007684826257659,
+    0.1941463479526962,
+    0.1877224509883067,
+    0.1814920044616803,
+    0.1754502656356323,
+    0.1695925413041991,
+    0.1639141922842669,
+    0.1584106374348990,
+    0.1530773572360710,
+    0.1479098969566969,
+    0.1429038694401250,
+    0.1380549575336883,
+    0.1333589161873203,
+    0.1288115742448300,
+    0.1244088359500270,
+    0.1201466821885792,
+    0.1160211714852698,
+    0.1120284407751141,
+    0.1081647059657158,
+    0.1044262623071727,
+    0.1008094845848469,
+    0.0973108271493890,
+    0.0939268237974889,
+    0.0906540875160106,
+    0.0874893101013543,
+    0.0844292616651377,
+    0.0814707900365929,
+    0.0786108200713800,
+    0.0758463528759084,
+    0.0731744649556428,
+    0.0705923072953072,
+    0.0680971043783837,
+    0.0656861531527741,
+    0.0633568219490458,
+    0.0611065493572223,
+    0.0589328430676567,
+    0.0568332786811473,
+    0.0548054984930601,
+    0.0528472102558939,
+    0.0509561859243809,
+    0.0491302603869077,
+    0.0473673301867607,
+    0.0456653522364111,
+    0.0440223425278144,
+    0.0424363748414465,
+    0.0409055794565784,
+    0.0394281418650815,
+    0.0380023014908522,
+    0.0366263504167641,
+    0.0352986321208818,
+    0.0340175402235017,
+    0.0327815172464461,
+    0.0315890533858807,
+    0.0304386852998058,
+    0.0293289949112408,
+    0.0282586082280085,
+    0.0272261941799208,
+    0.0262304634740650,
+    0.0252701674687994,
+    0.0243440970669807,
+    0.0234510816288642,
+    0.0225899879050480,
+    0.0217597189897583,
+    0.0209592132947168,
+    0.0201874435437662,
+    0.0194434157883799,
+    0.0187261684441326,
+    0.0180347713481601,
+    0.0173683248375987,
+    0.0167259588489542,
+    0.0161068320383143,
+    0.0155101309222909,
+    0.0149350690395443,
+    0.0143808861327198,
+    0.0138468473506013,
+    0.0133322424702643,
+    0.0128363851389939,
+    0.0123586121357148,
+    0.0118982826516654,
+    0.0114547775900349,
+    0.0110274988842702,
+    0.0106158688347500,
+    0.0102193294635131,
+    0.0098373418867231,
+    0.0094693857045423,
+    0.0091149584080853,
+    0.0087735748031163,
+    0.0084447664501541,
+    0.0081280811206428,
+    0.0078230822688482,
+    0.0075293485191375,
+    0.0072464731683002,
+    0.0069740637025694,
+    0.0067117413290037,
+    0.0064591405208906,
+    0.0062159085768378,
+    0.0059817051932169,
+    0.0057562020496316,
+    0.0055390824070828,
+    0.0053300407185094,
+    0.0051287822513842,
+    0.0049350227220528,
+    0.0047484879415055,
+    0.0045689134722762,
+    0.0043960442961698,
+    0.0042296344925230,
+    0.0040694469267080,
+    0.0039152529485966,
+    0.0037668321007033,
+    0.0036239718357372,
+    0.0034864672432910,
+    0.0033541207854084,
+    0.0032267420407699,
+    0.0031041474572487,
+    0.0029861601125883,
+    0.0028726094829638,
+    0.0027633312191911,
+    0.0026581669303560,
+    0.0025569639746388,
+    0.0024595752571165,
+    0.0023658590343307,
+    0.0022756787254125
+  };
+
+  private double getBitErrorRate(double signal) {
+    if (signal <= NOISE_FLOOR) {
+      return 0.5;
+    } else if (signal >= GOOD_SIGNAL) {
+      return 0.0;
+    } else {
+      long position = Math.round((signal - NOISE_FLOOR) * 10.0);
+      return bitErrorRateTable[(int)position];
+    }
+  }
+
+  public void receiveCustomData(Object data) {
+    if (!(data instanceof Byte)) {
+      logger.fatal("Bad custom data: " + data);
+      return;
+    }
+    lastIncomingByte = (Byte) data;
+
+    final byte inputByte;
+    if (isInterfered()) {
+      inputByte = (byte)0xFF;
+    } else {
+      double bitErrorRate = getBitErrorRate(currentSignalStrength);
+      if (bitErrorRate == 0.0) {
+        inputByte = lastIncomingByte;
+      } else if (bitErrorRate >= 0.5) {
+        inputByte = (byte) 0xFF;
+      } else {
+        /* convert to an unsigned int in order to prettify subsequent operations with bits */
+        int incomingByteAsInt = lastIncomingByte;
+        if (incomingByteAsInt < 0) incomingByteAsInt += 256;
+
+        /* a byte consists of 2 symbols; independently transceive each of them */
+        int firstSymbol = transceiveSymbolWithErrors(incomingByteAsInt >> 4, bitErrorRate);
+        int secondSymbol = transceiveSymbolWithErrors(incomingByteAsInt & 0xf, bitErrorRate);
+
+        inputByte = (byte)((firstSymbol << 4) + secondSymbol);
+      }
+    }
+
+    mote.getSimulation().scheduleEvent(new MspMoteTimeEvent(mote, 0) {
+      public void execute(long t) {
+        super.execute(t);
+        radio.receivedByte(inputByte);
+        mote.requestImmediateWakeup();
+      }
+    }, mote.getSimulation().getSimulationTime());
+
+  }
+}
diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/Msp802154Radio.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/Msp802154Radio.java
index 31aa30377..baa9676a9 100644
--- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/Msp802154Radio.java
+++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/Msp802154Radio.java
@@ -69,16 +69,16 @@ public class Msp802154Radio extends Radio implements CustomDataRadio {
 
   private RadioEvent lastEvent = RadioEvent.UNKNOWN;
 
-  private final MspMote mote;
-  private final Radio802154 radio;
+  protected final MspMote mote;
+  protected final Radio802154 radio;
 
   private boolean isInterfered = false;
   private boolean isTransmitting = false;
   private boolean isReceiving = false;
   private boolean isSynchronized = false;
 
-  private byte lastOutgoingByte;
-  private byte lastIncomingByte;
+  protected byte lastOutgoingByte;
+  protected byte lastIncomingByte;
 
   private RadioPacket lastOutgoingPacket = null;
   private RadioPacket lastIncomingPacket = null;

From 1818700bde933c1a61dd27c40b1971614e024a18 Mon Sep 17 00:00:00 2001
From: Marko Gucanin <marko.gucanin@soom-it.ch>
Date: Thu, 31 Mar 2016 13:51:03 +0200
Subject: [PATCH 142/393] JN516x clock module sign error fix

---
 platform/jn516x/dev/clock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/jn516x/dev/clock.c b/platform/jn516x/dev/clock.c
index b1927f5d6..8b2c316c0 100644
--- a/platform/jn516x/dev/clock.c
+++ b/platform/jn516x/dev/clock.c
@@ -258,7 +258,7 @@ clock_arch_time_to_etimer(void)
   clock_time_t time_to_etimer;
   if(etimer_pending()) {
     time_to_etimer = etimer_next_expiration_time() - clock_time();
-    if(time_to_etimer < 0) {
+    if((int32_t)time_to_etimer < 0) {
       time_to_etimer = 0;
     }
   } else {

From a81b4007b034c27c7ee6970c903675dfebad585e Mon Sep 17 00:00:00 2001
From: Toni Lozano <tlozano@zolertia.com>
Date: Mon, 4 Apr 2016 10:48:43 +0200
Subject: [PATCH 143/393] Allow to use up to 6xADC channels (now hardcoded),
 disabling the user button  (PA3) if ADC6 is enabled

---
 platform/zoul/contiki-main.c     |   4 +-
 platform/zoul/dev/adc-sensors.c  |   2 +-
 platform/zoul/dev/adc-zoul.c     |   8 +-
 platform/zoul/dev/adc-zoul.h     |  14 +++-
 platform/zoul/dev/zoul-sensors.c |   7 +-
 platform/zoul/firefly/board.h    | 122 +++++++++++++++++++++++++------
 platform/zoul/remote/board.h     | 107 +++++++++++++++++++++------
 7 files changed, 210 insertions(+), 54 deletions(-)

diff --git a/platform/zoul/contiki-main.c b/platform/zoul/contiki-main.c
index 80ca1ab21..b577066fe 100644
--- a/platform/zoul/contiki-main.c
+++ b/platform/zoul/contiki-main.c
@@ -218,9 +218,9 @@ main(void)
 #endif /* NETSTACK_CONF_WITH_IPV6 */
 
   process_start(&sensors_process, NULL);
-
+#if PLATFOM_HAS_BUTTON
   SENSORS_ACTIVATE(button_sensor);
-
+#endif
   energest_init();
   ENERGEST_ON(ENERGEST_TYPE_CPU);
 
diff --git a/platform/zoul/dev/adc-sensors.c b/platform/zoul/dev/adc-sensors.c
index c38455f19..6cc37fb4b 100644
--- a/platform/zoul/dev/adc-sensors.c
+++ b/platform/zoul/dev/adc-sensors.c
@@ -175,7 +175,7 @@ configure(int type, int value)
     return ADC_WRAPPER_ERROR;
   }
 
-  if((value < 0x01) || (value > 0x07) || (value == BUTTON_USER_PIN)) {
+  if((value < 0x01) || (value > 0x07) || ((value == BUTTON_USER_PIN) && (ADC_SENSORS_ADC6_PIN < 0))) {
     PRINTF("ADC sensors: invalid pin value, (PA0-PA1, PA3) are reserved\n");
     return ADC_WRAPPER_ERROR;
   }
diff --git a/platform/zoul/dev/adc-zoul.c b/platform/zoul/dev/adc-zoul.c
index f31a303ed..f19daab48 100644
--- a/platform/zoul/dev/adc-zoul.c
+++ b/platform/zoul/dev/adc-zoul.c
@@ -93,6 +93,9 @@ get_channel_pin(int type)
   if((ZOUL_SENSORS_ADC5) && (type == ZOUL_SENSORS_ADC5)) {
     return SOC_ADC_ADCCON_CH_AIN0 + ADC_SENSORS_ADC5_PIN;
   }
+  if((ZOUL_SENSORS_ADC6) && (type == ZOUL_SENSORS_ADC6)) {
+    return SOC_ADC_ADCCON_CH_AIN0 + ADC_SENSORS_ADC6_PIN;
+  }
   return ZOUL_SENSORS_ERROR;
 }
 /*---------------------------------------------------------------------------*/
@@ -154,9 +157,12 @@ configure(int type, int value)
     if(value & ZOUL_SENSORS_ADC5) {
       ioc_set_over(GPIO_A_NUM, ADC_SENSORS_ADC5_PIN, IOC_OVERRIDE_ANA);
     }
+    if(value & ZOUL_SENSORS_ADC6) {
+      ioc_set_over(GPIO_A_NUM, ADC_SENSORS_ADC6_PIN, IOC_OVERRIDE_ANA);
+    }
     adc_init();
     set_decimation_rate(SOC_ADC_ADCCON_DIV_512);
-    enabled_channels = value;
+    enabled_channels += value;
     break;
 
   case ZOUL_SENSORS_CONFIGURE_TYPE_DECIMATION_RATE:
diff --git a/platform/zoul/dev/adc-zoul.h b/platform/zoul/dev/adc-zoul.h
index d47da43c7..fca2643eb 100644
--- a/platform/zoul/dev/adc-zoul.h
+++ b/platform/zoul/dev/adc-zoul.h
@@ -38,7 +38,9 @@
  *
  * Driver for the Zoul ADC interface
  *
- * This driver supports analogue sensors connected to ADC1, ADC2 and AND3 inputs
+ * This driver supports analogue sensors connected to ADC1, ADC2, ADC3,
+ * ADC4, ADC5 and ADC6 inputs. ADC6 is shared with the user button, so disable
+ * user button if ADC6 is needed.
  * This is controlled by the type argument of the value() function. Possible
  * choices are:
  *
@@ -47,6 +49,7 @@
  * - ZOUL_SENSORS_ADC3
  * - ZOUL_SENSORS_ADC4
  * - ZOUL_SENSORS_ADC5
+ * - ZOUL_SENSORS_ADC6
  *
  * To initialize the ADC sensors use the configure() function, using as first
  * argument SENSORS_HW_INIT, and choose which ADC channels to enable passing as
@@ -128,13 +131,20 @@
 #else
 #define ZOUL_SENSORS_ADC5        0
 #endif
+
+/* ADC phidget-like connector ADC6 */
+#if ADC_SENSORS_ADC6_PIN >= ZOUL_SENSORS_ADC_MIN
+#define ZOUL_SENSORS_ADC6        GPIO_PIN_MASK(ADC_SENSORS_ADC6_PIN)
+#else
+#define ZOUL_SENSORS_ADC6        0
+#endif
 /*
  * This is safe as the disabled sensors should have a zero value thus not
  * affecting the mask operations
  */
 #define ZOUL_SENSORS_ADC_ALL     (ZOUL_SENSORS_ADC1 + ZOUL_SENSORS_ADC2 + \
                                   ZOUL_SENSORS_ADC3 + ZOUL_SENSORS_ADC4 + \
-                                  ZOUL_SENSORS_ADC5)
+                                  ZOUL_SENSORS_ADC5 + ZOUL_SENSORS_ADC6)
 /** @} */
 /*---------------------------------------------------------------------------*/
 extern const struct sensors_sensor adc_zoul;
diff --git a/platform/zoul/dev/zoul-sensors.c b/platform/zoul/dev/zoul-sensors.c
index e6e02c258..da755fc79 100644
--- a/platform/zoul/dev/zoul-sensors.c
+++ b/platform/zoul/dev/zoul-sensors.c
@@ -47,7 +47,12 @@
 #include <string.h>
 /*---------------------------------------------------------------------------*/
 /** \brief Exports global symbols for the sensor API */
-SENSORS(&button_sensor, &vdd3_sensor, &cc2538_temp_sensor);
+SENSORS(&vdd3_sensor,
+#if PLATFORM_HAS_BUTTON
+  &button_sensor,
+#endif
+  &cc2538_temp_sensor
+);
 /*---------------------------------------------------------------------------*/
 /**
  * @}
diff --git a/platform/zoul/firefly/board.h b/platform/zoul/firefly/board.h
index 101a95706..7cf92b39c 100644
--- a/platform/zoul/firefly/board.h
+++ b/platform/zoul/firefly/board.h
@@ -168,6 +168,92 @@
 #define UART1_RTS_PIN            (-1) /**< 0 */
 /** @} */
 /*---------------------------------------------------------------------------*/
+/**
+ * \name ADC configuration
+ *
+ * These values configure which CC2538 pins and ADC channels to use for the ADC
+ * inputs. There pins are suggested as they can be changed, but note that only
+ * pins from PA can be configured as ADC.
+ *
+ * - ADC1: up to 3.3V.
+ * - ADC2: up to 3.3V.
+ * - ADC3: up to 3.3V.
+ * - ADC4: up to 3.3V.
+ * - ADC5: up to 3.3V.
+ * - ADC6: up to 3.3V, shared with user button.
+ * 
+ * Only ADC1 and ADC3 are enabled as default.
+ *
+ * The internal ADC reference is 1190mV, use either a voltage divider as input,
+ * or a different voltage reference, like AVDD5 or other externally (AIN7 or
+ * AIN6).
+ * @{
+ */
+#define ADC_SENSORS_PORT         GPIO_A_NUM /**< ADC GPIO control port */
+
+#ifndef ADC_SENSORS_CONF_ADC1_PIN
+#define ADC_SENSORS_ADC1_PIN     5             /**< ADC1 to PA5  */
+#else
+#if ((ADC_SENSORS_CONF_ADC1_PIN != -1) && (ADC_SENSORS_CONF_ADC1_PIN != 5))
+#error "ADC1 channel should be mapped to PA5 or disabled with -1"
+#else
+#define ADC_SENSORS_ADC1_PIN ADC_SENSORS_CONF_ADC1_PIN
+#endif
+#endif
+
+#ifndef ADC_SENSORS_CONF_ADC2_PIN
+#define ADC_SENSORS_ADC2_PIN     4             /**< ADC2 to PA4  */
+#else
+#if ((ADC_SENSORS_CONF_ADC2_PIN != -1) && (ADC_SENSORS_CONF_ADC2_PIN != 4))
+#error "ADC2 channel should be mapped to PA4 or disabled with -1"
+#else
+#define ADC_SENSORS_ADC2_PIN ADC_SENSORS_CONF_ADC2_PIN
+#endif
+#endif
+
+#ifndef ADC_SENSORS_CONF_ADC3_PIN
+#define ADC_SENSORS_ADC3_PIN     2             /**< ADC3 to PA2  */
+#else
+#if ((ADC_SENSORS_CONF_ADC3_PIN != -1) && (ADC_SENSORS_CONF_ADC3_PIN != 2))
+#error "ADC3 channel should be mapped to PA2 or disabled with -1"
+#else
+#define ADC_SENSORS_ADC3_PIN ADC_SENSORS_CONF_ADC3_PIN
+#endif
+#endif
+
+#ifndef ADC_SENSORS_CONF_ADC4_PIN
+#define ADC_SENSORS_ADC4_PIN     6             /**< ADC4 to PA6   */
+#else
+#if ((ADC_SENSORS_CONF_ADC4_PIN != -1) && (ADC_SENSORS_CONF_ADC4_PIN != 6))
+#error "ADC4 channel should be mapped to PA6 or disabled with -1"
+#else
+#define ADC_SENSORS_ADC4_PIN ADC_SENSORS_CONF_ADC4_PIN
+#endif
+#endif
+
+#ifndef ADC_SENSORS_CONF_ADC5_PIN
+#define ADC_SENSORS_ADC5_PIN     7             /**< ADC5 to PA7   */
+#else
+#if ((ADC_SENSORS_CONF_ADC5_PIN != -1) && (ADC_SENSORS_CONF_ADC5_PIN != 7))
+#error "ADC5 channel should be mapped to PA7 or disabled with -1"
+#else
+#define ADC_SENSORS_ADC5_PIN ADC_SENSORS_CONF_ADC5_PIN
+#endif
+#endif
+
+#ifndef ADC_SENSORS_CONF_ADC6_PIN
+#define ADC_SENSORS_ADC6_PIN     (-1)          /**< ADC6 not declared    */
+#else
+#define ADC_SENSORS_ADC6_PIN     3             /**< Hard-coded to PA3    */
+#endif
+
+#ifndef ADC_SENSORS_CONF_MAX
+#define ADC_SENSORS_MAX          5            /**< Maximum sensors       */
+#else
+#define ADC_SENSORS_MAX          ADC_SENSORS_CONF_MAX
+#endif
+/** @} */
+/*---------------------------------------------------------------------------*/
 /** \name Firefly Button configuration
  *
  * Buttons on the Firefly are connected as follows:
@@ -180,31 +266,19 @@
 #define BUTTON_USER_PIN        3
 #define BUTTON_USER_VECTOR     NVIC_INT_GPIO_PORT_A
 
-/* Notify various examples that we have Buttons */
-#define PLATFORM_HAS_BUTTON      1
-/** @} */
-/*---------------------------------------------------------------------------*/
-/**
- * \name ADC configuration
- *
- * These values configure which CC2538 pins and ADC channels to use for the ADC
- * inputs. There pins are suggested as they can be changed, but note that only
- * pins from PA can be configured as ADC.
- *
- * The Firefly, as it is, only allows 3.3VDC sensors.
- *
- * The internal ADC reference is 1190mV, use either a voltage divider as input,
- * or a different voltage reference, like AVDD5 or other externally (AIN7 or
- * AIN6).
- * @{
+/* Notify various examples that we have an user button.
+ * If ADC6 channel is used, then disable the user button
  */
-#define ADC_SENSORS_PORT         GPIO_A_NUM /**< ADC GPIO control port */
-#define ADC_SENSORS_ADC1_PIN     5          /**< ADC1 to PA5, 3V3    */
-#define ADC_SENSORS_ADC2_PIN     4          /**< ADC2 to PA4, 3V3    */
-#define ADC_SENSORS_ADC3_PIN     2          /**< ADC3 to PA2, 3V3    */
-#define ADC_SENSORS_ADC4_PIN     6          /**< ADC4 to PA6, 3V3    */
-#define ADC_SENSORS_ADC5_PIN     7          /**< ADC5 to PA7, 3V3    */
-#define ADC_SENSORS_MAX          5          /**< PA2, PA4, PA5, PA6, PA7 */
+#ifdef PLATFORM_CONF_WITH_BUTTON
+#if (PLATFORM_CONF_WITH_BUTTON && (ADC_SENSORS_ADC6_PIN == 3))
+#error "The ADC6 (PA3) and user button cannot be enabled at the same time" 
+#else
+#define PLATFORM_HAS_BUTTON  (PLATFORM_CONF_WITH_BUTTON && \
+                              !(ADC_SENSORS_ADC6_PIN == 3))
+#endif /* (PLATFORM_CONF_WITH_BUTTON && (ADC_SENSORS_ADC6_PIN == 3)) */
+#else
+#define PLATFORM_HAS_BUTTON  !(ADC_SENSORS_ADC6_PIN == 3)
+#endif /* PLATFORM_CONF_WITH_BUTTON */
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/zoul/remote/board.h b/platform/zoul/remote/board.h
index 2ae4d8927..2887f452a 100644
--- a/platform/zoul/remote/board.h
+++ b/platform/zoul/remote/board.h
@@ -171,23 +171,6 @@
 #define UART1_RTS_PIN            (-1)
 /** @} */
 /*---------------------------------------------------------------------------*/
-/** \name RE-Mote Button configuration
- *
- * Buttons on the RE-Mote are connected as follows:
- * - BUTTON_USER  -> PA3, S1 user button, shared with bootloader and RTC_INT1
- * - BUTTON_RESET -> RESET_N line, S2 reset both CC2538 and CoP
- * - BUTTON_PIC1W -> shared with SHUTDOWN_ENABLE, not mounted.
- * @{
- */
-/** BUTTON_USER -> PA3 */
-#define BUTTON_USER_PORT       GPIO_A_NUM
-#define BUTTON_USER_PIN        3
-#define BUTTON_USER_VECTOR     NVIC_INT_GPIO_PORT_A
-
-/* Notify various examples that we have Buttons */
-#define PLATFORM_HAS_BUTTON      1
-/** @} */
-/*---------------------------------------------------------------------------*/
 /**
  * \name ADC configuration
  *
@@ -201,6 +184,12 @@
  * - ADC2: up to 3.3V, shared with RTC_INT
  * - ADC3: up to 5V, by means of a 2/3 voltage divider.
  *
+ * Also there are other ADC channels shared by default with Micro SD card and
+ * user button implementations: 
+ * - ADC4: up to 3.3V.
+ * - ADC5: up to 3.3V.
+ * - ADC6: up to 3.3V.
+ *
  * ADC inputs can only be on port A.
  * All ADCx are exposed in JP5 connector, but only ADC1 and ADC3 have GND and
  * VDD (3/5V) pins next to it, so these can be exposed into a 3-pin phidget-like
@@ -216,12 +205,84 @@
  * @{
  */
 #define ADC_SENSORS_PORT         GPIO_A_NUM /**< ADC GPIO control port */
-#define ADC_SENSORS_ADC1_PIN     5          /**< ADC1 to PA5, 3V3    */
-#define ADC_SENSORS_ADC2_PIN     (-1)       /**< ADC2 to PA4, 3V3    */
-#define ADC_SENSORS_ADC3_PIN     2          /**< ADC3 to PA2, 5V0    */
-#define ADC_SENSORS_ADC4_PIN     (-1)       /**< Not present    */
-#define ADC_SENSORS_ADC5_PIN     (-1)       /**< Not present    */
-#define ADC_SENSORS_MAX          2          /**< PA2, PA5 */
+
+#ifndef ADC_SENSORS_CONF_ADC1_PIN
+#define ADC_SENSORS_ADC1_PIN     5             /**< ADC1 to PA5, 3V3    */
+#else
+#if ((ADC_SENSORS_CONF_ADC1_PIN != -1) && (ADC_SENSORS_CONF_ADC1_PIN != 5))
+#error "ADC1 channel should be mapped to PA5 or disabled with -1"
+#else
+#define ADC_SENSORS_ADC1_PIN ADC_SENSORS_CONF_ADC1_PIN
+#endif
+#endif
+
+#ifndef ADC_SENSORS_CONF_ADC3_PIN
+#define ADC_SENSORS_ADC3_PIN     2             /**< ADC3 to PA2, 5V     */
+#else
+#if ((ADC_SENSORS_CONF_ADC3_PIN != -1) && (ADC_SENSORS_CONF_ADC3_PIN != 2))
+#error "ADC3 channel should be mapped to PA2 or disabled with -1"
+#else
+#define ADC_SENSORS_ADC3_PIN ADC_SENSORS_CONF_ADC3_PIN
+#endif
+#endif
+
+#ifndef ADC_SENSORS_CONF_ADC2_PIN
+#define ADC_SENSORS_ADC2_PIN     (-1)          /**< ADC2 no declared    */
+#else
+#define ADC_SENSORS_ADC2_PIN     4             /**< Hard-coded to PA4    */
+#endif
+
+#ifndef ADC_SENSORS_CONF_ADC4_PIN
+#define ADC_SENSORS_ADC4_PIN     (-1)          /**< ADC4 not declared    */
+#else
+#define ADC_SENSORS_ADC4_PIN     6             /**< Hard-coded to PA6    */
+#endif
+
+#ifndef ADC_SENSORS_CONF_ADC5_PIN
+#define ADC_SENSORS_ADC5_PIN     (-1)          /**< ADC5 not declared    */
+#else
+#define ADC_SENSORS_ADC5_PIN     7             /**< Hard-coded to PA7    */
+#endif
+
+#ifndef ADC_SENSORS_CONF_ADC6_PIN
+#define ADC_SENSORS_ADC6_PIN     (-1)             /**< ADC6 not declared    */
+#else
+#define ADC_SENSORS_ADC6_PIN     3             /**< Hard-coded to PA3    */
+#endif
+
+#ifndef ADC_SENSORS_CONF_MAX
+#define ADC_SENSORS_MAX          2             /**< Maximum sensors    */
+#else
+#define ADC_SENSORS_MAX          ADC_SENSORS_CONF_MAX
+#endif
+/** @} */
+/*---------------------------------------------------------------------------*/
+/** \name RE-Mote Button configuration
+ *
+ * Buttons on the RE-Mote are connected as follows:
+ * - BUTTON_USER  -> PA3, S1 user button, shared with bootloader and RTC_INT1
+ * - BUTTON_RESET -> RESET_N line, S2 reset both CC2538 and CoP
+ * - BUTTON_PIC1W -> shared with SHUTDOWN_ENABLE, not mounted.
+ * @{
+ */
+/** BUTTON_USER -> PA3 */
+#define BUTTON_USER_PORT       GPIO_A_NUM
+#define BUTTON_USER_PIN        3
+#define BUTTON_USER_VECTOR     NVIC_INT_GPIO_PORT_A
+
+/* Notify various examples that we have an user button.
+ * If ADC6 channel is used, then disable the user button
+ */
+#ifdef PLATFORM_CONF_WITH_BUTTON
+#if (PLATFORM_CONF_WITH_BUTTON && (ADC_SENSORS_ADC6_PIN == 3))
+#error "The ADC6 (PA3) and user button cannot be enabled at the same time" 
+#else
+#define PLATFORM_HAS_BUTTON  (PLATFORM_CONF_WITH_BUTTON && \
+                              !(ADC_SENSORS_ADC6_PIN == 3))
+#endif /* (PLATFORM_CONF_WITH_BUTTON && (ADC_SENSORS_ADC6_PIN == 3)) */
+#else
+#define PLATFORM_HAS_BUTTON  !(ADC_SENSORS_ADC6_PIN == 3)
+#endif /* PLATFORM_CONF_WITH_BUTTON */
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**

From 2a6999921497172f94fa2237aea3d4e052857c32 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Tue, 5 Apr 2016 17:12:48 +0200
Subject: [PATCH 144/393] space instead of tab

---
 core/net/mac/tsch/tsch-conf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/mac/tsch/tsch-conf.h b/core/net/mac/tsch/tsch-conf.h
index 43e50d7c3..0cbce5913 100644
--- a/core/net/mac/tsch/tsch-conf.h
+++ b/core/net/mac/tsch/tsch-conf.h
@@ -179,7 +179,7 @@
 #ifdef TSCH_CONF_HW_FRAME_FILTERING
 #define TSCH_HW_FRAME_FILTERING TSCH_CONF_HW_FRAME_FILTERING
 #else /* TSCH_CONF_HW_FRAME_FILTERING */
-#define TSCH_HW_FRAME_FILTERING	1
+#define TSCH_HW_FRAME_FILTERING 1
 #endif /* TSCH_CONF_HW_FRAME_FILTERING */
 
 #endif /* __TSCH_CONF_H__ */

From 2c48f3b232d269441de776961dea8c7265698b95 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <ol.sc@web.de>
Date: Tue, 5 Apr 2016 21:11:19 +0200
Subject: [PATCH 145/393] Added compatibility with W5100 shared access.

If the setup of socket 0 to 3 with 4+2+1+1KB is detected then the W5100 is _not_ initialized, otherwise it does set up socket 0 and 1 with 4KB each. Either way socket 0 is used - now with 4KB instead of 8KB as before.
---
 cpu/6502/net/w5100.S | 89 +++++++++++++++++++++++++++-----------------
 1 file changed, 55 insertions(+), 34 deletions(-)

diff --git a/cpu/6502/net/w5100.S b/cpu/6502/net/w5100.S
index 8fb040b01..3d8160170 100644
--- a/cpu/6502/net/w5100.S
+++ b/cpu/6502/net/w5100.S
@@ -97,7 +97,8 @@ fixup:	.byte	fixup02-fixup01, fixup03-fixup02, fixup04-fixup03
 	.byte	fixup20-fixup19, fixup21-fixup20, fixup22-fixup21
 	.byte	fixup23-fixup22, fixup24-fixup23, fixup25-fixup24
 	.byte	fixup26-fixup25, fixup27-fixup26, fixup28-fixup27
-	.byte	fixup29-fixup28, fixup30-fixup29
+	.byte	fixup29-fixup28, fixup30-fixup29, fixup31-fixup30
+	.byte	fixup32-fixup31
 
 fixups	= * - fixup
 
@@ -164,44 +165,64 @@ fixup04:eor data
 	sec
 	rts
 
+	; Check for W5100 shared access
+	; RX Memory Size Register: Assign 4+2+1+1KB to socket 0 to 3 ?
+:	; ldx #$00		; Hibyte
+	ldy #$1A		; Lobyte
+	jsr set_addr
+fixup05:lda data
+	cmp #$06
+	beq :+++
+
 	; S/W Reset
-:	lda #$80
-fixup05:sta mode
+	lda #$80
+fixup06:sta mode
 :
-fixup06:lda mode
+fixup07:lda mode
 	bmi :-
 
 	; Indirect Bus I/F mode, Address Auto-Increment, Ping Block
 	lda #$13
-fixup07:sta mode
+fixup08:sta mode
 
 	; Source Hardware Address Register: MAC Address
 	ldx #$00		; Hibyte
 	ldy #$09		; Lobyte
 	jsr set_addr
 :	lda mac,x
-fixup08:sta data
+fixup09:sta data
 	inx
 	cpx #$06
 	bcc :-
 
-	; RX Memory Size Register: Assign 8KB to socket 0
-	; TX Memory Size Register: Assign 8KB to socket 0
+	; RX Memory Size Register: Assign 4KB each to socket 0 and 1
+	; TX Memory Size Register: Assign 4KB each to socket 0 and 1
 	ldx #$00		; Hibyte
 	ldy #$1A		; Lobyte
 	jsr set_addr
-	lda #$03
-fixup09:sta data
+	lda #$0A
 fixup10:sta data
+fixup11:sta data
+
+	; MAC Address: Source Hardware Address Register
+:	; ldx #$00		; Hibyte
+	ldy #$09		; Lobyte
+	jsr set_addr
+:
+fixup12:lda data
+	sta mac,x
+	inx
+	cpx #$06
+	bcc :-
 
 	; Socket 0 Mode Register: MACRAW, MAC Filter
 	; Socket 0 Command Register: OPEN
 	ldy #$00
 	jsr set_addrsocket0
 	lda #$44
-fixup11:sta data
+fixup13:sta data
 	lda #$01
-fixup12:sta data
+fixup14:sta data
 	tya
 	tax
 	clc
@@ -213,7 +234,7 @@ poll:
 	; Check for completion of previous command
 	; Socket 0 Command Register: = 0 ?
 	jsr set_addrcmdreg0
-fixup13:lda data
+fixup15:lda data
 	beq :++
 
 	; No data available
@@ -225,8 +246,8 @@ fixup13:lda data
 	; Socket 0 RX Received Size Register: != 0 ?
 :	ldy #$26		; Socket RX Received Size Register
 	jsr set_addrsocket0
-fixup14:lda data		; Hibyte
-fixup15:ora data		; Lobyte
+fixup16:lda data		; Hibyte
+fixup17:ora data		; Lobyte
 	beq :--
 
 	; Process the incoming data
@@ -243,8 +264,8 @@ fixup15:ora data		; Lobyte
 	; Calculate and set physical address
 	jsr set_addrphysical
 
-	; Move physical address shadow to $E000-$FFFF
-	ora #>$8000
+	; Move physical address shadow to $F000-$FFFF
+	ora #>$F000
 	tax
 
 	; Read MAC raw 2byte packet size header
@@ -292,13 +313,13 @@ common: jsr set_addrsocket0
 	tax
 	lda reg+1
 	adc adv+1
-fixup16:sta data		; Hibyte
-fixup17:stx data		; Lobyte
+fixup18:sta data		; Hibyte
+fixup19:stx data		; Lobyte
 
 	; Set command register
 	tya			; Restore command
 	jsr set_addrcmdreg0
-fixup18:sta data
+fixup20:sta data
 
 	; Return data length (will be ignored for send)
 	lda len
@@ -325,14 +346,14 @@ send:
 	; Wait for completion of previous command
 	; Socket 0 Command Register: = 0 ?
 :	jsr set_addrcmdreg0
-fixup19:lda data
+fixup21:lda data
 	bne :-
 
 	; Socket 0 TX Free Size Register: < length ?
 :	ldy #$20		; Socket TX Free Size Register
 	jsr set_addrsocket0
-fixup20:lda data		; Hibyte
-fixup21:ldx data		; Lobyte
+fixup22:lda data		; Hibyte
+fixup23:ldx data		; Lobyte
 	cpx len
 	sbc len+1
 	bcc :-
@@ -362,16 +383,16 @@ exit:
 ;---------------------------------------------------------------------
 
 set_addrphysical:
-fixup22:lda data		; Hibyte
-fixup23:ldy data		; Lobyte
+fixup24:lda data		; Hibyte
+fixup25:ldy data		; Lobyte
 	sty reg
 	sta reg+1
-	and #>$1FFF		; Socket Mask Address (hibyte)
+	and #>$0FFF		; Socket Mask Address (hibyte)
 	ora bas			; Socket Base Address (hibyte)
 	tax
 set_addr:
-fixup24:stx addr		; Hibyte
-fixup25:sty addr+1		; Lobyte
+fixup26:stx addr		; Hibyte
+fixup27:sty addr+1		; Lobyte
 	rts
 
 set_addrcmdreg0:
@@ -386,7 +407,7 @@ set_addrbase:
 	beq set_addr		; Always
 
 get_datacheckaddr:
-fixup26:lda data
+fixup28:lda data
 	iny			; Physical address shadow (lobyte)
 	bne :+
 	inx			; Physical address shadow (hibyte)
@@ -399,7 +420,7 @@ set_parameters:
 	; Setup variables in zero page
 	sta bas			; Socket Base Address
 	clc
-	adc #>$2000		; Socket memory size
+	adc #>$1000		; Socket memory size
 	sta lim			; Socket memory limit
 	stx dir			; Transfer direction
 
@@ -427,10 +448,10 @@ mov_data:
 	; R/W without address wraparound possible because 
 	; highest R/W address > actual R/W address ?
 	; sec
-fixup27:sbc addr+1		; Lobyte
+fixup29:sbc addr+1		; Lobyte
 	tay
 	txa
-fixup28:sbc addr		; Hibyte
+fixup30:sbc addr		; Hibyte
 	tax
 	tya
 	bcs :+
@@ -491,7 +512,7 @@ rw_data:eor #$FF		; Two's complement part 1
 
 	; Read data
 :
-fixup29:lda data
+fixup31:lda data
 	sta (ptr),y
 	iny
 	bne :-
@@ -502,7 +523,7 @@ fixup29:lda data
 
 	; Write data
 :	lda (ptr),y
-fixup30:sta data
+fixup32:sta data
 	iny
 	bne :-
 	inc ptr+1

From a7b43de535956178260c22d56eeb3046b2b920e6 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Wed, 6 Apr 2016 16:54:45 +0200
Subject: [PATCH 146/393] add comment, use spaces

---
 examples/ipv6/rpl-tsch/project-conf.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/examples/ipv6/rpl-tsch/project-conf.h b/examples/ipv6/rpl-tsch/project-conf.h
index 81f7a01b6..1d3ad605d 100644
--- a/examples/ipv6/rpl-tsch/project-conf.h
+++ b/examples/ipv6/rpl-tsch/project-conf.h
@@ -67,18 +67,19 @@
 #define TSCH_CALLBACK_JOINING_NETWORK tsch_rpl_callback_joining_network
 #define TSCH_CALLBACK_LEAVING_NETWORK tsch_rpl_callback_leaving_network
 
+/* Needed for CC2538 platforms only */
 /* For TSCH we have to use the more accurate crystal oscillator
  * by default the RC oscillator is activated */
 #undef SYS_CTRL_CONF_OSC32K_USE_XTAL
-#define SYS_CTRL_CONF_OSC32K_USE_XTAL			1
+#define SYS_CTRL_CONF_OSC32K_USE_XTAL 1
 
 /* Needed for cc2420 platforms only */
 /* Disable DCO calibration (uses timerB) */
 #undef DCOSYNCH_CONF_ENABLED
-#define DCOSYNCH_CONF_ENABLED            0
+#define DCOSYNCH_CONF_ENABLED 0
 /* Enable SFD timestamps (uses timerB) */
 #undef CC2420_CONF_SFD_TIMESTAMPS
-#define CC2420_CONF_SFD_TIMESTAMPS       1
+#define CC2420_CONF_SFD_TIMESTAMPS 1
 
 /*******************************************************/
 /******************* Configure TSCH ********************/

From 9f1e87466fe2fc66d29e2b522e0ec529897e4dc8 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Wed, 6 Apr 2016 14:02:51 +0100
Subject: [PATCH 147/393] Fix failure of ARM-AAPCS travis job

Up till now we have been installing arm-gcc using apt from the team-gcc-arm-embedded ppa.

As discussed in #1453 and implemented in #1504, we have decided to lock travis to use the specific version of the toolchain that is documented in the READMEs of relevant platforms. However, the PPA no longer hosts this version, apt fails to install arm-gcc and as a result the job fails too.

This commit changes the travis job to wget an installation tarball for the desired version, instead of trying to install via apt.
---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3a035fd2e..006956968 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,13 +40,13 @@ before_script:
       arm-none-eabi-gcc --version ;
     fi
 
-  ## Install mainline ARM toolchain.  gcc-arm-none-eabi is available
-  ## in Ubuntu >= 14.04, but this external PPA is needed for 12.04.
-  ## Install srecord
+  ## Install mainline ARM toolchain and srecord.
   - if [ ${BUILD_ARCH:-0} = arm-aapcs ] ; then
-      sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa &&
-      sudo apt-get -qq update &&
-      sudo apt-get -qq install gcc-arm-embedded=5-2015q4-1~precise1 srecord &&
+      sudo apt-get -qq install srecord &&
+      $WGET https://launchpad.net/gcc-arm-embedded/5.0/5-2015-q4-major/+download/gcc-arm-none-eabi-5_2-2015q4-20151219-linux.tar.bz2 &&
+      tar xjf gcc-arm-none-eabi-5_2-2015q4-20151219-linux.tar.bz2 -C /tmp/ &&
+      sudo cp -f -r /tmp/gcc-arm-none-eabi-5_2-2015q4/* /usr/local/ &&
+      rm -rf /tmp/gcc-arm-none-eabi-* gcc-arm-none-eabi-*-linux.tar.bz2 &&
       arm-none-eabi-gcc --version ;
     fi
 

From 9ac859a2af439cfea168a44c66cc25f2e198118d Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Thu, 7 Apr 2016 15:17:44 +0200
Subject: [PATCH 148/393] add send_on_cca if query

---
 cpu/cc2538/dev/cc2538-rf.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/cpu/cc2538/dev/cc2538-rf.c b/cpu/cc2538/dev/cc2538-rf.c
index a9ea369d6..3f79f2bb8 100644
--- a/cpu/cc2538/dev/cc2538-rf.c
+++ b/cpu/cc2538/dev/cc2538-rf.c
@@ -607,9 +607,11 @@ transmit(unsigned short transmit_len)
     while(RTIMER_CLOCK_LT(RTIMER_NOW(), t0 + ONOFF_TIME));
   }
 
-  if(channel_clear() == CC2538_RF_CCA_BUSY) {
-    RIMESTATS_ADD(contentiondrop);
-    return RADIO_TX_COLLISION;
+  if(send_on_cca) {
+    if(channel_clear() == CC2538_RF_CCA_BUSY) {
+      RIMESTATS_ADD(contentiondrop);
+      return RADIO_TX_COLLISION;
+    }
   }
 
   /*

From 8211db64ae82dc52061a1fc1349993eec158ab61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Briano?= <ivan.briano@intel.com>
Date: Thu, 7 Apr 2016 10:37:30 -0300
Subject: [PATCH 149/393] Allow creating connections on unspecified local port

If the given local port is 0, we get no replies.
---
 core/net/ip/simple-udp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/ip/simple-udp.c b/core/net/ip/simple-udp.c
index 8ecd0aaa1..692fea19a 100644
--- a/core/net/ip/simple-udp.c
+++ b/core/net/ip/simple-udp.c
@@ -119,7 +119,7 @@ simple_udp_register(struct simple_udp_connection *c,
 
   PROCESS_CONTEXT_BEGIN(&simple_udp_process);
   c->udp_conn = udp_new(remote_addr, UIP_HTONS(remote_port), c);
-  if(c->udp_conn != NULL) {
+  if(c->udp_conn != NULL && local_port) {
     udp_bind(c->udp_conn, UIP_HTONS(local_port));
   }
   PROCESS_CONTEXT_END();

From 5753fb5173501e1b4f1c2be440e7ad1d63a23848 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Thu, 7 Apr 2016 15:41:15 +0200
Subject: [PATCH 150/393] Clean up the driver

Move mac_timer_init() into set_poll_mode() and remove now unneccesary clear outs and mask outs of interrupt sources and pending interrupts
---
 cpu/cc2538/dev/cc2538-rf.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/cpu/cc2538/dev/cc2538-rf.c b/cpu/cc2538/dev/cc2538-rf.c
index 3f79f2bb8..12fe9ffae 100644
--- a/cpu/cc2538/dev/cc2538-rf.c
+++ b/cpu/cc2538/dev/cc2538-rf.c
@@ -344,14 +344,12 @@ set_poll_mode(uint8_t enable)
   poll_mode = enable;
   
   if(enable) {
-    REG(RFCORE_XREG_RFIRQM0) &= ~RFCORE_XREG_RFIRQM0_FIFOP;	// mask out FIFOP interrupt source
-    REG(RFCORE_SFR_RFIRQF0) &= ~RFCORE_SFR_RFIRQF0_FIFOP;	// clear pending FIFOP interrupt
-    REG(RFCORE_XREG_RFIRQM0) &= ~RFCORE_XREG_RFIRQM0_SFD;	// disable SFD interrupt source
-    nvic_interrupt_disable(NVIC_INT_RF_RXTX);
+    mac_timer_init();
+    REG(RFCORE_XREG_RFIRQM0) &= ~RFCORE_XREG_RFIRQM0_FIFOP; // mask out FIFOP interrupt source
+    REG(RFCORE_SFR_RFIRQF0) &= ~RFCORE_SFR_RFIRQF0_FIFOP;   // clear pending FIFOP interrupt
+    nvic_interrupt_disable(NVIC_INT_RF_RXTX);               // disable RF interrupts
   } else {
-    REG(RFCORE_XREG_RFIRQM0) |= RFCORE_XREG_RFIRQM0_FIFOP;	// enable FIFOP interrupt source
-    REG(RFCORE_XREG_RFIRQM0) &= ~RFCORE_XREG_RFIRQM0_SFD;   // mask out SFD interrupt source
-    REG(RFCORE_SFR_RFIRQF0) &= ~RFCORE_SFR_RFIRQF0_SFD;	    // clear pending SFD interrupt
+    REG(RFCORE_XREG_RFIRQM0) |= RFCORE_XREG_RFIRQM0_FIFOP;  // enable FIFOP interrupt source
     nvic_interrupt_enable(NVIC_INT_RF_RXTX);			    // enable RF interrupts
   }
 }
@@ -521,8 +519,6 @@ init(void)
     udma_set_channel_src(CC2538_RF_CONF_RX_DMA_CHAN, RFCORE_SFR_RFDATA);
   }
   
-  mac_timer_init();
-  
   set_poll_mode(poll_mode);
 
   process_start(&cc2538_rf_process, NULL);

From 1d3c37d6da6af000088a4373d1e1fa3da201792b Mon Sep 17 00:00:00 2001
From: Pere Tuset <peretuset@gmail.com>
Date: Thu, 11 Feb 2016 01:34:08 +0100
Subject: [PATCH 151/393] Add OpenMote-CC2538 platform and examples.

---
 examples/openmote-cc2538/Makefile             |   9 +
 examples/openmote-cc2538/openmote-demo.c      | 152 +++++
 examples/openmote-cc2538/project-conf.h       |  46 ++
 examples/openmote-cc2538/test-adxl346.c       |  86 +++
 examples/openmote-cc2538/test-max44009.c      |  86 +++
 examples/openmote-cc2538/test-sht21.c         |  92 +++
 examples/openmote-cc2538/test-timer.c         | 188 ++++++
 .../openmote-cc2538/Makefile.openmote-cc2538  |  50 ++
 platform/openmote-cc2538/README.md            |   0
 platform/openmote-cc2538/board.c              |  61 ++
 platform/openmote-cc2538/board.h              | 166 ++++++
 platform/openmote-cc2538/contiki-conf.h       | 536 ++++++++++++++++++
 platform/openmote-cc2538/contiki-main.c       | 248 ++++++++
 platform/openmote-cc2538/dev/adxl346.c        | 252 ++++++++
 platform/openmote-cc2538/dev/adxl346.h        |  57 ++
 platform/openmote-cc2538/dev/antenna.c        |  99 ++++
 platform/openmote-cc2538/dev/antenna.h        |  50 ++
 platform/openmote-cc2538/dev/button-sensor.c  | 136 +++++
 platform/openmote-cc2538/dev/button-sensor.h  |  59 ++
 platform/openmote-cc2538/dev/leds-arch.c      |  69 +++
 platform/openmote-cc2538/dev/max44009.c       | 197 +++++++
 platform/openmote-cc2538/dev/max44009.h       |  56 ++
 platform/openmote-cc2538/dev/sht21.c          | 208 +++++++
 platform/openmote-cc2538/dev/sht21.h          |  58 ++
 .../openmote-cc2538/dev/smartrf-sensors.c     |  53 ++
 platform/openmote-cc2538/dev/tps62730.c       |  98 ++++
 platform/openmote-cc2538/dev/tps62730.h       |  54 ++
 27 files changed, 3166 insertions(+)
 create mode 100644 examples/openmote-cc2538/Makefile
 create mode 100644 examples/openmote-cc2538/openmote-demo.c
 create mode 100644 examples/openmote-cc2538/project-conf.h
 create mode 100644 examples/openmote-cc2538/test-adxl346.c
 create mode 100644 examples/openmote-cc2538/test-max44009.c
 create mode 100644 examples/openmote-cc2538/test-sht21.c
 create mode 100644 examples/openmote-cc2538/test-timer.c
 create mode 100644 platform/openmote-cc2538/Makefile.openmote-cc2538
 create mode 100644 platform/openmote-cc2538/README.md
 create mode 100644 platform/openmote-cc2538/board.c
 create mode 100644 platform/openmote-cc2538/board.h
 create mode 100644 platform/openmote-cc2538/contiki-conf.h
 create mode 100644 platform/openmote-cc2538/contiki-main.c
 create mode 100644 platform/openmote-cc2538/dev/adxl346.c
 create mode 100644 platform/openmote-cc2538/dev/adxl346.h
 create mode 100644 platform/openmote-cc2538/dev/antenna.c
 create mode 100644 platform/openmote-cc2538/dev/antenna.h
 create mode 100644 platform/openmote-cc2538/dev/button-sensor.c
 create mode 100644 platform/openmote-cc2538/dev/button-sensor.h
 create mode 100644 platform/openmote-cc2538/dev/leds-arch.c
 create mode 100644 platform/openmote-cc2538/dev/max44009.c
 create mode 100644 platform/openmote-cc2538/dev/max44009.h
 create mode 100644 platform/openmote-cc2538/dev/sht21.c
 create mode 100644 platform/openmote-cc2538/dev/sht21.h
 create mode 100644 platform/openmote-cc2538/dev/smartrf-sensors.c
 create mode 100644 platform/openmote-cc2538/dev/tps62730.c
 create mode 100644 platform/openmote-cc2538/dev/tps62730.h

diff --git a/examples/openmote-cc2538/Makefile b/examples/openmote-cc2538/Makefile
new file mode 100644
index 000000000..9f925fb70
--- /dev/null
+++ b/examples/openmote-cc2538/Makefile
@@ -0,0 +1,9 @@
+DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
+
+CONTIKI_PROJECT = openmote-demo test-timer test-adxl346 test-max44009 test-sht21
+
+all: $(CONTIKI_PROJECT)
+
+CONTIKI = ../..
+CONTIKI_WITH_RIME = 1
+include $(CONTIKI)/Makefile.include
diff --git a/examples/openmote-cc2538/openmote-demo.c b/examples/openmote-cc2538/openmote-demo.c
new file mode 100644
index 000000000..10a1c0762
--- /dev/null
+++ b/examples/openmote-cc2538/openmote-demo.c
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2014, OpenMote Technologies, S.L.
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup openmote-cc2538
+ * @{
+ *
+ * \defgroup openmote-examples OpenMote-CC2538 Example Projects
+ * @{
+ *
+ * \defgroup openmote-demo OpenMote-CC2538 Demo Project
+ *
+ *   Example project demonstrating the OpenMote-CC2538 functionality
+ *
+ *   This assumes that you are using an OpenMote-CC2538
+ *
+ * - Boot sequence: LEDs flashing, LED2 followed by LED3 then LED4
+ * - etimer/clock : Every LOOP_INTERVAL clock ticks the LED defined as
+ *                  LEDS_PERIODIC will turn on
+ * - rtimer       : Exactly LEDS_OFF_HYSTERISIS rtimer ticks later,
+ *                  LEDS_PERIODIC will turn back off
+ * - UART         : Every LOOP_INTERVAL the EM will print something over the
+ *                  UART. Receiving an entire line of text over UART (ending
+ *                  in \\r) will cause LEDS_SERIAL_IN to toggle
+ * - Radio comms  : BTN_SELECT sends a rime broadcast. Reception of a rime
+ *                  packet will toggle LEDs defined as LEDS_RF_RX
+ *
+ * @{
+ *
+ * \file
+ *     Example demonstrating the OpenMote platform.
+ * \author
+ *         Pere Tuset <peretuset@openmote.com>
+ */
+#include "contiki.h"
+#include "cpu.h"
+#include "sys/etimer.h"
+#include "sys/rtimer.h"
+#include "dev/leds.h"
+#include "dev/uart.h"
+#include "dev/button-sensor.h"
+#include "dev/watchdog.h"
+#include "dev/serial-line.h"
+#include "dev/sys-ctrl.h"
+#include "net/rime/broadcast.h"
+
+#include <stdio.h>
+#include <stdint.h>
+/*---------------------------------------------------------------------------*/
+#define LOOP_INTERVAL       CLOCK_SECOND
+#define LEDS_OFF_HYSTERISIS (RTIMER_SECOND >> 1)
+#define LEDS_PERIODIC       LEDS_YELLOW
+#define LEDS_BUTTON         LEDS_RED
+#define LEDS_SERIAL_IN      LEDS_ORANGE
+#define LEDS_REBOOT         LEDS_ALL
+#define LEDS_RF_RX          (LEDS_YELLOW | LEDS_ORANGE)
+#define BROADCAST_CHANNEL   129
+/*---------------------------------------------------------------------------*/
+static struct etimer et;
+static struct rtimer rt;
+static uint16_t counter;
+/*---------------------------------------------------------------------------*/
+PROCESS(openmote_demo_process, "OpenMote-CC2538 demo process");
+AUTOSTART_PROCESSES(&openmote_demo_process);
+/*---------------------------------------------------------------------------*/
+static void
+broadcast_recv(struct broadcast_conn *c, const linkaddr_t *from)
+{
+  leds_toggle(LEDS_RF_RX);
+  printf("Received %u bytes: '0x%04x'\n", packetbuf_datalen(),
+         *(uint16_t *)packetbuf_dataptr());
+}
+/*---------------------------------------------------------------------------*/
+static const struct broadcast_callbacks bc_rx = { broadcast_recv };
+static struct broadcast_conn bc;
+/*---------------------------------------------------------------------------*/
+void
+rt_callback(struct rtimer *t, void *ptr)
+{
+  leds_off(LEDS_PERIODIC);
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(openmote_demo_process, ev, data)
+{
+
+  PROCESS_EXITHANDLER(broadcast_close(&bc))
+
+  PROCESS_BEGIN();
+
+  counter = 0;
+  broadcast_open(&bc, BROADCAST_CHANNEL, &bc_rx);
+
+  while(1) {
+    etimer_set(&et, CLOCK_SECOND);
+
+    PROCESS_YIELD();
+
+    if(ev == PROCESS_EVENT_TIMER) {
+      leds_on(LEDS_PERIODIC);
+      printf("Counter = 0x%08x\n", counter);
+
+      etimer_set(&et, CLOCK_SECOND);
+      rtimer_set(&rt, RTIMER_NOW() + LEDS_OFF_HYSTERISIS, 1,
+                 rt_callback, NULL);
+    } else if(ev == sensors_event) {
+      if(data == &button_user_sensor) {
+        packetbuf_copyfrom(&counter, sizeof(counter));
+        broadcast_send(&bc);
+      }
+    } else if(ev == serial_line_event_message) {
+      leds_toggle(LEDS_SERIAL_IN);
+    }
+    counter++;
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ * @}
+ */
diff --git a/examples/openmote-cc2538/project-conf.h b/examples/openmote-cc2538/project-conf.h
new file mode 100644
index 000000000..126ea1058
--- /dev/null
+++ b/examples/openmote-cc2538/project-conf.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2012, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/**
+ * \addtogroup remote-examples
+ * @{
+ *
+ * \file
+ * Project specific configuration defines for the basic RE-Mote examples
+ */
+#ifndef PROJECT_CONF_H_
+#define PROJECT_CONF_H_
+
+#define BROADCAST_CHANNEL     129
+#define NETSTACK_CONF_RDC     nullrdc_driver
+
+#endif /* PROJECT_CONF_H_ */
+
+/** @} */
diff --git a/examples/openmote-cc2538/test-adxl346.c b/examples/openmote-cc2538/test-adxl346.c
new file mode 100644
index 000000000..1a750a67c
--- /dev/null
+++ b/examples/openmote-cc2538/test-adxl346.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2014, OpenMote Technologies, S.L.
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup openmote-examples
+ * @{
+ *
+ * \defgroup openmote-adxl346
+ *
+ *    This example tests the correct functionality of the ADXL346 acceleration
+ *    sensor using the I2C bus.
+ *
+ * @{
+ *
+ * \file
+ *          Testing the ADXL346 sensor on the OpenMote-CC2538 platform.
+ * \author
+ *         Pere Tuset <peretuset@openmote.com>
+ */
+
+#include "contiki.h"
+#include "dev/adxl346.h"
+
+#include <stdio.h>
+
+PROCESS(test_adxl346_process, "ADXL346 test");
+AUTOSTART_PROCESSES(&test_adxl346_process);
+
+PROCESS_THREAD(test_adxl346_process, ev, data)
+{
+  static struct etimer et;
+  static unsigned acceleration;
+
+  PROCESS_BEGIN();
+  adxl346_init();
+
+  if (!adxl346_is_present()) {
+    leds_on(LEDS_ORANGE);
+  }
+
+  while(1) {
+    etimer_set(&et, CLOCK_SECOND);
+
+    PROCESS_YIELD();
+
+    if (ev == PROCESS_EVENT_TIMER) {
+      acceleration = adxl346_read_x();
+      printf("X Acceleration: %u\n", acceleration);
+      acceleration = adxl346_read_y();
+      printf("Y Acceleration: %u\n", acceleration);
+      acceleration = adxl346_read_z();
+      printf("Z Acceleration: %u\n", acceleration);
+    }
+  }
+
+  PROCESS_END();
+}
diff --git a/examples/openmote-cc2538/test-max44009.c b/examples/openmote-cc2538/test-max44009.c
new file mode 100644
index 000000000..8085283ca
--- /dev/null
+++ b/examples/openmote-cc2538/test-max44009.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2014, OpenMote Technologies, S.L.
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup openmote-examples
+ * @{
+ *
+ * \defgroup openmote-max44009
+ *
+ *    This example tests the correct functionality of the MAX44009 light
+ *    sensor using the I2C bus.
+ *
+ * @{
+ *
+ * \file
+ *          Testing the MAX44009 sensor on the OpenMote-CC2538 platform.
+ * \author
+ *         Pere Tuset <peretuset@openmote.com>
+ */
+
+#include "contiki.h"
+#include "dev/max44009.h"
+#include "dev/leds.h"
+#include <stdio.h>
+
+PROCESS(test_max44009_process, "MAX44009 test");
+AUTOSTART_PROCESSES(&test_max44009_process);
+
+PROCESS_THREAD(test_max44009_process, ev, data)
+{
+  static struct etimer et;
+  static unsigned raw;
+  static float light;
+
+  PROCESS_BEGIN();
+  max44009_init();
+
+if (!max44009_is_present()) {
+    leds_on(LEDS_ORANGE);
+  }
+
+  while(1) {
+    etimer_set(&et, CLOCK_SECOND);
+
+    PROCESS_YIELD();
+
+    if (ev == PROCESS_EVENT_TIMER) {
+      leds_on(LEDS_YELLOW);
+      raw = max44009_read_light();
+      light = max44009_convert_light(raw);
+      printf("Light: %u.%u\n", (unsigned int) light, (unsigned int) (light * 100) % 100);
+      leds_off(LEDS_YELLOW);
+    }
+  }
+
+  PROCESS_END();
+}
diff --git a/examples/openmote-cc2538/test-sht21.c b/examples/openmote-cc2538/test-sht21.c
new file mode 100644
index 000000000..cefdb3266
--- /dev/null
+++ b/examples/openmote-cc2538/test-sht21.c
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2014, OpenMote Technologies, S.L.
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup openmote-examples
+ * @{
+ *
+ * \defgroup openmote-sht21
+ *
+ *    This example tests the correct functionality of the SHT21 temperature
+ *    and humidity sensor using the I2C bus.
+ *
+ * @{
+ *
+ * \file
+ *          Testing the SHT21 sensor on the OpenMote-CC2538 platform.
+ * \author
+ *         Pere Tuset <peretuset@openmote.com>
+ */
+
+#include "contiki.h"
+#include "dev/sht21.h"
+#include "dev/leds.h"
+#include "sys/etimer.h"
+
+#include <stdio.h>
+
+PROCESS(test_sht21_process, "SHT21 test");
+AUTOSTART_PROCESSES(&test_sht21_process);
+
+PROCESS_THREAD(test_sht21_process, ev, data)
+{
+  static struct etimer et;
+  static unsigned raw;
+  static float temperature;
+  static float humidity;
+
+  PROCESS_BEGIN();
+  sht21_init();
+
+  if (!sht21_is_present()) {
+    leds_on(LEDS_ORANGE);
+  }
+
+  while(1) {
+    etimer_set(&et, CLOCK_SECOND);
+
+    PROCESS_YIELD();
+
+    if (ev == PROCESS_EVENT_TIMER) {
+      leds_on(LEDS_YELLOW);
+      raw = sht21_read_temperature();
+      temperature = sht21_convert_temperature(raw);
+      printf("Temperature:   %u.%u degrees Celsius\n", (unsigned int) temperature, (unsigned int) (temperature * 100) % 100);
+      raw = sht21_read_humidity();
+      humidity = sht21_convert_humidity(raw);
+      printf("Rel. humidity: %u.%u%%\n",  (unsigned int) humidity, (unsigned int) (humidity * 100) % 100);
+      leds_off(LEDS_YELLOW	);
+    }
+  }
+  
+  PROCESS_END();
+}
diff --git a/examples/openmote-cc2538/test-timer.c b/examples/openmote-cc2538/test-timer.c
new file mode 100644
index 000000000..3eb8ff2ff
--- /dev/null
+++ b/examples/openmote-cc2538/test-timer.c
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2014, OpenMote Technologies, S.L.
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup openmote-examples
+ * @{
+ *
+ * \defgroup openmote-timers OpenMote-CC2538 Timer Test Project
+ *
+ *    This example tests the correct functionality of clocks and timers.
+ *
+ *    More specifically, it tests clock_seconds, rtimers, etimers and
+ *    clock_delay_usec.
+ *
+ *    This is largely-based on the same example of the cc2530 port.
+ * @{
+ *
+ * \file
+ *         Tests related to clocks and timers.
+ * \author
+ *         Pere Tuset <peretuset@openmote.com>
+ */
+
+#include "contiki.h"
+#include "sys/clock.h"
+#include "sys/rtimer.h"
+#include "dev/leds.h"
+
+#include <stdio.h>
+/*---------------------------------------------------------------------------*/
+#define TIMER_TEST_CONF_TEST_CLOCK_DELAY_USEC 1
+#define TIMER_TEST_CONF_TEST_RTIMER           1
+#define TIMER_TEST_CONF_TEST_ETIMER           1
+#define TIMER_TEST_CONF_TEST_CLOCK_SECONDS    1
+/*---------------------------------------------------------------------------*/
+static struct etimer et;
+
+#if TIMER_TEST_CONF_TEST_CLOCK_DELAY_USEC
+static rtimer_clock_t start_count, end_count, diff;
+#endif
+
+#if TIMER_TEST_CONF_TEST_CLOCK_SECONDS
+static unsigned long sec;
+#endif
+
+#if TIMER_TEST_CONF_TEST_ETIMER
+static clock_time_t count;
+#endif
+
+#if TIMER_TEST_CONF_TEST_RTIMER
+static struct rtimer rt;
+rtimer_clock_t rt_now, rt_for;
+static clock_time_t ct;
+#endif
+
+static uint8_t i;
+/*---------------------------------------------------------------------------*/
+PROCESS(timer_test_process, "Timer test process");
+AUTOSTART_PROCESSES(&timer_test_process);
+/*---------------------------------------------------------------------------*/
+#if TIMER_TEST_CONF_TEST_RTIMER
+void
+rt_callback(struct rtimer *t, void *ptr)
+{
+  rt_now = RTIMER_NOW();
+  ct = clock_time();
+  printf("Task called at %lu (clock = %lu)\n", rt_now, ct);
+}
+#endif
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(timer_test_process, ev, data)
+{
+
+  PROCESS_BEGIN();
+
+  etimer_set(&et, 2 * CLOCK_SECOND);
+
+  PROCESS_YIELD();
+
+#if TIMER_TEST_CONF_TEST_CLOCK_DELAY_USEC
+  printf("-----------------------------------------\n");
+  printf("clock_delay_usec test, (10,000 x i) usec:\n");
+  printf("N.B. clock_delay_usec is more accurate than rtimers\n");
+  i = 1;
+  while(i < 7) {
+    start_count = RTIMER_NOW();
+    clock_delay_usec(10000 * i);
+    end_count = RTIMER_NOW();
+    diff = end_count - start_count;
+    printf("Requested: %u usec, Real: %lu rtimer ticks = ~%lu us\n",
+           10000 * i, diff, diff * 1000000 / RTIMER_SECOND);
+    i++;
+  }
+#endif
+
+#if TIMER_TEST_CONF_TEST_RTIMER
+  printf("-----------------------------------------\n");
+  printf("Rtimer Test, 1 sec (%u rtimer ticks):\n", RTIMER_SECOND);
+  i = 0;
+  while(i < 5) {
+    etimer_set(&et, 2 * CLOCK_SECOND);
+    printf("=======================\n");
+    ct = clock_time();
+    rt_now = RTIMER_NOW();
+    rt_for = rt_now + RTIMER_SECOND;
+    printf("Now=%lu (clock = %lu) - For=%lu\n", rt_now, ct, rt_for);
+    if(rtimer_set(&rt, rt_for, 1, rt_callback, NULL) != RTIMER_OK) {
+      printf("Error setting\n");
+    }
+
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+    i++;
+  }
+#endif
+
+#if TIMER_TEST_CONF_TEST_ETIMER
+  printf("-----------------------------------------\n");
+  printf("Clock tick and etimer test, 1 sec (%u clock ticks):\n",
+         CLOCK_SECOND);
+  i = 0;
+  while(i < 10) {
+    etimer_set(&et, CLOCK_SECOND);
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+    etimer_reset(&et);
+
+    count = clock_time();
+    printf("%lu ticks\n", count);
+
+    leds_toggle(LEDS_RED);
+    i++;
+  }
+#endif
+
+#if TIMER_TEST_CONF_TEST_CLOCK_SECONDS
+  printf("-----------------------------------------\n");
+  printf("Clock seconds test (5s):\n");
+  i = 0;
+  while(i < 10) {
+    etimer_set(&et, 5 * CLOCK_SECOND);
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+    etimer_reset(&et);
+
+    sec = clock_seconds();
+    printf("%lu seconds\n", sec);
+
+    leds_toggle(LEDS_GREEN);
+    i++;
+  }
+#endif
+
+  printf("Done!\n");
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/openmote-cc2538/Makefile.openmote-cc2538 b/platform/openmote-cc2538/Makefile.openmote-cc2538
new file mode 100644
index 000000000..878b81877
--- /dev/null
+++ b/platform/openmote-cc2538/Makefile.openmote-cc2538
@@ -0,0 +1,50 @@
+# openmote-cc2538 platform makefile
+
+ifndef CONTIKI
+  $(error CONTIKI not defined! You must specify where CONTIKI resides!)
+endif
+
+### Configure the build for the board and pull in board-specific sources
+CONTIKI_TARGET_DIRS += . dev
+PLATFORM_ROOT_DIR = $(CONTIKI)/platform/$(TARGET)
+
+### Include
+CONTIKI_TARGET_SOURCEFILES += contiki-main.c board.c
+CONTIKI_TARGET_SOURCEFILES += leds-arch.c button-sensor.c smartrf-sensors.c
+CONTIKI_TARGET_SOURCEFILES += antenna.c adxl346.c max44009.c sht21.c tps62730.c
+
+CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
+
+CLEAN += *.openmote-cc2538
+
+### Unless the example dictates otherwise, build with code size optimisations
+ifndef SMALL
+  SMALL = 1
+endif
+
+### Define the CPU directory
+CONTIKI_CPU=$(CONTIKI)/cpu/cc2538
+include $(CONTIKI_CPU)/Makefile.cc2538
+
+MODULES += core/net core/net/mac \
+           core/net/mac/contikimac \
+           core/net/llsec core/net/llsec/noncoresec
+
+PYTHON = python
+BSL_FLAGS += -e -w --bootloader-invert-lines -b 115200 -v
+
+ifdef PORT
+  BSL_FLAGS += -p $(PORT)
+endif
+
+BSL = $(CONTIKI)/tools/cc2538-bsl/cc2538-bsl.py
+
+%.upload: %.bin %.elf
+ifeq ($(wildcard $(BSL)), )
+	@echo "ERROR: Could not find the cc2538-bsl script. Did you run 'git submodule update --init' ?"
+else
+	$(eval BSL_ADDRESS_ARG := -a $(shell $(OBJDUMP) -h $*.elf | grep -B1 LOAD | \
+	                               grep -Ev 'LOAD|\-\-' | awk '{print "0x" $$5}' | \
+	                               sort -g | head -1))
+	$(PYTHON) $(BSL) $(BSL_FLAGS) $(BSL_ADDRESS_ARG) $<
+endif
diff --git a/platform/openmote-cc2538/README.md b/platform/openmote-cc2538/README.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/platform/openmote-cc2538/board.c b/platform/openmote-cc2538/board.c
new file mode 100644
index 000000000..0b565b43c
--- /dev/null
+++ b/platform/openmote-cc2538/board.c
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2014, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup openmote-cc2538
+ * @{
+ *
+ * \file
+ *  Board-initialisation for the OpenMote-CC2538 platform
+ *
+ */
+/*---------------------------------------------------------------------------*/
+#include "contiki-conf.h"
+#include "dev/antenna.h"
+#include <stdint.h>
+#include <string.h>
+/*---------------------------------------------------------------------------*/
+static void
+configure_unused_pins(void)
+{
+  /* FIXME */
+}
+/*---------------------------------------------------------------------------*/
+void
+board_init()
+{
+  antenna_init();
+  configure_unused_pins();
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ */
+
diff --git a/platform/openmote-cc2538/board.h b/platform/openmote-cc2538/board.h
new file mode 100644
index 000000000..08538a995
--- /dev/null
+++ b/platform/openmote-cc2538/board.h
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2012, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+
+/**
+ * \addtogroup platform
+ * @{
+ *
+ * \defgroup openmote
+ *
+ * \file
+ * Header file with definitions related to the I/O connections on the
+ * OpenMote-CC2538 platform. This file provides connectivity information on
+ * LEDs, Buttons, UART and other peripherals.
+ *
+ * \note
+ * Do not include this file directly. It gets included by contiki-conf
+ * after all relevant directives have been set.
+ */
+
+#ifndef BOARD_H_
+#define BOARD_H_
+/*---------------------------------------------------------------------------*/
+#include "dev/gpio.h"
+#include "dev/nvic.h"
+/*---------------------------------------------------------------------------*/
+/** \name OpenMote-CC2538 LED configuration
+ *
+ * LEDs on the OpenMote-CC2538 are connected as follows:
+ * - LED1 (Red)    -> PC4
+ * - LED2 (Yellow) -> PC6
+ * - LED3 (Green)  -> PC7
+ * - LED4 (Orange) -> PC5
+ *
+ * @{
+ */
+/*---------------------------------------------------------------------------*/
+/* Some files include leds.h before us, so we need to get rid of defaults in
+ * leds.h before we provide correct definitions */
+#undef LEDS_GREEN
+#undef LEDS_YELLOW
+#undef LEDS_RED
+#undef LEDS_CONF_ALL
+
+#define LEDS_RED       16  /**< LED1 (Red) -> PC4 */
+#define LEDS_YELLOW    64  /**< LED2 (Yellow) -> PC6 */
+#define LEDS_GREEN     128 /**< LED3 (Green)  -> PC7 */
+#define LEDS_ORANGE    32  /**< LED4 (Orange) -> PC5 */
+#define LEDS_CONF_ALL  240
+
+/* Notify various examples that we have LEDs */
+#define PLATFORM_HAS_LEDS        1
+/** @} */
+/*---------------------------------------------------------------------------*/
+/** \name USB configuration
+ *
+ * The USB pullup is driven by PC0
+ */
+#define USB_PULLUP_PORT          GPIO_C_NUM
+#define USB_PULLUP_PIN           0
+/** @} */
+/*---------------------------------------------------------------------------*/
+/** \name UART configuration
+ *
+ * On the OpenMote, the UART is connected to the
+ * following ports/pins
+ * - RX:  PA0
+ * - TX:  PA1
+ * - CTS: PB0 (Can only be used with UART1)
+ * - RTS: PD3 (Can only be used with UART1)
+ *
+ * We configure the port to use UART0. To use UART1, replace UART0_* with
+ * UART1_* below.
+ * @{
+ */
+#define UART0_RX_PORT            GPIO_A_NUM
+#define UART0_RX_PIN             0
+
+#define UART0_TX_PORT            GPIO_A_NUM
+#define UART0_TX_PIN             1
+
+#define UART1_CTS_PORT           GPIO_B_NUM
+#define UART1_CTS_PIN            0
+
+#define UART1_RTS_PORT           GPIO_D_NUM
+#define UART1_RTS_PIN            3
+/** @} */
+/*---------------------------------------------------------------------------*/
+/** \name OpenMote-CC2538 Button configuration
+ *
+ * Buttons on the OpenMote-CC2538 are connected as follows:
+ * - BUTTON_USER -> PC3
+ * @{
+ */
+/** BUTTON_USER -> PC3 */
+#define BUTTON_USER_PORT       GPIO_C_NUM
+#define BUTTON_USER_PIN        3
+#define BUTTON_USER_VECTOR     NVIC_INT_GPIO_PORT_C
+/* Notify various examples that we have Buttons */
+#define PLATFORM_HAS_BUTTON    1
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name SPI configuration
+ *
+ * These values configure which CC2538 pins to use for the SPI lines.
+ * @{
+ */
+#define SPI_CLK_PORT             GPIO_A_NUM
+#define SPI_CLK_PIN              2
+#define SPI_MOSI_PORT            GPIO_A_NUM
+#define SPI_MOSI_PIN             5
+#define SPI_MISO_PORT            GPIO_A_NUM
+#define SPI_MISO_PIN             4
+#define SPI_SEL_PORT             GPIO_A_NUM
+#define SPI_SEL_PIN              3
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name I2C configuration
+ *
+ * These values configure which CC2538 pins to use for the I2C lines.
+ * @{
+ */
+#define I2C_SCL_PORT             GPIO_B_NUM
+#define I2C_SCL_PIN              3
+#define I2C_SDA_PORT             GPIO_B_NUM
+#define I2C_SDA_PIN              4
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name Device string used on startup
+ * @{
+ */
+#define BOARD_STRING "OpenMote-CC2538"
+/** @} */
+/*---------------------------------------------------------------------------*/
+#endif /* BOARD_H_ */
+/** @} */
diff --git a/platform/openmote-cc2538/contiki-conf.h b/platform/openmote-cc2538/contiki-conf.h
new file mode 100644
index 000000000..44a15e539
--- /dev/null
+++ b/platform/openmote-cc2538/contiki-conf.h
@@ -0,0 +1,536 @@
+/**
+ * \addtogroup openmote
+ * @{
+ *
+ * \file
+ *  Configuration for the OpenMote-CC2538 platform.
+ */
+#ifndef CONTIKI_CONF_H_
+#define CONTIKI_CONF_H_
+
+#include <stdint.h>
+#include <string.h>
+/*---------------------------------------------------------------------------*/
+/* Include Project Specific conf */
+#ifdef PROJECT_CONF_H
+#include PROJECT_CONF_H
+#endif /* PROJECT_CONF_H */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name Compiler configuration and platform-specific type definitions
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#define CLOCK_CONF_SECOND 128
+
+/* Compiler configurations */
+#define CCIF
+#define CLIF
+
+/* Platform typedefs */
+typedef uint32_t clock_time_t;
+typedef uint32_t uip_stats_t;
+
+/*
+ * rtimer.h typedefs rtimer_clock_t as unsigned short. We need to define
+ * RTIMER_CLOCK_LT to override this
+ */
+typedef uint32_t rtimer_clock_t;
+#define RTIMER_CLOCK_LT(a, b)     ((int32_t)((a) - (b)) < 0)
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name Serial Boot Loader Backdoor configuration
+ *
+ * @{
+ */
+#ifndef FLASH_CCA_CONF_BOOTLDR_BACKDOOR
+#define FLASH_CCA_CONF_BOOTLDR_BACKDOOR 1 /**<Enable the boot loader backdoor */
+#endif
+ 
+#ifndef FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PORT_A_PIN
+#define FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PORT_A_PIN 6 /**< Pin PA6 (ON/SLEEP on the OpenBase), activates the boot loader */
+#endif
+
+#ifndef FLASH_CCA_CONF_BOOTLDR_BACKDOOR_ACTIVE_HIGH
+#define FLASH_CCA_CONF_BOOTLDR_BACKDOOR_ACTIVE_HIGH 0 /**< A logic low level activates the boot loader */
+#endif
+/** @} */
+
+/*---------------------------------------------------------------------------*/
+/**
+ * \name CFS configuration
+ *
+ * @{
+ */
+#define COFFEE_CONF_SIZE            (4 * COFFEE_SECTOR_SIZE)
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name Watchdog Timer configuration
+ *
+ * @{
+ */
+#ifndef WATCHDOG_CONF_ENABLE
+#define WATCHDOG_CONF_ENABLE        1 /**< Enable the watchdog timer */
+#endif
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name USB 'core' configuration
+ *
+ * Those values are not meant to be modified by the user, except where stated
+ * otherwise
+ * @{
+ */
+#define CTRL_EP_SIZE                8
+#define USB_EP1_SIZE               32
+#define USB_EP2_SIZE               64
+#define USB_EP3_SIZE               64
+#define USB_ARCH_WRITE_NOTIFY       0
+
+#ifndef USB_ARCH_CONF_DMA
+#define USB_ARCH_CONF_DMA           1 /**< Change to Enable/Disable USB DMA */
+
+#endif
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name Generic Configuration directives
+ *
+ * @{
+ */
+#ifndef ENERGEST_CONF_ON
+#define ENERGEST_CONF_ON            0 /**< Energest Module */
+#endif
+
+#ifndef STARTUP_CONF_VERBOSE
+#define STARTUP_CONF_VERBOSE        1 /**< Set to 0 to decrease startup verbosity */
+#endif
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name uDMA Configuration and channel allocations
+ *
+ * @{
+ */
+#define USB_ARCH_CONF_RX_DMA_CHAN   0 /**< USB -> RAM DMA channel */
+#define USB_ARCH_CONF_TX_DMA_CHAN   1 /**< RAM -> USB DMA channel */
+#define CC2538_RF_CONF_TX_DMA_CHAN  2 /**< RF -> RAM DMA channel */
+#define CC2538_RF_CONF_RX_DMA_CHAN  3 /**< RAM -> RF DMA channel */
+#define UDMA_CONF_MAX_CHANNEL       CC2538_RF_CONF_RX_DMA_CHAN
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name Character I/O Configuration
+ *
+ * @{
+ */
+#ifndef UART_CONF_ENABLE
+#define UART_CONF_ENABLE            1 /**< Enable/Disable UART I/O */
+#endif
+
+#ifndef UART0_CONF_BAUD_RATE
+#define UART0_CONF_BAUD_RATE   115200 /**< Default UART0 baud rate */
+#endif
+
+#ifndef UART1_CONF_BAUD_RATE
+#define UART1_CONF_BAUD_RATE   115200 /**< Default UART1 baud rate */
+#endif
+
+#ifndef SLIP_ARCH_CONF_USB
+#define SLIP_ARCH_CONF_USB          0 /**< SLIP over UART by default */
+#endif
+
+#ifndef CC2538_RF_CONF_SNIFFER_USB
+#define CC2538_RF_CONF_SNIFFER_USB  0 /**< Sniffer out over UART by default */
+#endif
+
+#ifndef DBG_CONF_USB
+#define DBG_CONF_USB                0 /**< All debugging over UART by default */
+#endif
+
+#ifndef SERIAL_LINE_CONF_UART
+#define SERIAL_LINE_CONF_UART       0 /**< UART to use with serial line */
+#endif
+
+#if !SLIP_ARCH_CONF_USB
+#ifndef SLIP_ARCH_CONF_UART
+#define SLIP_ARCH_CONF_UART         0 /**< UART to use with SLIP */
+#endif
+#endif
+
+#if !CC2538_RF_CONF_SNIFFER_USB
+#ifndef CC2538_RF_CONF_SNIFFER_UART
+#define CC2538_RF_CONF_SNIFFER_UART 0 /**< UART to use with sniffer */
+#endif
+#endif
+
+#if !DBG_CONF_USB
+#ifndef DBG_CONF_UART
+#define DBG_CONF_UART               0 /**< UART to use for debugging */
+#endif
+#endif
+
+#ifndef UART1_CONF_UART
+#define UART1_CONF_UART             0 /**< UART to use for examples relying on
+                                           the uart1_* API */
+#endif
+
+/* Turn off example-provided putchars */
+#define SLIP_BRIDGE_CONF_NO_PUTCHAR 1
+#define SLIP_RADIO_CONF_NO_PUTCHAR  1
+
+#ifndef SLIP_ARCH_CONF_ENABLED
+/*
+ * Determine whether we need SLIP
+ * This will keep working while UIP_FALLBACK_INTERFACE and CMD_CONF_OUTPUT
+ * keep using SLIP
+ */
+#if defined(UIP_FALLBACK_INTERFACE) || defined(CMD_CONF_OUTPUT)
+#define SLIP_ARCH_CONF_ENABLED      1
+#endif
+#endif
+
+/*
+ * When set, the radio turns off address filtering and sends all captured
+ * frames down a peripheral (UART or USB, depending on the value of
+ * CC2538_RF_CONF_SNIFFER_USB)
+ */
+#ifndef CC2538_RF_CONF_SNIFFER
+#define CC2538_RF_CONF_SNIFFER      0
+#endif
+
+/**
+ * \brief Define this as 1 to build a headless node.
+ *
+ * The UART will not be initialised its clock will be gated, offering some
+ * energy savings. The USB will not be initialised either
+ */
+#ifndef CC2538_CONF_QUIET
+#define CC2538_CONF_QUIET           0
+#endif
+
+/* CC2538_CONF_QUIET is hard and overrides all other related defines */
+#if CC2538_CONF_QUIET
+#undef USB_SERIAL_CONF_ENABLE
+#define USB_SERIAL_CONF_ENABLE      0
+
+#undef UART_CONF_ENABLE
+#define UART_CONF_ENABLE            0
+
+#undef STARTUP_CONF_VERBOSE
+#define STARTUP_CONF_VERBOSE        0
+
+/* Little sanity check: We can't have quiet sniffers */
+#if CC2538_RF_CONF_SNIFFER
+#error "CC2538_RF_CONF_SNIFFER == 1 and CC2538_CONF_QUIET == 1"
+#error "These values are conflicting. Please set either to 0"
+#endif
+#endif /* CC2538_CONF_QUIET */
+
+/**
+ * \brief Enable the USB core only if we need it
+ */
+#ifndef USB_SERIAL_CONF_ENABLE
+#define USB_SERIAL_CONF_ENABLE \
+  ((SLIP_ARCH_CONF_USB & SLIP_ARCH_CONF_ENABLED) | \
+   DBG_CONF_USB | \
+   (CC2538_RF_CONF_SNIFFER & CC2538_RF_CONF_SNIFFER_USB))
+#endif
+
+/*
+ * If debugging and SLIP use the same peripheral, this will be 1. Don't modify
+ * this
+ */
+#if SLIP_ARCH_CONF_ENABLED
+#define DBG_CONF_SLIP_MUX (SLIP_ARCH_CONF_USB == DBG_CONF_USB && \
+                           (SLIP_ARCH_CONF_USB || \
+                            SLIP_ARCH_CONF_UART == DBG_CONF_UART))
+#endif
+
+/*
+ * Automatic detection of whether a specific UART is in use
+ */
+#define UART_IN_USE_BY_SERIAL_LINE(u) (SERIAL_LINE_CONF_UART == (u))
+#define UART_IN_USE_BY_SLIP(u)        (SLIP_ARCH_CONF_ENABLED && \
+                                       !SLIP_ARCH_CONF_USB && \
+                                       SLIP_ARCH_CONF_UART == (u))
+#define UART_IN_USE_BY_RF_SNIFFER(u)  (CC2538_RF_CONF_SNIFFER && \
+                                       !CC2538_RF_CONF_SNIFFER_USB && \
+                                       CC2538_RF_CONF_SNIFFER_UART == (u))
+#define UART_IN_USE_BY_DBG(u)         (!DBG_CONF_USB && DBG_CONF_UART == (u))
+#define UART_IN_USE_BY_UART1(u)       (UART1_CONF_UART == (u))
+
+#define UART_IN_USE(u) ( \
+  UART_CONF_ENABLE && \
+  (UART_IN_USE_BY_SERIAL_LINE(u) || \
+   UART_IN_USE_BY_SLIP(u) || \
+   UART_IN_USE_BY_RF_SNIFFER(u) || \
+   UART_IN_USE_BY_DBG(u) || \
+   UART_IN_USE_BY_UART1(u)) \
+)
+/** @} */
+/*---------------------------------------------------------------------------*/
+/* board.h assumes that basic configuration is done */
+#include "board.h"
+/*---------------------------------------------------------------------------*/
+/**
+ * \name Network Stack Configuration
+ *
+ * @{
+ */
+#ifndef NETSTACK_CONF_NETWORK
+#if NETSTACK_CONF_WITH_IPV6
+#define NETSTACK_CONF_NETWORK sicslowpan_driver
+#else
+#define NETSTACK_CONF_NETWORK rime_driver
+#endif /* NETSTACK_CONF_WITH_IPV6 */
+#endif /* NETSTACK_CONF_NETWORK */
+
+#ifndef NETSTACK_CONF_MAC
+#define NETSTACK_CONF_MAC     csma_driver
+#endif
+
+#ifndef NETSTACK_CONF_RDC
+#define NETSTACK_CONF_RDC     contikimac_driver
+#endif
+
+/* Configure NullRDC for when it's selected */
+#define NULLRDC_802154_AUTOACK                  1
+#define NULLRDC_802154_AUTOACK_HW               1
+
+/* Configure ContikiMAC for when it's selected */
+#define CONTIKIMAC_CONF_WITH_PHASE_OPTIMIZATION 0
+#define WITH_FAST_SLEEP                         1
+
+#ifndef NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE
+#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE    8
+#endif
+
+#ifndef NETSTACK_CONF_FRAMER
+#if NETSTACK_CONF_WITH_IPV6
+#define NETSTACK_CONF_FRAMER  framer_802154
+#else /* NETSTACK_CONF_WITH_IPV6 */
+#define NETSTACK_CONF_FRAMER  contikimac_framer
+#endif /* NETSTACK_CONF_WITH_IPV6 */
+#endif /* NETSTACK_CONF_FRAMER */
+
+#ifndef NETSTACK_CONF_RADIO
+#define NETSTACK_CONF_RADIO         cc2538_rf_driver
+#endif
+
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name LPM configuration
+ * @{
+ */
+#ifndef LPM_CONF_ENABLE
+#define LPM_CONF_ENABLE       1 /**< Set to 0 to disable LPM entirely */
+#endif
+
+/**
+ * \brief Maximum PM
+ *
+ * The SoC will never drop to a Power Mode deeper than the one specified here.
+ * 0 for PM0, 1 for PM1 and 2 for PM2
+ */
+#ifndef LPM_CONF_MAX_PM
+#define LPM_CONF_MAX_PM       1
+#endif
+
+#ifndef LPM_CONF_STATS
+#define LPM_CONF_STATS        0 /**< Set to 1 to enable LPM-related stats */
+#endif
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name IEEE address configuration
+ *
+ * Used to generate our RIME & IPv6 address
+ * @{
+ */
+/**
+ * \brief Location of the IEEE address
+ * 0 => Read from InfoPage,
+ * 1 => Use a hardcoded address, configured by IEEE_ADDR_CONF_ADDRESS
+ */
+#ifndef IEEE_ADDR_CONF_HARDCODED
+#define IEEE_ADDR_CONF_HARDCODED             0
+#endif
+
+/**
+ * \brief The hardcoded IEEE address to be used when IEEE_ADDR_CONF_HARDCODED
+ * is defined as 1
+ */
+#ifndef IEEE_ADDR_CONF_ADDRESS
+#define IEEE_ADDR_CONF_ADDRESS { 0x00, 0x12, 0x4B, 0x00, 0x89, 0xAB, 0xCD, 0xEF }
+#endif
+
+/**
+ * \brief Location of the IEEE address in the InfoPage when
+ * IEEE_ADDR_CONF_HARDCODED is defined as 0
+ * 0 => Use the primary address location
+ * 1 => Use the secondary address location
+ */
+#ifndef IEEE_ADDR_CONF_USE_SECONDARY_LOCATION
+#define IEEE_ADDR_CONF_USE_SECONDARY_LOCATION 0
+#endif
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name RF configuration
+ *
+ * @{
+ */
+/* RF Config */
+#ifndef IEEE802154_CONF_PANID
+#define IEEE802154_CONF_PANID           0xABCD
+#endif
+
+#ifndef CC2538_RF_CONF_CHANNEL
+#define CC2538_RF_CONF_CHANNEL              26
+#endif /* CC2538_RF_CONF_CHANNEL */
+
+#ifndef CC2538_RF_CONF_AUTOACK
+#define CC2538_RF_CONF_AUTOACK               1 /**< RF H/W generates ACKs */
+#endif /* CC2538_CONF_AUTOACK */
+
+#ifndef CC2538_RF_CONF_TX_USE_DMA
+#define CC2538_RF_CONF_TX_USE_DMA            1 /**< RF TX over DMA */
+#endif
+
+#ifndef CC2538_RF_CONF_RX_USE_DMA
+#define CC2538_RF_CONF_RX_USE_DMA            1 /**< RF RX over DMA */
+#endif
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name IPv6, RIME and network buffer configuration
+ *
+ * @{
+ */
+
+/* Don't let contiki-default-conf.h decide if we are an IPv6 build */
+#ifndef NETSTACK_CONF_WITH_IPV6
+#define NETSTACK_CONF_WITH_IPV6                        0
+#endif
+
+#if NETSTACK_CONF_WITH_IPV6
+/* Addresses, Sizes and Interfaces */
+/* 8-byte addresses here, 2 otherwise */
+#define LINKADDR_CONF_SIZE                   8
+#define UIP_CONF_LL_802154                   1
+#define UIP_CONF_LLH_LEN                     0
+#define UIP_CONF_NETIF_MAX_ADDRESSES         3
+
+/* TCP, UDP, ICMP */
+#ifndef UIP_CONF_TCP
+#define UIP_CONF_TCP                         1
+#endif
+#ifndef UIP_CONF_TCP_MSS
+#define UIP_CONF_TCP_MSS                    64
+#endif
+#define UIP_CONF_UDP                         1
+#define UIP_CONF_UDP_CHECKSUMS               1
+#define UIP_CONF_ICMP6                       1
+
+/* ND and Routing */
+#ifndef UIP_CONF_ROUTER
+#define UIP_CONF_ROUTER                      1
+#endif
+
+#define UIP_CONF_ND6_SEND_RA                 0
+#define UIP_CONF_IP_FORWARD                  0
+#define RPL_CONF_STATS                       0
+
+#ifndef RPL_CONF_OF
+#define RPL_CONF_OF rpl_mrhof
+#endif
+
+#define UIP_CONF_ND6_REACHABLE_TIME     600000
+#define UIP_CONF_ND6_RETRANS_TIMER       10000
+
+#ifndef NBR_TABLE_CONF_MAX_NEIGHBORS
+#define NBR_TABLE_CONF_MAX_NEIGHBORS                20
+#endif
+#ifndef UIP_CONF_MAX_ROUTES
+#define UIP_CONF_MAX_ROUTES                 20
+#endif
+
+/* uIP */
+#ifndef UIP_CONF_BUFFER_SIZE
+#define UIP_CONF_BUFFER_SIZE              1300
+#endif
+
+#define UIP_CONF_IPV6_QUEUE_PKT              0
+#define UIP_CONF_IPV6_CHECKS                 1
+#define UIP_CONF_IPV6_REASSEMBLY             0
+#define UIP_CONF_MAX_LISTENPORTS             8
+
+/* 6lowpan */
+#define SICSLOWPAN_CONF_COMPRESSION          SICSLOWPAN_COMPRESSION_HC06
+#ifndef SICSLOWPAN_CONF_COMPRESSION_THRESHOLD
+#define SICSLOWPAN_CONF_COMPRESSION_THRESHOLD 63
+#endif
+#ifndef SICSLOWPAN_CONF_FRAG
+#define SICSLOWPAN_CONF_FRAG                 1
+#endif
+#define SICSLOWPAN_CONF_MAXAGE               8
+
+/* Define our IPv6 prefixes/contexts here */
+#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS    1
+#ifndef SICSLOWPAN_CONF_ADDR_CONTEXT_0
+#define SICSLOWPAN_CONF_ADDR_CONTEXT_0 { \
+  addr_contexts[0].prefix[0] = 0xaa; \
+  addr_contexts[0].prefix[1] = 0xaa; \
+}
+#endif
+
+#define MAC_CONF_CHANNEL_CHECK_RATE          8
+
+#ifndef QUEUEBUF_CONF_NUM
+#define QUEUEBUF_CONF_NUM                    8
+#endif
+/*---------------------------------------------------------------------------*/
+#else /* NETSTACK_CONF_WITH_IPV6 */
+/* Network setup for non-IPv6 (rime). */
+#define UIP_CONF_IP_FORWARD                  1
+
+#ifndef UIP_CONF_BUFFER_SIZE
+#define UIP_CONF_BUFFER_SIZE               108
+#endif
+
+#define RIME_CONF_NO_POLITE_ANNOUCEMENTS     0
+
+#ifndef QUEUEBUF_CONF_NUM
+#define QUEUEBUF_CONF_NUM                    8
+#endif
+
+#endif /* NETSTACK_CONF_WITH_IPV6 */
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name Security
+ *
+ * @{
+ */
+#ifndef CRYPTO_CONF_INIT
+#define CRYPTO_CONF_INIT        1 /**< Whether to init cryptoprocessor */
+#endif
+
+#ifndef AES_128_CONF
+#define AES_128_CONF            cc2538_aes_128_driver /**< AES-128 driver */
+#endif
+
+#ifndef CCM_STAR_CONF
+#define CCM_STAR_CONF           cc2538_ccm_star_driver /**< AES-CCM* driver */
+#endif
+/** @} */
+/*---------------------------------------------------------------------------*/
+
+#endif /* CONTIKI_CONF_H_ */
+
+/** @} */
diff --git a/platform/openmote-cc2538/contiki-main.c b/platform/openmote-cc2538/contiki-main.c
new file mode 100644
index 000000000..72648088c
--- /dev/null
+++ b/platform/openmote-cc2538/contiki-main.c
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2012, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/**
+ * \addtogroup cc2538-platforms
+ * @{
+ *
+ * \defgroup openmote The OpenMote-CC2538 platform
+ *
+ * The OpenMote-CC2538 is based on the CC2538, the new platform by Texas Instruments
+ * based on an ARM Cortex-M3 core and a IEEE 802.15.4 radio.
+ * @{
+ *
+ * \file
+ * Main module for the OpenMote-CC2538 platform
+ */
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+#include "dev/leds.h"
+#include "dev/sys-ctrl.h"
+#include "dev/scb.h"
+#include "dev/nvic.h"
+#include "dev/uart.h"
+#include "dev/watchdog.h"
+#include "dev/ioc.h"
+#include "dev/button-sensor.h"
+#include "dev/serial-line.h"
+#include "dev/slip.h"
+#include "dev/cc2538-rf.h"
+#include "dev/udma.h"
+#include "dev/crypto.h"
+#include "usb/usb-serial.h"
+#include "lib/random.h"
+#include "net/netstack.h"
+#include "net/queuebuf.h"
+#include "net/ip/tcpip.h"
+#include "net/ip/uip.h"
+#include "net/mac/frame802154.h"
+#include "cpu.h"
+#include "reg.h"
+#include "ieee-addr.h"
+#include "lpm.h"
+
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+/*---------------------------------------------------------------------------*/
+#if STARTUP_CONF_VERBOSE
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+
+#if UART_CONF_ENABLE
+#define PUTS(s) puts(s)
+#else
+#define PUTS(s)
+#endif
+/*---------------------------------------------------------------------------*/
+/** \brief Board specific iniatialisation */
+void board_init(void);
+/*---------------------------------------------------------------------------*/
+static void
+fade(unsigned char l)
+{
+  volatile int i;
+  int k, j;
+  for(k = 0; k < 800; ++k) {
+    j = k > 400 ? 800 - k : k;
+
+    leds_on(l);
+    for(i = 0; i < j; ++i) {
+      asm("nop");
+    }
+    leds_off(l);
+    for(i = 0; i < 400 - j; ++i) {
+      asm("nop");
+    }
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+set_rf_params(void)
+{
+  uint16_t short_addr;
+  uint8_t ext_addr[8];
+
+  ieee_addr_cpy_to(ext_addr, 8);
+
+  short_addr = ext_addr[7];
+  short_addr |= ext_addr[6] << 8;
+
+  /* Populate linkaddr_node_addr. Maintain endianness */
+  memcpy(&linkaddr_node_addr, &ext_addr[8 - LINKADDR_SIZE], LINKADDR_SIZE);
+
+#if STARTUP_CONF_VERBOSE
+  {
+    int i;
+    printf("Rime configured with address ");
+    for(i = 0; i < LINKADDR_SIZE - 1; i++) {
+      printf("%02x:", linkaddr_node_addr.u8[i]);
+    }
+    printf("%02x\n", linkaddr_node_addr.u8[i]);
+  }
+#endif
+
+  NETSTACK_RADIO.set_value(RADIO_PARAM_PAN_ID, IEEE802154_PANID);
+  NETSTACK_RADIO.set_value(RADIO_PARAM_16BIT_ADDR, short_addr);
+  NETSTACK_RADIO.set_value(RADIO_PARAM_CHANNEL, CC2538_RF_CHANNEL);
+  NETSTACK_RADIO.set_object(RADIO_PARAM_64BIT_ADDR, ext_addr, 8);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Main routine for the OpenMote-CC2538 platforms
+ */
+int
+main(void)
+{
+  nvic_init();
+  ioc_init();
+  sys_ctrl_init();
+  clock_init();
+  lpm_init();
+  rtimer_init();
+  gpio_init();
+  leds_init();
+  fade(LEDS_RED);
+  process_init();
+  watchdog_init();
+
+  /*
+   * Character I/O Initialisation.
+   * When the UART receives a character it will call serial_line_input_byte to
+   * notify the core. The same applies for the USB driver.
+   *
+   * If slip-arch is also linked in afterwards (e.g. if we are a border router)
+   * it will overwrite one of the two peripheral input callbacks. Characters
+   * received over the relevant peripheral will be handled by
+   * slip_input_byte instead
+   */
+#if UART_CONF_ENABLE
+  uart_init(0);
+  uart_init(1);
+  uart_set_input(SERIAL_LINE_CONF_UART, serial_line_input_byte);
+#endif
+
+#if USB_SERIAL_CONF_ENABLE
+  usb_serial_init();
+  usb_serial_set_input(serial_line_input_byte);
+#endif
+
+  serial_line_init();
+
+  INTERRUPTS_ENABLE();
+  fade(LEDS_BLUE);
+
+  PUTS(CONTIKI_VERSION_STRING);
+  PUTS(BOARD_STRING);
+
+  /* Initialise the H/W RNG engine. */
+  random_init(0);
+
+  udma_init();
+
+  process_start(&etimer_process, NULL);
+  ctimer_init();
+
+  board_init();
+
+#if CRYPTO_CONF_INIT
+  crypto_init();
+  crypto_disable();
+#endif
+
+  netstack_init();
+  set_rf_params();
+
+  PRINTF(" Net: ");
+  PRINTF("%s\n", NETSTACK_NETWORK.name);
+  PRINTF(" MAC: ");
+  PRINTF("%s\n", NETSTACK_MAC.name);
+  PRINTF(" RDC: ");
+  PRINTF("%s\n", NETSTACK_RDC.name);
+
+#if NETSTACK_CONF_WITH_IPV6
+  memcpy(&uip_lladdr.addr, &linkaddr_node_addr, sizeof(uip_lladdr.addr));
+  queuebuf_init();
+  process_start(&tcpip_process, NULL);
+#endif /* NETSTACK_CONF_WITH_IPV6 */
+
+  process_start(&sensors_process, NULL);
+
+  SENSORS_ACTIVATE(button_sensor);
+
+  energest_init();
+  ENERGEST_ON(ENERGEST_TYPE_CPU);
+
+  autostart_start(autostart_processes);
+
+  watchdog_start();
+  fade(LEDS_GREEN);
+
+  while(1) {
+    uint8_t r;
+    do {
+      /* Reset watchdog and handle polls and events */
+      watchdog_periodic();
+
+      r = process_run();
+    } while(r > 0);
+
+    /* We have serviced all pending events. Enter a Low-Power mode. */
+    lpm_enter();
+  }
+}
+/*---------------------------------------------------------------------------*/
+
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/openmote-cc2538/dev/adxl346.c b/platform/openmote-cc2538/dev/adxl346.c
new file mode 100644
index 000000000..bdb934d2d
--- /dev/null
+++ b/platform/openmote-cc2538/dev/adxl346.c
@@ -0,0 +1,252 @@
+/*
+ * Copyright (c) 2014, OpenMote Technologies, S.L.
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup platform
+ * @{
+ *
+ * \defgroup openmote
+ *
+ * \file
+ * Driver for the ADXL346 acceleration sensor in OpenMote-CC2538.
+ *
+ * \author
+ * Pere Tuset <peretuset@openmote.com>
+ */
+
+/*---------------------------------------------------------------------------*/
+#include "dev/i2c.h"
+#include "dev/adxl346.h"
+/*---------------------------------------------------------------------------*/
+/* ADDRESS AND IDENTIFIER */
+#define ADXL346_ADDRESS                     (0x53)
+#define ADXL346_DEVID_VALUE                 (0xE6)
+
+/* REGISTER ADDRESSES */
+#define ADXL346_DEVID_ADDR                  (0x00)
+#define ADXL346_THRES_TAP_ADDR              (0x1D)
+#define ADXL346_OFSX_ADDR                   (0x1E)
+#define ADXL346_OFSY_ADDR                   (0x1F)
+#define ADXL346_OFSZ_ADDR                   (0x20)
+#define ADXL346_DUR_ADDR                    (0x21)
+#define ADXL346_LATENT_ADDR                 (0x22)
+#define ADXL346_WINDOW_ADDR                 (0x23)
+#define ADXL346_THRESH_ACT_ADDR             (0x24)
+#define ADXL346_THRESH_INACT_ADDR           (0x25)
+#define ADXL346_TIME_INACT_ADDR             (0x26)
+#define ADXL346_ACT_INACT_CTL_ADDR          (0x27)
+#define ADXL346_THRESH_FF_ADDR              (0x28)
+#define ADXL346_TIME_FF_ADDR                (0x29)
+#define ADXL346_TAP_AXES_ADDR               (0x2A)
+#define ADXL346_ACT_TAP_STATUS_ADDR         (0x2B)
+#define ADXL346_BW_RATE_ADDR                (0x2C)
+#define ADXL346_POWER_CTL_ADDR              (0x2D)
+#define ADXL346_INT_ENABLE_ADDR             (0x2E)
+#define ADXL346_INT_MAP_ADDR                (0x2F)
+#define ADXL346_INT_SOURCE_ADDR             (0x30)
+#define ADXL346_DATA_FORMAT_ADDR            (0x31)
+#define ADXL346_DATAX0_ADDR                 (0x32)
+#define ADXL346_DATAX1_ADDR                 (0x33)
+#define ADXL346_DATAY0_ADDR                 (0x34)
+#define ADXL346_DATAY1_ADDR                 (0x35)
+#define ADXL346_DATAZ0_ADDR                 (0x36)
+#define ADXL346_DATAZ1_ADDR                 (0x37)
+#define ADXL346_FIFO_CTL_ADDR               (0x38)
+#define ADXL346_FIFO_STATUS_ADDR            (0x39)
+#define ADXL346_TAP_SIGN_ADDR               (0x3A)
+#define ADXL346_ORIENT_CONF_ADDR            (0x3B)
+#define ADXL346_ORIENT_ADDR                 (0x3C)
+
+/* INT_ENABLE/INT_MAP/INT_SOURCE */
+#define ADXL346_INT_ENABLE_DATA_READY      (1 << 7)
+#define ADXL346_INT_ENABLE_SINGLE_TAP      (1 << 6)
+#define ADXL346_INT_ENABLE_DOUBLE_TAP      (1 << 5)
+#define ADXL346_INT_ENABLE_ACTIVITY        (1 << 4)
+#define ADXL346_INT_ENABLE_INACTIVITY      (1 << 3)
+#define ADXL346_INT_ENABLE_FREE_FALL       (1 << 2)
+#define ADXL346_INT_ENABLE_WATERMARK       (1 << 1)
+#define ADXL346_INT_ENABLE_OVERRUN         (1 << 0)
+
+/* ACT_INACT_CONTROL */
+#define ADXL346_ACT_INACT_CTL_ACT_ACDC     (1 << 7)
+#define ADXL346_ACT_INACT_CTL_ACT_X_EN     (1 << 6)
+#define ADXL346_ACT_INACT_CTL_ACT_Y_EN     (1 << 5)
+#define ADXL346_ACT_INACT_CTL_ACT_Z_EN     (1 << 4)
+#define ADXL346_ACT_INACT_CTL_INACT_ACDC   (1 << 3)
+#define ADXL346_ACT_INACT_CTL_INACT_X_EN   (1 << 2)
+#define ADXL346_ACT_INACT_CTL_INACT_Y_EN   (1 << 1)
+#define ADXL346_ACT_INACT_CTL_INACT_Z_EN   (1 << 0)
+
+/* TAP_AXES */
+#define ADXL346_TAP_AXES_SUPPRESS           (1 << 3)
+#define ADXL346_TAP_AXES_TAP_X_EN           (1 << 2)
+#define ADXL346_TAP_AXES_TAP_Y_EN           (1 << 1)
+#define ADXL346_TAP_AXES_TAP_Z_EN           (1 << 0)
+
+/* ACT_TAP_STATUS */
+#define ADXL346_ACT_TAP_STATUS_ACT_X_SRC    (1 << 6)
+#define ADXL346_ACT_TAP_STATUS_ACT_Y_SRC    (1 << 5)
+#define ADXL346_ACT_TAP_STATUS_ACT_Z_SRC    (1 << 4)
+#define ADXL346_ACT_TAP_STATUS_ASLEEP       (1 << 3)
+#define ADXL346_ACT_TAP_STATUS_TAP_X_SRC    (1 << 2)
+#define ADXL346_ACT_TAP_STATUS_TAP_Y_SRC    (1 << 1)
+#define ADXL346_ACT_TAP_STATUS_TAP_Z_SRC    (1 << 0)
+
+/* BW_RATE */
+#define ADXL346_BW_RATE_POWER               (1 << 4)
+#define ADXL346_BW_RATE_RATE(x)             ((x) & 0x0F)
+
+/* POWER CONTROL */
+#define ADXL346_POWER_CTL_LINK              (1 << 5)
+#define ADXL346_POWER_CTL_AUTO_SLEEP        (1 << 4)
+#define ADXL346_POWER_CTL_MEASURE           (1 << 3)
+#define ADXL346_POWER_CTL_SLEEP             (1 << 2)
+#define ADXL346_POWER_CTL_WAKEUP(x)         ((x) & 0x03)
+
+/* DATA_FORMAT */
+#define ADXL346_DATA_FORMAT_SELF_TEST       (1 << 7)
+#define ADXL346_DATA_FORMAT_SPI             (1 << 6)
+#define ADXL346_DATA_FORMAT_INT_INVERT      (1 << 5)
+#define ADXL346_DATA_FORMAT_FULL_RES        (1 << 3)
+#define ADXL346_DATA_FORMAT_JUSTIFY         (1 << 2)
+#define ADXL346_DATA_FORMAT_RANGE(x)        ((x) & 0x03)
+#define ADXL346_DATA_FORMAT_RANGE_PM_2g     (0)
+#define ADXL346_DATA_FORMAT_RANGE_PM_4g     (1)
+#define ADXL346_DATA_FORMAT_RANGE_PM_8g     (2)
+#define ADXL346_DATA_FORMAT_RANGE_PM_16g    (3)
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+void
+adxl346_init(void)
+{
+  uint8_t config[2];
+
+  i2c_init(I2C_SDA_PORT, I2C_SDA_PIN, I2C_SCL_PORT, I2C_SCL_PIN,
+           I2C_SCL_NORMAL_BUS_SPEED);
+
+  config[0] = ADXL346_BW_RATE_ADDR;
+  config[1] = (ADXL346_BW_RATE_RATE(11));
+  i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
+
+  config[0] = ADXL346_DATA_FORMAT_ADDR;
+  config[1] = (ADXL346_DATA_FORMAT_SELF_TEST |
+               ADXL346_DATA_FORMAT_FULL_RES |
+               ADXL346_DATA_FORMAT_RANGE_PM_16g);
+  i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
+
+  config[0] = ADXL346_POWER_CTL_ADDR;
+  config[1] = (ADXL346_POWER_CTL_MEASURE);
+  i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
+}
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+void
+adxl346_reset(void)
+{
+}
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+uint8_t
+adxl346_is_present(void)
+{
+  uint8_t is_present;
+
+  i2c_single_send(ADXL346_ADDRESS, ADXL346_DEVID_ADDR);
+  i2c_single_receive(ADXL346_ADDRESS, &is_present);
+
+  return is_present == ADXL346_DEVID_VALUE;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+uint16_t
+adxl346_read_x(void)
+{
+  uint8_t acceleration[2];
+  uint16_t x;
+
+  i2c_single_send(ADXL346_ADDRESS, ADXL346_DATAX0_ADDR);
+  i2c_single_receive(ADXL346_ADDRESS, &acceleration[0]);
+  i2c_single_send(ADXL346_ADDRESS, ADXL346_DATAX1_ADDR);
+  i2c_single_receive(ADXL346_ADDRESS, &acceleration[1]);
+
+  x = (acceleration[0] << 8) | acceleration[1];
+
+  return x;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+uint16_t
+adxl346_read_y(void)
+{
+  uint8_t acceleration[2];
+  uint16_t y;
+
+  i2c_single_send(ADXL346_ADDRESS, ADXL346_DATAY0_ADDR);
+  i2c_single_receive(ADXL346_ADDRESS, &acceleration[0]);
+  i2c_single_send(ADXL346_ADDRESS, ADXL346_DATAY1_ADDR);
+  i2c_single_receive(ADXL346_ADDRESS, &acceleration[1]);
+
+  y = (acceleration[0] << 8) | acceleration[1];
+
+  return y;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+uint16_t
+adxl346_read_z(void)
+{
+  uint8_t acceleration[2];
+  uint16_t z;
+
+  i2c_single_send(ADXL346_ADDRESS, ADXL346_DATAZ0_ADDR);
+  i2c_single_receive(ADXL346_ADDRESS, &acceleration[0]);
+  i2c_single_send(ADXL346_ADDRESS, ADXL346_DATAZ1_ADDR);
+  i2c_single_receive(ADXL346_ADDRESS, &acceleration[1]);
+
+  z = (acceleration[0] << 8) | acceleration[1];
+
+  return z;
+}
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/platform/openmote-cc2538/dev/adxl346.h b/platform/openmote-cc2538/dev/adxl346.h
new file mode 100644
index 000000000..d5e9eac76
--- /dev/null
+++ b/platform/openmote-cc2538/dev/adxl346.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2014, OpenMote Technologies, S.L.
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup platform
+ * @{
+ *
+ * \defgroup openmote
+ *
+ * \file
+ * Header for the ADXL346 acceleration sensor in OpenMote-CC2538.
+ *
+ * \author
+ * Pere Tuset <peretuset@openmote.com>
+ */
+
+#ifndef __ADXL346_H__
+#define __ADXL346_H__
+/*---------------------------------------------------------------------------*/
+void adxl346_init(void);
+void adxl346_reset(void);
+uint8_t adxl346_is_present(void);
+uint16_t adxl346_read_x(void);
+uint16_t adxl346_read_y(void);
+uint16_t adxl346_read_z(void);
+/*---------------------------------------------------------------------------*/
+#endif /* ifndef __ADXL346_H__ */
+/** @} */
diff --git a/platform/openmote-cc2538/dev/antenna.c b/platform/openmote-cc2538/dev/antenna.c
new file mode 100644
index 000000000..b0ad7b07e
--- /dev/null
+++ b/platform/openmote-cc2538/dev/antenna.c
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2014, Thingsquare, http://www.thingsquare.com/.
+ * 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 copyright holder 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 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 HOLDER 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.
+ *
+ */
+
+/**
+ * \addtogroup platform
+ * @{
+ *
+ * \defgroup openmote
+ *
+ * \file
+ * Driver for the antenna selection on the OpenMote-CC2538 platform.
+ */
+
+/*---------------------------------------------------------------------------*/
+#include "contiki-conf.h"
+#include "dev/gpio.h"
+#include "dev/antenna.h"
+/*---------------------------------------------------------------------------*/
+#define BSP_RADIO_BASE              (GPIO_D_BASE)
+#define BSP_RADIO_INT               (1 << 5)
+#define BSP_RADIO_EXT               (1 << 4)
+/*---------------------------------------------------------------------------*/
+static void
+gpio_set(int port, int bit)
+{
+  REG((port | GPIO_DATA) + (bit << 2)) = bit;
+}
+/*---------------------------------------------------------------------------*/
+static void
+gpio_reset(int port, int bit)
+{
+  REG((port | GPIO_DATA) + (bit << 2)) = 0;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * Configure the antenna using the RF switch
+ * INT is the internal antenna (chip) configured through ANT1_SEL (V1)
+ * EXT is the external antenna (connector) configured through ANT2_SEL (V2)
+ */
+void
+antenna_init(void)
+{
+  /* Configure the ANT1 and ANT2 GPIO as output */
+  GPIO_SET_OUTPUT(BSP_RADIO_BASE, BSP_RADIO_INT);
+  GPIO_SET_OUTPUT(BSP_RADIO_BASE, BSP_RADIO_EXT);
+
+  /* Select external antenna by default. */
+  antenna_external();
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * Select the external (connector) antenna
+ */
+void
+antenna_external(void)
+{
+  gpio_reset(BSP_RADIO_BASE, BSP_RADIO_INT);
+  gpio_set(BSP_RADIO_BASE, BSP_RADIO_EXT);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * Select the internal (chip) antenna
+ */
+void
+antenna_internal(void)
+{
+  gpio_reset(BSP_RADIO_BASE, BSP_RADIO_EXT);
+  gpio_set(BSP_RADIO_BASE, BSP_RADIO_INT);
+}
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/platform/openmote-cc2538/dev/antenna.h b/platform/openmote-cc2538/dev/antenna.h
new file mode 100644
index 000000000..8b14df4b0
--- /dev/null
+++ b/platform/openmote-cc2538/dev/antenna.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2014, Thingsquare, http://www.thingsquare.com/.
+ * 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 copyright holder 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 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 HOLDER 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.
+ *
+ */
+
+/**
+ * \addtogroup platform
+ * @{
+ *
+ * \defgroup openmote
+ *
+ * \file
+ * Header for the antenna selection on the OpenMote-CC2538 platform.
+ */
+
+#ifndef ANTENNA_H_
+#define ANTENNA_H_
+/*---------------------------------------------------------------------------*/
+void antenna_init(void);
+void antenna_internal(void);
+void antenna_external(void);
+/*---------------------------------------------------------------------------*/
+#endif /* ANTENNA_H_ */
+/** @} */
diff --git a/platform/openmote-cc2538/dev/button-sensor.c b/platform/openmote-cc2538/dev/button-sensor.c
new file mode 100644
index 000000000..6d85400d7
--- /dev/null
+++ b/platform/openmote-cc2538/dev/button-sensor.c
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2012, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+
+/**
+ * \addtogroup platform
+ * @{
+ *
+ * \defgroup openmote
+ *
+ * \file
+ * Driver for the OpenMote-CC2538 buttons
+ *
+ */
+
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+#include "dev/nvic.h"
+#include "dev/ioc.h"
+#include "dev/gpio.h"
+#include "dev/button-sensor.h"
+#include "sys/timer.h"
+
+#include <stdint.h>
+#include <string.h>
+/*---------------------------------------------------------------------------*/
+#define BUTTON_USER_PORT_BASE  GPIO_PORT_TO_BASE(BUTTON_USER_PORT)
+#define BUTTON_USER_PIN_MASK   GPIO_PIN_MASK(BUTTON_USER_PIN)
+/*---------------------------------------------------------------------------*/
+static struct timer debouncetimer;
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Common initialiser for all buttons
+ * \param port_base GPIO port's register offset
+ * \param pin_mask Pin mask corresponding to the button's pin
+ */
+static void
+config(uint32_t port_base, uint32_t pin_mask)
+{
+  /* Software controlled */
+  GPIO_SOFTWARE_CONTROL(port_base, pin_mask);
+
+  /* Set pin to input */
+  GPIO_SET_INPUT(port_base, pin_mask);
+
+  /* Enable edge detection */
+  GPIO_DETECT_EDGE(port_base, pin_mask);
+
+  /* Single edge */
+  GPIO_TRIGGER_SINGLE_EDGE(port_base, pin_mask);
+
+  /* Trigger interrupt on Falling edge */
+  GPIO_DETECT_RISING(port_base, pin_mask);
+
+  GPIO_ENABLE_INTERRUPT(port_base, pin_mask);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Callback registered with the GPIO module. Gets fired with a button
+ * port/pin generates an interrupt
+ * \param port The port number that generated the interrupt
+ * \param pin The pin number that generated the interrupt. This is the pin
+ * absolute number (i.e. 0, 1, ..., 7), not a mask
+ */
+static void
+btn_callback(uint8_t port, uint8_t pin)
+{
+  if(!timer_expired(&debouncetimer)) {
+    return;
+  }
+  timer_set(&debouncetimer, CLOCK_SECOND / 8);
+  if(port == GPIO_C_NUM) {
+    sensors_changed(&button_user_sensor);
+  }
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Init function for the select button.
+ *
+ * Parameters are ignored. They have been included because the prototype is
+ * dictated by the core sensor api. The return value is also not required by
+ * the API but otherwise ignored.
+ *
+ * \param type ignored
+ * \param value ignored
+ * \return ignored
+ */
+static int
+config_user(int type, int value)
+{
+  config(BUTTON_USER_PORT_BASE, BUTTON_USER_PIN_MASK);
+
+  ioc_set_over(BUTTON_USER_PORT, BUTTON_USER_PIN, IOC_OVERRIDE_PUE);
+
+  nvic_interrupt_enable(BUTTON_USER_VECTOR);
+
+  gpio_register_callback(btn_callback, BUTTON_USER_PORT, BUTTON_USER_PIN);
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+void
+button_sensor_init()
+{
+  timer_set(&debouncetimer, 0);
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(button_user_sensor, BUTTON_SENSOR, NULL, config_user, NULL);
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/platform/openmote-cc2538/dev/button-sensor.h b/platform/openmote-cc2538/dev/button-sensor.h
new file mode 100644
index 000000000..ec7849ee1
--- /dev/null
+++ b/platform/openmote-cc2538/dev/button-sensor.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2012, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+
+/**
+ * \addtogroup platform
+ * @{
+ *
+ * \defgroup openmote
+ *
+ * \file
+ * Header for the OpenMote-CC2538 buttons
+ *
+ */
+
+#ifndef BUTTON_SENSOR_H_
+#define BUTTON_SENSOR_H_
+/*---------------------------------------------------------------------------*/
+#include "lib/sensors.h"
+#include "dev/gpio.h"
+/*---------------------------------------------------------------------------*/
+#define BUTTON_SENSOR "Button"
+/*---------------------------------------------------------------------------*/
+#define button_sensor button_user_sensor
+extern const struct sensors_sensor button_user_sensor;
+/*---------------------------------------------------------------------------*/
+#endif /* BUTTON_SENSOR_H_ */
+
+/** \brief Common initialiser for all SmartRF Buttons */
+void button_sensor_init();
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/platform/openmote-cc2538/dev/leds-arch.c b/platform/openmote-cc2538/dev/leds-arch.c
new file mode 100644
index 000000000..13a4c1347
--- /dev/null
+++ b/platform/openmote-cc2538/dev/leds-arch.c
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2012, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+
+/**
+ * \addtogroup platform
+ * @{
+ *
+ * \defgroup openmote
+ *
+ * \file
+ * Driver for the OpenMote-CC2538 LEDs
+ *
+ */
+
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+#include "reg.h"
+#include "dev/leds.h"
+#include "dev/gpio.h"
+/*---------------------------------------------------------------------------*/
+#define LEDS_GPIO_PIN_MASK   LEDS_ALL
+/*---------------------------------------------------------------------------*/
+void
+leds_arch_init(void)
+{
+  GPIO_SET_OUTPUT(GPIO_C_BASE, LEDS_GPIO_PIN_MASK);
+}
+/*---------------------------------------------------------------------------*/
+unsigned char
+leds_arch_get(void)
+{
+  return GPIO_READ_PIN(GPIO_C_BASE, LEDS_GPIO_PIN_MASK);
+}
+/*---------------------------------------------------------------------------*/
+void
+leds_arch_set(unsigned char leds)
+{
+  GPIO_WRITE_PIN(GPIO_C_BASE, LEDS_GPIO_PIN_MASK, leds);
+}
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/platform/openmote-cc2538/dev/max44009.c b/platform/openmote-cc2538/dev/max44009.c
new file mode 100644
index 000000000..34bce89ab
--- /dev/null
+++ b/platform/openmote-cc2538/dev/max44009.c
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2014, OpenMote Technologies, S.L.
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup platform
+ * @{
+ *
+ * \defgroup openmote
+ *
+ * \file
+ * Driver for the MAX44009 light sensor in OpenMote-CC2538.
+ *
+ * \author
+ * Pere Tuset <peretuset@openmote.com>
+ */
+
+/*---------------------------------------------------------------------------*/
+#include "dev/i2c.h"
+#include "dev/max44009.h"
+/*---------------------------------------------------------------------------*/
+/* ADDRESS AND NOT_FOUND VALUE */
+#define MAX44009_ADDRESS                    (0x4A)
+#define MAX44009_NOT_FOUND                  (0x00)
+
+/* REGISTER ADDRESSES */
+#define MAX44009_INT_STATUS_ADDR            (0x00)      /* R */
+#define MAX44009_INT_ENABLE_ADDR            (0x01)      /* R/W */
+#define MAX44009_CONFIG_ADDR                (0x02)      /* R/W */
+#define MAX44009_LUX_HIGH_ADDR              (0x03)      /* R */
+#define MAX44009_LUX_LOW_ADDR               (0x04)      /* R */
+#define MAX44009_THR_HIGH_ADDR              (0x05)      /* R/W */
+#define MAX44009_THR_LOW_ADDR               (0x06)      /* R/W */
+#define MAX44009_THR_TIMER_ADDR             (0x07)      /* R/W */
+
+/* INTERRUPT VALUES */
+#define MAX44009_INT_STATUS_OFF             (0x00)
+#define MAX44009_INT_STATUS_ON              (0x01)
+#define MAX44009_INT_DISABLED               (0x00)
+#define MAX44009_INT_ENABLED                (0x01)
+
+/* CONFIGURATION VALUES */
+#define MAX44009_CONFIG_DEFAULT             (0 << 7)
+#define MAX44009_CONFIG_CONTINUOUS          (1 << 7)
+#define MAX44009_CONFIG_AUTO                (0 << 6)
+#define MAX44009_CONFIG_MANUAL              (1 << 6)
+#define MAX44009_CONFIG_CDR_NORMAL          (0 << 5)
+#define MAX44009_CONFIG_CDR_DIVIDED         (1 << 5)
+#define MAX44009_CONFIG_INTEGRATION_800ms   (0 << 0)
+#define MAX44009_CONFIG_INTEGRATION_400ms   (1 << 0)
+#define MAX44009_CONFIG_INTEGRATION_200ms   (2 << 0)
+#define MAX44009_CONFIG_INTEGRATION_100ms   (3 << 0)
+#define MAX44009_CONFIG_INTEGRATION_50ms    (4 << 0)
+#define MAX44009_CONFIG_INTEGRATION_25ms    (5 << 0)
+#define MAX44009_CONFIG_INTEGRATION_12ms    (6 << 0)
+#define MAX44009_CONFIG_INTEGRATION_6ms     (7 << 0)
+
+/* DEFAULT CONFIGURATION */
+#define MAX44009_DEFAULT_CONFIGURATION      (MAX44009_CONFIG_DEFAULT | \
+                                             MAX44009_CONFIG_AUTO | \
+                                             MAX44009_CONFIG_CDR_NORMAL | \
+                                             MAX44009_CONFIG_INTEGRATION_100ms)
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+void
+max44009_init(void)
+{
+  uint8_t max44009_address[5] = { MAX44009_INT_ENABLE_ADDR, MAX44009_CONFIG_ADDR, \
+                                  MAX44009_THR_HIGH_ADDR, MAX44009_THR_LOW_ADDR, \
+                                  MAX44009_THR_TIMER_ADDR };
+  uint8_t max44009_value[5];
+  uint8_t max44009_data[2];
+  uint8_t i;
+
+  max44009_value[0] = (MAX44009_INT_STATUS_ON);
+  max44009_value[1] = (MAX44009_DEFAULT_CONFIGURATION);
+  max44009_value[2] = (0xFF);
+  max44009_value[3] = (0x00);
+  max44009_value[4] = (0xFF);
+
+  i2c_init(I2C_SDA_PORT, I2C_SDA_PIN, I2C_SCL_PORT, I2C_SCL_PIN,
+           I2C_SCL_NORMAL_BUS_SPEED);
+
+  for(i = 0; i < sizeof(max44009_address); i++) {
+    max44009_data[0] = max44009_value[i];
+    max44009_data[1] = max44009_data[i];
+    i2c_burst_send(MAX44009_ADDRESS, max44009_data, 2);
+  }
+}
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+void
+max44009_reset(void)
+{
+  uint8_t max44009_address[5] = { MAX44009_INT_ENABLE_ADDR, MAX44009_CONFIG_ADDR, \
+                                  MAX44009_THR_HIGH_ADDR, MAX44009_THR_LOW_ADDR, \
+                                  MAX44009_THR_TIMER_ADDR };
+  uint8_t max44009_value[5] = { 0x00, 0x03, 0xFF, 0x00, 0xFF };
+  uint8_t max44009_data[2];
+  uint8_t i;
+
+  for(i = 0; i < sizeof(max44009_address); i++) {
+    max44009_data[0] = max44009_value[i];
+    max44009_data[1] = max44009_data[i];
+    i2c_burst_send(MAX44009_ADDRESS, max44009_data, 2);
+  }
+}
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+uint8_t
+max44009_is_present(void)
+{
+  uint8_t is_present;
+
+  i2c_single_send(MAX44009_ADDRESS, MAX44009_CONFIG_ADDR);
+  i2c_single_receive(MAX44009_ADDRESS, &is_present);
+
+  return is_present != MAX44009_NOT_FOUND;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+uint16_t
+max44009_read_light(void)
+{
+  uint8_t exponent, mantissa;
+  uint8_t max44009_data[2];
+  uint16_t result;
+
+  i2c_single_send(MAX44009_ADDRESS, MAX44009_LUX_HIGH_ADDR);
+  i2c_single_receive(MAX44009_ADDRESS, &max44009_data[0]);
+  i2c_single_send(MAX44009_ADDRESS, MAX44009_LUX_LOW_ADDR);
+  i2c_single_receive(MAX44009_ADDRESS, &max44009_data[1]);
+
+  exponent = ((max44009_data[0] >> 4) & 0x0E);
+  mantissa = ((max44009_data[0] & 0x0F) << 4) | (max44009_data[1] & 0x0F);
+
+  result = ((uint16_t)exponent << 8) | ((uint16_t)mantissa << 0);
+
+  return result;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+float
+max44009_convert_light(uint16_t lux)
+{
+  uint8_t exponent, mantissa;
+  float result = 0.045;
+
+  exponent = (lux >> 8) & 0xFF;
+  exponent = (exponent == 0x0F ? exponent & 0x0E : exponent);
+  
+  mantissa = (lux >> 0) & 0xFF;
+
+  result *= 2 ^ exponent * mantissa;
+
+  return result;
+}
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/platform/openmote-cc2538/dev/max44009.h b/platform/openmote-cc2538/dev/max44009.h
new file mode 100644
index 000000000..dbc40775d
--- /dev/null
+++ b/platform/openmote-cc2538/dev/max44009.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2014, OpenMote Technologies, S.L.
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup platform
+ * @{
+ *
+ * \defgroup openmote
+ *
+ * \file
+ * Header for the MAX44009 light sensor in OpenMote-CC2538.
+ *
+ * \author
+ * Pere Tuset <peretuset@openmote.com>
+ */
+
+#ifndef __MAX44009_H__
+#define __MAX44009_H__
+/*---------------------------------------------------------------------------*/
+void max44009_init(void);
+void max44009_reset(void);
+uint8_t max44009_is_present(void);
+uint16_t max44009_read_light(void);
+float max44009_convert_light(uint16_t light);
+/*---------------------------------------------------------------------------*/
+#endif /* ifndef __MAX44009_H__ */
+/** @} */
diff --git a/platform/openmote-cc2538/dev/sht21.c b/platform/openmote-cc2538/dev/sht21.c
new file mode 100644
index 000000000..1ad07836f
--- /dev/null
+++ b/platform/openmote-cc2538/dev/sht21.c
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2014, OpenMote Technologies, S.L.
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup platform
+ * @{
+ *
+ * \defgroup openmote
+ *
+ * \file
+ * Driver for the SHT21 temperature and humidity sensor in OpenMote-CC2538.
+ *
+ * \author
+ * Pere Tuset <peretuset@openmote.com>
+ */
+
+/*---------------------------------------------------------------------------*/
+#include "i2c.h"
+#include "sht21.h"
+/*---------------------------------------------------------------------------*/
+#define SHT21_ADDRESS                   (0x40)
+
+#define SHT21_USER_REG_READ             (0xE7)
+#define SHT21_USER_REG_WRITE            (0xE6)
+#define SHT21_USER_REG_RESERVED_BITS    (0x38)
+
+#define SHT21_RESOLUTION_12b_14b        ((0 << 7) | (0 << 0))
+#define SHT21_RESOLUTION_8b_12b         ((0 << 7) | (1 << 0))
+#define SHT21_RESOLUTION_10b_13b        ((1 << 7) | (0 << 0))
+#define SHT21_RESOLUTION_11b_11b        ((1 << 7) | (1 << 0))
+#define SHT21_BATTERY_ABOVE_2V25        (0 << 6)
+#define SHT21_BATTERY_BELOW_2V25        (1 << 6)
+#define SHT21_ONCHIP_HEATER_ENABLE      (1 << 2)
+#define SHT21_ONCHIP_HEATER_DISABLE     (0 << 2)
+#define SHT21_OTP_RELOAD_ENABLE         (0 << 1)
+#define SHT21_OTP_RELOAD_DISABLE        (1 << 1)
+
+#define SHT21_TEMPERATURE_HM_CMD        (0xE3)
+#define SHT21_HUMIDITY_HM_CMD           (0xE5)
+#define SHT21_TEMPERATURE_NHM_CMD       (0xF3)
+#define SHT21_HUMIDITY_NHM_CMD          (0xF5)
+#define SHT21_RESET_CMD                 (0xFE)
+
+#define SHT21_STATUS_MASK               ( 0xFC )
+
+#define SHT21_DEFAULT_CONFIG            (SHT21_RESOLUTION_12b_14b | \
+                                         SHT21_ONCHIP_HEATER_DISABLE | \
+                                         SHT21_BATTERY_ABOVE_2V25 | \
+                                         SHT21_OTP_RELOAD_DISABLE)
+
+#define SHT21_USER_CONFIG               (SHT21_RESOLUTION_8b_12b | \
+                                         SHT21_ONCHIP_HEATER_DISABLE | \
+                                         SHT21_BATTERY_ABOVE_2V25 | \
+                                         SHT21_OTP_RELOAD_DISABLE)
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+void
+sht21_init(void)
+{
+  uint8_t config[2];
+
+  i2c_init(I2C_SDA_PORT, I2C_SDA_PIN, I2C_SCL_PORT, I2C_SCL_PIN,
+           I2C_SCL_NORMAL_BUS_SPEED);
+
+  /* Setup the configuration vector, the first position holds address */
+  /* and the second position holds the actual configuration */
+  config[0] = SHT21_USER_REG_WRITE;
+  config[1] = 0;
+
+  /* Read the current configuration according to the datasheet (pag. 9, fig. 18) */
+  i2c_single_send(SHT21_ADDRESS, SHT21_USER_REG_READ);
+  i2c_single_receive(SHT21_ADDRESS, &config[1]);
+
+  /* Clean all the configuration bits except those reserved */
+  config[1] &= SHT21_USER_REG_RESERVED_BITS;
+
+  /* Set the configuration bits without changing those reserved */
+  config[1] |= SHT21_USER_CONFIG;
+
+  i2c_burst_send(SHT21_ADDRESS, config, sizeof(config));
+}
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+void
+sht21_reset(void)
+{
+  /* Send a soft-reset command according to the datasheet (pag. 9, fig. 17) */
+  i2c_single_send(SHT21_ADDRESS, SHT21_RESET_CMD);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+uint8_t
+sht21_is_present(void)
+{
+  uint8_t is_present;
+
+  /* Read the current configuration according to the datasheet (pag. 9, fig. 18) */
+  i2c_single_send(SHT21_ADDRESS, SHT21_USER_REG_READ);
+  i2c_single_receive(SHT21_ADDRESS, &is_present);
+
+  /* Clear the reserved bits according to the datasheet (pag. 9, tab. 8) */
+  is_present &= ~SHT21_USER_REG_RESERVED_BITS;
+
+  is_present = ((is_present == SHT21_USER_CONFIG) || (is_present == SHT21_DEFAULT_CONFIG));
+
+  return is_present;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+uint16_t
+sht21_read_temperature(void)
+{
+  uint8_t sht21_temperature[2];
+  uint16_t temperature;
+
+  /* Read the current temperature according to the datasheet (pag. 8, fig. 15) */
+  i2c_single_send(SHT21_ADDRESS, SHT21_TEMPERATURE_HM_CMD);
+  i2c_burst_receive(SHT21_ADDRESS, sht21_temperature, sizeof(sht21_temperature));
+
+  temperature = (sht21_temperature[0] << 8) | (sht21_temperature[1] & SHT21_STATUS_MASK);
+
+  return temperature;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+float
+sht21_convert_temperature(uint16_t temperature)
+{
+  float result;
+
+  result = -46.85;
+  result += 175.72 * (float) temperature / 65536.0;
+
+  return result;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+uint16_t
+sht21_read_humidity(void)
+{
+  uint8_t sht21_humidity[2];
+  uint16_t humidity;
+
+  /* Read the current humidity according to the datasheet (pag. 8, fig. 15) */
+  i2c_single_send(SHT21_ADDRESS, SHT21_HUMIDITY_HM_CMD);
+  i2c_burst_receive(SHT21_ADDRESS, sht21_humidity, sizeof(sht21_humidity));
+
+  humidity = (sht21_humidity[0] << 8) | (sht21_humidity[1] & SHT21_STATUS_MASK);
+
+  return humidity;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ *
+ */
+float
+sht21_convert_humidity(uint16_t humidity)
+{
+  float result;
+
+  result = -6.0;
+  result += 125.0 * (float) humidity / 65536.0;
+
+  return result;
+}
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/platform/openmote-cc2538/dev/sht21.h b/platform/openmote-cc2538/dev/sht21.h
new file mode 100644
index 000000000..c95e02edf
--- /dev/null
+++ b/platform/openmote-cc2538/dev/sht21.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2014, OpenMote Technologies, S.L.
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup platform
+ * @{
+ *
+ * \defgroup openmote
+ *
+ * \file
+ * Header for the SHT21 temperature and humidity sensor in OpenMote-CC2538.
+ *
+ * \author
+ * Pere Tuset <peretuset@openmote.com>
+ */
+
+#ifndef __SHT21_H__
+#define __SHT21_H__
+/*---------------------------------------------------------------------------*/
+void sht21_init(void);
+void sht21_reset(void);
+uint8_t sht21_is_present(void);
+uint16_t sht21_read_temperature(void);
+float sht21_convert_temperature(uint16_t temperature);
+uint16_t sht21_read_humidity(void);
+float sht21_convert_humidity(uint16_t humidity);
+/*---------------------------------------------------------------------------*/
+#endif /* ifndef __SHT21_H__ */
+/** @} */
diff --git a/platform/openmote-cc2538/dev/smartrf-sensors.c b/platform/openmote-cc2538/dev/smartrf-sensors.c
new file mode 100644
index 000000000..d8948a017
--- /dev/null
+++ b/platform/openmote-cc2538/dev/smartrf-sensors.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2012, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+
+/**
+ * \addtogroup platform
+ * @{
+ *
+ * \defgroup openmote
+ *
+ * \file
+ * Implementation of a generic module controlling OpenMote-CC2538 sensors.
+ */
+
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+#include "dev/button-sensor.h"
+
+#include <string.h>
+/*---------------------------------------------------------------------------*/
+/**
+   *\brief Exports a global symbol to be used by the sensor API
+ */
+SENSORS(&button_user_sensor);
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/platform/openmote-cc2538/dev/tps62730.c b/platform/openmote-cc2538/dev/tps62730.c
new file mode 100644
index 000000000..0356077f9
--- /dev/null
+++ b/platform/openmote-cc2538/dev/tps62730.c
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2014, OpenMote Technologies, S.L.
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup platform
+ * @{
+ *
+ * \defgroup openmote
+ *
+ * \file
+ * Driver for the TPS62730 voltage regulator on the OpenMote-CC2538.
+ *
+ * \author
+ * Pere Tuset <peretuset@openmote.com>
+ */
+
+/*---------------------------------------------------------------------------*/
+#include "contiki-conf.h"
+#include "dev/gpio.h"
+#include "dev/tps62730.h"
+/*---------------------------------------------------------------------------*/
+#define BSP_TPS62730_BASE           (GPIO_B_BASE)
+#define BSP_TPS62730_ON             (1 << 1)
+#define BSP_TPS62730_STATUS         (1 << 0)
+/*---------------------------------------------------------------------------*/
+static void
+gpio_set(int port, int bit)
+{
+  REG((port | GPIO_DATA) + (bit << 2)) = bit;
+}
+/*---------------------------------------------------------------------------*/
+static void
+gpio_reset(int port, int bit)
+{
+  REG((port | GPIO_DATA) + (bit << 2)) = 0;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * Initializes the TPS62730 voltage regulator
+ * By default it is in bypass mode, Vout = Vin, Iq < 1 uA
+ */
+void
+tps62730_init(void)
+{
+  GPIO_SET_OUTPUT(BSP_TPS62730_BASE, BSP_TPS62730_ON);
+  GPIO_SET_INPUT(BSP_TPS62730_BASE, BSP_TPS62730_STATUS);
+
+  tps62730_bypass();
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * Enables the TPS62730, Vout = 2.2V, Iq = 30 uA
+ */
+void
+tps62730_on(void)
+{
+  gpio_set(BSP_TPS62730_BASE, BSP_TPS62730_ON);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * Disables the TPS62730, Vout = Vin, Iq < 1 uA
+ */
+void
+tps62730_bypass(void)
+{
+  gpio_reset(BSP_TPS62730_BASE, BSP_TPS62730_ON);
+}
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/platform/openmote-cc2538/dev/tps62730.h b/platform/openmote-cc2538/dev/tps62730.h
new file mode 100644
index 000000000..b3e99bc8d
--- /dev/null
+++ b/platform/openmote-cc2538/dev/tps62730.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2014, OpenMote Technologies, S.L.
+ * 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.
+ *
+ */
+
+/**
+ * \addtogroup platform
+ * @{
+ *
+ * \defgroup openmote
+ *
+ * \file
+ * Header for the TPS62730 voltage regulator on the OpenMote-CC2538.
+ *
+ * \author
+ * Pere Tuset <peretuset@openmote.com>
+ */
+
+#ifndef TPS62730_H_
+#define TPS62730_H_
+/*---------------------------------------------------------------------------*/
+void tps62730_init(void);
+void tps62730_on(void);
+void tps62730_bypass(void);
+/*---------------------------------------------------------------------------*/
+#endif /* TPS62730_H_ */
+/** @} */

From 9a3c6adf8d72b1c0d4d5506b1ac1d83db6539fc1 Mon Sep 17 00:00:00 2001
From: harald42 <harald@20150300048NB.evva.com>
Date: Tue, 12 Apr 2016 10:34:40 +0200
Subject: [PATCH 152/393] add mcu_sleep routines

---
 apps/arduino/arduino-process.c              | 30 ++++++++++++++++++++-
 apps/arduino/arduino-process.h              |  7 +++++
 examples/osd/arduino-climate3/sketch.pde    |  8 +++---
 examples/osd/arduino-dallastemp/sketch.pde  |  6 ++---
 examples/osd/arduino-distance/sketch.pde    |  8 +++---
 examples/osd/arduino-dooralert/sketch.pde   |  6 ++++-
 examples/osd/arduino-htu21/sketch.pde       | 29 +++++++++-----------
 examples/osd/arduino-merkurboard/sketch.pde |  9 +++----
 examples/osd/arduino-wateralert/sketch.pde  |  5 ++--
 9 files changed, 71 insertions(+), 37 deletions(-)

diff --git a/apps/arduino/arduino-process.c b/apps/arduino/arduino-process.c
index ff26d6abd..d3041e602 100644
--- a/apps/arduino/arduino-process.c
+++ b/apps/arduino/arduino-process.c
@@ -54,6 +54,34 @@
 #include "adc.h"
 #include "hw-arduino.h"
 
+extern volatile uint8_t mcusleepcycle;
+volatile uint8_t mcusleepcycleval; 
+
+/*-------------- enabled sleep mode ----------------------------------------*/
+void
+mcu_sleep_init(void)
+{
+	mcusleepcycleval=mcusleepcycle; 
+}
+void
+mcu_sleep_on(void)
+{
+	mcusleepcycle= mcusleepcycleval;
+}
+/*--------------- disable sleep mode ---------------------------------------*/
+void
+mcu_sleep_off(void)
+{
+	mcusleepcycle=0;
+}
+/*---------------- set duty cycle value ------------------------------------*/
+void
+mcu_sleep_set(uint8_t value)
+{
+	mcusleepcycleval= value;
+	mcusleepcycle = mcusleepcycleval;
+}
+
 PROCESS(arduino_sketch, "Arduino Sketch Wrapper");
 
 #ifndef LOOP_INTERVAL
@@ -65,8 +93,8 @@ PROCESS_THREAD(arduino_sketch, ev, data)
   static struct etimer loop_periodic_timer;
   
   PROCESS_BEGIN();
-
   adc_init ();
+  mcu_sleep_init ();
   setup ();
   /* Define application-specific events here. */
   etimer_set(&loop_periodic_timer, LOOP_INTERVAL);
diff --git a/apps/arduino/arduino-process.h b/apps/arduino/arduino-process.h
index 23b00ede4..bea6708f8 100644
--- a/apps/arduino/arduino-process.h
+++ b/apps/arduino/arduino-process.h
@@ -51,6 +51,13 @@
 
 #include "contiki.h"
 
+/*--------------- enable sleep mode ---------------------------------------*/
+void mcu_sleep_on(void);
+/*--------------- disable sleep mode ---------------------------------------*/
+void mcu_sleep_off(void);
+/*---------------- set sleep value ------------------------------------*/
+void mcu_sleep_set(uint8_t value);
+
 extern void loop         (void);
 extern void setup        (void);
 extern void arduino_init (void);
diff --git a/examples/osd/arduino-climate3/sketch.pde b/examples/osd/arduino-climate3/sketch.pde
index fd1bee2c0..9f9cb22d7 100644
--- a/examples/osd/arduino-climate3/sketch.pde
+++ b/examples/osd/arduino-climate3/sketch.pde
@@ -17,12 +17,10 @@
 
 extern "C" {
 
-
+#include "arduino-process.h"
 #include "rest-engine.h"
 #include "sketch.h"
 
-extern volatile uint8_t mcusleepcycle;  // default 16
-
 // Data wire is plugged into port 2 on the Arduino
 #define ONE_WIRE_BUS 3
 #define TEMPERATURE_PRECISION 9
@@ -130,7 +128,7 @@ void setup (void)
 // LOOP_INTERVAL		(20 * CLOCK_SECOND)
 void loop (void)
 {
-      mcusleepcycle=0;  // dont sleep
+	  mcu_sleep_off();  
       // call sensors.requestTemperatures() to issue a global temperature 
       // request to all devices on the bus
 //      printf("Requesting temperatures...");
@@ -156,5 +154,5 @@ void loop (void)
 	printf("Temp: %s",htu21d_temp_s);
     printf("\t\tHum: %s\n",htu21d_hum_s);
     
-    mcusleepcycle=32; // sleep, wakeup every 32 cycles
+    mcu_sleep_on();
 }
diff --git a/examples/osd/arduino-dallastemp/sketch.pde b/examples/osd/arduino-dallastemp/sketch.pde
index 0aaff48e2..37f5c4413 100644
--- a/examples/osd/arduino-dallastemp/sketch.pde
+++ b/examples/osd/arduino-dallastemp/sketch.pde
@@ -15,7 +15,7 @@
 
 extern "C" {
 
-
+#include "arduino-process.h"
 #include "rest-engine.h"
 #include "sketch.h"
 
@@ -161,7 +161,7 @@ void setup (void)
 // LOOP_INTERVAL		(10 * CLOCK_SECOND)
 void loop (void)
 {
-      mcusleepcycle=0;  // dont sleep
+      mcu_sleep_off();
       // call sensors.requestTemperatures() to issue a global temperature 
       // request to all devices on the bus
       printf("Requesting temperatures...");
@@ -171,7 +171,7 @@ void loop (void)
       // print the device information
       printData(insideThermometer,0);
       printData(outsideThermometer,1);
-      mcusleepcycle=32; // sleep, wakeup every 32 cycles
+      mcu_sleep_on();
    
 //  debug only 
 }
diff --git a/examples/osd/arduino-distance/sketch.pde b/examples/osd/arduino-distance/sketch.pde
index 2233e0a7b..11d268b1c 100644
--- a/examples/osd/arduino-distance/sketch.pde
+++ b/examples/osd/arduino-distance/sketch.pde
@@ -11,11 +11,11 @@
  */
 
 extern "C" {
+#include "arduino-process.h"
 #include "sketch.h"
 #include "rest-engine.h"
 #include "net/netstack.h"
 
-extern volatile uint8_t mcusleepcycle;  // default 16
 extern resource_t res_battery, res_distance;
 #define LED_PIN 4    /* LED Pin */
 
@@ -39,8 +39,8 @@ void setup (void)
 
 void loop (void)
 {
-    mcusleepcycle=0;  // dont sleep
-
-    mcusleepcycle=16; // sleep, wakeup every 32 cycles
+	mcu_sleep_off();
+	
+	mcu_sleep_on();
 }
 
diff --git a/examples/osd/arduino-dooralert/sketch.pde b/examples/osd/arduino-dooralert/sketch.pde
index 67603c19a..d7de583c8 100644
--- a/examples/osd/arduino-dooralert/sketch.pde
+++ b/examples/osd/arduino-dooralert/sketch.pde
@@ -11,6 +11,7 @@
  */
 
 extern "C" {
+#include "arduino-process.h"
 #include "rest-engine.h"
 
 extern resource_t res_door, res_battery;
@@ -29,9 +30,12 @@ void setup (void)
     rest_init_engine ();
     rest_activate_resource (&res_door, "s/door");
     rest_activate_resource (&res_battery, "s/battery");
+ //   NETSTACK_MAC.off(1);
 }
 
 void loop (void)
 {
-
+	mcu_sleep_off();
+	
+	mcu_sleep_on();
 }
diff --git a/examples/osd/arduino-htu21/sketch.pde b/examples/osd/arduino-htu21/sketch.pde
index 93dc1d1c3..2336e111f 100644
--- a/examples/osd/arduino-htu21/sketch.pde
+++ b/examples/osd/arduino-htu21/sketch.pde
@@ -14,12 +14,9 @@
 #include "Adafruit_HTU21DF.h"
 
 extern "C" {
-
-
+#include "arduino-process.h"
 #include "rest-engine.h"
 
-extern volatile uint8_t mcusleepcycle;  // default 16
-
 Adafruit_HTU21DF htu = Adafruit_HTU21DF();
 
 extern resource_t res_htu21dtemp, res_htu21dhum, res_battery;
@@ -51,19 +48,19 @@ void setup (void)
 // LOOP_INTERVAL		(10 * CLOCK_SECOND)
 void loop (void)
 {
-      mcusleepcycle=0;  // dont sleep
-      htu21d_temp = htu.readTemperature();
-      htu21d_hum = htu.readHumidity();
-      mcusleepcycle=32; // sleep, wakeup every 32 cycles
-      dtostrf(htu21d_temp , 6, 2, htu21d_temp_s );   
-      dtostrf(htu21d_hum , 6, 2, htu21d_hum_s );
-      // remove space
-      if(htu21d_temp_s[0]==' '){
-        memcpy (htu21d_temp_s,htu21d_temp_s+1,strlen(htu21d_temp_s)+1);
-      }
-      if(htu21d_hum_s[0]==' '){
+	mcu_sleep_off();
+    htu21d_temp = htu.readTemperature();
+    htu21d_hum = htu.readHumidity();
+  	mcu_sleep_on();    
+    dtostrf(htu21d_temp , 6, 2, htu21d_temp_s );   
+	tostrf(htu21d_hum , 6, 2, htu21d_hum_s );
+    // remove space
+    if(htu21d_temp_s[0]==' '){
+      memcpy (htu21d_temp_s,htu21d_temp_s+1,strlen(htu21d_temp_s)+1);
+    }
+    if(htu21d_hum_s[0]==' '){
         memcpy (htu21d_hum_s,htu21d_hum_s+1,strlen(htu21d_hum_s)+1);
-      }
+    }
       
 //  debug only   
 //	  printf("Temp: %s",htu21d_temp_s);
diff --git a/examples/osd/arduino-merkurboard/sketch.pde b/examples/osd/arduino-merkurboard/sketch.pde
index 0f60b8dad..c5b3bc3db 100644
--- a/examples/osd/arduino-merkurboard/sketch.pde
+++ b/examples/osd/arduino-merkurboard/sketch.pde
@@ -11,11 +11,10 @@
  */
 
 extern "C" {
+#include "arduino-process.h"
 #include "rest-engine.h"
 #include "net/netstack.h"
 
-extern volatile uint8_t mcusleepcycle;  // default 16
-
 extern resource_t res_leds, res_battery, res_cputemp;
 uint8_t door_pin = 3;
 uint8_t door_status = 0;
@@ -39,7 +38,7 @@ void setup (void)
 
 void loop (void)
 {
-  mcusleepcycle=0;
-  
-  mcusleepcycle=16;
+	mcu_sleep_off();
+	
+	mcu_sleep_on();
 }
diff --git a/examples/osd/arduino-wateralert/sketch.pde b/examples/osd/arduino-wateralert/sketch.pde
index b8a6d559a..22aaa864f 100644
--- a/examples/osd/arduino-wateralert/sketch.pde
+++ b/examples/osd/arduino-wateralert/sketch.pde
@@ -11,6 +11,7 @@
  */
 
 extern "C" {
+#include "arduino-process.h"
 #include "rest-engine.h"
 
 extern volatile uint8_t mcusleepcycle;  // default 16
@@ -37,12 +38,12 @@ void setup (void)
 
 void loop (void)
 {
-  mcusleepcycle=0;  // dont sleep
+  mcu_sleep_off();
   moisture_voltage = analogRead(moisture_pin);
   if(moisture_voltage < 800){
       digitalWrite(BUZZER_PIN, LOW);
   }else{
       digitalWrite(BUZZER_PIN, HIGH);
   }
-  mcusleepcycle=32; // sleep, wakeup every 32 cycles
+  mcu_sleep_on();
 }

From 0379af3624f8173972a1f27123129a18cc327957 Mon Sep 17 00:00:00 2001
From: kkrentz <konrad.krentz@gmail.com>
Date: Thu, 17 Dec 2015 01:42:00 -0800
Subject: [PATCH 153/393] llsec: Do not define surrogates in packetbuf.h, as
 otherwise configuration errors go unnoticed

---
 core/net/llsec/anti-replay.c            |  4 ++++
 core/net/llsec/ccm-star-packetbuf.c     |  4 ++++
 core/net/llsec/noncoresec/noncoresec.c  |  3 +++
 core/net/mac/tsch/tsch-slot-operation.c |  4 ++++
 core/net/packetbuf.h                    | 23 -----------------------
 5 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/core/net/llsec/anti-replay.c b/core/net/llsec/anti-replay.c
index 7c392bff7..a59f6b4c8 100644
--- a/core/net/llsec/anti-replay.c
+++ b/core/net/llsec/anti-replay.c
@@ -45,6 +45,9 @@
 
 #include "net/llsec/anti-replay.h"
 #include "net/packetbuf.h"
+#include "net/llsec/llsec802154.h"
+
+#if LLSEC802154_USES_FRAME_COUNTER
 
 /* This node's current frame counter value */
 static uint32_t counter;
@@ -107,5 +110,6 @@ anti_replay_was_replayed(struct anti_replay_info *info)
   }
 }
 /*---------------------------------------------------------------------------*/
+#endif /* LLSEC802154_USES_FRAME_COUNTER */
 
 /** @} */
diff --git a/core/net/llsec/ccm-star-packetbuf.c b/core/net/llsec/ccm-star-packetbuf.c
index 61e681b1c..9b3a95644 100644
--- a/core/net/llsec/ccm-star-packetbuf.c
+++ b/core/net/llsec/ccm-star-packetbuf.c
@@ -41,8 +41,11 @@
 #include "llsec/ccm-star-packetbuf.h"
 #include "net/linkaddr.h"
 #include "net/packetbuf.h"
+#include "net/llsec/llsec802154.h"
 #include <string.h>
 
+#if LLSEC802154_SECURITY_LEVEL && LLSEC802154_USES_FRAME_COUNTER
+
 /*---------------------------------------------------------------------------*/
 static const uint8_t *
 get_extended_address(const linkaddr_t *addr)
@@ -76,3 +79,4 @@ ccm_star_packetbuf_set_nonce(uint8_t *nonce, int forward)
   nonce[12] = packetbuf_attr(PACKETBUF_ATTR_SECURITY_LEVEL);
 }
 /*---------------------------------------------------------------------------*/
+#endif /* LLSEC802154_SECURITY_LEVEL && LLSEC802154_USES_FRAME_COUNTER */
diff --git a/core/net/llsec/noncoresec/noncoresec.c b/core/net/llsec/noncoresec/noncoresec.c
index 860f7e613..97d018ede 100644
--- a/core/net/llsec/noncoresec/noncoresec.c
+++ b/core/net/llsec/noncoresec/noncoresec.c
@@ -76,6 +76,8 @@
 #define PRINTF(...)
 #endif /* DEBUG */
 
+#if LLSEC802154_SECURITY_LEVEL && LLSEC802154_USES_FRAME_COUNTER
+
 /* network-wide CCM* key */
 static uint8_t key[16] = NONCORESEC_KEY;
 NBR_TABLE(struct anti_replay_info, anti_replay_table);
@@ -256,5 +258,6 @@ const struct framer noncoresec_framer = {
   parse
 };
 /*---------------------------------------------------------------------------*/
+#endif /* LLSEC802154_SECURITY_LEVEL && LLSEC802154_USES_FRAME_COUNTER */
 
 /** @} */
diff --git a/core/net/mac/tsch/tsch-slot-operation.c b/core/net/mac/tsch/tsch-slot-operation.c
index befd5a18f..6bad7cf47 100644
--- a/core/net/mac/tsch/tsch-slot-operation.c
+++ b/core/net/mac/tsch/tsch-slot-operation.c
@@ -604,7 +604,11 @@ PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
     log->tx.drift = drift_correction;
     log->tx.drift_used = is_drift_correction_used;
     log->tx.is_data = ((((uint8_t *)(queuebuf_dataptr(current_packet->qb)))[0]) & 7) == FRAME802154_DATAFRAME;
+#if TSCH_SECURITY_ENABLED
     log->tx.sec_level = queuebuf_attr(current_packet->qb, PACKETBUF_ATTR_SECURITY_LEVEL);
+#else /* TSCH_SECURITY_ENABLED */
+    log->tx.sec_level = 0;
+#endif /* TSCH_SECURITY_ENABLED */
     log->tx.dest = TSCH_LOG_ID_FROM_LINKADDR(queuebuf_addr(current_packet->qb, PACKETBUF_ADDR_RECEIVER));
     );
 
diff --git a/core/net/packetbuf.h b/core/net/packetbuf.h
index 12b0d9dce..969e020cd 100644
--- a/core/net/packetbuf.h
+++ b/core/net/packetbuf.h
@@ -365,29 +365,6 @@ enum {
   PACKETBUF_ATTR_MAX
 };
 
-/* Define surrogates when 802.15.4 security is off */
-#if !LLSEC802154_SECURITY_LEVEL
-enum {
-  PACKETBUF_ATTR_SECURITY_LEVEL,
-};
-#endif /* LLSEC802154_SECURITY_LEVEL */
-
-#if !LLSEC802154_USES_FRAME_COUNTER
-enum {
-  PACKETBUF_ATTR_FRAME_COUNTER_BYTES_0_1,
-  PACKETBUF_ATTR_FRAME_COUNTER_BYTES_2_3
-};
-#endif /* LLSEC802154_USES_FRAME_COUNTER */
-
-/* Define surrogates when not using explicit keys */
-#if !LLSEC802154_USES_EXPLICIT_KEYS
-enum {
-  PACKETBUF_ATTR_KEY_ID_MODE,
-  PACKETBUF_ATTR_KEY_INDEX,
-  PACKETBUF_ATTR_KEY_SOURCE_BYTES_0_1
-};
-#endif /* LLSEC802154_USES_EXPLICIT_KEYS */
-
 #if NETSTACK_CONF_WITH_RIME
 #define PACKETBUF_NUM_ADDRS 4
 #else /* NETSTACK_CONF_WITH_RIME */

From 10d8b05bc684b1582c43c00c6a587b58fe5ff951 Mon Sep 17 00:00:00 2001
From: kkrentz <konrad.krentz@gmail.com>
Date: Thu, 17 Dec 2015 03:13:32 -0800
Subject: [PATCH 154/393] llsec: Permit dynamic security levels

---
 core/contiki-default-conf.h                   |  7 ----
 core/net/llsec/ccm-star-packetbuf.c           |  4 +--
 core/net/llsec/llsec802154.h                  | 35 +++++++------------
 core/net/llsec/noncoresec/noncoresec.c        | 29 +++++++++------
 core/net/mac/frame802154.c                    | 16 ++++-----
 core/net/mac/framer-802154.c                  |  8 ++---
 core/net/mac/rdc.h                            |  2 +-
 core/net/mac/tsch/README.md                   |  6 ++--
 core/net/mac/tsch/tsch-packet.c               | 16 ++++-----
 core/net/mac/tsch/tsch-security.h             | 30 +++++++++++-----
 core/net/mac/tsch/tsch-slot-operation.c       | 26 +++++++-------
 core/net/mac/tsch/tsch.c                      | 20 +++++------
 core/net/mac/tsch/tsch.h                      |  4 +--
 core/net/packetbuf.h                          |  4 +--
 examples/ipv6/rpl-tsch/node.c                 |  6 ++--
 examples/ipv6/rpl-tsch/project-conf.h         |  6 ++--
 examples/jn516x/tsch/common-conf.h            |  2 +-
 .../tsch/simple-sensor-network/node/node.c    |  4 +--
 .../ccm-star-tests/encryption/project-conf.h  |  2 +-
 .../llsec/ccm-star-tests/encryption/tests.c   | 15 ++++----
 .../verification/project-conf.h               |  2 +-
 .../llsec/ccm-star-tests/verification/tests.c | 15 ++++----
 22 files changed, 137 insertions(+), 122 deletions(-)

diff --git a/core/contiki-default-conf.h b/core/contiki-default-conf.h
index 7b001bd58..ed82c73ac 100644
--- a/core/contiki-default-conf.h
+++ b/core/contiki-default-conf.h
@@ -78,13 +78,6 @@
 #define NETSTACK_CONF_LLSEC nullsec_driver
 #endif /* NETSTACK_CONF_LLSEC */
 
-/* To avoid unnecessary complexity, we assume the common case of
-   a constant LoWPAN-wide IEEE 802.15.4 security level, which
-   can be specified by defining LLSEC802154_CONF_SECURITY_LEVEL. */
-#ifndef LLSEC802154_CONF_SECURITY_LEVEL
-#define LLSEC802154_CONF_SECURITY_LEVEL 0
-#endif /* LLSEC802154_CONF_SECURITY_LEVEL */
-
 /* NETSTACK_CONF_NETWORK specifies the network layer and can be either
    sicslowpan_driver, for IPv6 networking, or rime_driver, for the
    custom Rime network stack. */
diff --git a/core/net/llsec/ccm-star-packetbuf.c b/core/net/llsec/ccm-star-packetbuf.c
index 9b3a95644..d5d077301 100644
--- a/core/net/llsec/ccm-star-packetbuf.c
+++ b/core/net/llsec/ccm-star-packetbuf.c
@@ -44,7 +44,7 @@
 #include "net/llsec/llsec802154.h"
 #include <string.h>
 
-#if LLSEC802154_SECURITY_LEVEL && LLSEC802154_USES_FRAME_COUNTER
+#if LLSEC802154_USES_AUX_HEADER && LLSEC802154_USES_FRAME_COUNTER
 
 /*---------------------------------------------------------------------------*/
 static const uint8_t *
@@ -79,4 +79,4 @@ ccm_star_packetbuf_set_nonce(uint8_t *nonce, int forward)
   nonce[12] = packetbuf_attr(PACKETBUF_ATTR_SECURITY_LEVEL);
 }
 /*---------------------------------------------------------------------------*/
-#endif /* LLSEC802154_SECURITY_LEVEL && LLSEC802154_USES_FRAME_COUNTER */
+#endif /* LLSEC802154_USES_AUX_HEADER && LLSEC802154_USES_FRAME_COUNTER */
diff --git a/core/net/llsec/llsec802154.h b/core/net/llsec/llsec802154.h
index 2ccd30515..acbba1f9d 100644
--- a/core/net/llsec/llsec802154.h
+++ b/core/net/llsec/llsec802154.h
@@ -56,28 +56,13 @@
 #include "net/mac/frame802154.h"
 #include "net/ip/uip.h"
 
-#ifdef LLSEC802154_CONF_SECURITY_LEVEL
-#define LLSEC802154_SECURITY_LEVEL     LLSEC802154_CONF_SECURITY_LEVEL
-#else /* LLSEC802154_CONF_SECURITY_LEVEL */
-#define LLSEC802154_SECURITY_LEVEL     FRAME802154_SECURITY_LEVEL_NONE
-#endif /* LLSEC802154_CONF_SECURITY_LEVEL */
+#ifdef LLSEC802154_CONF_ENABLED
+#define LLSEC802154_ENABLED            LLSEC802154_CONF_ENABLED
+#else /* LLSEC802154_CONF_ENABLED */
+#define LLSEC802154_ENABLED            0
+#endif /* LLSEC802154_CONF_ENABLED */
 
-#if ((LLSEC802154_SECURITY_LEVEL < 0) || (LLSEC802154_SECURITY_LEVEL > 7))
-#error "unsupported security level"
-#endif
-
-#define LLSEC802154_SECURITY_LEVEL_MIC (LLSEC802154_SECURITY_LEVEL & 3)
-#if LLSEC802154_SECURITY_LEVEL_MIC
-#define LLSEC802154_MIC_LENGTH         (2 << LLSEC802154_SECURITY_LEVEL_MIC)
-#else
-#define LLSEC802154_MIC_LENGTH         0
-#endif
-
-#ifdef LLSEC802154_CONF_USES_ENCRYPTION
-#define LLSEC802154_USES_ENCRYPTION    LLSEC802154_CONF_USES_ENCRYPTION
-#else /* LLSEC802154_CONF_USES_ENCRYPTION */
-#define LLSEC802154_USES_ENCRYPTION    (LLSEC802154_SECURITY_LEVEL & (1 << 2))
-#endif /* LLSEC802154_CONF_USES_ENCRYPTION */
+#define LLSEC802154_MIC_LEN(sec_lvl)   (2 << (sec_lvl & 3))
 
 #ifdef LLSEC802154_CONF_USES_EXPLICIT_KEYS
 #define LLSEC802154_USES_EXPLICIT_KEYS LLSEC802154_CONF_USES_EXPLICIT_KEYS
@@ -88,9 +73,15 @@
 #ifdef LLSEC802154_CONF_USES_FRAME_COUNTER
 #define LLSEC802154_USES_FRAME_COUNTER LLSEC802154_CONF_USES_FRAME_COUNTER
 #else /* LLSEC802154_CONF_USES_FRAME_COUNTER */
-#define LLSEC802154_USES_FRAME_COUNTER (LLSEC802154_SECURITY_LEVEL != FRAME802154_SECURITY_LEVEL_NONE)
+#define LLSEC802154_USES_FRAME_COUNTER LLSEC802154_ENABLED
 #endif /* LLSEC802154_CONF_USES_FRAME_COUNTER */
 
+#ifdef LLSEC802154_CONF_USES_AUX_HEADER
+#define LLSEC802154_USES_AUX_HEADER    LLSEC802154_CONF_USES_AUX_HEADER
+#else /* LLSEC802154_CONF_USES_AUX_HEADER */
+#define LLSEC802154_USES_AUX_HEADER    LLSEC802154_ENABLED
+#endif /* LLSEC802154_CONF_USES_AUX_HEADER */
+
 #if UIP_BYTE_ORDER == UIP_LITTLE_ENDIAN
 #define LLSEC802154_HTONS(n) (n)
 #define LLSEC802154_HTONL(n) (n)
diff --git a/core/net/llsec/noncoresec/noncoresec.c b/core/net/llsec/noncoresec/noncoresec.c
index 97d018ede..c55128336 100644
--- a/core/net/llsec/noncoresec/noncoresec.c
+++ b/core/net/llsec/noncoresec/noncoresec.c
@@ -55,7 +55,14 @@
 #include "lib/ccm-star.h"
 #include <string.h>
 
-#define WITH_ENCRYPTION (LLSEC802154_SECURITY_LEVEL & (1 << 2))
+#ifdef NONCORESEC_CONF_SEC_LVL
+#define SEC_LVL         NONCORESEC_CONF_SEC_LVL
+#else /* NONCORESEC_CONF_SEC_LVL */
+#define SEC_LVL         2
+#endif /* NONCORESEC_CONF_SEC_LVL */
+
+#define WITH_ENCRYPTION (SEC_LVL & (1 << 2))
+#define MIC_LEN         LLSEC802154_MIC_LEN(SEC_LVL)
 
 #ifdef NONCORESEC_CONF_KEY
 #define NONCORESEC_KEY NONCORESEC_CONF_KEY
@@ -76,7 +83,7 @@
 #define PRINTF(...)
 #endif /* DEBUG */
 
-#if LLSEC802154_SECURITY_LEVEL && LLSEC802154_USES_FRAME_COUNTER
+#if LLSEC802154_USES_AUX_HEADER && SEC_LVL && LLSEC802154_USES_FRAME_COUNTER
 
 /* network-wide CCM* key */
 static uint8_t key[16] = NONCORESEC_KEY;
@@ -93,7 +100,7 @@ aead(uint8_t hdrlen, int forward)
   uint8_t *a;
   uint8_t a_len;
   uint8_t *result;
-  uint8_t generated_mic[LLSEC802154_MIC_LENGTH];
+  uint8_t generated_mic[MIC_LEN];
   uint8_t *mic;
   
   ccm_star_packetbuf_set_nonce(nonce, forward);
@@ -115,14 +122,14 @@ aead(uint8_t hdrlen, int forward)
   CCM_STAR.aead(nonce,
       m, m_len,
       a, a_len,
-      result, LLSEC802154_MIC_LENGTH,
+      result, MIC_LEN,
       forward);
   
   if(forward) {
-    packetbuf_set_datalen(packetbuf_datalen() + LLSEC802154_MIC_LENGTH);
+    packetbuf_set_datalen(packetbuf_datalen() + MIC_LEN);
     return 1;
   } else {
-    return (memcmp(generated_mic, mic, LLSEC802154_MIC_LENGTH) == 0);
+    return (memcmp(generated_mic, mic, MIC_LEN) == 0);
   }
 }
 /*---------------------------------------------------------------------------*/
@@ -131,7 +138,7 @@ add_security_header(void)
 {
   if(!packetbuf_attr(PACKETBUF_ATTR_SECURITY_LEVEL)) {
     packetbuf_set_attr(PACKETBUF_ATTR_FRAME_TYPE, FRAME802154_DATAFRAME);
-    packetbuf_set_attr(PACKETBUF_ATTR_SECURITY_LEVEL, LLSEC802154_SECURITY_LEVEL);
+    packetbuf_set_attr(PACKETBUF_ATTR_SECURITY_LEVEL, SEC_LVL);
     anti_replay_set_counter();
   }
 }
@@ -170,7 +177,7 @@ parse(void)
     return result;
   }
   
-  if(packetbuf_attr(PACKETBUF_ATTR_SECURITY_LEVEL) != LLSEC802154_SECURITY_LEVEL) {
+  if(packetbuf_attr(PACKETBUF_ATTR_SECURITY_LEVEL) != SEC_LVL) {
     PRINTF("noncoresec: received frame with wrong security level\n");
     return FRAMER_FAILED;
   }
@@ -180,7 +187,7 @@ parse(void)
     return FRAMER_FAILED;
   }
   
-  packetbuf_set_datalen(packetbuf_datalen() - LLSEC802154_MIC_LENGTH);
+  packetbuf_set_datalen(packetbuf_datalen() - MIC_LEN);
   
   if(!aead(result, 0)) {
     PRINTF("noncoresec: received unauthentic frame %"PRIu32"\n",
@@ -235,7 +242,7 @@ static int
 length(void)
 {
   add_security_header();
-  return framer_802154.length() + LLSEC802154_MIC_LENGTH;
+  return framer_802154.length() + MIC_LEN;
 }
 /*---------------------------------------------------------------------------*/
 static void
@@ -258,6 +265,6 @@ const struct framer noncoresec_framer = {
   parse
 };
 /*---------------------------------------------------------------------------*/
-#endif /* LLSEC802154_SECURITY_LEVEL && LLSEC802154_USES_FRAME_COUNTER */
+#endif /* LLSEC802154_USES_AUX_HEADER && SEC_LVL && LLSEC802154_USES_FRAME_COUNTER */
 
 /** @} */
diff --git a/core/net/mac/frame802154.c b/core/net/mac/frame802154.c
index c2982a014..77727ab47 100644
--- a/core/net/mac/frame802154.c
+++ b/core/net/mac/frame802154.c
@@ -102,7 +102,7 @@ addr_len(uint8_t mode)
   }
 }
 /*----------------------------------------------------------------------------*/
-#if LLSEC802154_USES_EXPLICIT_KEYS
+#if LLSEC802154_USES_AUX_HEADER && LLSEC802154_USES_EXPLICIT_KEYS
 static uint8_t
 get_key_id_len(uint8_t key_id_mode)
 {
@@ -117,7 +117,7 @@ get_key_id_len(uint8_t key_id_mode)
     return 0;
   }
 }
-#endif /* LLSEC802154_USES_EXPLICIT_KEYS */
+#endif /* LLSEC802154_USES_AUX_HEADER && LLSEC802154_USES_EXPLICIT_KEYS */
 /*---------------------------------------------------------------------------*/
 /* Get current PAN ID */
 uint16_t
@@ -317,7 +317,7 @@ field_len(frame802154_t *p, field_length_t *flen)
   flen->dest_addr_len = addr_len(p->fcf.dest_addr_mode & 3);
   flen->src_addr_len = addr_len(p->fcf.src_addr_mode & 3);
 
-#if LLSEC802154_SECURITY_LEVEL
+#if LLSEC802154_USES_AUX_HEADER
   /* Aux security header */
   if(p->fcf.security_enabled & 1) {
     flen->aux_sec_len = 1; /* FCF + possibly frame counter and key ID */
@@ -333,7 +333,7 @@ field_len(frame802154_t *p, field_length_t *flen)
 #endif /* LLSEC802154_USES_EXPLICIT_KEYS */
     ;
   }
-#endif /* LLSEC802154_SECURITY_LEVEL */
+#endif /* LLSEC802154_USES_AUX_HEADER */
 }
 /*----------------------------------------------------------------------------*/
 /**
@@ -418,7 +418,7 @@ frame802154_create(frame802154_t *p, uint8_t *buf)
   for(c = flen.src_addr_len; c > 0; c--) {
     buf[pos++] = p->src_addr[c - 1];
   }
-#if LLSEC802154_SECURITY_LEVEL
+#if LLSEC802154_USES_AUX_HEADER
   /* Aux header */
   if(flen.aux_sec_len) {
     buf[pos++] = p->aux_hdr.security_control.security_level
@@ -447,7 +447,7 @@ frame802154_create(frame802154_t *p, uint8_t *buf)
     }
 #endif /* LLSEC802154_USES_EXPLICIT_KEYS */
   }
-#endif /* LLSEC802154_SECURITY_LEVEL */
+#endif /* LLSEC802154_USES_AUX_HEADER */
 
   return (int)pos;
 }
@@ -570,7 +570,7 @@ frame802154_parse(uint8_t *data, int len, frame802154_t *pf)
     pf->src_pid = 0;
   }
 
-#if LLSEC802154_SECURITY_LEVEL
+#if LLSEC802154_USES_AUX_HEADER
   if(fcf.security_enabled) {
     pf->aux_hdr.security_control.security_level = p[0] & 7;
 #if LLSEC802154_USES_EXPLICIT_KEYS
@@ -599,7 +599,7 @@ frame802154_parse(uint8_t *data, int len, frame802154_t *pf)
     }
 #endif /* LLSEC802154_USES_EXPLICIT_KEYS */
   }
-#endif /* LLSEC802154_SECURITY_LEVEL */
+#endif /* LLSEC802154_USES_AUX_HEADER */
 
   /* header length */
   c = p - data;
diff --git a/core/net/mac/framer-802154.c b/core/net/mac/framer-802154.c
index 14ccc5aa3..7e524afb1 100644
--- a/core/net/mac/framer-802154.c
+++ b/core/net/mac/framer-802154.c
@@ -98,7 +98,7 @@ create_frame(int type, int do_create)
   /* Insert IEEE 802.15.4 version bits. */
   params.fcf.frame_version = FRAME802154_VERSION;
   
-#if LLSEC802154_SECURITY_LEVEL
+#if LLSEC802154_USES_AUX_HEADER
   if(packetbuf_attr(PACKETBUF_ATTR_SECURITY_LEVEL)) {
     params.fcf.security_enabled = 1;
   }
@@ -116,7 +116,7 @@ create_frame(int type, int do_create)
   params.aux_hdr.key_index = packetbuf_attr(PACKETBUF_ATTR_KEY_INDEX);
   params.aux_hdr.key_source.u16[0] = packetbuf_attr(PACKETBUF_ATTR_KEY_SOURCE_BYTES_0_1);
 #endif /* LLSEC802154_USES_EXPLICIT_KEYS */
-#endif /* LLSEC802154_SECURITY_LEVEL */
+#endif /* LLSEC802154_USES_AUX_HEADER */
 
   /* Increment and set the data sequence number. */
   if(!do_create) {
@@ -238,7 +238,7 @@ parse(void)
     packetbuf_set_attr(PACKETBUF_ATTR_PACKET_ID, frame.seq);
 #endif
 
-#if LLSEC802154_SECURITY_LEVEL
+#if LLSEC802154_USES_AUX_HEADER
     if(frame.fcf.security_enabled) {
       packetbuf_set_attr(PACKETBUF_ATTR_SECURITY_LEVEL, frame.aux_hdr.security_control.security_level);
 #if LLSEC802154_USES_FRAME_COUNTER
@@ -251,7 +251,7 @@ parse(void)
       packetbuf_set_attr(PACKETBUF_ATTR_KEY_SOURCE_BYTES_0_1, frame.aux_hdr.key_source.u16[0]);
 #endif /* LLSEC802154_USES_EXPLICIT_KEYS */
     }
-#endif /* LLSEC802154_SECURITY_LEVEL */
+#endif /* LLSEC802154_USES_AUX_HEADER */
 
     PRINTF("15.4-IN: %2X", frame.fcf.frame_type);
     PRINTADDR(packetbuf_addr(PACKETBUF_ADDR_SENDER));
diff --git a/core/net/mac/rdc.h b/core/net/mac/rdc.h
index 0818a9b40..72717455b 100644
--- a/core/net/mac/rdc.h
+++ b/core/net/mac/rdc.h
@@ -51,7 +51,7 @@
    frame because it has seen its sequence number already. Replay
    protection should be implemented at the LLSEC layer where the
    authenticity of frames is verified. */
-#define RDC_WITH_DUPLICATE_DETECTION !LLSEC802154_CONF_SECURITY_LEVEL
+#define RDC_WITH_DUPLICATE_DETECTION !LLSEC802154_CONF_ENABLED
 #endif /* RDC_CONF_WITH_DUPLICATE_DETECTION */
 
 /* List of packets to be sent by RDC layer */
diff --git a/core/net/mac/tsch/README.md b/core/net/mac/tsch/README.md
index ffd6dc789..a70b4806d 100644
--- a/core/net/mac/tsch/README.md
+++ b/core/net/mac/tsch/README.md
@@ -128,8 +128,10 @@ To configure TSCH, see the macros in `.h` files under `core/net/mac/tsch/` and r
 To include TSCH standard-compliant security, set the following:
 ```
 /* Enable security */
-#undef LLSEC802154_CONF_SECURITY_LEVEL
-#define LLSEC802154_CONF_SECURITY_LEVEL 1
+#undef LLSEC802154_CONF_ENABLED
+#define LLSEC802154_CONF_ENABLED 1
+#undef TSCH_SECURITY_CONF_LEVEL
+#define TSCH_SECURITY_CONF_LEVEL 1
 /* TSCH uses explicit keys to identify k1 and k2 */
 #undef LLSEC802154_CONF_USES_EXPLICIT_KEYS
 #define LLSEC802154_CONF_USES_EXPLICIT_KEYS 1
diff --git a/core/net/mac/tsch/tsch-packet.c b/core/net/mac/tsch/tsch-packet.c
index dbfad6082..9f9a8e107 100644
--- a/core/net/mac/tsch/tsch-packet.c
+++ b/core/net/mac/tsch/tsch-packet.c
@@ -94,7 +94,7 @@ tsch_packet_create_eack(uint8_t *buf, int buf_size,
   p.src_pid = IEEE802154_PANID;
   linkaddr_copy((linkaddr_t *)&p.src_addr, &linkaddr_node_addr);
 #endif
-#if TSCH_SECURITY_ENABLED
+#if LLSEC802154_ENABLED
   if(tsch_is_pan_secured) {
     p.fcf.security_enabled = 1;
     p.aux_hdr.security_control.security_level = TSCH_SECURITY_KEY_SEC_LEVEL_ACK;
@@ -103,7 +103,7 @@ tsch_packet_create_eack(uint8_t *buf, int buf_size,
     p.aux_hdr.security_control.frame_counter_size = 1;
     p.aux_hdr.key_index = TSCH_SECURITY_KEY_INDEX_ACK;
   }
-#endif /* TSCH_SECURITY_ENABLED */
+#endif /* LLSEC802154_ENABLED */
 
   if((curr_len = frame802154_create(&p, buf)) == 0) {
     return 0;
@@ -166,13 +166,13 @@ tsch_packet_parse_eack(const uint8_t *buf, int buf_size,
 
   if(frame->fcf.ie_list_present) {
     int mic_len = 0;
-#if TSCH_SECURITY_ENABLED
+#if LLSEC802154_ENABLED
     /* Check if there is space for the security MIC (if any) */
     mic_len = tsch_security_mic_len(frame);
     if(buf_size < curr_len + mic_len) {
       return 0;
     }
-#endif /* TSCH_SECURITY_ENABLED */
+#endif /* LLSEC802154_ENABLED */
     /* Parse information elements. We need to substract the MIC length, as the exact payload len is needed while parsing */
     if((ret = frame802154e_parse_information_elements(buf + curr_len, buf_size - curr_len - mic_len, ies)) == -1) {
       return 0;
@@ -222,7 +222,7 @@ tsch_packet_create_eb(uint8_t *buf, int buf_size, uint8_t seqno,
   p.dest_addr[0] = 0xff;
   p.dest_addr[1] = 0xff;
 
-#if TSCH_SECURITY_ENABLED
+#if LLSEC802154_ENABLED
   if(tsch_is_pan_secured) {
     p.fcf.security_enabled = packetbuf_attr(PACKETBUF_ATTR_SECURITY_LEVEL) > 0;
     p.aux_hdr.security_control.security_level = packetbuf_attr(PACKETBUF_ATTR_SECURITY_LEVEL);
@@ -231,7 +231,7 @@ tsch_packet_create_eb(uint8_t *buf, int buf_size, uint8_t seqno,
     p.aux_hdr.security_control.frame_counter_size = 1;
     p.aux_hdr.key_index = packetbuf_attr(PACKETBUF_ATTR_KEY_INDEX);
   }
-#endif /* TSCH_SECURITY_ENABLED */
+#endif /* LLSEC802154_ENABLED */
 
   if((curr_len = frame802154_create(&p, buf)) == 0) {
     return 0;
@@ -387,14 +387,14 @@ tsch_packet_parse_eb(const uint8_t *buf, int buf_size,
   if(frame->fcf.ie_list_present) {
     /* Calculate space needed for the security MIC, if any, before attempting to parse IEs */
     int mic_len = 0;
-#if TSCH_SECURITY_ENABLED
+#if LLSEC802154_ENABLED
     if(!frame_without_mic) {
       mic_len = tsch_security_mic_len(frame);
       if(buf_size < curr_len + mic_len) {
         return 0;
       }
     }
-#endif /* TSCH_SECURITY_ENABLED */
+#endif /* LLSEC802154_ENABLED */
 
     /* Parse information elements. We need to substract the MIC length, as the exact payload len is needed while parsing */
     if((ret = frame802154e_parse_information_elements(buf + curr_len, buf_size - curr_len - mic_len, ies)) == -1) {
diff --git a/core/net/mac/tsch/tsch-security.h b/core/net/mac/tsch/tsch-security.h
index 694afa78e..c01e7ea6b 100644
--- a/core/net/mac/tsch/tsch-security.h
+++ b/core/net/mac/tsch/tsch-security.h
@@ -39,22 +39,36 @@
 #include "net/mac/tsch/tsch-asn.h"
 #include "net/mac/tsch/tsch-private.h"
 #include "net/mac/frame802154.h"
+#include "net/llsec/llsec802154.h"
 #include "net/mac/frame802154e-ie.h"
 
 /******** Configuration *******/
 
 /* To enable TSCH security:
- * - set LLSEC802154_CONF_SECURITY_LEVEL
+ * - set LLSEC802154_CONF_ENABLED
+ * - set TSCH_SECURITY_CONF_LEVEL
  * - set LLSEC802154_CONF_USES_EXPLICIT_KEYS
  * - unset LLSEC802154_CONF_USES_FRAME_COUNTER
  * */
-#define TSCH_SECURITY_ENABLED (LLSEC802154_CONF_SECURITY_LEVEL != 0)
-#if TSCH_SECURITY_ENABLED && !LLSEC802154_CONF_USES_EXPLICIT_KEYS
-#error TSCH_SECURITY_ENABLED set but LLSEC802154_CONF_USES_EXPLICIT_KEYS unset
-#endif /* TSCH_SECURITY_ENABLED */
-#if TSCH_SECURITY_ENABLED && LLSEC802154_CONF_USES_FRAME_COUNTER
-#error TSCH_SECURITY_ENABLED set but LLSEC802154_CONF_USES_FRAME_COUNTER set
-#endif /* TSCH_SECURITY_ENABLED */
+
+#ifdef TSCH_SECURITY_CONF_LEVEL
+#define TSCH_SECURITY_LEVEL TSCH_SECURITY_CONF_LEVEL
+#else /* TSCH_SECURITY_CONF_LEVEL */
+#define TSCH_SECURITY_LEVEL FRAME802154_SECURITY_LEVEL_NONE
+#endif /* TSCH_SECURITY_CONF_LEVEL */
+
+#if LLSEC802154_ENABLED && !TSCH_SECURITY_LEVEL
+#error LLSEC802154_ENABLED set but TSCH_SECURITY_LEVEL unset
+#endif /* LLSEC802154_ENABLED */
+#if !LLSEC802154_ENABLED && TSCH_SECURITY_LEVEL
+#error TSCH_SECURITY_LEVEL set but LLSEC802154_ENABLED unset
+#endif /* LLSEC802154_ENABLED */
+#if LLSEC802154_ENABLED && !LLSEC802154_USES_EXPLICIT_KEYS
+#error LLSEC802154_ENABLED set but LLSEC802154_USES_EXPLICIT_KEYS unset
+#endif /* LLSEC802154_ENABLED */
+#if LLSEC802154_ENABLED && LLSEC802154_USES_FRAME_COUNTER
+#error LLSEC802154_ENABLED set but LLSEC802154_USES_FRAME_COUNTER set
+#endif /* LLSEC802154_ENABLED */
 
 /* K1, defined in 6TiSCH minimal, is well-known (offers no security) and used for EBs only */
 #ifdef TSCH_SECURITY_CONF_K1
diff --git a/core/net/mac/tsch/tsch-slot-operation.c b/core/net/mac/tsch/tsch-slot-operation.c
index 6bad7cf47..03905617e 100644
--- a/core/net/mac/tsch/tsch-slot-operation.c
+++ b/core/net/mac/tsch/tsch-slot-operation.c
@@ -404,10 +404,10 @@ PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
     } else {
       /* packet payload */
       static void *packet;
-#if TSCH_SECURITY_ENABLED
+#if LLSEC802154_ENABLED
       /* encrypted payload */
       static uint8_t encrypted_packet[TSCH_PACKET_MAX_LEN];
-#endif /* TSCH_SECURITY_ENABLED */
+#endif /* LLSEC802154_ENABLED */
       /* packet payload length */
       static uint8_t packet_len;
       /* packet seqno */
@@ -434,7 +434,7 @@ PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
         packet_ready = 1;
       }
 
-#if TSCH_SECURITY_ENABLED
+#if LLSEC802154_ENABLED
       if(tsch_is_pan_secured) {
         /* If we are going to encrypt, we need to generate the output in a separate buffer and keep
          * the original untouched. This is to allow for future retransmissions. */
@@ -445,7 +445,7 @@ PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
           packet = encrypted_packet;
         }
       }
-#endif /* TSCH_SECURITY_ENABLED */
+#endif /* LLSEC802154_ENABLED */
 
       /* prepare packet to send: copy to radio buffer */
       if(packet_ready && NETSTACK_RADIO.prepare(packet, packet_len) == 0) { /* 0 means success */
@@ -530,7 +530,7 @@ PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
                   ack_len = 0;
                 }
 
-#if TSCH_SECURITY_ENABLED
+#if LLSEC802154_ENABLED
                 if(ack_len != 0) {
                   if(!tsch_security_parse_frame(ackbuf, ack_hdrlen, ack_len - ack_hdrlen - tsch_security_mic_len(&frame),
                       &frame, &current_neighbor->addr, &current_asn)) {
@@ -544,7 +544,7 @@ PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
                       snprintf(log->message, sizeof(log->message),
                       "!failed to parse ACK"));
                 }
-#endif /* TSCH_SECURITY_ENABLED */
+#endif /* LLSEC802154_ENABLED */
               }
 
               if(ack_len != 0) {
@@ -604,11 +604,11 @@ PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
     log->tx.drift = drift_correction;
     log->tx.drift_used = is_drift_correction_used;
     log->tx.is_data = ((((uint8_t *)(queuebuf_dataptr(current_packet->qb)))[0]) & 7) == FRAME802154_DATAFRAME;
-#if TSCH_SECURITY_ENABLED
+#if LLSEC802154_ENABLED
     log->tx.sec_level = queuebuf_attr(current_packet->qb, PACKETBUF_ATTR_SECURITY_LEVEL);
-#else /* TSCH_SECURITY_ENABLED */
+#else /* LLSEC802154_ENABLED */
     log->tx.sec_level = 0;
-#endif /* TSCH_SECURITY_ENABLED */
+#endif /* LLSEC802154_ENABLED */
     log->tx.dest = TSCH_LOG_ID_FROM_LINKADDR(queuebuf_addr(current_packet->qb, PACKETBUF_ADDR_RECEIVER));
     );
 
@@ -712,7 +712,7 @@ PT_THREAD(tsch_rx_slot(struct pt *pt, struct rtimer *t))
 
         packet_duration = TSCH_PACKET_DURATION(current_input->len);
 
-#if TSCH_SECURITY_ENABLED
+#if LLSEC802154_ENABLED
         /* Decrypt and verify incoming frame */
         if(frame_valid) {
           if(tsch_security_parse_frame(
@@ -731,7 +731,7 @@ PT_THREAD(tsch_rx_slot(struct pt *pt, struct rtimer *t))
               "!failed to parse frame %u %u", header_len, current_input->len));
           frame_valid = 0;
         }
-#endif /* TSCH_SECURITY_ENABLED */
+#endif /* LLSEC802154_ENABLED */
 
         if(frame_valid) {
           if(linkaddr_cmp(&destination_address, &linkaddr_node_addr)
@@ -765,12 +765,12 @@ PT_THREAD(tsch_rx_slot(struct pt *pt, struct rtimer *t))
               ack_len = tsch_packet_create_eack(ack_buf, sizeof(ack_buf),
                   &source_address, frame.seq, (int16_t)RTIMERTICKS_TO_US(estimated_drift), do_nack);
 
-#if TSCH_SECURITY_ENABLED
+#if LLSEC802154_ENABLED
               if(tsch_is_pan_secured) {
                 /* Secure ACK frame. There is only header and header IEs, therefore data len == 0. */
                 ack_len += tsch_security_secure_frame(ack_buf, ack_buf, ack_len, 0, &current_asn);
               }
-#endif /* TSCH_SECURITY_ENABLED */
+#endif /* LLSEC802154_ENABLED */
 
               /* Copy to radio buffer */
               NETSTACK_RADIO.prepare((const void *)ack_buf, ack_len);
diff --git a/core/net/mac/tsch/tsch.c b/core/net/mac/tsch/tsch.c
index fa92fe8ad..442323abc 100644
--- a/core/net/mac/tsch/tsch.c
+++ b/core/net/mac/tsch/tsch.c
@@ -141,7 +141,7 @@ int tsch_is_coordinator = 0;
 /* Are we associated to a TSCH network? */
 int tsch_is_associated = 0;
 /* Is the PAN running link-layer security? */
-int tsch_is_pan_secured = TSCH_SECURITY_ENABLED;
+int tsch_is_pan_secured = LLSEC802154_ENABLED;
 /* The current Absolute Slot Number (ASN) */
 struct asn_t current_asn;
 /* Device rank or join priority:
@@ -177,7 +177,7 @@ tsch_set_coordinator(int enable)
 void
 tsch_set_pan_secured(int enable)
 {
-  tsch_is_pan_secured = TSCH_SECURITY_ENABLED && enable;
+  tsch_is_pan_secured = LLSEC802154_ENABLED && enable;
 }
 /*---------------------------------------------------------------------------*/
 void
@@ -455,21 +455,21 @@ tsch_associate(const struct input_packet *input_eb, rtimer_clock_t timestamp)
   }
 #endif /* TSCH_JOIN_SECURED_ONLY */
   
-#if TSCH_SECURITY_ENABLED
+#if LLSEC802154_ENABLED
   if(!tsch_security_parse_frame(input_eb->payload, hdrlen,
       input_eb->len - hdrlen - tsch_security_mic_len(&frame),
       &frame, (linkaddr_t*)&frame.src_addr, &current_asn)) {
     PRINTF("TSCH:! parse_eb: failed to authenticate\n");
     return 0;
   }
-#endif /* TSCH_SECURITY_ENABLED */
+#endif /* LLSEC802154_ENABLED */
 
-#if !TSCH_SECURITY_ENABLED
+#if !LLSEC802154_ENABLED
   if(frame.fcf.security_enabled == 1) {
     PRINTF("TSCH:! parse_eb: we do not support security, but EB is secured\n");
     return 0;
   }
-#endif /* !TSCH_SECURITY_ENABLED */
+#endif /* !LLSEC802154_ENABLED */
 
 #if TSCH_JOIN_MY_PANID_ONLY
   /* Check if the EB comes from the PAN ID we expect */
@@ -746,14 +746,14 @@ PROCESS_THREAD(tsch_send_eb_process, ev, data)
         }
         packetbuf_set_attr(PACKETBUF_ATTR_FRAME_TYPE, FRAME802154_BEACONFRAME);
         packetbuf_set_attr(PACKETBUF_ATTR_MAC_SEQNO, tsch_packet_seqno);
-#if TSCH_SECURITY_ENABLED
+#if LLSEC802154_ENABLED
         if(tsch_is_pan_secured) {
           /* Set security level, key id and index */
           packetbuf_set_attr(PACKETBUF_ATTR_SECURITY_LEVEL, TSCH_SECURITY_KEY_SEC_LEVEL_EB);
           packetbuf_set_attr(PACKETBUF_ATTR_KEY_ID_MODE, FRAME802154_1_BYTE_KEY_ID_MODE); /* Use 1-byte key index */
           packetbuf_set_attr(PACKETBUF_ATTR_KEY_INDEX, TSCH_SECURITY_KEY_INDEX_EB);
         }
-#endif /* TSCH_SECURITY_ENABLED */
+#endif /* LLSEC802154_ENABLED */
         eb_len = tsch_packet_create_eb(packetbuf_dataptr(), PACKETBUF_SIZE,
             tsch_packet_seqno, &hdr_len, &tsch_sync_ie_offset);
         if(eb_len != 0) {
@@ -907,14 +907,14 @@ send_packet(mac_callback_t sent, void *ptr)
   packetbuf_set_attr(PACKETBUF_ATTR_FRAME_TYPE, FRAME802154_DATAFRAME);
   packetbuf_set_attr(PACKETBUF_ATTR_MAC_SEQNO, tsch_packet_seqno);
 
-#if TSCH_SECURITY_ENABLED
+#if LLSEC802154_ENABLED
   if(tsch_is_pan_secured) {
     /* Set security level, key id and index */
     packetbuf_set_attr(PACKETBUF_ATTR_SECURITY_LEVEL, TSCH_SECURITY_KEY_SEC_LEVEL_OTHER);
     packetbuf_set_attr(PACKETBUF_ATTR_KEY_ID_MODE, FRAME802154_1_BYTE_KEY_ID_MODE); /* Use 1-byte key index */
     packetbuf_set_attr(PACKETBUF_ATTR_KEY_INDEX, TSCH_SECURITY_KEY_INDEX_OTHER);
   }
-#endif /* TSCH_SECURITY_ENABLED */
+#endif /* LLSEC802154_ENABLED */
 
   packet_count_before = tsch_queue_packet_count(addr);
 
diff --git a/core/net/mac/tsch/tsch.h b/core/net/mac/tsch/tsch.h
index 31b5d41f9..d548df9d5 100644
--- a/core/net/mac/tsch/tsch.h
+++ b/core/net/mac/tsch/tsch.h
@@ -84,8 +84,8 @@
 #ifdef TSCH_CONF_JOIN_SECURED_ONLY
 #define TSCH_JOIN_SECURED_ONLY TSCH_CONF_JOIN_SECURED_ONLY
 #else
-/* By default, set if TSCH_SECURITY_ENABLED is also non-zero */
-#define TSCH_JOIN_SECURED_ONLY TSCH_SECURITY_ENABLED
+/* By default, set if LLSEC802154_ENABLED is also non-zero */
+#define TSCH_JOIN_SECURED_ONLY LLSEC802154_ENABLED
 #endif
 
 /* By default, join any PAN ID. Otherwise, wait for an EB from IEEE802154_PANID */
diff --git a/core/net/packetbuf.h b/core/net/packetbuf.h
index 969e020cd..bbdd1a6cf 100644
--- a/core/net/packetbuf.h
+++ b/core/net/packetbuf.h
@@ -332,9 +332,9 @@ enum {
 #endif /* NETSTACK_CONF_WITH_RIME */
   PACKETBUF_ATTR_PENDING,
   PACKETBUF_ATTR_FRAME_TYPE,
-#if LLSEC802154_SECURITY_LEVEL
+#if LLSEC802154_USES_AUX_HEADER
   PACKETBUF_ATTR_SECURITY_LEVEL,
-#endif /* LLSEC802154_SECURITY_LEVEL */
+#endif /* LLSEC802154_USES_AUX_HEADER */
 #if LLSEC802154_USES_FRAME_COUNTER
   PACKETBUF_ATTR_FRAME_COUNTER_BYTES_0_1,
   PACKETBUF_ATTR_FRAME_COUNTER_BYTES_2_3,
diff --git a/examples/ipv6/rpl-tsch/node.c b/examples/ipv6/rpl-tsch/node.c
index 203dfd9a9..79f8719ea 100644
--- a/examples/ipv6/rpl-tsch/node.c
+++ b/examples/ipv6/rpl-tsch/node.c
@@ -144,7 +144,7 @@ PROCESS_THREAD(node_process, ev, data)
   
   /* Set node with ID == 1 as coordinator, convenient in Cooja. */
   if(node_id == 1) {
-    if(LLSEC802154_CONF_SECURITY_LEVEL) {
+    if(TSCH_SECURITY_LEVEL) {
       node_role = role_6dr_sec;
     } else {
       node_role = role_6dr;
@@ -169,7 +169,7 @@ PROCESS_THREAD(node_process, ev, data)
                                || etimer_expired(&et));
       if(ev == sensors_event && data == &button_sensor && button_sensor.value(0) > 0) {
         node_role = (node_role + 1) % 3;
-        if(LLSEC802154_CONF_SECURITY_LEVEL == 0 && node_role == role_6dr_sec) {
+        if(TSCH_SECURITY_LEVEL == 0 && node_role == role_6dr_sec) {
           node_role = (node_role + 1) % 3;
         }
         etimer_restart(&et);
@@ -182,7 +182,7 @@ PROCESS_THREAD(node_process, ev, data)
   printf("Init: node starting with role %s\n",
       node_role == role_6ln ? "6ln" : (node_role == role_6dr) ? "6dr" : "6dr-sec");
 
-  tsch_set_pan_secured(LLSEC802154_CONF_SECURITY_LEVEL && (node_role == role_6dr_sec));
+  tsch_set_pan_secured(TSCH_SECURITY_LEVEL && (node_role == role_6dr_sec));
   is_coordinator = node_role > role_6ln;
 
   if(is_coordinator) {
diff --git a/examples/ipv6/rpl-tsch/project-conf.h b/examples/ipv6/rpl-tsch/project-conf.h
index 2b602d908..11c882c43 100644
--- a/examples/ipv6/rpl-tsch/project-conf.h
+++ b/examples/ipv6/rpl-tsch/project-conf.h
@@ -100,8 +100,10 @@
 #if WITH_SECURITY
 
 /* Enable security */
-#undef LLSEC802154_CONF_SECURITY_LEVEL
-#define LLSEC802154_CONF_SECURITY_LEVEL 1
+#undef TSCH_SECURITY_CONF_LEVEL
+#define TSCH_SECURITY_CONF_LEVEL 1
+#undef LLSEC802154_CONF_ENABLED
+#define LLSEC802154_CONF_ENABLED 1
 /* TSCH uses explicit keys to identify k1 and k2 */
 #undef LLSEC802154_CONF_USES_EXPLICIT_KEYS
 #define LLSEC802154_CONF_USES_EXPLICIT_KEYS 1
diff --git a/examples/jn516x/tsch/common-conf.h b/examples/jn516x/tsch/common-conf.h
index b42e6c810..91037c794 100644
--- a/examples/jn516x/tsch/common-conf.h
+++ b/examples/jn516x/tsch/common-conf.h
@@ -142,7 +142,7 @@
 
 #if WITH_TSCH_SECURITY
 /* Set security level to the maximum, even if unused, to all crypto code */
-#define LLSEC802154_CONF_SECURITY_LEVEL 7
+#define LLSEC802154_CONF_ENABLED 1
 /* Attempt to associate from both secured and non-secured EBs */
 #define TSCH_CONF_JOIN_SECURED_ONLY 0
 /* We need explicit keys to identify k1 and k2 */
diff --git a/examples/jn516x/tsch/simple-sensor-network/node/node.c b/examples/jn516x/tsch/simple-sensor-network/node/node.c
index 48b7c4ff5..561df6a47 100644
--- a/examples/jn516x/tsch/simple-sensor-network/node/node.c
+++ b/examples/jn516x/tsch/simple-sensor-network/node/node.c
@@ -152,7 +152,7 @@ PROCESS_THREAD(node_process, ev, data)
 
   /* Set node with ID == 1 as coordinator, handy in Cooja. */
   if(node_id == 1) {
-    if(LLSEC802154_CONF_SECURITY_LEVEL) {
+    if(LLSEC802154_ENABLED) {
       node_role = role_6dr_sec;
     } else {
       node_role = role_6dr;
@@ -165,7 +165,7 @@ PROCESS_THREAD(node_process, ev, data)
       node_role == role_6ln ? "6ln" : (node_role == role_6dr) ? "6dr" : "6dr-sec");
 
 #if WITH_TSCH
-  tsch_set_pan_secured(LLSEC802154_CONF_SECURITY_LEVEL && (node_role == role_6dr_sec));
+  tsch_set_pan_secured(LLSEC802154_ENABLED && (node_role == role_6dr_sec));
 #endif /* WITH_TSCH */
   is_coordinator = node_role > role_6ln;
 
diff --git a/examples/llsec/ccm-star-tests/encryption/project-conf.h b/examples/llsec/ccm-star-tests/encryption/project-conf.h
index 613619373..55e4e35d4 100644
--- a/examples/llsec/ccm-star-tests/encryption/project-conf.h
+++ b/examples/llsec/ccm-star-tests/encryption/project-conf.h
@@ -37,4 +37,4 @@
  *         Konrad Krentz <konrad.krentz@gmail.com>
  */
 
-#define LLSEC802154_CONF_SECURITY_LEVEL 6
+#define LLSEC802154_CONF_ENABLED 1
diff --git a/examples/llsec/ccm-star-tests/encryption/tests.c b/examples/llsec/ccm-star-tests/encryption/tests.c
index b5c296799..0ef158960 100644
--- a/examples/llsec/ccm-star-tests/encryption/tests.c
+++ b/examples/llsec/ccm-star-tests/encryption/tests.c
@@ -47,6 +47,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#define SEC_LVL 6
+#define MIC_LEN LLSEC802154_MIC_LEN(6)
+
 /*---------------------------------------------------------------------------*/
 /* Test vector C.2.1.2 from IEEE 802.15.4-2006 */
 static void
@@ -70,8 +73,8 @@ test_sec_lvl_6()
                        /* Frame Counter */
                        0x05 , 0x00 , 0x00 , 0x00 ,
                        0x01 , 0xCE };
-  uint8_t oracle[LLSEC802154_MIC_LENGTH] = { 0x4F , 0xDE , 0x52 , 0x90 ,
-                                             0x61 , 0xF9 , 0xC6 , 0xF1 };
+  uint8_t oracle[MIC_LEN] = { 0x4F , 0xDE , 0x52 , 0x90 ,
+                              0x61 , 0xF9 , 0xC6 , 0xF1 };
   uint8_t nonce[13];
   frame802154_frame_counter_t counter;
   
@@ -84,7 +87,7 @@ test_sec_lvl_6()
   counter.u32 = 5;
   packetbuf_set_attr(PACKETBUF_ATTR_FRAME_COUNTER_BYTES_0_1, counter.u16[0]);
   packetbuf_set_attr(PACKETBUF_ATTR_FRAME_COUNTER_BYTES_2_3, counter.u16[1]);
-  packetbuf_set_attr(PACKETBUF_ATTR_SECURITY_LEVEL, LLSEC802154_SECURITY_LEVEL);
+  packetbuf_set_attr(PACKETBUF_ATTR_SECURITY_LEVEL, SEC_LVL);
   packetbuf_hdrreduce(29);
   
   CCM_STAR.set_key(key);
@@ -92,10 +95,10 @@ test_sec_lvl_6()
   CCM_STAR.aead(nonce,
       packetbuf_dataptr(), packetbuf_datalen(),
       packetbuf_hdrptr(), packetbuf_hdrlen(),
-      ((uint8_t *) packetbuf_hdrptr()) + 30, LLSEC802154_MIC_LENGTH,
+      ((uint8_t *) packetbuf_hdrptr()) + 30, MIC_LEN,
       1);
   
-  if(memcmp(((uint8_t *) packetbuf_hdrptr()) + 30, oracle, LLSEC802154_MIC_LENGTH) == 0) {
+  if(memcmp(((uint8_t *) packetbuf_hdrptr()) + 30, oracle, MIC_LEN) == 0) {
     printf("Success\n");
   } else {
     printf("Failure\n");
@@ -115,7 +118,7 @@ test_sec_lvl_6()
   CCM_STAR.aead(nonce,
       packetbuf_dataptr(), packetbuf_datalen(),
       packetbuf_hdrptr(), packetbuf_hdrlen(),
-      ((uint8_t *) packetbuf_hdrptr()) + 30, LLSEC802154_MIC_LENGTH,
+      ((uint8_t *) packetbuf_hdrptr()) + 30, MIC_LEN,
       0);
   if(((uint8_t *) packetbuf_hdrptr())[29] == 0xCE) {
     printf("Success\n");
diff --git a/examples/llsec/ccm-star-tests/verification/project-conf.h b/examples/llsec/ccm-star-tests/verification/project-conf.h
index 9f8776b90..3d7e42488 100644
--- a/examples/llsec/ccm-star-tests/verification/project-conf.h
+++ b/examples/llsec/ccm-star-tests/verification/project-conf.h
@@ -37,4 +37,4 @@
  *         Konrad Krentz <konrad.krentz@gmail.com>
  */
 
-#define LLSEC802154_CONF_SECURITY_LEVEL 2
+#define LLSEC802154_CONF_ENABLED 1
diff --git a/examples/llsec/ccm-star-tests/verification/tests.c b/examples/llsec/ccm-star-tests/verification/tests.c
index 4de463fee..3c981552d 100644
--- a/examples/llsec/ccm-star-tests/verification/tests.c
+++ b/examples/llsec/ccm-star-tests/verification/tests.c
@@ -48,6 +48,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#define SEC_LVL 2
+#define MIC_LEN LLSEC802154_MIC_LEN(2)
+
 /*---------------------------------------------------------------------------*/
 /* Test vector C.1 from FIPS Pub 197 */
 static void
@@ -97,10 +100,10 @@ test_sec_lvl_2()
                        0x05 , 0x00 , 0x00 , 0x00 ,
                        /* Payload */
                        0x55 , 0xCF , 0x00 , 0x00 , 0x51 , 0x52 , 0x53 , 0x54 };
-  uint8_t oracle[LLSEC802154_MIC_LENGTH] = { 0x22 , 0x3B , 0xC1 , 0xEC ,
-                                             0x84 , 0x1A , 0xB5 , 0x53 };
+  uint8_t oracle[MIC_LEN] = { 0x22 , 0x3B , 0xC1 , 0xEC ,
+                              0x84 , 0x1A , 0xB5 , 0x53 };
   frame802154_frame_counter_t counter;
-  uint8_t mic[LLSEC802154_MIC_LENGTH];
+  uint8_t mic[MIC_LEN];
   uint8_t nonce[13];
   
   printf("Testing verification ... ");
@@ -112,7 +115,7 @@ test_sec_lvl_2()
   counter.u32 = 5;
   packetbuf_set_attr(PACKETBUF_ATTR_FRAME_COUNTER_BYTES_0_1, counter.u16[0]);
   packetbuf_set_attr(PACKETBUF_ATTR_FRAME_COUNTER_BYTES_2_3, counter.u16[1]);
-  packetbuf_set_attr(PACKETBUF_ATTR_SECURITY_LEVEL, LLSEC802154_SECURITY_LEVEL);
+  packetbuf_set_attr(PACKETBUF_ATTR_SECURITY_LEVEL, SEC_LVL);
   packetbuf_hdrreduce(18);
   
   CCM_STAR.set_key(key);
@@ -120,10 +123,10 @@ test_sec_lvl_2()
   CCM_STAR.aead(nonce,
       NULL, 0,
       packetbuf_hdrptr(), packetbuf_totlen(),
-      ((uint8_t *) packetbuf_dataptr()) + packetbuf_datalen(), LLSEC802154_MIC_LENGTH,
+      ((uint8_t *) packetbuf_dataptr()) + packetbuf_datalen(), MIC_LEN,
       1);
   
-  if(memcmp(((uint8_t *) packetbuf_dataptr()) + packetbuf_datalen(), oracle, LLSEC802154_MIC_LENGTH) == 0) {
+  if(memcmp(((uint8_t *) packetbuf_dataptr()) + packetbuf_datalen(), oracle, MIC_LEN) == 0) {
     printf("Success\n");
   } else {
     printf("Failure\n");

From 403d3325553e7a4caa22b02df0c9331862836251 Mon Sep 17 00:00:00 2001
From: kkrentz <konrad.krentz@gmail.com>
Date: Thu, 17 Dec 2015 05:55:13 -0800
Subject: [PATCH 155/393] llsec: Make decorated framer configurable

---
 core/net/llsec/noncoresec/noncoresec.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/net/llsec/noncoresec/noncoresec.c b/core/net/llsec/noncoresec/noncoresec.c
index c55128336..a14e71e52 100644
--- a/core/net/llsec/noncoresec/noncoresec.c
+++ b/core/net/llsec/noncoresec/noncoresec.c
@@ -47,7 +47,6 @@
 #include "net/llsec/llsec802154.h"
 #include "net/llsec/ccm-star-packetbuf.h"
 #include "net/mac/frame802154.h"
-#include "net/mac/framer-802154.h"
 #include "net/netstack.h"
 #include "net/packetbuf.h"
 #include "net/nbr-table.h"
@@ -55,6 +54,14 @@
 #include "lib/ccm-star.h"
 #include <string.h>
 
+#ifdef NONCORESEC_CONF_DECORATED_FRAMER
+#define DECORATED_FRAMER NONCORESEC_CONF_DECORATED_FRAMER
+#else /* NONCORESEC_CONF_DECORATED_FRAMER */
+#define DECORATED_FRAMER framer_802154
+#endif /* NONCORESEC_CONF_DECORATED_FRAMER */
+
+extern const struct framer DECORATED_FRAMER;
+
 #ifdef NONCORESEC_CONF_SEC_LVL
 #define SEC_LVL         NONCORESEC_CONF_SEC_LVL
 #else /* NONCORESEC_CONF_SEC_LVL */
@@ -155,7 +162,7 @@ create(void)
   int result;
   
   add_security_header();
-  result = framer_802154.create();
+  result = DECORATED_FRAMER.create();
   if(result == FRAMER_FAILED) {
     return result;
   }
@@ -172,7 +179,7 @@ parse(void)
   const linkaddr_t *sender;
   struct anti_replay_info* info;
   
-  result = framer_802154.parse();
+  result = DECORATED_FRAMER.parse();
   if(result == FRAMER_FAILED) {
     return result;
   }
@@ -242,7 +249,7 @@ static int
 length(void)
 {
   add_security_header();
-  return framer_802154.length() + MIC_LEN;
+  return DECORATED_FRAMER.length() + MIC_LEN;
 }
 /*---------------------------------------------------------------------------*/
 static void

From b3f2bba3ecd4d0284dc57467164762ac5c1521ee Mon Sep 17 00:00:00 2001
From: Hardy <ntbox@mardys.de>
Date: Wed, 13 Apr 2016 18:12:47 +0200
Subject: [PATCH 156/393] Removed some unnecessary statics in do_event() and
 process_post().

This allows the optimizer to put the corresponding variables into registers.
See also discussion about other static variables:
https://sourceforge.net/p/contiki/mailman/message/35010460/
---
 core/sys/process.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/sys/process.c b/core/sys/process.c
index b2ed5701c..f98057cd3 100644
--- a/core/sys/process.c
+++ b/core/sys/process.c
@@ -245,10 +245,10 @@ do_poll(void)
 static void
 do_event(void)
 {
-  static process_event_t ev;
-  static process_data_t data;
-  static struct process *receiver;
-  static struct process *p;
+  process_event_t ev;
+  process_data_t data;
+  struct process *receiver;
+  struct process *p;
   
   /*
    * If there are any events in the queue, take the first one and walk
@@ -321,7 +321,7 @@ process_nevents(void)
 int
 process_post(struct process *p, process_event_t ev, process_data_t data)
 {
-  static process_num_events_t snum;
+  process_num_events_t snum;
 
   if(PROCESS_CURRENT() == NULL) {
     PRINTF("process_post: NULL process posts event %d to process '%s', nevents %d\n",

From 431530bf6bfd2445fd558d8b22ba11555aae2b18 Mon Sep 17 00:00:00 2001
From: kkrentz <konrad.krentz@gmail.com>
Date: Thu, 15 Oct 2015 01:39:42 -0700
Subject: [PATCH 157/393] llsec: Added READMEs

---
 core/net/llsec/README.md            |  5 +++++
 core/net/llsec/noncoresec/README.md | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 core/net/llsec/README.md
 create mode 100644 core/net/llsec/noncoresec/README.md

diff --git a/core/net/llsec/README.md b/core/net/llsec/README.md
new file mode 100644
index 000000000..a5ac5854e
--- /dev/null
+++ b/core/net/llsec/README.md
@@ -0,0 +1,5 @@
+Link layer security is implemented as a new netstack layer, which is located in between the MAC and the NETWORK layer. The interface of LLSEC drivers is defined in [llsec.h](llsec.h). Additionally, LLSEC drivers may define a special [FRAMER](../mac/framer.h), which calls the actual FRAMER underneath. By default, the LLSEC driver `nullsec` is used, which does nothing.
+
+# TODO
+
+* Most main files do not call LLSEC.init, yet
\ No newline at end of file
diff --git a/core/net/llsec/noncoresec/README.md b/core/net/llsec/noncoresec/README.md
new file mode 100644
index 000000000..00ca46f15
--- /dev/null
+++ b/core/net/llsec/noncoresec/README.md
@@ -0,0 +1,21 @@
+`noncoresec` is a noncompromise-resilient 802.15.4 security implementation, which uses a network-wide key. Add these lines to your `project_conf.h` to enable `noncoresec`:
+
+```c
+#undef LLSEC802154_CONF_ENABLED
+#define LLSEC802154_CONF_ENABLED          1
+#undef NETSTACK_CONF_FRAMER
+#define NETSTACK_CONF_FRAMER              noncoresec_framer
+#undef NETSTACK_CONF_LLSEC
+#define NETSTACK_CONF_LLSEC               noncoresec_driver
+#undef NONCORESEC_CONF_SEC_LVL
+#define NONCORESEC_CONF_SEC_LVL           1
+```
+`NONCORESEC_CONF_SEC_LVL` defines the length of MICs and whether encryption is enabled or not.
+
+Setting the network-wide key works as follows:
+```c
+#define NONCORESEC_CONF_KEY { 0x00 , 0x01 , 0x02 , 0x03 , \
+                              0x04 , 0x05 , 0x06 , 0x07 , \ 
+                              0x08 , 0x09 , 0x0A , 0x0B , \ 
+                              0x0C , 0x0D , 0x0E , 0x0F } 
+```

From 4a88e9e537dbbe297f9271062917094978394e60 Mon Sep 17 00:00:00 2001
From: kkrentz <konrad.krentz@gmail.com>
Date: Fri, 18 Dec 2015 06:52:18 -0800
Subject: [PATCH 158/393] llsec: Removed TSCH_SECURITY_CONF_LEVEL and
 TSCH_SECURITY_LEVEL

---
 core/net/mac/tsch/README.md           |  2 --
 core/net/mac/tsch/tsch-security.h     | 13 -------------
 examples/ipv6/rpl-tsch/node.c         |  6 +++---
 examples/ipv6/rpl-tsch/project-conf.h |  2 --
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/core/net/mac/tsch/README.md b/core/net/mac/tsch/README.md
index a70b4806d..02fe0cb05 100644
--- a/core/net/mac/tsch/README.md
+++ b/core/net/mac/tsch/README.md
@@ -130,8 +130,6 @@ To include TSCH standard-compliant security, set the following:
 /* Enable security */
 #undef LLSEC802154_CONF_ENABLED
 #define LLSEC802154_CONF_ENABLED 1
-#undef TSCH_SECURITY_CONF_LEVEL
-#define TSCH_SECURITY_CONF_LEVEL 1
 /* TSCH uses explicit keys to identify k1 and k2 */
 #undef LLSEC802154_CONF_USES_EXPLICIT_KEYS
 #define LLSEC802154_CONF_USES_EXPLICIT_KEYS 1
diff --git a/core/net/mac/tsch/tsch-security.h b/core/net/mac/tsch/tsch-security.h
index c01e7ea6b..42f18e8d9 100644
--- a/core/net/mac/tsch/tsch-security.h
+++ b/core/net/mac/tsch/tsch-security.h
@@ -46,23 +46,10 @@
 
 /* To enable TSCH security:
  * - set LLSEC802154_CONF_ENABLED
- * - set TSCH_SECURITY_CONF_LEVEL
  * - set LLSEC802154_CONF_USES_EXPLICIT_KEYS
  * - unset LLSEC802154_CONF_USES_FRAME_COUNTER
  * */
 
-#ifdef TSCH_SECURITY_CONF_LEVEL
-#define TSCH_SECURITY_LEVEL TSCH_SECURITY_CONF_LEVEL
-#else /* TSCH_SECURITY_CONF_LEVEL */
-#define TSCH_SECURITY_LEVEL FRAME802154_SECURITY_LEVEL_NONE
-#endif /* TSCH_SECURITY_CONF_LEVEL */
-
-#if LLSEC802154_ENABLED && !TSCH_SECURITY_LEVEL
-#error LLSEC802154_ENABLED set but TSCH_SECURITY_LEVEL unset
-#endif /* LLSEC802154_ENABLED */
-#if !LLSEC802154_ENABLED && TSCH_SECURITY_LEVEL
-#error TSCH_SECURITY_LEVEL set but LLSEC802154_ENABLED unset
-#endif /* LLSEC802154_ENABLED */
 #if LLSEC802154_ENABLED && !LLSEC802154_USES_EXPLICIT_KEYS
 #error LLSEC802154_ENABLED set but LLSEC802154_USES_EXPLICIT_KEYS unset
 #endif /* LLSEC802154_ENABLED */
diff --git a/examples/ipv6/rpl-tsch/node.c b/examples/ipv6/rpl-tsch/node.c
index 79f8719ea..af0db8845 100644
--- a/examples/ipv6/rpl-tsch/node.c
+++ b/examples/ipv6/rpl-tsch/node.c
@@ -144,7 +144,7 @@ PROCESS_THREAD(node_process, ev, data)
   
   /* Set node with ID == 1 as coordinator, convenient in Cooja. */
   if(node_id == 1) {
-    if(TSCH_SECURITY_LEVEL) {
+    if(LLSEC802154_ENABLED) {
       node_role = role_6dr_sec;
     } else {
       node_role = role_6dr;
@@ -169,7 +169,7 @@ PROCESS_THREAD(node_process, ev, data)
                                || etimer_expired(&et));
       if(ev == sensors_event && data == &button_sensor && button_sensor.value(0) > 0) {
         node_role = (node_role + 1) % 3;
-        if(TSCH_SECURITY_LEVEL == 0 && node_role == role_6dr_sec) {
+        if(LLSEC802154_ENABLED == 0 && node_role == role_6dr_sec) {
           node_role = (node_role + 1) % 3;
         }
         etimer_restart(&et);
@@ -182,7 +182,7 @@ PROCESS_THREAD(node_process, ev, data)
   printf("Init: node starting with role %s\n",
       node_role == role_6ln ? "6ln" : (node_role == role_6dr) ? "6dr" : "6dr-sec");
 
-  tsch_set_pan_secured(TSCH_SECURITY_LEVEL && (node_role == role_6dr_sec));
+  tsch_set_pan_secured(LLSEC802154_ENABLED && (node_role == role_6dr_sec));
   is_coordinator = node_role > role_6ln;
 
   if(is_coordinator) {
diff --git a/examples/ipv6/rpl-tsch/project-conf.h b/examples/ipv6/rpl-tsch/project-conf.h
index 11c882c43..30f638bb4 100644
--- a/examples/ipv6/rpl-tsch/project-conf.h
+++ b/examples/ipv6/rpl-tsch/project-conf.h
@@ -100,8 +100,6 @@
 #if WITH_SECURITY
 
 /* Enable security */
-#undef TSCH_SECURITY_CONF_LEVEL
-#define TSCH_SECURITY_CONF_LEVEL 1
 #undef LLSEC802154_CONF_ENABLED
 #define LLSEC802154_CONF_ENABLED 1
 /* TSCH uses explicit keys to identify k1 and k2 */

From 7353829c72fd6a499942fdb9f946f62780e5a4ac Mon Sep 17 00:00:00 2001
From: kkrentz <konrad.krentz@gmail.com>
Date: Wed, 2 Mar 2016 01:58:19 -0800
Subject: [PATCH 159/393] llsec: Fix for Issue #1537

---
 core/net/llsec/noncoresec/noncoresec.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/net/llsec/noncoresec/noncoresec.c b/core/net/llsec/noncoresec/noncoresec.c
index a14e71e52..71a1cb82a 100644
--- a/core/net/llsec/noncoresec/noncoresec.c
+++ b/core/net/llsec/noncoresec/noncoresec.c
@@ -143,16 +143,15 @@ aead(uint8_t hdrlen, int forward)
 static void
 add_security_header(void)
 {
-  if(!packetbuf_attr(PACKETBUF_ATTR_SECURITY_LEVEL)) {
-    packetbuf_set_attr(PACKETBUF_ATTR_FRAME_TYPE, FRAME802154_DATAFRAME);
-    packetbuf_set_attr(PACKETBUF_ATTR_SECURITY_LEVEL, SEC_LVL);
-    anti_replay_set_counter();
-  }
+  packetbuf_set_attr(PACKETBUF_ATTR_FRAME_TYPE, FRAME802154_DATAFRAME);
+  packetbuf_set_attr(PACKETBUF_ATTR_SECURITY_LEVEL, SEC_LVL);
 }
 /*---------------------------------------------------------------------------*/
 static void
 send(mac_callback_t sent, void *ptr)
 {
+  add_security_header();
+  anti_replay_set_counter();
   NETSTACK_MAC.send(sent, ptr);
 }
 /*---------------------------------------------------------------------------*/
@@ -161,7 +160,6 @@ create(void)
 {
   int result;
   
-  add_security_header();
   result = DECORATED_FRAMER.create();
   if(result == FRAMER_FAILED) {
     return result;

From d478c0f7f15fc884914c2cfc164588e43152f882 Mon Sep 17 00:00:00 2001
From: Konrad Krentz <konrad.krentz@gmail.com>
Date: Fri, 17 Jul 2015 05:40:45 -0700
Subject: [PATCH 160/393] packetbuf: Deleted functions that are never called

---
 core/net/packetbuf.c | 29 -----------------------------
 core/net/packetbuf.h | 31 -------------------------------
 2 files changed, 60 deletions(-)

diff --git a/core/net/packetbuf.c b/core/net/packetbuf.c
index c7e2a9898..3cc2e1ac7 100644
--- a/core/net/packetbuf.c
+++ b/core/net/packetbuf.c
@@ -83,12 +83,6 @@ packetbuf_clear(void)
   packetbuf_attr_clear();
 }
 /*---------------------------------------------------------------------------*/
-void
-packetbuf_clear_hdr(void)
-{
-  hdrptr = PACKETBUF_HDR_SIZE;
-}
-/*---------------------------------------------------------------------------*/
 int
 packetbuf_copyfrom(const void *from, uint16_t len)
 {
@@ -117,23 +111,6 @@ packetbuf_compact(void)
 }
 /*---------------------------------------------------------------------------*/
 int
-packetbuf_copyto_hdr(uint8_t *to)
-{
-#if DEBUG_LEVEL > 0
-  {
-    int i;
-    PRINTF("packetbuf_write_hdr: header:\n");
-    for(i = hdrptr; i < PACKETBUF_HDR_SIZE; ++i) {
-      PRINTF("0x%02x, ", packetbuf[i]);
-    }
-    PRINTF("\n");
-  }
-#endif /* DEBUG_LEVEL */
-  memcpy(to, packetbuf + hdrptr, PACKETBUF_HDR_SIZE - hdrptr);
-  return PACKETBUF_HDR_SIZE - hdrptr;
-}
-/*---------------------------------------------------------------------------*/
-int
 packetbuf_copyto(void *to)
 {
 #if DEBUG_LEVEL > 0
@@ -176,12 +153,6 @@ packetbuf_hdralloc(int size)
   return 0;
 }
 /*---------------------------------------------------------------------------*/
-void
-packetbuf_hdr_remove(int size)
-{
-  hdrptr += size;
-}
-/*---------------------------------------------------------------------------*/
 int
 packetbuf_hdrreduce(int size)
 {
diff --git a/core/net/packetbuf.h b/core/net/packetbuf.h
index 12b0d9dce..fe3472536 100644
--- a/core/net/packetbuf.h
+++ b/core/net/packetbuf.h
@@ -92,21 +92,6 @@
  */
 void packetbuf_clear(void);
 
-/**
- * \brief      Clear and reset the header of the packetbuf
- *
- *             This function clears the header of the packetbuf and
- *             resets all the internal state pointers pertaining to
- *             the header (header size, header pointer, but not
- *             external data pointer). It is used before after sending
- *             a packet in the packetbuf, to be able to reuse the
- *             packet buffer for a later retransmission.
- *
- */
-void packetbuf_clear_hdr(void);
-
-void packetbuf_hdr_remove(int bytes);
-
 /**
  * \brief      Get a pointer to the data in the packetbuf
  * \return     Pointer to the packetbuf data
@@ -235,22 +220,6 @@ int packetbuf_copyfrom(const void *from, uint16_t len);
  */
 int packetbuf_copyto(void *to);
 
-/**
- * \brief      Copy the header portion of the packetbuf to an external buffer
- * \param to   A pointer to the buffer to which the data is to be copied
- * \retval     The number of bytes that was copied to the external buffer
- *
- *             This function copies the header portion of the packetbuf
- *             to an external buffer.
- *
- *             The external buffer to which the packetbuf is to be
- *             copied must be able to accomodate at least
- *             PACKETBUF_HDR_SIZE bytes. The number of bytes that was
- *             copied to the external buffer is returned.
- *
- */
-int packetbuf_copyto_hdr(uint8_t *to);
-
 /**
  * \brief      Extend the header of the packetbuf, for outbound packets
  * \param size The number of bytes the header should be extended

From a1b91d8b59398249816e67f89fc8553e194cff16 Mon Sep 17 00:00:00 2001
From: kkrentz <konrad.krentz@gmail.com>
Date: Wed, 3 Feb 2016 06:41:15 -0800
Subject: [PATCH 161/393] packetbuf: Removed commented code

---
 core/net/packetbuf.c | 2 --
 core/net/packetbuf.h | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/core/net/packetbuf.c b/core/net/packetbuf.c
index 3cc2e1ac7..774ff2f60 100644
--- a/core/net/packetbuf.c
+++ b/core/net/packetbuf.c
@@ -243,7 +243,6 @@ packetbuf_attr_copyfrom(struct packetbuf_attr *attrs,
 int
 packetbuf_set_attr(uint8_t type, const packetbuf_attr_t val)
 {
-/*   packetbuf_attrs[type].type = type; */
   packetbuf_attrs[type].val = val;
   return 1;
 }
@@ -257,7 +256,6 @@ packetbuf_attr(uint8_t type)
 int
 packetbuf_set_addr(uint8_t type, const linkaddr_t *addr)
 {
-/*   packetbuf_addrs[type - PACKETBUF_ADDR_FIRST].type = type; */
   linkaddr_copy(&packetbuf_addrs[type - PACKETBUF_ADDR_FIRST].addr, addr);
   return 1;
 }
diff --git a/core/net/packetbuf.h b/core/net/packetbuf.h
index fe3472536..cca365f6e 100644
--- a/core/net/packetbuf.h
+++ b/core/net/packetbuf.h
@@ -253,11 +253,9 @@ int packetbuf_hdrreduce(int size);
 typedef uint16_t packetbuf_attr_t;
 
 struct packetbuf_attr {
-/*   uint8_t type; */
   packetbuf_attr_t val;
 };
 struct packetbuf_addr {
-/*   uint8_t type; */
   linkaddr_t addr;
 };
 
@@ -380,7 +378,6 @@ static const linkaddr_t *packetbuf_addr(uint8_t type);
 static inline int
 packetbuf_set_attr(uint8_t type, const packetbuf_attr_t val)
 {
-/*   packetbuf_attrs[type].type = type; */
   packetbuf_attrs[type].val = val;
   return 1;
 }
@@ -393,7 +390,6 @@ packetbuf_attr(uint8_t type)
 static inline int
 packetbuf_set_addr(uint8_t type, const linkaddr_t *addr)
 {
-/*   packetbuf_addrs[type - PACKETBUF_ADDR_FIRST].type = type; */
   linkaddr_copy(&packetbuf_addrs[type - PACKETBUF_ADDR_FIRST].addr, addr);
   return 1;
 }

From 11c03eef797ed03820374fc307010c0d76eb636e Mon Sep 17 00:00:00 2001
From: kkrentz <konrad.krentz@gmail.com>
Date: Wed, 3 Feb 2016 06:42:18 -0800
Subject: [PATCH 162/393] packetbuf: Removed function prototypes

---
 core/net/packetbuf.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/core/net/packetbuf.h b/core/net/packetbuf.h
index cca365f6e..0afd02a74 100644
--- a/core/net/packetbuf.h
+++ b/core/net/packetbuf.h
@@ -370,11 +370,6 @@ enum {
 extern struct packetbuf_attr packetbuf_attrs[];
 extern struct packetbuf_addr packetbuf_addrs[];
 
-static int               packetbuf_set_attr(uint8_t type, const packetbuf_attr_t val);
-static packetbuf_attr_t    packetbuf_attr(uint8_t type);
-static int               packetbuf_set_addr(uint8_t type, const linkaddr_t *addr);
-static const linkaddr_t *packetbuf_addr(uint8_t type);
-
 static inline int
 packetbuf_set_attr(uint8_t type, const packetbuf_attr_t val)
 {

From 1014018c2d5fa4a61b57f7ba6f56f7ffc18f6029 Mon Sep 17 00:00:00 2001
From: kkrentz <konrad.krentz@gmail.com>
Date: Wed, 3 Feb 2016 08:08:12 -0800
Subject: [PATCH 163/393] packetbuf: Removed debugging stuff

---
 core/net/packetbuf.c | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/core/net/packetbuf.c b/core/net/packetbuf.c
index 774ff2f60..cfc831fd8 100644
--- a/core/net/packetbuf.c
+++ b/core/net/packetbuf.c
@@ -113,26 +113,6 @@ packetbuf_compact(void)
 int
 packetbuf_copyto(void *to)
 {
-#if DEBUG_LEVEL > 0
-  {
-    int i;
-    char buffer[1000];
-    char *bufferptr = buffer;
-    int  bufferlen = 0;
-    
-    bufferptr[0] = 0;
-    for(i = hdrptr; i < PACKETBUF_HDR_SIZE; ++i) {
-      bufferptr += sprintf(bufferptr, "0x%02x, ", packetbuf[i]);
-    }
-    PRINTF("packetbuf_write: header: %s\n", buffer);
-    bufferptr = buffer;
-    bufferptr[0] = 0;
-    for(i = bufptr; ((i < buflen + bufptr) && (bufferlen < (sizeof(buffer) - 10))); ++i) {
-      bufferlen += sprintf(bufferptr + bufferlen, "0x%02x, ", packetbufptr[i]);
-    }
-    PRINTF("packetbuf_write: data: %s\n", buffer);
-  }
-#endif /* DEBUG_LEVEL */
   if(PACKETBUF_HDR_SIZE - hdrptr + buflen > PACKETBUF_SIZE) {
     /* Too large packet */
     return 0;

From 3d79292e441fe66e78b161f8963481f0eb6c2067 Mon Sep 17 00:00:00 2001
From: kkrentz <konrad.krentz@gmail.com>
Date: Wed, 3 Feb 2016 07:59:22 -0800
Subject: [PATCH 164/393] packetbuf: Simplified packetbuf_attr_clear

---
 core/net/packetbuf.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/net/packetbuf.c b/core/net/packetbuf.c
index cfc831fd8..1e6b9a57f 100644
--- a/core/net/packetbuf.c
+++ b/core/net/packetbuf.c
@@ -195,9 +195,7 @@ void
 packetbuf_attr_clear(void)
 {
   int i;
-  for(i = 0; i < PACKETBUF_NUM_ATTRS; ++i) {
-    packetbuf_attrs[i].val = 0;
-  }
+  memset(packetbuf_attrs, 0, sizeof(packetbuf_attrs));
   for(i = 0; i < PACKETBUF_NUM_ADDRS; ++i) {
     linkaddr_copy(&packetbuf_addrs[i].addr, &linkaddr_null);
   }

From 0af4a18c09d6759f8285e017c216b04b8c2414ac Mon Sep 17 00:00:00 2001
From: kkrentz <konrad.krentz@gmail.com>
Date: Wed, 3 Feb 2016 08:09:13 -0800
Subject: [PATCH 165/393] packetbuf: Use MIN macro

---
 core/net/packetbuf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/net/packetbuf.c b/core/net/packetbuf.c
index 1e6b9a57f..a2f295816 100644
--- a/core/net/packetbuf.c
+++ b/core/net/packetbuf.c
@@ -47,6 +47,7 @@
 #include "contiki-net.h"
 #include "net/packetbuf.h"
 #include "net/rime/rime.h"
+#include "sys/cc.h"
 
 struct packetbuf_attr packetbuf_attrs[PACKETBUF_NUM_ATTRS];
 struct packetbuf_addr packetbuf_addrs[PACKETBUF_NUM_ADDRS];
@@ -89,7 +90,7 @@ packetbuf_copyfrom(const void *from, uint16_t len)
   uint16_t l;
 
   packetbuf_clear();
-  l = len > PACKETBUF_SIZE? PACKETBUF_SIZE: len;
+  l = MIN(PACKETBUF_SIZE, len);
   memcpy(packetbufptr, from, l);
   buflen = l;
   return l;

From f1110bf6df176cdc61a284030021c67f314cb7df Mon Sep 17 00:00:00 2001
From: Marko Gucanin <marko.gucanin@soom-it.ch>
Date: Thu, 14 Apr 2016 16:52:32 +0200
Subject: [PATCH 166/393] removed NETSTACK_LLSEC.init

---
 platform/jn516x/contiki-jn516x-main.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/platform/jn516x/contiki-jn516x-main.c b/platform/jn516x/contiki-jn516x-main.c
index 171b94a2a..9a64365e6 100644
--- a/platform/jn516x/contiki-jn516x-main.c
+++ b/platform/jn516x/contiki-jn516x-main.c
@@ -409,7 +409,6 @@ main(void)
 #endif /* NETSTACK_CONF_WITH_IPV4 */
 
   watchdog_start();
-  NETSTACK_LLSEC.init();
 
 #if NETSTACK_CONF_WITH_IPV6
   start_uip6();

From d8db093eb256641e3c131e4803c1ae9d591fe246 Mon Sep 17 00:00:00 2001
From: Marko Gucanin <marko.gucanin@soom-it.ch>
Date: Thu, 14 Apr 2016 16:55:48 +0200
Subject: [PATCH 167/393] renamed ccm-star.c to jn516x-ccm-star.c, adapted
 Makefile accordingly

---
 platform/jn516x/Makefile.jn516x                       | 2 +-
 platform/jn516x/dev/{ccm-star.c => jn516x-ccm-star.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename platform/jn516x/dev/{ccm-star.c => jn516x-ccm-star.c} (100%)

diff --git a/platform/jn516x/Makefile.jn516x b/platform/jn516x/Makefile.jn516x
index 27587ccaf..ca41ce3ae 100644
--- a/platform/jn516x/Makefile.jn516x
+++ b/platform/jn516x/Makefile.jn516x
@@ -80,7 +80,7 @@ SIZE:=$(CROSS_COMPILE)-size
 OBJCOPY:=$(CROSS_COMPILE)-objcopy
 OBJDUMP:=$(CROSS_COMPILE)-objdump
 
-ARCH = ccm-star.c exceptions.c rtimer-arch.c rtimer-arch-slow.c \
+ARCH = jn516x-ccm-star.c exceptions.c rtimer-arch.c rtimer-arch-slow.c \
        slip_uart0.c clock.c micromac-radio.c \
        mtarch.c node-id.c watchdog.c log.c slip.c sprintf.c
 # Default uart0 for printf and slip
diff --git a/platform/jn516x/dev/ccm-star.c b/platform/jn516x/dev/jn516x-ccm-star.c
similarity index 100%
rename from platform/jn516x/dev/ccm-star.c
rename to platform/jn516x/dev/jn516x-ccm-star.c

From 6fb6fd5bb9639941d141028ac205f89b9d4a7c8a Mon Sep 17 00:00:00 2001
From: kkrentz <konrad.krentz@gmail.com>
Date: Thu, 4 Feb 2016 03:25:47 -0800
Subject: [PATCH 168/393] packetbuf: No more splitting of header and data

---
 core/net/packetbuf.c                 | 62 ++++++++++++----------------
 core/net/packetbuf.h                 | 46 +--------------------
 platform/avr-raven/contiki-conf.h    |  3 --
 platform/avr-ravenusb/contiki-conf.h |  5 ---
 platform/avr-rcb/contiki-conf.h      |  1 -
 platform/avr-zigbit/contiki-conf.h   |  3 --
 6 files changed, 28 insertions(+), 92 deletions(-)

diff --git a/core/net/packetbuf.c b/core/net/packetbuf.c
index a2f295816..4869263cf 100644
--- a/core/net/packetbuf.c
+++ b/core/net/packetbuf.c
@@ -54,17 +54,15 @@ struct packetbuf_addr packetbuf_addrs[PACKETBUF_NUM_ADDRS];
 
 
 static uint16_t buflen, bufptr;
-static uint8_t hdrptr;
+static uint8_t hdrlen;
 
 /* The declarations below ensure that the packet buffer is aligned on
    an even 32-bit boundary. On some platforms (most notably the
    msp430 or OpenRISC), having a potentially misaligned packet buffer may lead to
    problems when accessing words. */
-static uint32_t packetbuf_aligned[(PACKETBUF_SIZE + PACKETBUF_HDR_SIZE + 3) / 4];
+static uint32_t packetbuf_aligned[(PACKETBUF_SIZE + 3) / 4];
 static uint8_t *packetbuf = (uint8_t *)packetbuf_aligned;
 
-static uint8_t *packetbufptr;
-
 #define DEBUG 0
 #if DEBUG
 #include <stdio.h>
@@ -78,9 +76,8 @@ void
 packetbuf_clear(void)
 {
   buflen = bufptr = 0;
-  hdrptr = PACKETBUF_HDR_SIZE;
+  hdrlen = 0;
 
-  packetbufptr = &packetbuf[PACKETBUF_HDR_SIZE];
   packetbuf_attr_clear();
 }
 /*---------------------------------------------------------------------------*/
@@ -91,7 +88,7 @@ packetbuf_copyfrom(const void *from, uint16_t len)
 
   packetbuf_clear();
   l = MIN(PACKETBUF_SIZE, len);
-  memcpy(packetbufptr, from, l);
+  memcpy(packetbuf, from, l);
   buflen = l;
   return l;
 }
@@ -99,14 +96,13 @@ packetbuf_copyfrom(const void *from, uint16_t len)
 void
 packetbuf_compact(void)
 {
-  int i, len;
+  int16_t i;
 
-  if(bufptr > 0) {
-    len = packetbuf_datalen() + PACKETBUF_HDR_SIZE;
-    for(i = PACKETBUF_HDR_SIZE; i < len; i++) {
-      packetbuf[i] = packetbuf[bufptr + i];
+  if(bufptr) {
+    /* shift data to the left */
+    for(i = 0; i < buflen; i++) {
+      packetbuf[hdrlen + i] = packetbuf[packetbuf_hdrlen() + i];
     }
-
     bufptr = 0;
   }
 }
@@ -114,24 +110,29 @@ packetbuf_compact(void)
 int
 packetbuf_copyto(void *to)
 {
-  if(PACKETBUF_HDR_SIZE - hdrptr + buflen > PACKETBUF_SIZE) {
-    /* Too large packet */
+  if(hdrlen + buflen > PACKETBUF_SIZE) {
     return 0;
   }
-  memcpy(to, packetbuf + hdrptr, PACKETBUF_HDR_SIZE - hdrptr);
-  memcpy((uint8_t *)to + PACKETBUF_HDR_SIZE - hdrptr, packetbufptr + bufptr,
-	 buflen);
-  return PACKETBUF_HDR_SIZE - hdrptr + buflen;
+  memcpy(to, packetbuf_hdrptr(), hdrlen);
+  memcpy((uint8_t *)to + hdrlen, packetbuf_dataptr(), buflen);
+  return hdrlen + buflen;
 }
 /*---------------------------------------------------------------------------*/
 int
 packetbuf_hdralloc(int size)
 {
-  if(hdrptr >= size && packetbuf_totlen() + size <= PACKETBUF_SIZE) {
-    hdrptr -= size;
-    return 1;
+  int16_t i;
+
+  if(size + packetbuf_totlen() > PACKETBUF_SIZE) {
+    return 0;
   }
-  return 0;
+
+  /* shift data to the right */
+  for(i = packetbuf_totlen() - 1; i >= 0; i--) {
+    packetbuf[i + size] = packetbuf[i];
+  }
+  hdrlen += size;
+  return 1;
 }
 /*---------------------------------------------------------------------------*/
 int
@@ -156,13 +157,13 @@ packetbuf_set_datalen(uint16_t len)
 void *
 packetbuf_dataptr(void)
 {
-  return (void *)(&packetbuf[bufptr + PACKETBUF_HDR_SIZE]);
+  return packetbuf + packetbuf_hdrlen();
 }
 /*---------------------------------------------------------------------------*/
 void *
 packetbuf_hdrptr(void)
 {
-  return (void *)(&packetbuf[hdrptr]);
+  return packetbuf;
 }
 /*---------------------------------------------------------------------------*/
 uint16_t
@@ -174,16 +175,7 @@ packetbuf_datalen(void)
 uint8_t
 packetbuf_hdrlen(void)
 {
-  uint8_t hdrlen;
-  
-  hdrlen = PACKETBUF_HDR_SIZE - hdrptr;
-  if(hdrlen) {
-    /* outbound packet */
-    return hdrlen;
-  } else {
-    /* inbound packet */
-    return bufptr;
-  }
+  return bufptr + hdrlen;
 }
 /*---------------------------------------------------------------------------*/
 uint16_t
diff --git a/core/net/packetbuf.h b/core/net/packetbuf.h
index 0afd02a74..3d6386d26 100644
--- a/core/net/packetbuf.h
+++ b/core/net/packetbuf.h
@@ -66,15 +66,6 @@
 #define PACKETBUF_SIZE 128
 #endif
 
-/**
- * \brief      The size of the packetbuf header, in bytes
- */
-#ifdef PACKETBUF_CONF_HDR_SIZE
-#define PACKETBUF_HDR_SIZE PACKETBUF_CONF_HDR_SIZE
-#else
-#define PACKETBUF_HDR_SIZE 48
-#endif
-
 #ifdef PACKETBUF_CONF_WITH_PACKET_TYPE
 #define PACKETBUF_WITH_PACKET_TYPE PACKETBUF_CONF_WITH_PACKET_TYPE
 #else
@@ -100,15 +91,6 @@ void packetbuf_clear(void);
  *             the packetbuf. The data is either stored in the packetbuf,
  *             or referenced to an external location.
  *
- *             For outbound packets, the packetbuf consists of two
- *             parts: header and data. The header is accessed with the
- *             packetbuf_hdrptr() function.
- *
- *             For incoming packets, both the packet header and the
- *             packet data is stored in the data portion of the
- *             packetbuf. Thus this function is used to get a pointer to
- *             the header for incoming packets.
- *
  */
 void *packetbuf_dataptr(void);
 
@@ -116,11 +98,6 @@ void *packetbuf_dataptr(void);
  * \brief      Get a pointer to the header in the packetbuf, for outbound packets
  * \return     Pointer to the packetbuf header
  *
- *             For outbound packets, the packetbuf consists of two
- *             parts: header and data. This function is used to get a
- *             pointer to the header in the packetbuf. The header is
- *             stored in the packetbuf.
- *
  */
 void *packetbuf_hdrptr(void);
 
@@ -128,12 +105,6 @@ void *packetbuf_hdrptr(void);
  * \brief      Get the length of the header in the packetbuf
  * \return     Length of the header in the packetbuf
  *
- *             For outbound packets, the packetbuf consists of two
- *             parts: header and data. This function is used to get
- *             the length of the header in the packetbuf. The header is
- *             stored in the packetbuf and accessed via the
- *             packetbuf_hdrptr() function.
- *
  */
 uint8_t packetbuf_hdrlen(void);
 
@@ -142,17 +113,6 @@ uint8_t packetbuf_hdrlen(void);
  * \brief      Get the length of the data in the packetbuf
  * \return     Length of the data in the packetbuf
  *
- *             For outbound packets, the packetbuf consists of two
- *             parts: header and data. This function is used to get
- *             the length of the data in the packetbuf. The data is
- *             stored in the packetbuf and accessed via the
- *             packetbuf_dataptr() function.
- *
- *             For incoming packets, both the packet header and the
- *             packet data is stored in the data portion of the
- *             packetbuf. This function is then used to get the total
- *             length of the packet - both header and data.
- *
  */
 uint16_t packetbuf_datalen(void);
 
@@ -166,10 +126,6 @@ uint16_t packetbuf_totlen(void);
 /**
  * \brief      Set the length of the data in the packetbuf
  * \param len  The length of the data
- *
- *             For outbound packets, the packetbuf consists of two
- *             parts: header and data. This function is used to set
- *             the length of the data in the packetbuf.
  */
 void packetbuf_set_datalen(uint16_t len);
 
@@ -213,7 +169,7 @@ int packetbuf_copyfrom(const void *from, uint16_t len);
  *
  *             The external buffer to which the packetbuf is to be
  *             copied must be able to accomodate at least
- *             (PACKETBUF_SIZE + PACKETBUF_HDR_SIZE) bytes. The number of
+ *             PACKETBUF_SIZE bytes. The number of
  *             bytes that was copied to the external buffer is
  *             returned.
  *
diff --git a/platform/avr-raven/contiki-conf.h b/platform/avr-raven/contiki-conf.h
index ab770540d..45ea5fb22 100644
--- a/platform/avr-raven/contiki-conf.h
+++ b/platform/avr-raven/contiki-conf.h
@@ -138,15 +138,12 @@ typedef unsigned short uip_stats_t;
 
 /* Network setup. The new NETSTACK interface requires RF230BB (as does ip4) */
 #if RF230BB
-#undef PACKETBUF_CONF_HDR_SIZE                  //Use the packetbuf default for header size
 /* TX routine passes the cca/ack result in the return parameter */
 #define RDC_CONF_HARDWARE_ACK      1
 /* TX routine does automatic cca and optional backoff */
 #define RDC_CONF_HARDWARE_CSMA     1
 /* Allow MCU sleeping between channel checks */
 #define RDC_CONF_MCU_SLEEP         0
-#else
-#define PACKETBUF_CONF_HDR_SIZE    0            //RF230 combined driver/mac handles headers internally
 #endif /*RF230BB */
 
 #if NETSTACK_CONF_WITH_IPV6
diff --git a/platform/avr-ravenusb/contiki-conf.h b/platform/avr-ravenusb/contiki-conf.h
index 71d56e248..8eab7cce9 100644
--- a/platform/avr-ravenusb/contiki-conf.h
+++ b/platform/avr-ravenusb/contiki-conf.h
@@ -204,11 +204,6 @@ extern void mac_log_802_15_4_rx(const uint8_t* buffer, size_t total_len);
 /* Network setup. The new NETSTACK interface requires RF230BB (as does ip4) */
 /* These mostly have no effect when the Jackdaw is a repeater (CONTIKI_NO_NET=1 using fakeuip.c) */
 
-#if RF230BB
-#else
-#define PACKETBUF_CONF_HDR_SIZE    0         //RF230 combined driver/mac handles headers internally
-#endif /*RF230BB */
-
 #if NETSTACK_CONF_WITH_IPV6
 #define LINKADDR_CONF_SIZE       8
 #define UIP_CONF_ICMP6           1
diff --git a/platform/avr-rcb/contiki-conf.h b/platform/avr-rcb/contiki-conf.h
index 298a33cd0..68ce8f3b6 100644
--- a/platform/avr-rcb/contiki-conf.h
+++ b/platform/avr-rcb/contiki-conf.h
@@ -85,7 +85,6 @@ void clock_adjust_ticks(clock_time_t howmany);
 #define CLIF
 
 #define LINKADDR_CONF_SIZE       8
-#define PACKETBUF_CONF_HDR_SIZE    48	/* Choose a buffersize != 0 for the messages which should be sended over the wireless interface */
 
 /* Uncomment this lines to activate the specific drivers */
 //#define NETSTACK_CONF_NETWORK     rime_driver		
diff --git a/platform/avr-zigbit/contiki-conf.h b/platform/avr-zigbit/contiki-conf.h
index f84df8863..c01c6555c 100644
--- a/platform/avr-zigbit/contiki-conf.h
+++ b/platform/avr-zigbit/contiki-conf.h
@@ -88,7 +88,6 @@ void clock_adjust_ticks(clock_time_t howmany);
 #endif
 
 #define LINKADDR_CONF_SIZE       8
-#define PACKETBUF_CONF_HDR_SIZE    0
 
 //define NETSTACK_CONF_WITH_IPV6            1 //Let the makefile do this, allows hello-world to compile
 #if NETSTACK_CONF_WITH_IPV6
@@ -100,7 +99,6 @@ void clock_adjust_ticks(clock_time_t howmany);
 /* The new NETSTACK interface requires RF230BB */
 #if RF230BB
 #define SICSLOWPAN_CONF_COMPRESSION       SICSLOWPAN_COMPRESSION_HC06
-#undef PACKETBUF_CONF_HDR_SIZE                  //RF230BB takes the packetbuf default for header size
 #define UIP_CONF_LLH_LEN         0
 
 /* No radio cycling */
@@ -126,7 +124,6 @@ void clock_adjust_ticks(clock_time_t howmany);
 
 #else
 /* Original combined RF230/mac code will not compile with current contiki stack */
-//#define PACKETBUF_CONF_HDR_SIZE    0            //RF230 handles headers internally
 //FTH081105
 #define SICSLOWPAN_CONF_COMPRESSION       SICSLOWPAN_COMPRESSION_HC06
 #define SICSLOWPAN_CONF_MAXAGE 5

From 3bf05d664e77b6e6e43b3f7bd34e3b1f4d3fc715 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Fri, 15 Apr 2016 15:50:01 +0200
Subject: [PATCH 169/393] moving macros to .c

---
 cpu/cc2538/dev/cc2538-rf.h | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/cpu/cc2538/dev/cc2538-rf.h b/cpu/cc2538/dev/cc2538-rf.h
index 287147a92..5edb478ba 100644
--- a/cpu/cc2538/dev/cc2538-rf.h
+++ b/cpu/cc2538/dev/cc2538-rf.h
@@ -129,15 +129,6 @@
   REG(RFCORE_SFR_RFST) = CC2538_RF_CSP_OP_ISFLUSHTX; \
   REG(RFCORE_SFR_RFST) = CC2538_RF_CSP_OP_ISFLUSHTX; \
 } while(0)
-/*---------------------------------------------------------------------------
- * MAC timer
- *---------------------------------------------------------------------------*/
-/* Timer conversion */
-#define RADIO_TO_RTIMER(X) ((X) * RTIMER_ARCH_SECOND / SYS_CTRL_32MHZ)
-
-#define CLOCK_STABLE() do {															\
-			while ( !(REG(SYS_CTRL_CLOCK_STA) & (SYS_CTRL_CLOCK_STA_XOSC_STB)));	\
-		} while(0)
 /*---------------------------------------------------------------------------*/
 /** The NETSTACK data structure for the cc2538 RF driver */
 extern const struct radio_driver cc2538_rf_driver;

From 6262025ef3befe7afc0b653444c3d7276d6c5aaa Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Fri, 15 Apr 2016 15:50:20 +0200
Subject: [PATCH 170/393] code style fixes and insert macros from .h

---
 cpu/cc2538/dev/cc2538-rf.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/cpu/cc2538/dev/cc2538-rf.c b/cpu/cc2538/dev/cc2538-rf.c
index 12fe9ffae..652480a9e 100644
--- a/cpu/cc2538/dev/cc2538-rf.c
+++ b/cpu/cc2538/dev/cc2538-rf.c
@@ -119,6 +119,15 @@ static const uint8_t magic[] = { 0x53, 0x6E, 0x69, 0x66 };      /** Snif */
 #else
 #define CC2538_RF_AUTOACK 1
 #endif
+/*---------------------------------------------------------------------------
+ * MAC timer
+ *---------------------------------------------------------------------------*/
+/* Timer conversion */
+#define RADIO_TO_RTIMER(X) ((X) * RTIMER_ARCH_SECOND / SYS_CTRL_32MHZ)
+
+#define CLOCK_STABLE() do {															\
+			while ( !(REG(SYS_CTRL_CLOCK_STA) & (SYS_CTRL_CLOCK_STA_XOSC_STB)));	\
+		} while(0)
 /*---------------------------------------------------------------------------*/
 /* Are we currently in poll mode? Disabled by default */
 static uint8_t volatile poll_mode = 0;
@@ -427,7 +436,7 @@ off(void)
   /* Wait for ongoing TX to complete (e.g. this could be an outgoing ACK) */
   while(REG(RFCORE_XREG_FSMSTAT1) & RFCORE_XREG_FSMSTAT1_TX_ACTIVE);
 
-  if (!(REG(RFCORE_XREG_FSMSTAT1) & RFCORE_XREG_FSMSTAT1_FIFOP)) {
+  if(!(REG(RFCORE_XREG_FSMSTAT1) & RFCORE_XREG_FSMSTAT1_FIFOP)) {
     CC2538_RF_CSP_ISFLUSHRX();
   }
 
@@ -1071,7 +1080,7 @@ cc2538_rf_rx_tx_isr(void)
     process_poll(&cc2538_rf_process);
   }
 
-  /* We only acknowledge FIFOP or SFD so we can safely wipe out the entire SFR */
+  /* We only acknowledge FIFOP so we can safely wipe out the entire SFR */
   REG(RFCORE_SFR_RFIRQF0) = 0;
 
   ENERGEST_OFF(ENERGEST_TYPE_IRQ);
@@ -1149,7 +1158,8 @@ void mac_timer_init(void)
   while(!(REG(RFCORE_SFR_MTCTRL) & RFCORE_SFR_MTCTRL_STATE));
   REG(RFCORE_SFR_MTCTRL) &= ~RFCORE_SFR_MTCTRL_RUN;
   while(REG(RFCORE_SFR_MTCTRL) & RFCORE_SFR_MTCTRL_STATE);
-  REG(RFCORE_SFR_MTCTRL) |= (RFCORE_SFR_MTCTRL_RUN | RFCORE_SFR_MTCTRL_SYNC);
+  REG(RFCORE_SFR_MTCTRL) |= RFCORE_SFR_MTCTRL_SYNC;
+  REG(RFCORE_SFR_MTCTRL) |= (RFCORE_SFR_MTCTRL_RUN);
   while(!(REG(RFCORE_SFR_MTCTRL) & RFCORE_SFR_MTCTRL_STATE));
 }
 /*---------------------------------------------------------------------------*/

From 2a07dc0e0a7f3d87073ab19331f5d2fb5349fe1a Mon Sep 17 00:00:00 2001
From: Phil Rhinehart <phil@jaloo.us>
Date: Mon, 18 Apr 2016 17:02:07 +0800
Subject: [PATCH 171/393] This fixes an event handling issue in the cc26xx BLE
 driver. Currently, the rf_ble_beacon_process triggers the BLE beacon upon
 receiving any event, rather than verifying that the event timer has expired.
 This means that any PROCESS_BROADCAST (e.g. any sensor event) will fire the
 beacon. This commit adds logic to prevent this.

---
 cpu/cc26xx-cc13xx/rf-core/rf-ble.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpu/cc26xx-cc13xx/rf-core/rf-ble.c b/cpu/cc26xx-cc13xx/rf-core/rf-ble.c
index b8af55ff8..48daba69f 100644
--- a/cpu/cc26xx-cc13xx/rf-core/rf-ble.c
+++ b/cpu/cc26xx-cc13xx/rf-core/rf-ble.c
@@ -256,7 +256,7 @@ PROCESS_THREAD(rf_ble_beacon_process, ev, data)
   while(1) {
     etimer_set(&ble_adv_et, beacond_config.interval);
 
-    PROCESS_WAIT_EVENT();
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&ble_adv_et) || ev == PROCESS_EVENT_EXIT);
 
     if(ev == PROCESS_EVENT_EXIT) {
       PROCESS_EXIT();
@@ -374,7 +374,7 @@ PROCESS_THREAD(rf_ble_beacon_process, ev, data)
 
       /* Wait unless this is the last burst */
       if(i < BLE_ADV_MESSAGES - 1) {
-        PROCESS_WAIT_EVENT();
+        PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&ble_adv_et));
       }
     }
 

From 5d5544151f3a7bf993c0692778a1583ec918f78c Mon Sep 17 00:00:00 2001
From: Phil Rhinehart <phil@jaloo.us>
Date: Mon, 18 Apr 2016 16:36:33 +0800
Subject: [PATCH 172/393] Fixed bug in cc26xx-cc13xx rf-core. When running BLE
 in conjunction with ContikiMAC, oscillators were modified from an interrupt
 state causing occasional bus faults and infinite loops. We now check if BLE
 is active prior to modifiying the oscillators to avoid these conditions.

---
 cpu/cc26xx-cc13xx/rf-core/ieee-mode.c | 12 ++++++------
 cpu/cc26xx-cc13xx/rf-core/prop-mode.c | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
index fc0ef7cbb..f26d57939 100644
--- a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
+++ b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
@@ -1048,12 +1048,6 @@ pending_packet(void)
 static int
 on(void)
 {
-  /*
-   * Request the HF XOSC as the source for the HF clock. Needed before we can
-   * use the FS. This will only request, it will _not_ perform the switch.
-   */
-  oscillators_request_hf_xosc();
-
   /*
    * If we are in the middle of a BLE operation, we got called by ContikiMAC
    * from within an interrupt context. Abort, but pretend everything is OK.
@@ -1063,6 +1057,12 @@ on(void)
     return RF_CORE_CMD_OK;
   }
 
+  /*
+   * Request the HF XOSC as the source for the HF clock. Needed before we can
+   * use the FS. This will only request, it will _not_ perform the switch.
+   */
+  oscillators_request_hf_xosc();
+
   if(rf_is_on()) {
     PRINTF("on: We were on. PD=%u, RX=0x%04x \n", rf_core_is_accessible(),
            RF_RADIO_OP_GET_STATUS(cmd_ieee_rx_buf));
diff --git a/cpu/cc26xx-cc13xx/rf-core/prop-mode.c b/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
index 7515d79b4..419a7b9d2 100644
--- a/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
+++ b/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
@@ -893,12 +893,6 @@ pending_packet(void)
 static int
 on(void)
 {
-  /*
-   * Request the HF XOSC as the source for the HF clock. Needed before we can
-   * use the FS. This will only request, it will _not_ perform the switch.
-   */
-  oscillators_request_hf_xosc();
-
   /*
    * If we are in the middle of a BLE operation, we got called by ContikiMAC
    * from within an interrupt context. Abort, but pretend everything is OK.
@@ -907,6 +901,12 @@ on(void)
     return RF_CORE_CMD_OK;
   }
 
+  /*
+   * Request the HF XOSC as the source for the HF clock. Needed before we can
+   * use the FS. This will only request, it will _not_ perform the switch.
+   */
+  oscillators_request_hf_xosc();
+
   if(rf_is_on()) {
     PRINTF("on: We were on. PD=%u, RX=0x%04x \n", rf_core_is_accessible(),
            smartrf_settings_cmd_prop_rx_adv.status);

From 3a76207b5958d34c587ee83b7a46d54cf7cd4a3e Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Mon, 18 Apr 2016 11:40:52 +0200
Subject: [PATCH 173/393] Use 64 bit values for MAC timer

---
 cpu/cc2538/dev/cc2538-rf.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cpu/cc2538/dev/cc2538-rf.c b/cpu/cc2538/dev/cc2538-rf.c
index 652480a9e..52708e0ca 100644
--- a/cpu/cc2538/dev/cc2538-rf.c
+++ b/cpu/cc2538/dev/cc2538-rf.c
@@ -123,7 +123,7 @@ static const uint8_t magic[] = { 0x53, 0x6E, 0x69, 0x66 };      /** Snif */
  * MAC timer
  *---------------------------------------------------------------------------*/
 /* Timer conversion */
-#define RADIO_TO_RTIMER(X) ((X) * RTIMER_ARCH_SECOND / SYS_CTRL_32MHZ)
+#define RADIO_TO_RTIMER(X) ((uint32_t)((uint64_t)(X) * RTIMER_ARCH_SECOND / SYS_CTRL_32MHZ))
 
 #define CLOCK_STABLE() do {															\
 			while ( !(REG(SYS_CTRL_CLOCK_STA) & (SYS_CTRL_CLOCK_STA_XOSC_STB)));	\
@@ -1129,7 +1129,7 @@ cc2538_rf_set_promiscous_mode(char p)
 /*---------------------------------------------------------------------------*/
 uint32_t get_sfd_timestamp(void)
 {
-  uint32_t sfd, timer_val;
+  uint64_t sfd, timer_val, buffer;
 
   REG(RFCORE_SFR_MTMSEL) = (REG(RFCORE_SFR_MTMSEL) & ~RFCORE_SFR_MTMSEL_MTMSEL) | 0x00000000;
   REG(RFCORE_SFR_MTCTRL) |= RFCORE_SFR_MTCTRL_LATCH_MODE;
@@ -1138,6 +1138,8 @@ uint32_t get_sfd_timestamp(void)
   REG(RFCORE_SFR_MTMSEL) = (REG(RFCORE_SFR_MTMSEL) & ~RFCORE_SFR_MTMSEL_MTMOVFSEL) | 0x00000000;
   timer_val |= ((REG(RFCORE_SFR_MTMOVF0) & RFCORE_SFR_MTMOVF0_MTMOVF0) << 16);
   timer_val |= ((REG(RFCORE_SFR_MTMOVF1) & RFCORE_SFR_MTMOVF1_MTMOVF1) << 24);
+  buffer = REG(RFCORE_SFR_MTMOVF2) & RFCORE_SFR_MTMOVF2_MTMOVF2;
+  timer_val |= (buffer << 32);
 
   REG(RFCORE_SFR_MTMSEL) = (REG(RFCORE_SFR_MTMSEL) & ~RFCORE_SFR_MTMSEL_MTMSEL) | 0x00000001;
   REG(RFCORE_SFR_MTCTRL) |= RFCORE_SFR_MTCTRL_LATCH_MODE;
@@ -1146,6 +1148,8 @@ uint32_t get_sfd_timestamp(void)
   REG(RFCORE_SFR_MTMSEL) = (REG(RFCORE_SFR_MTMSEL) & ~RFCORE_SFR_MTMSEL_MTMOVFSEL) | 0x00000010;
   sfd |= ((REG(RFCORE_SFR_MTMOVF0) & RFCORE_SFR_MTMOVF0_MTMOVF0) << 16);
   sfd |= ((REG(RFCORE_SFR_MTMOVF1) & RFCORE_SFR_MTMOVF1_MTMOVF1) << 24);
+  buffer = REG(RFCORE_SFR_MTMOVF2) & RFCORE_SFR_MTMOVF2_MTMOVF2;
+  sfd |= (buffer << 32);
 
   return (RTIMER_NOW() - RADIO_TO_RTIMER(timer_val - sfd));
 }

From 3e00ea55d1fce8a76df2ee2850541cac1fec65b4 Mon Sep 17 00:00:00 2001
From: Pere Tuset <peretuset@gmail.com>
Date: Mon, 11 Apr 2016 15:32:29 +0200
Subject: [PATCH 174/393] Updated the OpenMote-CC2538 platform and examples.

---
 examples/openmote-cc2538/Makefile             |   2 +-
 examples/openmote-cc2538/openmote-demo.c      | 130 +++++++-----
 examples/openmote-cc2538/openmote-demo.gdb    |  10 +
 examples/openmote-cc2538/project-conf.h       |   8 +-
 examples/openmote-cc2538/test-adxl346.c       |  86 --------
 examples/openmote-cc2538/test-max44009.c      |  86 --------
 examples/openmote-cc2538/test-sht21.c         |  92 ---------
 examples/openmote-cc2538/test-timer.c         | 188 -----------------
 .../openmote-cc2538/Makefile.openmote-cc2538  |   4 +-
 platform/openmote-cc2538/README.md            | 189 ++++++++++++++++++
 platform/openmote-cc2538/board.c              |   5 +-
 platform/openmote-cc2538/board.h              |  69 ++++---
 platform/openmote-cc2538/contiki-conf.h       |  75 +++++--
 platform/openmote-cc2538/contiki-main.c       |  38 ++--
 platform/openmote-cc2538/dev/adxl346.c        |  58 ++----
 platform/openmote-cc2538/dev/adxl346.h        |  46 ++++-
 platform/openmote-cc2538/dev/antenna.c        |  56 ++----
 platform/openmote-cc2538/dev/antenna.h        |  31 ++-
 platform/openmote-cc2538/dev/button-sensor.c  | 143 ++++++++-----
 platform/openmote-cc2538/dev/button-sensor.h  |  41 ++--
 platform/openmote-cc2538/dev/leds-arch.c      |  20 +-
 platform/openmote-cc2538/dev/max44009.c       |  71 +++----
 platform/openmote-cc2538/dev/max44009.h       |  42 +++-
 .../{smartrf-sensors.c => openmote-sensors.c} |  23 ++-
 .../openmote-cc2538/dev/openmote-sensors.h    |  59 ++++++
 platform/openmote-cc2538/dev/sht21.c          |  81 ++++----
 platform/openmote-cc2538/dev/sht21.h          |  50 ++++-
 platform/openmote-cc2538/dev/tps62730.c       |  27 +--
 platform/openmote-cc2538/dev/tps62730.h       |  32 ++-
 .../18-compile-arm-ports/Makefile             |   1 +
 30 files changed, 895 insertions(+), 868 deletions(-)
 create mode 100644 examples/openmote-cc2538/openmote-demo.gdb
 delete mode 100644 examples/openmote-cc2538/test-adxl346.c
 delete mode 100644 examples/openmote-cc2538/test-max44009.c
 delete mode 100644 examples/openmote-cc2538/test-sht21.c
 delete mode 100644 examples/openmote-cc2538/test-timer.c
 rename platform/openmote-cc2538/dev/{smartrf-sensors.c => openmote-sensors.c} (82%)
 create mode 100644 platform/openmote-cc2538/dev/openmote-sensors.h

diff --git a/examples/openmote-cc2538/Makefile b/examples/openmote-cc2538/Makefile
index 9f925fb70..e5e5eb4f3 100644
--- a/examples/openmote-cc2538/Makefile
+++ b/examples/openmote-cc2538/Makefile
@@ -1,6 +1,6 @@
 DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
 
-CONTIKI_PROJECT = openmote-demo test-timer test-adxl346 test-max44009 test-sht21
+CONTIKI_PROJECT = openmote-demo
 
 all: $(CONTIKI_PROJECT)
 
diff --git a/examples/openmote-cc2538/openmote-demo.c b/examples/openmote-cc2538/openmote-demo.c
index 10a1c0762..f36c3a0b4 100644
--- a/examples/openmote-cc2538/openmote-demo.c
+++ b/examples/openmote-cc2538/openmote-demo.c
@@ -29,7 +29,7 @@
  * This file is part of the Contiki operating system.
  *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
  * \addtogroup openmote-cc2538
  * @{
@@ -37,65 +37,42 @@
  * \defgroup openmote-examples OpenMote-CC2538 Example Projects
  * @{
  *
- * \defgroup openmote-demo OpenMote-CC2538 Demo Project
- *
- *   Example project demonstrating the OpenMote-CC2538 functionality
- *
- *   This assumes that you are using an OpenMote-CC2538
- *
- * - Boot sequence: LEDs flashing, LED2 followed by LED3 then LED4
- * - etimer/clock : Every LOOP_INTERVAL clock ticks the LED defined as
- *                  LEDS_PERIODIC will turn on
- * - rtimer       : Exactly LEDS_OFF_HYSTERISIS rtimer ticks later,
- *                  LEDS_PERIODIC will turn back off
- * - UART         : Every LOOP_INTERVAL the EM will print something over the
- *                  UART. Receiving an entire line of text over UART (ending
- *                  in \\r) will cause LEDS_SERIAL_IN to toggle
- * - Radio comms  : BTN_SELECT sends a rime broadcast. Reception of a rime
- *                  packet will toggle LEDs defined as LEDS_RF_RX
+ * Example project demonstrating the OpenMote-CC2538 functionality
  *
  * @{
  *
  * \file
- *     Example demonstrating the OpenMote platform.
+ * Example demonstrating the OpenMote-CC2538 platform
  * \author
- *         Pere Tuset <peretuset@openmote.com>
+ * Pere Tuset <peretuset@openmote.com>
  */
+/*---------------------------------------------------------------------------*/
 #include "contiki.h"
 #include "cpu.h"
 #include "sys/etimer.h"
-#include "sys/rtimer.h"
 #include "dev/leds.h"
 #include "dev/uart.h"
 #include "dev/button-sensor.h"
-#include "dev/watchdog.h"
 #include "dev/serial-line.h"
 #include "dev/sys-ctrl.h"
 #include "net/rime/broadcast.h"
 
+#include "dev/adxl346.h"
+#include "dev/max44009.h"
+#include "dev/sht21.h"
+
 #include <stdio.h>
 #include <stdint.h>
 /*---------------------------------------------------------------------------*/
-#define LOOP_INTERVAL       CLOCK_SECOND
-#define LEDS_OFF_HYSTERISIS (RTIMER_SECOND >> 1)
-#define LEDS_PERIODIC       LEDS_YELLOW
-#define LEDS_BUTTON         LEDS_RED
-#define LEDS_SERIAL_IN      LEDS_ORANGE
-#define LEDS_REBOOT         LEDS_ALL
-#define LEDS_RF_RX          (LEDS_YELLOW | LEDS_ORANGE)
 #define BROADCAST_CHANNEL   129
 /*---------------------------------------------------------------------------*/
-static struct etimer et;
-static struct rtimer rt;
-static uint16_t counter;
-/*---------------------------------------------------------------------------*/
 PROCESS(openmote_demo_process, "OpenMote-CC2538 demo process");
 AUTOSTART_PROCESSES(&openmote_demo_process);
 /*---------------------------------------------------------------------------*/
 static void
 broadcast_recv(struct broadcast_conn *c, const linkaddr_t *from)
 {
-  leds_toggle(LEDS_RF_RX);
+  leds_toggle(LEDS_GREEN);
   printf("Received %u bytes: '0x%04x'\n", packetbuf_datalen(),
          *(uint16_t *)packetbuf_dataptr());
 }
@@ -103,43 +80,92 @@ broadcast_recv(struct broadcast_conn *c, const linkaddr_t *from)
 static const struct broadcast_callbacks bc_rx = { broadcast_recv };
 static struct broadcast_conn bc;
 /*---------------------------------------------------------------------------*/
-void
-rt_callback(struct rtimer *t, void *ptr)
-{
-  leds_off(LEDS_PERIODIC);
-}
-/*---------------------------------------------------------------------------*/
 PROCESS_THREAD(openmote_demo_process, ev, data)
 {
+  static struct etimer et;
+  static unsigned int raw, counter;
+  static uint8_t adxl346_present, max44009_present, sht21_present;
+  static float light, temperature, humidity;
 
   PROCESS_EXITHANDLER(broadcast_close(&bc))
 
   PROCESS_BEGIN();
 
+  adxl346_init();
+  adxl346_present = adxl346_is_present();
+  if(!adxl346_present) {
+    printf("ADXL346 sensor is NOT present!\n");
+    leds_on(LEDS_YELLOW);
+  }
+
+  max44009_init();
+  max44009_present = max44009_is_present();
+  if(!max44009_present) {
+    printf("MAX44009 sensor is NOT present!\n");
+    leds_on(LEDS_ORANGE);
+  }
+
+  sht21_init();
+  sht21_present = sht21_is_present();
+  if(!sht21_present) {
+    printf("SHT21 sensor is NOT present!\n");
+    leds_on(LEDS_RED);
+  }
+
   counter = 0;
   broadcast_open(&bc, BROADCAST_CHANNEL, &bc_rx);
 
+  printf("****************************************\n");
+
   while(1) {
     etimer_set(&et, CLOCK_SECOND);
 
     PROCESS_YIELD();
 
     if(ev == PROCESS_EVENT_TIMER) {
-      leds_on(LEDS_PERIODIC);
-      printf("Counter = 0x%08x\n", counter);
-
-      etimer_set(&et, CLOCK_SECOND);
-      rtimer_set(&rt, RTIMER_NOW() + LEDS_OFF_HYSTERISIS, 1,
-                 rt_callback, NULL);
-    } else if(ev == sensors_event) {
-      if(data == &button_user_sensor) {
-        packetbuf_copyfrom(&counter, sizeof(counter));
-        broadcast_send(&bc);
+      if(adxl346_present) {
+        leds_on(LEDS_YELLOW);
+        raw = adxl346_read_x();
+        printf("X Acceleration: %u\n", raw);
+        raw = adxl346_read_y();
+        printf("Y Acceleration: %u\n", raw);
+        raw = adxl346_read_z();
+        printf("Z Acceleration: %u\n", raw);
+        leds_off(LEDS_YELLOW);
+      }
+
+      if(max44009_present) {
+        leds_on(LEDS_ORANGE);
+        raw = max44009_read_light();
+        light = max44009_convert_light(raw);
+        printf("Light: %u.%ulux\n", (unsigned int)light, (unsigned int)(light * 100) % 100);
+        leds_off(LEDS_ORANGE);
+      }
+
+      if(sht21_present) {
+        leds_on(LEDS_RED);
+        raw = sht21_read_temperature();
+        temperature = sht21_convert_temperature(raw);
+        printf("Temperature: %u.%uC\n", (unsigned int)temperature, (unsigned int)(temperature * 100) % 100);
+        raw = sht21_read_humidity();
+        humidity = sht21_convert_humidity(raw);
+        printf("Rel. humidity: %u.%u%%\n", (unsigned int)humidity, (unsigned int)(humidity * 100) % 100);
+        leds_off(LEDS_RED);
+      }
+
+      printf("****************************************\n");
+    }
+
+    if(ev == sensors_event) {
+      if(data == &button_sensor) {
+        if(button_sensor.value(BUTTON_SENSOR_VALUE_TYPE_LEVEL) ==
+           BUTTON_SENSOR_PRESSED_LEVEL) {
+          leds_toggle(LEDS_GREEN);
+          packetbuf_copyfrom(&counter, sizeof(counter));
+          broadcast_send(&bc);
+        }
       }
-    } else if(ev == serial_line_event_message) {
-      leds_toggle(LEDS_SERIAL_IN);
     }
-    counter++;
   }
 
   PROCESS_END();
diff --git a/examples/openmote-cc2538/openmote-demo.gdb b/examples/openmote-cc2538/openmote-demo.gdb
new file mode 100644
index 000000000..43cbb5530
--- /dev/null
+++ b/examples/openmote-cc2538/openmote-demo.gdb
@@ -0,0 +1,10 @@
+target remote localhost:2331
+monitor interface JTAG
+monitor endian little
+monitor speed auto
+monitor flash device = CC2538SF53
+monitor flash breakpoints = 1
+monitor flash download = 1
+monitor reset
+load
+continue
diff --git a/examples/openmote-cc2538/project-conf.h b/examples/openmote-cc2538/project-conf.h
index 126ea1058..718ce668d 100644
--- a/examples/openmote-cc2538/project-conf.h
+++ b/examples/openmote-cc2538/project-conf.h
@@ -10,7 +10,6 @@
  * 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 copyright holder nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
@@ -35,12 +34,13 @@
  * \file
  * Project specific configuration defines for the basic RE-Mote examples
  */
+/*---------------------------------------------------------------------------*/
 #ifndef PROJECT_CONF_H_
 #define PROJECT_CONF_H_
-
+/*---------------------------------------------------------------------------*/
 #define BROADCAST_CHANNEL     129
 #define NETSTACK_CONF_RDC     nullrdc_driver
-
+/*---------------------------------------------------------------------------*/
 #endif /* PROJECT_CONF_H_ */
-
+/*---------------------------------------------------------------------------*/
 /** @} */
diff --git a/examples/openmote-cc2538/test-adxl346.c b/examples/openmote-cc2538/test-adxl346.c
deleted file mode 100644
index 1a750a67c..000000000
--- a/examples/openmote-cc2538/test-adxl346.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2014, OpenMote Technologies, S.L.
- * 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.
- *
- */
-
-/**
- * \addtogroup openmote-examples
- * @{
- *
- * \defgroup openmote-adxl346
- *
- *    This example tests the correct functionality of the ADXL346 acceleration
- *    sensor using the I2C bus.
- *
- * @{
- *
- * \file
- *          Testing the ADXL346 sensor on the OpenMote-CC2538 platform.
- * \author
- *         Pere Tuset <peretuset@openmote.com>
- */
-
-#include "contiki.h"
-#include "dev/adxl346.h"
-
-#include <stdio.h>
-
-PROCESS(test_adxl346_process, "ADXL346 test");
-AUTOSTART_PROCESSES(&test_adxl346_process);
-
-PROCESS_THREAD(test_adxl346_process, ev, data)
-{
-  static struct etimer et;
-  static unsigned acceleration;
-
-  PROCESS_BEGIN();
-  adxl346_init();
-
-  if (!adxl346_is_present()) {
-    leds_on(LEDS_ORANGE);
-  }
-
-  while(1) {
-    etimer_set(&et, CLOCK_SECOND);
-
-    PROCESS_YIELD();
-
-    if (ev == PROCESS_EVENT_TIMER) {
-      acceleration = adxl346_read_x();
-      printf("X Acceleration: %u\n", acceleration);
-      acceleration = adxl346_read_y();
-      printf("Y Acceleration: %u\n", acceleration);
-      acceleration = adxl346_read_z();
-      printf("Z Acceleration: %u\n", acceleration);
-    }
-  }
-
-  PROCESS_END();
-}
diff --git a/examples/openmote-cc2538/test-max44009.c b/examples/openmote-cc2538/test-max44009.c
deleted file mode 100644
index 8085283ca..000000000
--- a/examples/openmote-cc2538/test-max44009.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2014, OpenMote Technologies, S.L.
- * 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.
- *
- */
-
-/**
- * \addtogroup openmote-examples
- * @{
- *
- * \defgroup openmote-max44009
- *
- *    This example tests the correct functionality of the MAX44009 light
- *    sensor using the I2C bus.
- *
- * @{
- *
- * \file
- *          Testing the MAX44009 sensor on the OpenMote-CC2538 platform.
- * \author
- *         Pere Tuset <peretuset@openmote.com>
- */
-
-#include "contiki.h"
-#include "dev/max44009.h"
-#include "dev/leds.h"
-#include <stdio.h>
-
-PROCESS(test_max44009_process, "MAX44009 test");
-AUTOSTART_PROCESSES(&test_max44009_process);
-
-PROCESS_THREAD(test_max44009_process, ev, data)
-{
-  static struct etimer et;
-  static unsigned raw;
-  static float light;
-
-  PROCESS_BEGIN();
-  max44009_init();
-
-if (!max44009_is_present()) {
-    leds_on(LEDS_ORANGE);
-  }
-
-  while(1) {
-    etimer_set(&et, CLOCK_SECOND);
-
-    PROCESS_YIELD();
-
-    if (ev == PROCESS_EVENT_TIMER) {
-      leds_on(LEDS_YELLOW);
-      raw = max44009_read_light();
-      light = max44009_convert_light(raw);
-      printf("Light: %u.%u\n", (unsigned int) light, (unsigned int) (light * 100) % 100);
-      leds_off(LEDS_YELLOW);
-    }
-  }
-
-  PROCESS_END();
-}
diff --git a/examples/openmote-cc2538/test-sht21.c b/examples/openmote-cc2538/test-sht21.c
deleted file mode 100644
index cefdb3266..000000000
--- a/examples/openmote-cc2538/test-sht21.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2014, OpenMote Technologies, S.L.
- * 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.
- *
- */
-
-/**
- * \addtogroup openmote-examples
- * @{
- *
- * \defgroup openmote-sht21
- *
- *    This example tests the correct functionality of the SHT21 temperature
- *    and humidity sensor using the I2C bus.
- *
- * @{
- *
- * \file
- *          Testing the SHT21 sensor on the OpenMote-CC2538 platform.
- * \author
- *         Pere Tuset <peretuset@openmote.com>
- */
-
-#include "contiki.h"
-#include "dev/sht21.h"
-#include "dev/leds.h"
-#include "sys/etimer.h"
-
-#include <stdio.h>
-
-PROCESS(test_sht21_process, "SHT21 test");
-AUTOSTART_PROCESSES(&test_sht21_process);
-
-PROCESS_THREAD(test_sht21_process, ev, data)
-{
-  static struct etimer et;
-  static unsigned raw;
-  static float temperature;
-  static float humidity;
-
-  PROCESS_BEGIN();
-  sht21_init();
-
-  if (!sht21_is_present()) {
-    leds_on(LEDS_ORANGE);
-  }
-
-  while(1) {
-    etimer_set(&et, CLOCK_SECOND);
-
-    PROCESS_YIELD();
-
-    if (ev == PROCESS_EVENT_TIMER) {
-      leds_on(LEDS_YELLOW);
-      raw = sht21_read_temperature();
-      temperature = sht21_convert_temperature(raw);
-      printf("Temperature:   %u.%u degrees Celsius\n", (unsigned int) temperature, (unsigned int) (temperature * 100) % 100);
-      raw = sht21_read_humidity();
-      humidity = sht21_convert_humidity(raw);
-      printf("Rel. humidity: %u.%u%%\n",  (unsigned int) humidity, (unsigned int) (humidity * 100) % 100);
-      leds_off(LEDS_YELLOW	);
-    }
-  }
-  
-  PROCESS_END();
-}
diff --git a/examples/openmote-cc2538/test-timer.c b/examples/openmote-cc2538/test-timer.c
deleted file mode 100644
index 3eb8ff2ff..000000000
--- a/examples/openmote-cc2538/test-timer.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2014, OpenMote Technologies, S.L.
- * 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.
- *
- */
-
-/**
- * \addtogroup openmote-examples
- * @{
- *
- * \defgroup openmote-timers OpenMote-CC2538 Timer Test Project
- *
- *    This example tests the correct functionality of clocks and timers.
- *
- *    More specifically, it tests clock_seconds, rtimers, etimers and
- *    clock_delay_usec.
- *
- *    This is largely-based on the same example of the cc2530 port.
- * @{
- *
- * \file
- *         Tests related to clocks and timers.
- * \author
- *         Pere Tuset <peretuset@openmote.com>
- */
-
-#include "contiki.h"
-#include "sys/clock.h"
-#include "sys/rtimer.h"
-#include "dev/leds.h"
-
-#include <stdio.h>
-/*---------------------------------------------------------------------------*/
-#define TIMER_TEST_CONF_TEST_CLOCK_DELAY_USEC 1
-#define TIMER_TEST_CONF_TEST_RTIMER           1
-#define TIMER_TEST_CONF_TEST_ETIMER           1
-#define TIMER_TEST_CONF_TEST_CLOCK_SECONDS    1
-/*---------------------------------------------------------------------------*/
-static struct etimer et;
-
-#if TIMER_TEST_CONF_TEST_CLOCK_DELAY_USEC
-static rtimer_clock_t start_count, end_count, diff;
-#endif
-
-#if TIMER_TEST_CONF_TEST_CLOCK_SECONDS
-static unsigned long sec;
-#endif
-
-#if TIMER_TEST_CONF_TEST_ETIMER
-static clock_time_t count;
-#endif
-
-#if TIMER_TEST_CONF_TEST_RTIMER
-static struct rtimer rt;
-rtimer_clock_t rt_now, rt_for;
-static clock_time_t ct;
-#endif
-
-static uint8_t i;
-/*---------------------------------------------------------------------------*/
-PROCESS(timer_test_process, "Timer test process");
-AUTOSTART_PROCESSES(&timer_test_process);
-/*---------------------------------------------------------------------------*/
-#if TIMER_TEST_CONF_TEST_RTIMER
-void
-rt_callback(struct rtimer *t, void *ptr)
-{
-  rt_now = RTIMER_NOW();
-  ct = clock_time();
-  printf("Task called at %lu (clock = %lu)\n", rt_now, ct);
-}
-#endif
-/*---------------------------------------------------------------------------*/
-PROCESS_THREAD(timer_test_process, ev, data)
-{
-
-  PROCESS_BEGIN();
-
-  etimer_set(&et, 2 * CLOCK_SECOND);
-
-  PROCESS_YIELD();
-
-#if TIMER_TEST_CONF_TEST_CLOCK_DELAY_USEC
-  printf("-----------------------------------------\n");
-  printf("clock_delay_usec test, (10,000 x i) usec:\n");
-  printf("N.B. clock_delay_usec is more accurate than rtimers\n");
-  i = 1;
-  while(i < 7) {
-    start_count = RTIMER_NOW();
-    clock_delay_usec(10000 * i);
-    end_count = RTIMER_NOW();
-    diff = end_count - start_count;
-    printf("Requested: %u usec, Real: %lu rtimer ticks = ~%lu us\n",
-           10000 * i, diff, diff * 1000000 / RTIMER_SECOND);
-    i++;
-  }
-#endif
-
-#if TIMER_TEST_CONF_TEST_RTIMER
-  printf("-----------------------------------------\n");
-  printf("Rtimer Test, 1 sec (%u rtimer ticks):\n", RTIMER_SECOND);
-  i = 0;
-  while(i < 5) {
-    etimer_set(&et, 2 * CLOCK_SECOND);
-    printf("=======================\n");
-    ct = clock_time();
-    rt_now = RTIMER_NOW();
-    rt_for = rt_now + RTIMER_SECOND;
-    printf("Now=%lu (clock = %lu) - For=%lu\n", rt_now, ct, rt_for);
-    if(rtimer_set(&rt, rt_for, 1, rt_callback, NULL) != RTIMER_OK) {
-      printf("Error setting\n");
-    }
-
-    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
-    i++;
-  }
-#endif
-
-#if TIMER_TEST_CONF_TEST_ETIMER
-  printf("-----------------------------------------\n");
-  printf("Clock tick and etimer test, 1 sec (%u clock ticks):\n",
-         CLOCK_SECOND);
-  i = 0;
-  while(i < 10) {
-    etimer_set(&et, CLOCK_SECOND);
-    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
-    etimer_reset(&et);
-
-    count = clock_time();
-    printf("%lu ticks\n", count);
-
-    leds_toggle(LEDS_RED);
-    i++;
-  }
-#endif
-
-#if TIMER_TEST_CONF_TEST_CLOCK_SECONDS
-  printf("-----------------------------------------\n");
-  printf("Clock seconds test (5s):\n");
-  i = 0;
-  while(i < 10) {
-    etimer_set(&et, 5 * CLOCK_SECOND);
-    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
-    etimer_reset(&et);
-
-    sec = clock_seconds();
-    printf("%lu seconds\n", sec);
-
-    leds_toggle(LEDS_GREEN);
-    i++;
-  }
-#endif
-
-  printf("Done!\n");
-
-  PROCESS_END();
-}
-/*---------------------------------------------------------------------------*/
-/**
- * @}
- * @}
- */
diff --git a/platform/openmote-cc2538/Makefile.openmote-cc2538 b/platform/openmote-cc2538/Makefile.openmote-cc2538
index 878b81877..3439a3211 100644
--- a/platform/openmote-cc2538/Makefile.openmote-cc2538
+++ b/platform/openmote-cc2538/Makefile.openmote-cc2538
@@ -10,7 +10,7 @@ PLATFORM_ROOT_DIR = $(CONTIKI)/platform/$(TARGET)
 
 ### Include
 CONTIKI_TARGET_SOURCEFILES += contiki-main.c board.c
-CONTIKI_TARGET_SOURCEFILES += leds-arch.c button-sensor.c smartrf-sensors.c
+CONTIKI_TARGET_SOURCEFILES += leds-arch.c button-sensor.c openmote-sensors.c
 CONTIKI_TARGET_SOURCEFILES += antenna.c adxl346.c max44009.c sht21.c tps62730.c
 
 CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
@@ -31,7 +31,7 @@ MODULES += core/net core/net/mac \
            core/net/llsec core/net/llsec/noncoresec
 
 PYTHON = python
-BSL_FLAGS += -e -w --bootloader-invert-lines -b 115200 -v
+BSL_FLAGS += -e -w -v -b 450000
 
 ifdef PORT
   BSL_FLAGS += -p $(PORT)
diff --git a/platform/openmote-cc2538/README.md b/platform/openmote-cc2538/README.md
index e69de29bb..2f3ee7d07 100644
--- a/platform/openmote-cc2538/README.md
+++ b/platform/openmote-cc2538/README.md
@@ -0,0 +1,189 @@
+OpenMote-CC2538 platform
+========================
+The OpenMote-CC2538 is based on TI's CC2538 SoC (System on Chip), featuring an ARM Cortex-M3 running at 16/32 MHz and with 32 kbytes of RAM and 512 kbytes of FLASH. It has the following key features:
+
+  * Standard Cortex M3 peripherals (NVIC, SCB, SysTick)
+  * Sleep Timer (underpins rtimers)
+  * SysTick (underpins the platform clock and Contiki's timers infrastructure)
+  * RF (2.4 GHz)
+  * UART
+  * Watchdog (in watchdog mode)
+  * USB (in CDC-ACM)
+  * uDMA Controller (RAM to/from USB and RAM to/from RF)
+  * Random number generator
+  * Low Power Modes
+  * General-Purpose Timers
+  * ADC
+  * Cryptoprocessor (AES-ECB/CBC/CTR/CBC-MAC/GCM/CCM-128/192/256, SHA-256)
+  * Public Key Accelerator (ECDH, ECDSA)
+  * Flash-based port of Coffee
+  * PWM
+  * Built-in core temperature and battery sensor
+
+Requirements
+============
+To start using Contiki with the OpenMote-CC2538, the following is required:
+
+ * An OpenMote-CC2538 board.
+ * A toolchain to compile Contiki for the CC2538.
+ * Drivers so that your OS can communicate with your hardware.
+ * Software to upload images to the CC2538.
+
+Install a Toolchain
+-------------------
+The toolchain used to build contiki is arm-gcc, also used by other arm-based Contiki ports. If you are using Instant Contiki, you may have a version pre-installed in your system.
+
+The platform is currently being used/tested with "GNU Tools for ARM Embedded Processors" (<https://launchpad.net/gcc-arm-embedded>). The current recommended version and the one being used by Contiki's regression tests on Travis is shown below.
+
+    $ arm-none-eabi-gcc --version
+    arm-none-eabi-gcc (GNU Tools for ARM Embedded Processors) 5.2.1 20151202 (release) [ARM/embedded-5-branch revision 231848]
+    Copyright (C) 2015 Free Software Foundation, Inc.
+    This is free software; see the source for copying conditions.  There is NO
+    warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+Software to Program the Nodes
+-----------------------------
+The OpenMote-CC2538 can be programmed via the jtag interface or via the serial boot loader on the chip.
+
+The OpenMote-CC2538 has a mini JTAG 10-pin male header, compatible with the `SmartRF06` development board, which can be used to flash and debug the platforms. Alternatively one could use the `JLink` programmer with a 20-to-10 pin converter like the following: <https://www.olimex.com/Products/ARM/JTAG/ARM-JTAG-20-10/>.
+
+The serial boot loader on the chip is exposed to the user via the USB interface. To activate the bootloader short the ON/SLEEP pin to GND and then press the reset button.
+
+Instructions to flash for different OS are given below.
+
+* On Windows:
+    * Nodes can be programmed with TI's ArmProgConsole or the SmartRF Flash Programmer 2. The README should be self-explanatory. With ArmProgConsole, upload the file with a `.bin` extension.
+    * Nodes can also be programmed via the serial boot loader in the cc2538. In `tools/cc2538-bsl/` you can find `cc2538-bsl.py` python script, which can download firmware to your node via a serial connection. If you use this option you just need to make sure you have a working version of python installed. You can read the README in the same directory for more info.
+
+* On Linux:
+    * Nodes can be programmed with TI's [UniFlash] tool. With UniFlash, use the file with `.elf` extension.
+    * Nodes can also be programmed via the serial boot loader in the cc2538. No extra software needs to be installed.
+
+* On OSX:
+    * The `cc2538-bsl.py` script in `tools/cc2538-bsl/` is the only option. No extra software needs to be installed.
+
+Use the Port
+============
+The following examples are intended to work off-the-shelf:
+
+* Examples under `examples/openmote-cc2538`
+* MQTT example `examples/cc2538dk/mqtt-demo`
+* Border router: `examples/ipv6/rpl-border-router`
+* Webserver: `examples/webserver-ipv6`
+* CoAP example: `examples/er-rest-example`
+
+Build your First Examples
+-------------------------
+It is recommended to start with the `openmote-demo`, it is a simple example that demonstrates the OpenMote-CC2538 features, such as the built-in sensors, LEDs, user button and radio (using RIME broadcast).
+
+The `Makefile.target` includes the `TARGET=` argument, predefining which is the target platform to compile for, it is automatically included at compilation.
+
+To generate or override an existing one, you can run:
+
+`make TARGET=openmote-cc2538 savetarget`
+
+Then you can just run `make` to compile an application, otherwise you will need to do `make TARGET=openmote-cc2538`.
+
+If you want to upload the compiled firmware to a node via the serial boot loader you need first to either manually enable the boot loader.
+
+Then use `make openmote-demo.upload`. 
+
+The `PORT` argument could be used to specify in which port the device is connected, in case we have multiple devices connected at the same time.
+
+To generate an assembly listing of the compiled firmware, run `make openmote-demo.lst`. This may be useful for debugging or optimizing your application code. To intersperse the C source code within the assembly listing, you must instruct the compiler to include debugging information by adding `CFLAGS += -g` to the project Makefile and rebuild by running `make clean openmote-demo.lst`.
+
+To enable printing debug output to your console, use the `make login` to get the information over the USB programming/debugging port, or alternatively use `make serialview` to also add a timestamp in each print.
+
+Node IEEE/RIME/IPv6 Addresses
+-----------------------------
+
+Nodes will generally autoconfigure their IPv6 address based on their IEEE address. The IEEE address can be read directly from the CC2538 Info Page, or it can be hard-coded. Additionally, the user may specify a 2-byte value at build time, which will be used as the IEEE address' 2 LSBs.
+
+To configure the IEEE address source location (Info Page or hard-coded), use the `IEEE_ADDR_CONF_HARDCODED` define in contiki-conf.h:
+
+* 0: Info Page
+* 1: Hard-coded
+
+If `IEEE_ADDR_CONF_HARDCODED` is defined as 1, the IEEE address will take its value from the `IEEE_ADDR_CONF_ADDRESS` define. If `IEEE_ADDR_CONF_HARDCODED` is defined as 0, the IEEE address can come from either the primary or secondary location in the Info Page. To use the secondary address, define `IEEE_ADDR_CONF_USE_SECONDARY_LOCATION` as 1.
+
+Additionally, you can override the IEEE's 2 LSBs, by using the `NODEID` make variable. The value of `NODEID` will become the value of the `IEEE_ADDR_NODE_ID` pre-processor define. If `NODEID` is not defined, `IEEE_ADDR_NODE_ID` will not get defined either. For example:
+
+    make NODEID=0x79ab
+
+This will result in the 2 last bytes of the IEEE address getting set to 0x79 0xAB
+
+Note: Some early production devices do not have am IEEE address written on the Info Page. For those devices, using value 0 above will result in a Rime address of all 0xFFs. If your device is in this category, define `IEEE_ADDR_CONF_HARDCODED` to 1 and specify `NODEID` to differentiate between devices.
+
+Low-Power Modes
+---------------
+The CC2538 port supports power modes for low energy consumption. The SoC will enter a low power mode as part of the main loop when there are no more events to service.
+
+LPM support can be disabled in its entirety by setting `LPM_CONF_ENABLE` to 0 in `contiki-conf.h` or `project-conf.h`.
+
+The Low-Power module uses a simple heuristic to determine the best power mode, depending on anticipated Deep Sleep duration and the state of various peripherals.
+
+In a nutshell, the algorithm first answers the following questions:
+
+* Is the RF off?
+* Are all registered peripherals permitting PM1+?
+* Is the Sleep Timer scheduled to fire an interrupt?
+
+If the answer to any of the above question is "No", the SoC will enter PM0. If the answer to all questions is "Yes", the SoC will enter one of PMs 0/1/2 depending on the expected Deep Sleep duration and subject to user configuration and application requirements.
+
+At runtime, the application may enable/disable some Power Modes by making calls to `lpm_set_max_pm()`. For example, to avoid PM2 an application could call `lpm_set_max_pm(1)`. Subsequently, to re-enable PM2 the application would call `lpm_set_max_pm(2)`.
+
+The LPM module can be configured with a hard maximum permitted power mode.
+
+    #define LPM_CONF_MAX_PM        N
+
+Where N corresponds to the PM number. Supported values are 0, 1, 2. PM3 is not supported. Thus, if the value of the define is 1, the SoC will only ever enter PMs 0 or 1 but never 2 and so on.
+
+The configuration directive `LPM_CONF_MAX_PM` sets a hard upper boundary. For instance, if `LPM_CONF_MAX_PM` is defined as 1, calls to `lpm_set_max_pm()` can only enable/disable PM1. In this scenario, PM2 can not be enabled at runtime.
+
+When setting `LPM_CONF_MAX_PM` to 0 or 1, the entire SRAM will be available. Crucially, when value 2 is used the linker will automatically stop using the SoC's SRAM non-retention area, resulting in a total available RAM of 16 kbytes instead of 32 kbytes.
+
+### LPM and Duty Cycling Driver
+LPM is highly related to the operations of the Radio Duty Cycling (RDC) driver of the Contiki network stack and will work correctly with ContikiMAC and NullRDC.
+
+* With ContikiMAC, PMs 0/1/2 are supported subject to user configuration.
+* When NullRDC is in use, the radio will be always on. As a result, the algorithm discussed above will always choose PM0 and will never attempt to drop to PM1/2.
+
+Build headless nodes
+--------------------
+It is possible to turn off all character I/O for nodes not connected to a PC. Doing this will entirely disable the UART as well as the USB controller, preserving energy in the long term. The define used to achieve this is (1: Quiet, 0: Normal output):
+
+    #define CC2538_CONF_QUIET      0
+
+Setting this define to 1 will automatically set the following to 0:
+
+* `USB_SERIAL_CONF_ENABLE`
+* `UART_CONF_ENABLE`
+* `STARTUP_CONF_VERBOSE`
+
+Code Size Optimisations
+-----------------------
+The build system currently uses optimization level `-Os`, which is controlled indirectly through the value of the `SMALL` make variable. This value can be overridden by example makefiles, or it can be changed directly in `platform/openmote-cc2538/Makefile.openmote-cc2538`.
+
+Historically, the `-Os` flag has caused problems with some toolchains. If you are using one of the toolchains documented in this README, you should be able to use it without issues. If for whatever reason you do come across problems, try setting `SMALL=0` or replacing `-Os` with `-O2` in `cpu/cc2538/Makefile.cc2538`.
+
+Doxygen Documentation
+=====================
+This port's code has been documented with doxygen. To build the documentation, navigate to `$(CONTIKI)/doc` and run `make`. This will build the entire contiki documentation and may take a while.
+
+If you want to build this platform's documentation only and skip the remaining platforms, run this:
+
+    make basedirs="platform/openmote-cc2538 core cpu/cc2538 examples/openmote-cc2538 examples/openmote-cc2538"
+
+Once you've built the docs, open `$(CONTIKI)/doc/html/index.html` and enjoy.
+
+Other Versions of this Guide
+============================
+If you prefer this guide in other formats, use the excellent [pandoc] to convert it.
+
+* **pdf**: `pandoc -s --toc README.md -o README.pdf`
+* **html**: `pandoc -s --toc README.md -o README.html`
+
+Maintainers
+===========
+The OpenMote-CC2538 is maintained by OpenMote Technologies.
+Main contributor: Pere Tuset <peretuset@openmote.com>
diff --git a/platform/openmote-cc2538/board.c b/platform/openmote-cc2538/board.c
index 0b565b43c..c27812a9a 100644
--- a/platform/openmote-cc2538/board.c
+++ b/platform/openmote-cc2538/board.c
@@ -26,6 +26,9 @@
  * 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.
+ *
  */
 /*---------------------------------------------------------------------------*/
 /**
@@ -34,7 +37,6 @@
  *
  * \file
  *  Board-initialisation for the OpenMote-CC2538 platform
- *
  */
 /*---------------------------------------------------------------------------*/
 #include "contiki-conf.h"
@@ -58,4 +60,3 @@ board_init()
 /**
  * @}
  */
-
diff --git a/platform/openmote-cc2538/board.h b/platform/openmote-cc2538/board.h
index 08538a995..9c9a62bc1 100644
--- a/platform/openmote-cc2538/board.h
+++ b/platform/openmote-cc2538/board.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright (c) 2014, Texas Instruments Incorporated - http://www.ti.com/
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -10,7 +10,6 @@
  * 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 copyright holder nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
@@ -27,22 +26,24 @@
  * 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.
+ *
  */
-
+/* -------------------------------------------------------------------------- */
 /**
- * \addtogroup platform
+ * \addtogroup openmote-cc2538
  * @{
  *
- * \defgroup openmote
- *
  * \file
- * Header file with definitions related to the I/O connections on the
- * OpenMote-CC2538 platform. This file provides connectivity information on
- * LEDs, Buttons, UART and other peripherals.
+ * This file provides connectivity information on LEDs, Buttons, UART and
+ * other OpenMote-CC2538 peripherals.
  *
- * \note
- * Do not include this file directly. It gets included by contiki-conf
- * after all relevant directives have been set.
+ * This file can be used as the basis to configure other platforms using the
+ * cc2538 SoC.
+ *
+ * \note   Do not include this file directly. It gets included by contiki-conf
+ *         after all relevant directives have been set.
  */
 
 #ifndef BOARD_H_
@@ -69,7 +70,7 @@
 #undef LEDS_RED
 #undef LEDS_CONF_ALL
 
-#define LEDS_RED       16  /**< LED1 (Red) -> PC4 */
+#define LEDS_RED       16  /**< LED1 (Red)    -> PC4 */
 #define LEDS_YELLOW    64  /**< LED2 (Yellow) -> PC6 */
 #define LEDS_GREEN     128 /**< LED3 (Green)  -> PC7 */
 #define LEDS_ORANGE    32  /**< LED4 (Orange) -> PC5 */
@@ -102,15 +103,17 @@
  */
 #define UART0_RX_PORT            GPIO_A_NUM
 #define UART0_RX_PIN             0
-
 #define UART0_TX_PORT            GPIO_A_NUM
 #define UART0_TX_PIN             1
 
-#define UART1_CTS_PORT           GPIO_B_NUM
-#define UART1_CTS_PIN            0
-
-#define UART1_RTS_PORT           GPIO_D_NUM
-#define UART1_RTS_PIN            3
+#define UART1_RX_PORT            GPIO_B_NUM
+#define UART1_RX_PIN             0
+#define UART1_TX_PORT            GPIO_D_NUM
+#define UART1_TX_PIN             3
+#define UART1_CTS_PORT           (-1)
+#define UART1_CTS_PIN            (-1)
+#define UART1_RTS_PORT           (-1)
+#define UART1_RTS_PIN            (-1)
 /** @} */
 /*---------------------------------------------------------------------------*/
 /** \name OpenMote-CC2538 Button configuration
@@ -128,9 +131,11 @@
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
- * \name SPI configuration
+ * \name SPI (SSI0) configuration
  *
- * These values configure which CC2538 pins to use for the SPI lines.
+ * These values configure which CC2538 pins to use for the SPI (SSI0) lines.
+ * The SSI0 is currently used to interface with the Ethernet driver (ENC28J60)
+ * on the OpenBase board.
  * @{
  */
 #define SPI_CLK_PORT             GPIO_A_NUM
@@ -139,8 +144,21 @@
 #define SPI_MOSI_PIN             5
 #define SPI_MISO_PORT            GPIO_A_NUM
 #define SPI_MISO_PIN             4
-#define SPI_SEL_PORT             GPIO_A_NUM
-#define SPI_SEL_PIN              3
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name SPI (SSI1) configuration
+ *
+ * These values configure which CC2538 pins to use for the SPI (SSI1) lines.
+ * The SSI1 is currently not used.
+ * @{
+ */
+#define SPI1_CLK_PORT            GPIO_C_NUM
+#define SPI1_CLK_PIN             4
+#define SPI1_TX_PORT             GPIO_C_NUM
+#define SPI1_TX_PIN              5
+#define SPI1_RX_PORT             GPIO_C_NUM
+#define SPI1_RX_PIN              6
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
@@ -163,4 +181,7 @@
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* BOARD_H_ */
-/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ */
diff --git a/platform/openmote-cc2538/contiki-conf.h b/platform/openmote-cc2538/contiki-conf.h
index 44a15e539..6c0349025 100644
--- a/platform/openmote-cc2538/contiki-conf.h
+++ b/platform/openmote-cc2538/contiki-conf.h
@@ -1,9 +1,48 @@
+/*
+ * Copyright (c) 2014, OpenMote Technologies, S.L.
+ * 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.
+ *
+ */
+/*---------------------------------------------------------------------------*/
 /**
- * \addtogroup openmote
+ * \addtogroup openmote-cc2538
  * @{
  *
+ * \defgroup openmote-cc2538-platforms OpenMote-CC2538 platform
+ *
+ * The OpenMote-CC2538 platform was designed at UC Berkeley in 2013 and
+ * is comercialized by OpenMote Technologies since 2014. It is the first
+ * commercial platform based on the powerful TI CC2538 SoC. It uses a
+ * XBee form-factor to ease prototyping.
+ *
  * \file
- *  Configuration for the OpenMote-CC2538 platform.
+ *  Configuration for the OpenMote-CC2538 platform
  */
 #ifndef CONTIKI_CONF_H_
 #define CONTIKI_CONF_H_
@@ -48,7 +87,7 @@ typedef uint32_t rtimer_clock_t;
 #ifndef FLASH_CCA_CONF_BOOTLDR_BACKDOOR
 #define FLASH_CCA_CONF_BOOTLDR_BACKDOOR 1 /**<Enable the boot loader backdoor */
 #endif
- 
+
 #ifndef FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PORT_A_PIN
 #define FLASH_CCA_CONF_BOOTLDR_BACKDOOR_PORT_A_PIN 6 /**< Pin PA6 (ON/SLEEP on the OpenBase), activates the boot loader */
 #endif
@@ -64,7 +103,9 @@ typedef uint32_t rtimer_clock_t;
  *
  * @{
  */
+#ifndef COFFEE_CONF_SIZE
 #define COFFEE_CONF_SIZE            (4 * COFFEE_SECTOR_SIZE)
+#endif
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
@@ -264,13 +305,13 @@ typedef uint32_t rtimer_clock_t;
 #define UART_IN_USE_BY_UART1(u)       (UART1_CONF_UART == (u))
 
 #define UART_IN_USE(u) ( \
-  UART_CONF_ENABLE && \
-  (UART_IN_USE_BY_SERIAL_LINE(u) || \
-   UART_IN_USE_BY_SLIP(u) || \
-   UART_IN_USE_BY_RF_SNIFFER(u) || \
-   UART_IN_USE_BY_DBG(u) || \
-   UART_IN_USE_BY_UART1(u)) \
-)
+    UART_CONF_ENABLE && \
+    (UART_IN_USE_BY_SERIAL_LINE(u) || \
+     UART_IN_USE_BY_SLIP(u) || \
+     UART_IN_USE_BY_RF_SNIFFER(u) || \
+     UART_IN_USE_BY_DBG(u) || \
+     UART_IN_USE_BY_UART1(u)) \
+    )
 /** @} */
 /*---------------------------------------------------------------------------*/
 /* board.h assumes that basic configuration is done */
@@ -484,8 +525,8 @@ typedef uint32_t rtimer_clock_t;
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS    1
 #ifndef SICSLOWPAN_CONF_ADDR_CONTEXT_0
 #define SICSLOWPAN_CONF_ADDR_CONTEXT_0 { \
-  addr_contexts[0].prefix[0] = 0xaa; \
-  addr_contexts[0].prefix[1] = 0xaa; \
+  addr_contexts[0].prefix[0] = UIP_DS6_DEFAULT_PREFIX_0; \
+  addr_contexts[0].prefix[1] = UIP_DS6_DEFAULT_PREFIX_1; \
 }
 #endif
 
@@ -528,9 +569,11 @@ typedef uint32_t rtimer_clock_t;
 #ifndef CCM_STAR_CONF
 #define CCM_STAR_CONF           cc2538_ccm_star_driver /**< AES-CCM* driver */
 #endif
-/** @} */
+
 /*---------------------------------------------------------------------------*/
-
 #endif /* CONTIKI_CONF_H_ */
-
-/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/openmote-cc2538/contiki-main.c b/platform/openmote-cc2538/contiki-main.c
index 72648088c..39736463e 100644
--- a/platform/openmote-cc2538/contiki-main.c
+++ b/platform/openmote-cc2538/contiki-main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright (c) 2014, Texas Instruments Incorporated - http://www.ti.com/
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -10,7 +10,6 @@
  * 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 copyright holder nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
@@ -27,12 +26,16 @@
  * 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.
+ *
  */
+/*---------------------------------------------------------------------------*/
 /**
- * \addtogroup cc2538-platforms
+ * \addtogroup platform
  * @{
  *
- * \defgroup openmote The OpenMote-CC2538 platform
+ * \defgroup openmote-cc2538 OpenMote-CC2538 platform
  *
  * The OpenMote-CC2538 is based on the CC2538, the new platform by Texas Instruments
  * based on an ARM Cortex-M3 core and a IEEE 802.15.4 radio.
@@ -48,6 +51,7 @@
 #include "dev/scb.h"
 #include "dev/nvic.h"
 #include "dev/uart.h"
+#include "dev/i2c.h"
 #include "dev/watchdog.h"
 #include "dev/ioc.h"
 #include "dev/button-sensor.h"
@@ -84,7 +88,9 @@
 #define PUTS(s)
 #endif
 /*---------------------------------------------------------------------------*/
-/** \brief Board specific iniatialisation */
+/**
+ * \brief Board specific iniatialisation
+ */
 void board_init(void);
 /*---------------------------------------------------------------------------*/
 static void
@@ -155,16 +161,6 @@ main(void)
   process_init();
   watchdog_init();
 
-  /*
-   * Character I/O Initialisation.
-   * When the UART receives a character it will call serial_line_input_byte to
-   * notify the core. The same applies for the USB driver.
-   *
-   * If slip-arch is also linked in afterwards (e.g. if we are a border router)
-   * it will overwrite one of the two peripheral input callbacks. Characters
-   * received over the relevant peripheral will be handled by
-   * slip_input_byte instead
-   */
 #if UART_CONF_ENABLE
   uart_init(0);
   uart_init(1);
@@ -176,6 +172,8 @@ main(void)
   usb_serial_set_input(serial_line_input_byte);
 #endif
 
+  i2c_init(I2C_SDA_PORT, I2C_SDA_PIN, I2C_SCL_PORT, I2C_SCL_PIN, I2C_SCL_NORMAL_BUS_SPEED);
+
   serial_line_init();
 
   INTERRUPTS_ENABLE();
@@ -184,7 +182,6 @@ main(void)
   PUTS(CONTIKI_VERSION_STRING);
   PUTS(BOARD_STRING);
 
-  /* Initialise the H/W RNG engine. */
   random_init(0);
 
   udma_init();
@@ -202,11 +199,11 @@ main(void)
   netstack_init();
   set_rf_params();
 
-  PRINTF(" Net: ");
+  PRINTF("Net: ");
   PRINTF("%s\n", NETSTACK_NETWORK.name);
-  PRINTF(" MAC: ");
+  PRINTF("MAC: ");
   PRINTF("%s\n", NETSTACK_MAC.name);
-  PRINTF(" RDC: ");
+  PRINTF("RDC: ");
   PRINTF("%s\n", NETSTACK_RDC.name);
 
 #if NETSTACK_CONF_WITH_IPV6
@@ -230,18 +227,15 @@ main(void)
   while(1) {
     uint8_t r;
     do {
-      /* Reset watchdog and handle polls and events */
       watchdog_periodic();
 
       r = process_run();
     } while(r > 0);
 
-    /* We have serviced all pending events. Enter a Low-Power mode. */
     lpm_enter();
   }
 }
 /*---------------------------------------------------------------------------*/
-
 /**
  * @}
  * @}
diff --git a/platform/openmote-cc2538/dev/adxl346.c b/platform/openmote-cc2538/dev/adxl346.c
index bdb934d2d..650b7cfda 100644
--- a/platform/openmote-cc2538/dev/adxl346.c
+++ b/platform/openmote-cc2538/dev/adxl346.c
@@ -29,29 +29,33 @@
  * This file is part of the Contiki operating system.
  *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
- * \addtogroup platform
+ * \addtogroup openmote-adxl346-sensor
  * @{
  *
- * \defgroup openmote
- *
  * \file
- * Driver for the ADXL346 acceleration sensor in OpenMote-CC2538.
+ * Driver for the ADXL346 acceleration sensor
  *
  * \author
  * Pere Tuset <peretuset@openmote.com>
  */
-
 /*---------------------------------------------------------------------------*/
 #include "dev/i2c.h"
 #include "dev/adxl346.h"
 /*---------------------------------------------------------------------------*/
-/* ADDRESS AND IDENTIFIER */
+/**
+ * \name ADXL346 address and device identifier
+ * @{
+ */
 #define ADXL346_ADDRESS                     (0x53)
 #define ADXL346_DEVID_VALUE                 (0xE6)
-
-/* REGISTER ADDRESSES */
+/** @} */
+/* -------------------------------------------------------------------------- */
+/**
+ * \name ADXL346 register addresses
+ * @{
+ */
 #define ADXL346_DEVID_ADDR                  (0x00)
 #define ADXL346_THRES_TAP_ADDR              (0x1D)
 #define ADXL346_OFSX_ADDR                   (0x1E)
@@ -85,8 +89,12 @@
 #define ADXL346_TAP_SIGN_ADDR               (0x3A)
 #define ADXL346_ORIENT_CONF_ADDR            (0x3B)
 #define ADXL346_ORIENT_ADDR                 (0x3C)
-
-/* INT_ENABLE/INT_MAP/INT_SOURCE */
+/** @} */
+/* -------------------------------------------------------------------------- */
+/**
+ * \name ADXL346 register values
+ * @{
+ */
 #define ADXL346_INT_ENABLE_DATA_READY      (1 << 7)
 #define ADXL346_INT_ENABLE_SINGLE_TAP      (1 << 6)
 #define ADXL346_INT_ENABLE_DOUBLE_TAP      (1 << 5)
@@ -96,7 +104,6 @@
 #define ADXL346_INT_ENABLE_WATERMARK       (1 << 1)
 #define ADXL346_INT_ENABLE_OVERRUN         (1 << 0)
 
-/* ACT_INACT_CONTROL */
 #define ADXL346_ACT_INACT_CTL_ACT_ACDC     (1 << 7)
 #define ADXL346_ACT_INACT_CTL_ACT_X_EN     (1 << 6)
 #define ADXL346_ACT_INACT_CTL_ACT_Y_EN     (1 << 5)
@@ -106,13 +113,11 @@
 #define ADXL346_ACT_INACT_CTL_INACT_Y_EN   (1 << 1)
 #define ADXL346_ACT_INACT_CTL_INACT_Z_EN   (1 << 0)
 
-/* TAP_AXES */
 #define ADXL346_TAP_AXES_SUPPRESS           (1 << 3)
 #define ADXL346_TAP_AXES_TAP_X_EN           (1 << 2)
 #define ADXL346_TAP_AXES_TAP_Y_EN           (1 << 1)
 #define ADXL346_TAP_AXES_TAP_Z_EN           (1 << 0)
 
-/* ACT_TAP_STATUS */
 #define ADXL346_ACT_TAP_STATUS_ACT_X_SRC    (1 << 6)
 #define ADXL346_ACT_TAP_STATUS_ACT_Y_SRC    (1 << 5)
 #define ADXL346_ACT_TAP_STATUS_ACT_Z_SRC    (1 << 4)
@@ -121,18 +126,15 @@
 #define ADXL346_ACT_TAP_STATUS_TAP_Y_SRC    (1 << 1)
 #define ADXL346_ACT_TAP_STATUS_TAP_Z_SRC    (1 << 0)
 
-/* BW_RATE */
 #define ADXL346_BW_RATE_POWER               (1 << 4)
 #define ADXL346_BW_RATE_RATE(x)             ((x) & 0x0F)
 
-/* POWER CONTROL */
 #define ADXL346_POWER_CTL_LINK              (1 << 5)
 #define ADXL346_POWER_CTL_AUTO_SLEEP        (1 << 4)
 #define ADXL346_POWER_CTL_MEASURE           (1 << 3)
 #define ADXL346_POWER_CTL_SLEEP             (1 << 2)
 #define ADXL346_POWER_CTL_WAKEUP(x)         ((x) & 0x03)
 
-/* DATA_FORMAT */
 #define ADXL346_DATA_FORMAT_SELF_TEST       (1 << 7)
 #define ADXL346_DATA_FORMAT_SPI             (1 << 6)
 #define ADXL346_DATA_FORMAT_INT_INVERT      (1 << 5)
@@ -143,18 +145,13 @@
 #define ADXL346_DATA_FORMAT_RANGE_PM_4g     (1)
 #define ADXL346_DATA_FORMAT_RANGE_PM_8g     (2)
 #define ADXL346_DATA_FORMAT_RANGE_PM_16g    (3)
+/** @} */
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 void
 adxl346_init(void)
 {
   uint8_t config[2];
 
-  i2c_init(I2C_SDA_PORT, I2C_SDA_PIN, I2C_SCL_PORT, I2C_SCL_PIN,
-           I2C_SCL_NORMAL_BUS_SPEED);
-
   config[0] = ADXL346_BW_RATE_ADDR;
   config[1] = (ADXL346_BW_RATE_RATE(11));
   i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
@@ -170,17 +167,11 @@ adxl346_init(void)
   i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
 }
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 void
 adxl346_reset(void)
 {
 }
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 uint8_t
 adxl346_is_present(void)
 {
@@ -192,9 +183,6 @@ adxl346_is_present(void)
   return is_present == ADXL346_DEVID_VALUE;
 }
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 uint16_t
 adxl346_read_x(void)
 {
@@ -211,9 +199,6 @@ adxl346_read_x(void)
   return x;
 }
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 uint16_t
 adxl346_read_y(void)
 {
@@ -230,9 +215,6 @@ adxl346_read_y(void)
   return y;
 }
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 uint16_t
 adxl346_read_z(void)
 {
diff --git a/platform/openmote-cc2538/dev/adxl346.h b/platform/openmote-cc2538/dev/adxl346.h
index d5e9eac76..d5751ce70 100644
--- a/platform/openmote-cc2538/dev/adxl346.h
+++ b/platform/openmote-cc2538/dev/adxl346.h
@@ -29,29 +29,57 @@
  * This file is part of the Contiki operating system.
  *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
- * \addtogroup platform
+ * \addtogroup openmote-sensors
  * @{
  *
- * \defgroup openmote
+ * \defgroup openmote-adxl346-sensor ADXL346 acceleration sensor
+ * @{
  *
  * \file
- * Header for the ADXL346 acceleration sensor in OpenMote-CC2538.
+ * ADXL346 acceleration sensor driver header file
  *
  * \author
  * Pere Tuset <peretuset@openmote.com>
  */
-
-#ifndef __ADXL346_H__
-#define __ADXL346_H__
 /*---------------------------------------------------------------------------*/
+#ifndef ADXL346_H_
+#define ADXL346_H_
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Initialize the ADXL346 sensor
+ */
 void adxl346_init(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Reset the ADXL346 sensor
+ */
 void adxl346_reset(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Check if the ADXL346 sensor is present
+ */
 uint8_t adxl346_is_present(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Read the x-axis from the ADXL346 sensor
+ */
 uint16_t adxl346_read_x(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Read the y-axis from the ADXL346 sensor
+ */
 uint16_t adxl346_read_y(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Read the z-axis from the ADXL346 sensor
+ */
 uint16_t adxl346_read_z(void);
 /*---------------------------------------------------------------------------*/
-#endif /* ifndef __ADXL346_H__ */
-/** @} */
+#endif /* ADXL346_H_ */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/openmote-cc2538/dev/antenna.c b/platform/openmote-cc2538/dev/antenna.c
index b0ad7b07e..3672258f9 100644
--- a/platform/openmote-cc2538/dev/antenna.c
+++ b/platform/openmote-cc2538/dev/antenna.c
@@ -27,44 +27,31 @@
  * 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.
+ *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
- * \addtogroup platform
+ * \addtogroup openmote-antenna
  * @{
  *
- * \defgroup openmote
+ * Driver for the OpenMote-CC2538 RF switch.
+ * INT is the internal antenna (chip) configured through ANT1_SEL (V1)
+ * EXT is the external antenna (connector) configured through ANT2_SEL (V2)
+ * @{
  *
  * \file
- * Driver for the antenna selection on the OpenMote-CC2538 platform.
+ * Driver implementation for the OpenMote-CC2538 antenna switch
  */
-
 /*---------------------------------------------------------------------------*/
 #include "contiki-conf.h"
 #include "dev/gpio.h"
 #include "dev/antenna.h"
 /*---------------------------------------------------------------------------*/
-#define BSP_RADIO_BASE              (GPIO_D_BASE)
-#define BSP_RADIO_INT               (1 << 5)
-#define BSP_RADIO_EXT               (1 << 4)
+#define BSP_RADIO_BASE              GPIO_PORT_TO_BASE(GPIO_D_NUM)
+#define BSP_RADIO_INT               GPIO_PIN_MASK(5)
+#define BSP_RADIO_EXT               GPIO_PIN_MASK(4)
 /*---------------------------------------------------------------------------*/
-static void
-gpio_set(int port, int bit)
-{
-  REG((port | GPIO_DATA) + (bit << 2)) = bit;
-}
-/*---------------------------------------------------------------------------*/
-static void
-gpio_reset(int port, int bit)
-{
-  REG((port | GPIO_DATA) + (bit << 2)) = 0;
-}
-/*---------------------------------------------------------------------------*/
-/**
- * Configure the antenna using the RF switch
- * INT is the internal antenna (chip) configured through ANT1_SEL (V1)
- * EXT is the external antenna (connector) configured through ANT2_SEL (V2)
- */
 void
 antenna_init(void)
 {
@@ -76,24 +63,21 @@ antenna_init(void)
   antenna_external();
 }
 /*---------------------------------------------------------------------------*/
-/**
- * Select the external (connector) antenna
- */
 void
 antenna_external(void)
 {
-  gpio_reset(BSP_RADIO_BASE, BSP_RADIO_INT);
-  gpio_set(BSP_RADIO_BASE, BSP_RADIO_EXT);
+  GPIO_WRITE_PIN(BSP_RADIO_BASE, BSP_RADIO_INT, 0);
+  GPIO_WRITE_PIN(BSP_RADIO_BASE, BSP_RADIO_EXT, 1);
 }
 /*---------------------------------------------------------------------------*/
-/**
- * Select the internal (chip) antenna
- */
 void
 antenna_internal(void)
 {
-  gpio_reset(BSP_RADIO_BASE, BSP_RADIO_EXT);
-  gpio_set(BSP_RADIO_BASE, BSP_RADIO_INT);
+  GPIO_WRITE_PIN(BSP_RADIO_BASE, BSP_RADIO_EXT, 0);
+  GPIO_WRITE_PIN(BSP_RADIO_BASE, BSP_RADIO_INT, 1);
 }
 /*---------------------------------------------------------------------------*/
-/** @} */
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/openmote-cc2538/dev/antenna.h b/platform/openmote-cc2538/dev/antenna.h
index 8b14df4b0..9c42bf885 100644
--- a/platform/openmote-cc2538/dev/antenna.h
+++ b/platform/openmote-cc2538/dev/antenna.h
@@ -27,24 +27,43 @@
  * 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.
+ *
  */
-
+/*--------------------------------------------------------------------------*/
 /**
- * \addtogroup platform
+ * \addtogroup openmote-cc2538
  * @{
  *
- * \defgroup openmote
+ * \defgroup openmote-antenna OpenMote-CC2538 antenna switch
+ *
+ * Driver for the OpenMote-CC2538 antenna switch
+ * @{
  *
  * \file
- * Header for the antenna selection on the OpenMote-CC2538 platform.
+ * Header for the OpenMote-CC2538 antenna switch
  */
-
+/*---------------------------------------------------------------------------*/
 #ifndef ANTENNA_H_
 #define ANTENNA_H_
 /*---------------------------------------------------------------------------*/
+/**
+ * \brief Initialize the antenna switch, by default it uses the external
+ */
 void antenna_init(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Select the external (connector) antenna
+ */
 void antenna_internal(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Select the internal (chip) antenna
+ */
 void antenna_external(void);
 /*---------------------------------------------------------------------------*/
 #endif /* ANTENNA_H_ */
-/** @} */
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/openmote-cc2538/dev/button-sensor.c b/platform/openmote-cc2538/dev/button-sensor.c
index 6d85400d7..6477045c5 100644
--- a/platform/openmote-cc2538/dev/button-sensor.c
+++ b/platform/openmote-cc2538/dev/button-sensor.c
@@ -27,19 +27,18 @@
  * 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.
+ *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
- * \addtogroup platform
+ * \addtogroup openmote-button-sensor
  * @{
  *
- * \defgroup openmote
- *
  * \file
- * Driver for the OpenMote-CC2538 buttons
- *
+ * Driver for for the OpenMote-CC2538 user button
  */
-
 /*---------------------------------------------------------------------------*/
 #include "contiki.h"
 #include "dev/nvic.h"
@@ -47,6 +46,8 @@
 #include "dev/gpio.h"
 #include "dev/button-sensor.h"
 #include "sys/timer.h"
+#include "sys/ctimer.h"
+#include "sys/process.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -54,32 +55,44 @@
 #define BUTTON_USER_PORT_BASE  GPIO_PORT_TO_BASE(BUTTON_USER_PORT)
 #define BUTTON_USER_PIN_MASK   GPIO_PIN_MASK(BUTTON_USER_PIN)
 /*---------------------------------------------------------------------------*/
+#define DEBOUNCE_DURATION (CLOCK_SECOND >> 4)
+
 static struct timer debouncetimer;
 /*---------------------------------------------------------------------------*/
-/**
- * \brief Common initialiser for all buttons
- * \param port_base GPIO port's register offset
- * \param pin_mask Pin mask corresponding to the button's pin
- */
+static clock_time_t press_duration = 0;
+static struct ctimer press_counter;
+static uint8_t press_event_counter;
+
+process_event_t button_press_duration_exceeded;
+/*---------------------------------------------------------------------------*/
 static void
-config(uint32_t port_base, uint32_t pin_mask)
+duration_exceeded_callback(void *data)
 {
-  /* Software controlled */
-  GPIO_SOFTWARE_CONTROL(port_base, pin_mask);
+  press_event_counter++;
+  process_post(PROCESS_BROADCAST, button_press_duration_exceeded,
+               &press_event_counter);
+  ctimer_set(&press_counter, press_duration, duration_exceeded_callback,
+             NULL);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Retrieves the value of the button pin
+ * \param type Returns the pin level or the counter of press duration events.
+ *             type == BUTTON_SENSOR_VALUE_TYPE_LEVEL or
+ *             type == BUTTON_SENSOR_VALUE_TYPE_PRESS_DURATION
+ *             respectively
+ */
+static int
+value(int type)
+{
+  switch(type) {
+  case BUTTON_SENSOR_VALUE_TYPE_LEVEL:
+    return GPIO_READ_PIN(BUTTON_USER_PORT_BASE, BUTTON_USER_PIN_MASK);
+  case BUTTON_SENSOR_VALUE_TYPE_PRESS_DURATION:
+    return press_event_counter;
+  }
 
-  /* Set pin to input */
-  GPIO_SET_INPUT(port_base, pin_mask);
-
-  /* Enable edge detection */
-  GPIO_DETECT_EDGE(port_base, pin_mask);
-
-  /* Single edge */
-  GPIO_TRIGGER_SINGLE_EDGE(port_base, pin_mask);
-
-  /* Trigger interrupt on Falling edge */
-  GPIO_DETECT_RISING(port_base, pin_mask);
-
-  GPIO_ENABLE_INTERRUPT(port_base, pin_mask);
+  return 0;
 }
 /*---------------------------------------------------------------------------*/
 /**
@@ -95,42 +108,72 @@ btn_callback(uint8_t port, uint8_t pin)
   if(!timer_expired(&debouncetimer)) {
     return;
   }
-  timer_set(&debouncetimer, CLOCK_SECOND / 8);
-  if(port == GPIO_C_NUM) {
-    sensors_changed(&button_user_sensor);
+
+  timer_set(&debouncetimer, DEBOUNCE_DURATION);
+
+  if(press_duration) {
+    press_event_counter = 0;
+    if(value(BUTTON_SENSOR_VALUE_TYPE_LEVEL) == BUTTON_SENSOR_PRESSED_LEVEL) {
+      ctimer_set(&press_counter, press_duration, duration_exceeded_callback,
+                 NULL);
+    } else {
+      ctimer_stop(&press_counter);
+    }
   }
+
+  sensors_changed(&button_sensor);
 }
 /*---------------------------------------------------------------------------*/
 /**
- * \brief Init function for the select button.
+ * \brief Init function for the User button.
+ * \param type SENSORS_ACTIVE: Activate / Deactivate the sensor (value == 1
+ *             or 0 respectively)
  *
- * Parameters are ignored. They have been included because the prototype is
- * dictated by the core sensor api. The return value is also not required by
- * the API but otherwise ignored.
- *
- * \param type ignored
- * \param value ignored
- * \return ignored
+ * \param value Depends on the value of the type argument
+ * \return Depends on the value of the type argument
  */
 static int
 config_user(int type, int value)
 {
-  config(BUTTON_USER_PORT_BASE, BUTTON_USER_PIN_MASK);
+  switch(type) {
+  case SENSORS_HW_INIT:
+    button_press_duration_exceeded = process_alloc_event();
 
-  ioc_set_over(BUTTON_USER_PORT, BUTTON_USER_PIN, IOC_OVERRIDE_PUE);
+    /* Software controlled */
+    GPIO_SOFTWARE_CONTROL(BUTTON_USER_PORT_BASE, BUTTON_USER_PIN_MASK);
 
-  nvic_interrupt_enable(BUTTON_USER_VECTOR);
+    /* Set pin to input */
+    GPIO_SET_INPUT(BUTTON_USER_PORT_BASE, BUTTON_USER_PIN_MASK);
+
+    /* Enable edge detection */
+    GPIO_DETECT_EDGE(BUTTON_USER_PORT_BASE, BUTTON_USER_PIN_MASK);
+
+    /* Both Edges */
+    GPIO_TRIGGER_BOTH_EDGES(BUTTON_USER_PORT_BASE, BUTTON_USER_PIN_MASK);
+
+    ioc_set_over(BUTTON_USER_PORT, BUTTON_USER_PIN, IOC_OVERRIDE_PUE);
+
+    gpio_register_callback(btn_callback, BUTTON_USER_PORT, BUTTON_USER_PIN);
+    break;
+  case SENSORS_ACTIVE:
+    if(value) {
+      GPIO_ENABLE_INTERRUPT(BUTTON_USER_PORT_BASE, BUTTON_USER_PIN_MASK);
+      nvic_interrupt_enable(BUTTON_USER_VECTOR);
+    } else {
+      GPIO_DISABLE_INTERRUPT(BUTTON_USER_PORT_BASE, BUTTON_USER_PIN_MASK);
+      nvic_interrupt_disable(BUTTON_USER_VECTOR);
+    }
+    return value;
+  case BUTTON_SENSOR_CONFIG_TYPE_INTERVAL:
+    press_duration = (clock_time_t)value;
+    break;
+  default:
+    break;
+  }
 
-  gpio_register_callback(btn_callback, BUTTON_USER_PORT, BUTTON_USER_PIN);
   return 1;
 }
 /*---------------------------------------------------------------------------*/
-void
-button_sensor_init()
-{
-  timer_set(&debouncetimer, 0);
-}
-/*---------------------------------------------------------------------------*/
-SENSORS_SENSOR(button_user_sensor, BUTTON_SENSOR, NULL, config_user, NULL);
+SENSORS_SENSOR(button_sensor, BUTTON_SENSOR, value, config_user, NULL);
 /*---------------------------------------------------------------------------*/
 /** @} */
diff --git a/platform/openmote-cc2538/dev/button-sensor.h b/platform/openmote-cc2538/dev/button-sensor.h
index ec7849ee1..9a08634ae 100644
--- a/platform/openmote-cc2538/dev/button-sensor.h
+++ b/platform/openmote-cc2538/dev/button-sensor.h
@@ -27,33 +27,48 @@
  * 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.
+ *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
- * \addtogroup platform
+ * \addtogroup openmote-cc2538
  * @{
  *
- * \defgroup openmote
+ * \defgroup openmote-button-sensor OpenMote-CC2538 user button driver
+ *
+ * The user button will generate a sensors_changed event on press as
+ * well as on release.
+ *
+ * @{
  *
  * \file
- * Header for the OpenMote-CC2538 buttons
- *
+ * Header for the OpenMote-CC2538 button driver
  */
-
+/*---------------------------------------------------------------------------*/
 #ifndef BUTTON_SENSOR_H_
 #define BUTTON_SENSOR_H_
 /*---------------------------------------------------------------------------*/
 #include "lib/sensors.h"
-#include "dev/gpio.h"
 /*---------------------------------------------------------------------------*/
 #define BUTTON_SENSOR "Button"
+
+extern const struct sensors_sensor button_sensor;
 /*---------------------------------------------------------------------------*/
-#define button_sensor button_user_sensor
-extern const struct sensors_sensor button_user_sensor;
+extern process_event_t button_press_duration_exceeded;
+/*---------------------------------------------------------------------------*/
+#define BUTTON_SENSOR_CONFIG_TYPE_INTERVAL      0x0100
+
+#define BUTTON_SENSOR_VALUE_TYPE_LEVEL          0
+#define BUTTON_SENSOR_VALUE_TYPE_PRESS_DURATION 1
+
+#define BUTTON_SENSOR_PRESSED_LEVEL             0
+#define BUTTON_SENSOR_RELEASED_LEVEL            8
 /*---------------------------------------------------------------------------*/
 #endif /* BUTTON_SENSOR_H_ */
-
-/** \brief Common initialiser for all SmartRF Buttons */
-void button_sensor_init();
 /*---------------------------------------------------------------------------*/
-/** @} */
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/openmote-cc2538/dev/leds-arch.c b/platform/openmote-cc2538/dev/leds-arch.c
index 13a4c1347..28454dacf 100644
--- a/platform/openmote-cc2538/dev/leds-arch.c
+++ b/platform/openmote-cc2538/dev/leds-arch.c
@@ -10,7 +10,6 @@
  * 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 copyright holder nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
@@ -27,19 +26,21 @@
  * 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.
+ *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
- * \addtogroup platform
+ * \addtogroup openmote-cc2538
  * @{
  *
- * \defgroup openmote
+ * \defgroup openmote-leds OpenMote-CC2538 LED driver
+ * @{
  *
  * \file
- * Driver for the OpenMote-CC2538 LEDs
- *
+ * LED driver implementation for the OpenMote-CC2538 platform
  */
-
 /*---------------------------------------------------------------------------*/
 #include "contiki.h"
 #include "reg.h"
@@ -66,4 +67,7 @@ leds_arch_set(unsigned char leds)
   GPIO_WRITE_PIN(GPIO_C_BASE, LEDS_GPIO_PIN_MASK, leds);
 }
 /*---------------------------------------------------------------------------*/
-/** @} */
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/openmote-cc2538/dev/max44009.c b/platform/openmote-cc2538/dev/max44009.c
index 34bce89ab..233b07d13 100644
--- a/platform/openmote-cc2538/dev/max44009.c
+++ b/platform/openmote-cc2538/dev/max44009.c
@@ -29,29 +29,33 @@
  * This file is part of the Contiki operating system.
  *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
- * \addtogroup platform
+ * \addtogroup openmote-max44009-sensor
  * @{
  *
- * \defgroup openmote
- *
  * \file
- * Driver for the MAX44009 light sensor in OpenMote-CC2538.
+ * Driver for the MAX44009 light sensor
  *
  * \author
  * Pere Tuset <peretuset@openmote.com>
  */
-
 /*---------------------------------------------------------------------------*/
 #include "dev/i2c.h"
 #include "dev/max44009.h"
 /*---------------------------------------------------------------------------*/
-/* ADDRESS AND NOT_FOUND VALUE */
+/**
+ * \name MAX44009 address and device identifier
+ * @{
+ */
 #define MAX44009_ADDRESS                    (0x4A)
 #define MAX44009_NOT_FOUND                  (0x00)
-
-/* REGISTER ADDRESSES */
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name MAX44009 register addresses
+ * @{
+ */
 #define MAX44009_INT_STATUS_ADDR            (0x00)      /* R */
 #define MAX44009_INT_ENABLE_ADDR            (0x01)      /* R/W */
 #define MAX44009_CONFIG_ADDR                (0x02)      /* R/W */
@@ -60,14 +64,17 @@
 #define MAX44009_THR_HIGH_ADDR              (0x05)      /* R/W */
 #define MAX44009_THR_LOW_ADDR               (0x06)      /* R/W */
 #define MAX44009_THR_TIMER_ADDR             (0x07)      /* R/W */
-
-/* INTERRUPT VALUES */
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name MAX44009 register values
+ * @{
+ */
 #define MAX44009_INT_STATUS_OFF             (0x00)
 #define MAX44009_INT_STATUS_ON              (0x01)
 #define MAX44009_INT_DISABLED               (0x00)
 #define MAX44009_INT_ENABLED                (0x01)
 
-/* CONFIGURATION VALUES */
 #define MAX44009_CONFIG_DEFAULT             (0 << 7)
 #define MAX44009_CONFIG_CONTINUOUS          (1 << 7)
 #define MAX44009_CONFIG_AUTO                (0 << 6)
@@ -83,15 +90,12 @@
 #define MAX44009_CONFIG_INTEGRATION_12ms    (6 << 0)
 #define MAX44009_CONFIG_INTEGRATION_6ms     (7 << 0)
 
-/* DEFAULT CONFIGURATION */
 #define MAX44009_DEFAULT_CONFIGURATION      (MAX44009_CONFIG_DEFAULT | \
                                              MAX44009_CONFIG_AUTO | \
                                              MAX44009_CONFIG_CDR_NORMAL | \
                                              MAX44009_CONFIG_INTEGRATION_100ms)
+/** @} */
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 void
 max44009_init(void)
 {
@@ -108,19 +112,13 @@ max44009_init(void)
   max44009_value[3] = (0x00);
   max44009_value[4] = (0xFF);
 
-  i2c_init(I2C_SDA_PORT, I2C_SDA_PIN, I2C_SCL_PORT, I2C_SCL_PIN,
-           I2C_SCL_NORMAL_BUS_SPEED);
-
-  for(i = 0; i < sizeof(max44009_address); i++) {
-    max44009_data[0] = max44009_value[i];
-    max44009_data[1] = max44009_data[i];
+  for(i = 0; i < sizeof(max44009_address) / sizeof(max44009_address[0]); i++) {
+    max44009_data[0] = max44009_address[i];
+    max44009_data[1] = max44009_value[i];
     i2c_burst_send(MAX44009_ADDRESS, max44009_data, 2);
   }
 }
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 void
 max44009_reset(void)
 {
@@ -131,30 +129,28 @@ max44009_reset(void)
   uint8_t max44009_data[2];
   uint8_t i;
 
-  for(i = 0; i < sizeof(max44009_address); i++) {
-    max44009_data[0] = max44009_value[i];
-    max44009_data[1] = max44009_data[i];
+  for(i = 0; i < sizeof(max44009_address) / sizeof(max44009_address[0]); i++) {
+    max44009_data[0] = max44009_address[i];
+    max44009_data[1] = max44009_value[i];
     i2c_burst_send(MAX44009_ADDRESS, max44009_data, 2);
   }
 }
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 uint8_t
 max44009_is_present(void)
 {
+  uint8_t status;
   uint8_t is_present;
 
   i2c_single_send(MAX44009_ADDRESS, MAX44009_CONFIG_ADDR);
-  i2c_single_receive(MAX44009_ADDRESS, &is_present);
+  status = i2c_single_receive(MAX44009_ADDRESS, &is_present);
+  if(status != I2C_MASTER_ERR_NONE) {
+    return 0;
+  }
 
   return is_present != MAX44009_NOT_FOUND;
 }
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 uint16_t
 max44009_read_light(void)
 {
@@ -175,9 +171,6 @@ max44009_read_light(void)
   return result;
 }
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 float
 max44009_convert_light(uint16_t lux)
 {
@@ -186,7 +179,7 @@ max44009_convert_light(uint16_t lux)
 
   exponent = (lux >> 8) & 0xFF;
   exponent = (exponent == 0x0F ? exponent & 0x0E : exponent);
-  
+
   mantissa = (lux >> 0) & 0xFF;
 
   result *= 2 ^ exponent * mantissa;
diff --git a/platform/openmote-cc2538/dev/max44009.h b/platform/openmote-cc2538/dev/max44009.h
index dbc40775d..e94a91fca 100644
--- a/platform/openmote-cc2538/dev/max44009.h
+++ b/platform/openmote-cc2538/dev/max44009.h
@@ -29,28 +29,52 @@
  * This file is part of the Contiki operating system.
  *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
- * \addtogroup platform
+ * \addtogroup openmote-sensors
  * @{
  *
- * \defgroup openmote
+ * \defgroup openmote-max44009-sensor MAX4009 light sensor
+ * @{
  *
  * \file
- * Header for the MAX44009 light sensor in OpenMote-CC2538.
+ * Header file for the MAX44009 light sensor driver
  *
  * \author
  * Pere Tuset <peretuset@openmote.com>
  */
-
-#ifndef __MAX44009_H__
-#define __MAX44009_H__
 /*---------------------------------------------------------------------------*/
+#ifndef MAX44009_H_
+#define MAX44009_H_
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Initialize the MAX44009 sensor
+ */
 void max44009_init(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Reset the MAX44009 sensor
+ */
 void max44009_reset(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Check if the MAX44009 sensor is present
+ */
 uint8_t max44009_is_present(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Read the light from the MAX44009 sensor
+ */
 uint16_t max44009_read_light(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Convert the light from the MAX44009 sensor
+ */
 float max44009_convert_light(uint16_t light);
 /*---------------------------------------------------------------------------*/
-#endif /* ifndef __MAX44009_H__ */
-/** @} */
+#endif /* MAX44009_H_ */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/openmote-cc2538/dev/smartrf-sensors.c b/platform/openmote-cc2538/dev/openmote-sensors.c
similarity index 82%
rename from platform/openmote-cc2538/dev/smartrf-sensors.c
rename to platform/openmote-cc2538/dev/openmote-sensors.c
index d8948a017..3b55e4cbb 100644
--- a/platform/openmote-cc2538/dev/smartrf-sensors.c
+++ b/platform/openmote-cc2538/dev/openmote-sensors.c
@@ -27,27 +27,34 @@
  * 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.
+ *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
- * \addtogroup platform
+ * \addtogroup openmote-sensors
  * @{
  *
- * \defgroup openmote
+ * Generic module controlling sensors on the OpenMote-CC2538 platform
+ * @{
  *
  * \file
- * Implementation of a generic module controlling OpenMote-CC2538 sensors.
+ * Implementation of a generic module controlling OpenMote-CC2538 sensors
  */
-
 /*---------------------------------------------------------------------------*/
 #include "contiki.h"
+#include "dev/cc2538-sensors.h"
 #include "dev/button-sensor.h"
 
 #include <string.h>
 /*---------------------------------------------------------------------------*/
 /**
-   *\brief Exports a global symbol to be used by the sensor API
+ * \brief Exports a global symbol to be used by the sensor API
  */
-SENSORS(&button_user_sensor);
+SENSORS(&button_sensor, &cc2538_temp_sensor);
 /*---------------------------------------------------------------------------*/
-/** @} */
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/openmote-cc2538/dev/openmote-sensors.h b/platform/openmote-cc2538/dev/openmote-sensors.h
new file mode 100644
index 000000000..a765dbd3d
--- /dev/null
+++ b/platform/openmote-cc2538/dev/openmote-sensors.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2012, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ *
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup openmote-cc2538
+ * @{
+ *
+ * \defgroup openmote-sensors OpenMote-CC2538 sensors
+ *
+ * Generic module controlling sensors on the OpenMote-CC2538 platform
+ * @{
+ *
+ * \file
+ * Implementation of a generic module controlling OpenMote-CC2538 sensors
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef OPENMOTE_SENSORS_H_
+#define OPENMOTE_SENSORS_H_
+/*---------------------------------------------------------------------------*/
+#include "lib/sensors.h"
+#include "dev/cc2538-sensors.h"
+#include "dev/button-sensor.h"
+/*---------------------------------------------------------------------------*/
+#endif /* OPENMOTE_SENSORS_H_ */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/openmote-cc2538/dev/sht21.c b/platform/openmote-cc2538/dev/sht21.c
index 1ad07836f..989fe2905 100644
--- a/platform/openmote-cc2538/dev/sht21.c
+++ b/platform/openmote-cc2538/dev/sht21.c
@@ -29,30 +29,43 @@
  * This file is part of the Contiki operating system.
  *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
- * \addtogroup platform
+ * \addtogroup openmote-sht21-sensor
  * @{
  *
- * \defgroup openmote
- *
  * \file
- * Driver for the SHT21 temperature and humidity sensor in OpenMote-CC2538.
+ * Driver for the SHT21 temperature and relative humidity sensor
  *
  * \author
  * Pere Tuset <peretuset@openmote.com>
  */
-
 /*---------------------------------------------------------------------------*/
 #include "i2c.h"
 #include "sht21.h"
 /*---------------------------------------------------------------------------*/
+/**
+ * \name SHT21 address
+ */
 #define SHT21_ADDRESS                   (0x40)
-
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name SHT21 register addresses and values
+ * @{
+ */
 #define SHT21_USER_REG_READ             (0xE7)
 #define SHT21_USER_REG_WRITE            (0xE6)
 #define SHT21_USER_REG_RESERVED_BITS    (0x38)
 
+#define SHT21_TEMPERATURE_HM_CMD        (0xE3)
+#define SHT21_HUMIDITY_HM_CMD           (0xE5)
+#define SHT21_TEMPERATURE_NHM_CMD       (0xF3)
+#define SHT21_HUMIDITY_NHM_CMD          (0xF5)
+#define SHT21_RESET_CMD                 (0xFE)
+
+#define SHT21_STATUS_MASK               (0xFC)
+
 #define SHT21_RESOLUTION_12b_14b        ((0 << 7) | (0 << 0))
 #define SHT21_RESOLUTION_8b_12b         ((0 << 7) | (1 << 0))
 #define SHT21_RESOLUTION_10b_13b        ((1 << 7) | (0 << 0))
@@ -63,15 +76,12 @@
 #define SHT21_ONCHIP_HEATER_DISABLE     (0 << 2)
 #define SHT21_OTP_RELOAD_ENABLE         (0 << 1)
 #define SHT21_OTP_RELOAD_DISABLE        (1 << 1)
-
-#define SHT21_TEMPERATURE_HM_CMD        (0xE3)
-#define SHT21_HUMIDITY_HM_CMD           (0xE5)
-#define SHT21_TEMPERATURE_NHM_CMD       (0xF3)
-#define SHT21_HUMIDITY_NHM_CMD          (0xF5)
-#define SHT21_RESET_CMD                 (0xFE)
-
-#define SHT21_STATUS_MASK               ( 0xFC )
-
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name SHT21 configuration values
+ * @{
+ */
 #define SHT21_DEFAULT_CONFIG            (SHT21_RESOLUTION_12b_14b | \
                                          SHT21_ONCHIP_HEATER_DISABLE | \
                                          SHT21_BATTERY_ABOVE_2V25 | \
@@ -81,18 +91,13 @@
                                          SHT21_ONCHIP_HEATER_DISABLE | \
                                          SHT21_BATTERY_ABOVE_2V25 | \
                                          SHT21_OTP_RELOAD_DISABLE)
+/** @} */
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 void
 sht21_init(void)
 {
   uint8_t config[2];
 
-  i2c_init(I2C_SDA_PORT, I2C_SDA_PIN, I2C_SCL_PORT, I2C_SCL_PIN,
-           I2C_SCL_NORMAL_BUS_SPEED);
-
   /* Setup the configuration vector, the first position holds address */
   /* and the second position holds the actual configuration */
   config[0] = SHT21_USER_REG_WRITE;
@@ -111,9 +116,6 @@ sht21_init(void)
   i2c_burst_send(SHT21_ADDRESS, config, sizeof(config));
 }
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 void
 sht21_reset(void)
 {
@@ -121,29 +123,25 @@ sht21_reset(void)
   i2c_single_send(SHT21_ADDRESS, SHT21_RESET_CMD);
 }
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 uint8_t
 sht21_is_present(void)
 {
+  uint8_t status;
   uint8_t is_present;
 
   /* Read the current configuration according to the datasheet (pag. 9, fig. 18) */
   i2c_single_send(SHT21_ADDRESS, SHT21_USER_REG_READ);
-  i2c_single_receive(SHT21_ADDRESS, &is_present);
+  status = i2c_single_receive(SHT21_ADDRESS, &is_present);
+  if(status != I2C_MASTER_ERR_NONE) {
+    return 0;
+  }
 
   /* Clear the reserved bits according to the datasheet (pag. 9, tab. 8) */
   is_present &= ~SHT21_USER_REG_RESERVED_BITS;
 
-  is_present = ((is_present == SHT21_USER_CONFIG) || (is_present == SHT21_DEFAULT_CONFIG));
-
-  return is_present;
+  return (is_present == SHT21_USER_CONFIG) || (is_present == SHT21_DEFAULT_CONFIG);
 }
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 uint16_t
 sht21_read_temperature(void)
 {
@@ -159,23 +157,17 @@ sht21_read_temperature(void)
   return temperature;
 }
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 float
 sht21_convert_temperature(uint16_t temperature)
 {
   float result;
 
   result = -46.85;
-  result += 175.72 * (float) temperature / 65536.0;
+  result += 175.72 * (float)temperature / 65536.0;
 
   return result;
 }
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 uint16_t
 sht21_read_humidity(void)
 {
@@ -191,16 +183,13 @@ sht21_read_humidity(void)
   return humidity;
 }
 /*---------------------------------------------------------------------------*/
-/**
- *
- */
 float
 sht21_convert_humidity(uint16_t humidity)
 {
   float result;
 
   result = -6.0;
-  result += 125.0 * (float) humidity / 65536.0;
+  result += 125.0 * (float)humidity / 65536.0;
 
   return result;
 }
diff --git a/platform/openmote-cc2538/dev/sht21.h b/platform/openmote-cc2538/dev/sht21.h
index c95e02edf..1483a70a9 100644
--- a/platform/openmote-cc2538/dev/sht21.h
+++ b/platform/openmote-cc2538/dev/sht21.h
@@ -29,30 +29,62 @@
  * This file is part of the Contiki operating system.
  *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
- * \addtogroup platform
+ * \addtogroup openmote-sensors
  * @{
  *
- * \defgroup openmote
+ * \defgroup openmote-sht21-sensor SHT21 sensor
+ * @{
  *
  * \file
- * Header for the SHT21 temperature and humidity sensor in OpenMote-CC2538.
+ * Header file for the SHT21 temperature and humidity sensor driver
  *
  * \author
  * Pere Tuset <peretuset@openmote.com>
  */
-
-#ifndef __SHT21_H__
-#define __SHT21_H__
 /*---------------------------------------------------------------------------*/
+#ifndef SHT21_H_
+#define SHT21_H_
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Initialize the SHT21 sensor
+ */
 void sht21_init(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Reset the SHT21 sensor
+ */
 void sht21_reset(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Check if the SHT21 sensor is present
+ */
 uint8_t sht21_is_present(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Read the temperature from the SHT21 sensor
+ */
 uint16_t sht21_read_temperature(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Convert the temperature from the SHT21 sensor
+ */
 float sht21_convert_temperature(uint16_t temperature);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Read the relative humidity from the SHT21 sensor
+ */
 uint16_t sht21_read_humidity(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Convert the relative humidity from the SHT21 sensor
+ */
 float sht21_convert_humidity(uint16_t humidity);
 /*---------------------------------------------------------------------------*/
-#endif /* ifndef __SHT21_H__ */
-/** @} */
+#endif /* SHT21_H_ */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/openmote-cc2538/dev/tps62730.c b/platform/openmote-cc2538/dev/tps62730.c
index 0356077f9..f90c0e097 100644
--- a/platform/openmote-cc2538/dev/tps62730.c
+++ b/platform/openmote-cc2538/dev/tps62730.c
@@ -29,20 +29,22 @@
  * This file is part of the Contiki operating system.
  *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
- * \addtogroup platform
+ * \addtogroup openmote-tps62730
  * @{
  *
- * \defgroup openmote
+ * Driver for the TPS62730 voltage regulator, to enable power from
+ * the battery voltage (bypass, Vout=Vin, Iq < 1uA) or through the
+ * buck regulator (on, Vout=2.1V, Iq = 30uA)
+ * @{
  *
  * \file
- * Driver for the TPS62730 voltage regulator on the OpenMote-CC2538.
+ * Driver for the TPS62730 voltage regulator
  *
  * \author
  * Pere Tuset <peretuset@openmote.com>
  */
-
 /*---------------------------------------------------------------------------*/
 #include "contiki-conf.h"
 #include "dev/gpio.h"
@@ -64,10 +66,6 @@ gpio_reset(int port, int bit)
   REG((port | GPIO_DATA) + (bit << 2)) = 0;
 }
 /*---------------------------------------------------------------------------*/
-/**
- * Initializes the TPS62730 voltage regulator
- * By default it is in bypass mode, Vout = Vin, Iq < 1 uA
- */
 void
 tps62730_init(void)
 {
@@ -77,22 +75,19 @@ tps62730_init(void)
   tps62730_bypass();
 }
 /*---------------------------------------------------------------------------*/
-/**
- * Enables the TPS62730, Vout = 2.2V, Iq = 30 uA
- */
 void
 tps62730_on(void)
 {
   gpio_set(BSP_TPS62730_BASE, BSP_TPS62730_ON);
 }
 /*---------------------------------------------------------------------------*/
-/**
- * Disables the TPS62730, Vout = Vin, Iq < 1 uA
- */
 void
 tps62730_bypass(void)
 {
   gpio_reset(BSP_TPS62730_BASE, BSP_TPS62730_ON);
 }
 /*---------------------------------------------------------------------------*/
-/** @} */
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/openmote-cc2538/dev/tps62730.h b/platform/openmote-cc2538/dev/tps62730.h
index b3e99bc8d..00518c9c7 100644
--- a/platform/openmote-cc2538/dev/tps62730.h
+++ b/platform/openmote-cc2538/dev/tps62730.h
@@ -29,26 +29,46 @@
  * This file is part of the Contiki operating system.
  *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
- * \addtogroup platform
+ * \addtogroup openmote-cc2538
  * @{
  *
- * \defgroup openmote
+ * \defgroup openmote-tps62730 TPS62730 voltage regulator
+ *
+ * Driver for the TPS62730 voltage regulator, to enable power from
+ * the battery voltage (bypass, Vout=Vin, Iq < 1uA) or through the
+ * buck regulator (on, Vout=2.1V, Iq = 30uA)
+ * @{
  *
  * \file
- * Header for the TPS62730 voltage regulator on the OpenMote-CC2538.
+ * Driver for the TPS62730 voltage regulator
  *
  * \author
  * Pere Tuset <peretuset@openmote.com>
  */
-
+/*---------------------------------------------------------------------------*/
 #ifndef TPS62730_H_
 #define TPS62730_H_
 /*---------------------------------------------------------------------------*/
+/**
+ * \brief Initialize the TPS62730 voltage regulator in bypass mode
+ */
 void tps62730_init(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Set TPS62730 to on, Vout = 2.2V, Iq = 30 uA
+ */
 void tps62730_on(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Set TPS62730 to bypass, Vout = Vin, Iq < 1 uA
+ */
 void tps62730_bypass(void);
 /*---------------------------------------------------------------------------*/
 #endif /* TPS62730_H_ */
-/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/regression-tests/18-compile-arm-ports/Makefile b/regression-tests/18-compile-arm-ports/Makefile
index dbac11d43..19bd7d63e 100644
--- a/regression-tests/18-compile-arm-ports/Makefile
+++ b/regression-tests/18-compile-arm-ports/Makefile
@@ -32,6 +32,7 @@ cc2538-common/crypto/zoul \
 cc2538-common/pka/zoul \
 zolertia/zoul/zoul \
 zolertia/zoul/cc1200-demo/zoul \
+openmote-cc2538/openmote-cc2538 \
 er-rest-example/zoul \
 ipso-objects/zoul \
 hello-world/zoul \

From 510fc9e51edf1f8818e0ed488f88f7983b714b5d Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Tue, 24 Nov 2015 11:35:20 +0100
Subject: [PATCH 175/393] removed memcpy that cause inconsistency in nbr-table
 when adding nd6 neighbor with NS/NA.

---
 core/net/ipv6/uip-nd6.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/core/net/ipv6/uip-nd6.c b/core/net/ipv6/uip-nd6.c
index 107e66369..a6b8931ad 100644
--- a/core/net/ipv6/uip-nd6.c
+++ b/core/net/ipv6/uip-nd6.c
@@ -492,10 +492,11 @@ na_input(void)
   } else {
     uip_lladdr_t *lladdr;
     nbr = uip_ds6_nbr_lookup(&UIP_ND6_NA_BUF->tgtipaddr);
-    lladdr = (uip_lladdr_t *)uip_ds6_nbr_get_ll(nbr);
     if(nbr == NULL) {
       goto discard;
     }
+    lladdr = (uip_lladdr_t *)uip_ds6_nbr_get_ll(nbr);
+
     if(nd6_opt_llao != 0) {
       is_llchange =
         memcmp(&nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET], (void *)lladdr,
@@ -505,8 +506,16 @@ na_input(void)
       if(nd6_opt_llao == NULL) {
         goto discard;
       }
-      memcpy(lladdr, &nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET],
-             UIP_LLADDR_LEN);
+
+      /* Remove this neighbor - since it has a NULL MAC address */
+      uip_ds6_nbr_rm(nbr);
+      /* Re-add this neighbor - now with a correct MAC address */
+      nbr = uip_ds6_nbr_add(&UIP_ND6_NA_BUF->tgtipaddr,
+                            (const uip_lladdr_t *) &nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET],
+                            is_router, NBR_STALE);
+      if(nbr == NULL) {
+        goto discard;
+      }
       if(is_solicited) {
         nbr->state = NBR_REACHABLE;
         nbr->nscount = 0;

From b2f72fc99634a28258d98078c3a7a228cd818bdf Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Tue, 24 Nov 2015 23:00:50 +0100
Subject: [PATCH 176/393] replaces with aligned lladdress and also fixed the
 second memcpy to avoid risk of inconsistency when nodes change MAC address

---
 core/net/ipv6/uip-nd6.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/core/net/ipv6/uip-nd6.c b/core/net/ipv6/uip-nd6.c
index a6b8931ad..1d354d384 100644
--- a/core/net/ipv6/uip-nd6.c
+++ b/core/net/ipv6/uip-nd6.c
@@ -490,16 +490,16 @@ na_input(void)
     PRINTF("NA received is bad\n");
     goto discard;
   } else {
-    uip_lladdr_t *lladdr;
+    uip_lladdr_t lladdr_aligned;
     nbr = uip_ds6_nbr_lookup(&UIP_ND6_NA_BUF->tgtipaddr);
     if(nbr == NULL) {
       goto discard;
     }
-    lladdr = (uip_lladdr_t *)uip_ds6_nbr_get_ll(nbr);
+    extract_lladdr_aligned(&lladdr_aligned);
 
     if(nd6_opt_llao != 0) {
       is_llchange =
-        memcmp(&nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET], (void *)lladdr,
+        memcmp(&nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET], (void *)&lladdr_aligned,
                UIP_LLADDR_LEN);
     }
     if(nbr->state == NBR_INCOMPLETE) {
@@ -511,7 +511,7 @@ na_input(void)
       uip_ds6_nbr_rm(nbr);
       /* Re-add this neighbor - now with a correct MAC address */
       nbr = uip_ds6_nbr_add(&UIP_ND6_NA_BUF->tgtipaddr,
-                            (const uip_lladdr_t *) &nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET],
+                            &lladdr_aligned,
                             is_router, NBR_STALE);
       if(nbr == NULL) {
         goto discard;
@@ -537,8 +537,15 @@ na_input(void)
         if(is_override || (!is_override && nd6_opt_llao != 0 && !is_llchange)
            || nd6_opt_llao == 0) {
           if(nd6_opt_llao != 0) {
-            memcpy(lladdr, &nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET],
-                   UIP_LLADDR_LEN);
+            /* Remove this neighbor - since it has updated its MAC address */
+            uip_ds6_nbr_rm(nbr);
+            /* Re-add this neighbor - now with a correct (new) MAC address */
+            nbr = uip_ds6_nbr_add(&UIP_ND6_NA_BUF->tgtipaddr,
+                                  &lladdr_aligned,
+                                  is_router, NBR_STALE);
+            if(nbr == NULL) {
+              goto discard;
+            }
           }
           if(is_solicited) {
             nbr->state = NBR_REACHABLE;

From 6f271bf8531aca07383e6cb8221963d9a073db59 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Wed, 25 Nov 2015 15:01:46 +0100
Subject: [PATCH 177/393] fixed so that the comparison of old lladdr and llao
 lladdr is compared instead of two llaos - and improved code style on
 surrounding code

---
 core/net/ipv6/uip-nd6.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/core/net/ipv6/uip-nd6.c b/core/net/ipv6/uip-nd6.c
index 1d354d384..0eac94c4f 100644
--- a/core/net/ipv6/uip-nd6.c
+++ b/core/net/ipv6/uip-nd6.c
@@ -490,22 +490,22 @@ na_input(void)
     PRINTF("NA received is bad\n");
     goto discard;
   } else {
-    uip_lladdr_t lladdr_aligned;
     nbr = uip_ds6_nbr_lookup(&UIP_ND6_NA_BUF->tgtipaddr);
     if(nbr == NULL) {
       goto discard;
     }
-    extract_lladdr_aligned(&lladdr_aligned);
 
-    if(nd6_opt_llao != 0) {
+    if(nd6_opt_llao != NULL) {
       is_llchange =
-        memcmp(&nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET], (void *)&lladdr_aligned,
+        memcmp(&nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET], uip_ds6_nbr_get_ll(nbr),
                UIP_LLADDR_LEN);
     }
     if(nbr->state == NBR_INCOMPLETE) {
+      uip_lladdr_t lladdr_aligned;
       if(nd6_opt_llao == NULL) {
         goto discard;
       }
+      extract_lladdr_aligned(&lladdr_aligned);
 
       /* Remove this neighbor - since it has a NULL MAC address */
       uip_ds6_nbr_rm(nbr);
@@ -534,9 +534,12 @@ na_input(void)
         }
         goto discard;
       } else {
-        if(is_override || (!is_override && nd6_opt_llao != 0 && !is_llchange)
-           || nd6_opt_llao == 0) {
-          if(nd6_opt_llao != 0) {
+        if(is_override || (!is_override && nd6_opt_llao != NULL && !is_llchange)
+           || nd6_opt_llao == NULL) {
+          if(nd6_opt_llao != NULL) {
+            uip_lladdr_t lladdr_aligned;
+            extract_lladdr_aligned(&lladdr_aligned);
+
             /* Remove this neighbor - since it has updated its MAC address */
             uip_ds6_nbr_rm(nbr);
             /* Re-add this neighbor - now with a correct (new) MAC address */
@@ -552,7 +555,7 @@ na_input(void)
             /* reachable time is stored in ms */
             stimer_set(&(nbr->reachable), uip_ds6_if.reachable_time / 1000);
           } else {
-            if(nd6_opt_llao != 0 && is_llchange) {
+            if(nd6_opt_llao != NULL && is_llchange) {
               nbr->state = NBR_STALE;
             }
           }

From 223f002676829f6df15f6aa10e35f39b8de5d1d1 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Thu, 26 Nov 2015 14:10:16 +0100
Subject: [PATCH 178/393] fixed the case when the lladdr did not change but the
 LLAO is there and it is not an override.

---
 core/net/ipv6/uip-nd6.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/net/ipv6/uip-nd6.c b/core/net/ipv6/uip-nd6.c
index 0eac94c4f..316172fb2 100644
--- a/core/net/ipv6/uip-nd6.c
+++ b/core/net/ipv6/uip-nd6.c
@@ -534,9 +534,12 @@ na_input(void)
         }
         goto discard;
       } else {
-        if(is_override || (!is_override && nd6_opt_llao != NULL && !is_llchange)
-           || nd6_opt_llao == NULL) {
-          if(nd6_opt_llao != NULL) {
+        /**
+         *  If this is an cache override, or same lladdr, or no llao -
+         *  do updates of nbr states.
+         */
+        if(is_override || !is_llchange || nd6_opt_llao == NULL) {
+          if(nd6_opt_llao != NULL && is_llchange) {
             uip_lladdr_t lladdr_aligned;
             extract_lladdr_aligned(&lladdr_aligned);
 
@@ -554,10 +557,6 @@ na_input(void)
             nbr->state = NBR_REACHABLE;
             /* reachable time is stored in ms */
             stimer_set(&(nbr->reachable), uip_ds6_if.reachable_time / 1000);
-          } else {
-            if(nd6_opt_llao != NULL && is_llchange) {
-              nbr->state = NBR_STALE;
-            }
           }
         }
       }

From 2e852f758b3fbc18ad30ec75d8c62b5d5238e70a Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Thu, 26 Nov 2015 14:19:12 +0100
Subject: [PATCH 179/393] added a null check on the lladdr before the memcmp.

---
 core/net/ipv6/uip-nd6.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/net/ipv6/uip-nd6.c b/core/net/ipv6/uip-nd6.c
index 316172fb2..62b3a64cb 100644
--- a/core/net/ipv6/uip-nd6.c
+++ b/core/net/ipv6/uip-nd6.c
@@ -490,14 +490,16 @@ na_input(void)
     PRINTF("NA received is bad\n");
     goto discard;
   } else {
+    const uip_lladdr_t *lladdr;
     nbr = uip_ds6_nbr_lookup(&UIP_ND6_NA_BUF->tgtipaddr);
     if(nbr == NULL) {
       goto discard;
     }
 
+    lladdr = uip_ds6_nbr_get_ll(nbr);
     if(nd6_opt_llao != NULL) {
-      is_llchange =
-        memcmp(&nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET], uip_ds6_nbr_get_ll(nbr),
+      is_llchange = lladdr == NULL ||
+        memcmp(&nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET], lladdr,
                UIP_LLADDR_LEN);
     }
     if(nbr->state == NBR_INCOMPLETE) {

From e9e31e9fd11070d04cec5e37fd47c3c145bb82df Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Thu, 26 Nov 2015 20:26:10 +0100
Subject: [PATCH 180/393] replaced add/remove ds6-nbr with an nbr-module
 controlled update of lladdress to avoid loss of other state information

---
 core/net/ipv6/uip-nd6.c | 77 ++++++++++++++++++++++++++---------------
 core/net/nbr-table.c    | 69 ++++++++++++++++++++++++++++--------
 core/net/nbr-table.h    |  1 +
 3 files changed, 104 insertions(+), 43 deletions(-)

diff --git a/core/net/ipv6/uip-nd6.c b/core/net/ipv6/uip-nd6.c
index 62b3a64cb..d160392ed 100644
--- a/core/net/ipv6/uip-nd6.c
+++ b/core/net/ipv6/uip-nd6.c
@@ -136,7 +136,7 @@ static uip_ds6_prefix_t *prefix; /**  Pointer to a prefix list entry */
 /*------------------------------------------------------------------*/
 /* Copy link-layer address from LLAO option to a word-aligned uip_lladdr_t */
 static void
-extract_lladdr_aligned(uip_lladdr_t *dest) {
+extract_lladdr_from_llao_aligned(uip_lladdr_t *dest) {
   if(dest != NULL && nd6_opt_llao != NULL) {
     memcpy(dest, &nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET], UIP_LLADDR_LEN);
   }
@@ -199,17 +199,29 @@ ns_input(void)
         goto discard;
       } else {
 #endif /*UIP_CONF_IPV6_CHECKS */
+        uip_lladdr_t lladdr_aligned;
+        extract_lladdr_from_llao_aligned(&lladdr_aligned);
         nbr = uip_ds6_nbr_lookup(&UIP_IP_BUF->srcipaddr);
         if(nbr == NULL) {
+<<<<<<< 2e852f758b3fbc18ad30ec75d8c62b5d5238e70a
           uip_lladdr_t lladdr_aligned;
           extract_lladdr_aligned(&lladdr_aligned);
           uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned,
 			  0, NBR_STALE, NBR_TABLE_REASON_IPV6_ND, NULL);
+=======
+          uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned, 0, NBR_STALE);
+>>>>>>> replaced add/remove ds6-nbr with an nbr-module controlled update of lladdress to avoid loss of other state information
         } else {
-          uip_lladdr_t *lladdr = (uip_lladdr_t *)uip_ds6_nbr_get_ll(nbr);
+          const uip_lladdr_t *lladdr = uip_ds6_nbr_get_ll(nbr);
+          if(lladdr == NULL) {
+            goto discard;
+          }
           if(memcmp(&nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET],
               lladdr, UIP_LLADDR_LEN) != 0) {
-            memcpy(lladdr, &nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET], UIP_LLADDR_LEN);
+            if(nbr_table_update_lladdr((const linkaddr_t *)lladdr, (const linkaddr_t *)&lladdr_aligned, 1) == 0) {
+              /* failed to update the lladdr */
+              goto discard;
+            }
             nbr->state = NBR_STALE;
           } else {
             if(nbr->state == NBR_INCOMPLETE) {
@@ -495,10 +507,12 @@ na_input(void)
     if(nbr == NULL) {
       goto discard;
     }
-
     lladdr = uip_ds6_nbr_get_ll(nbr);
+    if(lladdr == NULL) {
+      goto discard;
+    }
     if(nd6_opt_llao != NULL) {
-      is_llchange = lladdr == NULL ||
+      is_llchange =
         memcmp(&nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET], lladdr,
                UIP_LLADDR_LEN);
     }
@@ -507,17 +521,13 @@ na_input(void)
       if(nd6_opt_llao == NULL) {
         goto discard;
       }
-      extract_lladdr_aligned(&lladdr_aligned);
 
-      /* Remove this neighbor - since it has a NULL MAC address */
-      uip_ds6_nbr_rm(nbr);
-      /* Re-add this neighbor - now with a correct MAC address */
-      nbr = uip_ds6_nbr_add(&UIP_ND6_NA_BUF->tgtipaddr,
-                            &lladdr_aligned,
-                            is_router, NBR_STALE);
-      if(nbr == NULL) {
+      extract_lladdr_from_llao_aligned(&lladdr_aligned);
+      if(nbr_table_update_lladdr((const linkaddr_t *)lladdr, (const linkaddr_t *)&lladdr_aligned, 1) == 0) {
+        /* failed to update the lladdr */
         goto discard;
       }
+
       if(is_solicited) {
         nbr->state = NBR_REACHABLE;
         nbr->nscount = 0;
@@ -529,7 +539,7 @@ na_input(void)
         nbr->state = NBR_STALE;
       }
       nbr->isrouter = is_router;
-    } else {
+    } else { /* NBR is not INCOMPLETE */
       if(!is_override && is_llchange) {
         if(nbr->state == NBR_REACHABLE) {
           nbr->state = NBR_STALE;
@@ -543,15 +553,9 @@ na_input(void)
         if(is_override || !is_llchange || nd6_opt_llao == NULL) {
           if(nd6_opt_llao != NULL && is_llchange) {
             uip_lladdr_t lladdr_aligned;
-            extract_lladdr_aligned(&lladdr_aligned);
-
-            /* Remove this neighbor - since it has updated its MAC address */
-            uip_ds6_nbr_rm(nbr);
-            /* Re-add this neighbor - now with a correct (new) MAC address */
-            nbr = uip_ds6_nbr_add(&UIP_ND6_NA_BUF->tgtipaddr,
-                                  &lladdr_aligned,
-                                  is_router, NBR_STALE);
-            if(nbr == NULL) {
+            extract_lladdr_from_llao_aligned(&lladdr_aligned);
+            if(nbr_table_update_lladdr((const linkaddr_t *) lladdr, (const linkaddr_t *) &lladdr_aligned, 1) == 0) {
+              /* failed to update the lladdr */
               goto discard;
             }
           }
@@ -652,15 +656,19 @@ rs_input(void)
     } else {
 #endif /*UIP_CONF_IPV6_CHECKS */
       uip_lladdr_t lladdr_aligned;
-      extract_lladdr_aligned(&lladdr_aligned);
+      extract_lladdr_from_llao_aligned(&lladdr_aligned);
       if((nbr = uip_ds6_nbr_lookup(&UIP_IP_BUF->srcipaddr)) == NULL) {
         /* we need to add the neighbor */
         uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned,
                         0, NBR_STALE, NBR_TABLE_REASON_IPV6_ND, NULL);
       } else {
         /* If LL address changed, set neighbor state to stale */
+        const uip_lladdr_t *lladdr = uip_ds6_nbr_get_ll(nbr);
+        if(lladdr == NULL) {
+          goto discard;
+        }
         if(memcmp(&nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET],
-                  uip_ds6_nbr_get_ll(nbr), UIP_LLADDR_LEN) != 0) {
+            lladdr, UIP_LLADDR_LEN) != 0) {
           uip_ds6_nbr_t nbr_data = *nbr;
           uip_ds6_nbr_rm(nbr);
           nbr = uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned,
@@ -892,18 +900,31 @@ ra_input(void)
       nbr = uip_ds6_nbr_lookup(&UIP_IP_BUF->srcipaddr);
       if(nbr == NULL) {
         uip_lladdr_t lladdr_aligned;
+<<<<<<< 2e852f758b3fbc18ad30ec75d8c62b5d5238e70a
         extract_lladdr_aligned(&lladdr_aligned);
         nbr = uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned,
                               1, NBR_STALE, NBR_TABLE_REASON_IPV6_ND, NULL);
+=======
+        extract_lladdr_from_llao_aligned(&lladdr_aligned);
+        nbr = uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned, 1, NBR_STALE);
+>>>>>>> replaced add/remove ds6-nbr with an nbr-module controlled update of lladdress to avoid loss of other state information
       } else {
-        uip_lladdr_t *lladdr = (uip_lladdr_t *)uip_ds6_nbr_get_ll(nbr);
+        uip_lladdr_t lladdr_aligned;
+        extract_lladdr_from_llao_aligned(&lladdr_aligned);
+        const uip_lladdr_t *lladdr = uip_ds6_nbr_get_ll(nbr);
+        if(lladdr == NULL) {
+          goto discard;
+        }
         if(nbr->state == NBR_INCOMPLETE) {
           nbr->state = NBR_STALE;
         }
         if(memcmp(&nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET],
                   lladdr, UIP_LLADDR_LEN) != 0) {
-          memcpy(lladdr, &nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET],
-                 UIP_LLADDR_LEN);
+          /* change of link layer address */
+          if(nbr_table_update_lladdr((const linkaddr_t *)lladdr, (const linkaddr_t *)&lladdr_aligned, 1) == 0) {
+            /* failed to update the lladdr */
+            goto discard;
+          }
           nbr->state = NBR_STALE;
         }
         nbr->isrouter = 1;
diff --git a/core/net/nbr-table.c b/core/net/nbr-table.c
index ddae06fca..4a3518475 100644
--- a/core/net/nbr-table.c
+++ b/core/net/nbr-table.c
@@ -178,6 +178,26 @@ nbr_set_bit(uint8_t *bitmap, nbr_table_t *table, nbr_table_item_t *item, int val
   return 0;
 }
 /*---------------------------------------------------------------------------*/
+static void
+remove_key(nbr_table_key_t *least_used_key)
+{
+  int i;
+  for(i = 0; i < MAX_NUM_TABLES; i++) {
+    if(all_tables[i] != NULL && all_tables[i]->callback != NULL) {
+      /* Call table callback for each table that uses this item */
+      nbr_table_item_t *removed_item = item_from_key(all_tables[i], least_used_key);
+      if(nbr_get_bit(used_map, all_tables[i], removed_item) == 1) {
+        all_tables[i]->callback(removed_item);
+      }
+    }
+  }
+  /* Empty used map */
+  used_map[index_from_key(least_used_key)] = 0;
+  /* Remove neighbor from list */
+  list_remove(nbr_table_keys, least_used_key);
+  /* Return associated key */
+}
+
 static nbr_table_key_t *
 nbr_table_allocate(nbr_table_reason_t reason, void *data)
 {
@@ -253,21 +273,7 @@ nbr_table_allocate(nbr_table_reason_t reason, void *data)
       return NULL;
     } else {
       /* Reuse least used item */
-      int i;
-      for(i = 0; i<MAX_NUM_TABLES; i++) {
-        if(all_tables[i] != NULL && all_tables[i]->callback != NULL) {
-          /* Call table callback for each table that uses this item */
-          nbr_table_item_t *removed_item = item_from_key(all_tables[i], least_used_key);
-          if(nbr_get_bit(used_map, all_tables[i], removed_item) == 1) {
-            all_tables[i]->callback(removed_item);
-          }
-        }
-      }
-      /* Empty used map */
-      used_map[index_from_key(least_used_key)] = 0;
-      /* Remove neighbor from list */
-      list_remove(nbr_table_keys, least_used_key);
-      /* Return associated key */
+      remove_key(least_used_key);
       return least_used_key;
     }
   }
@@ -416,6 +422,39 @@ nbr_table_get_lladdr(nbr_table_t *table, const void *item)
   return key != NULL ? &key->lladdr : NULL;
 }
 /*---------------------------------------------------------------------------*/
+/* Update link-layer address of an item */
+int
+nbr_table_update_lladdr(const linkaddr_t *old_addr, const linkaddr_t *new_addr,
+                        int remove_if_duplicate)
+{
+  int index;
+  int new_index;
+  nbr_table_key_t *key;
+  index = index_from_lladdr(old_addr);
+  if(index == -1) {
+    /* Failure to change since there is nothing to change. */
+    return 0;
+  }
+  if((new_index = index_from_lladdr(new_addr)) != -1) {
+    /* check if it is a change or not - do not remove / fail if same */
+    if(new_index == index) {
+      return 1;
+    }
+    /* This new entry already exists - failure! - remove if requested. */
+    if(remove_if_duplicate) {
+      remove_key(key_from_index(index));
+    }
+    return 0;
+  }
+  key = key_from_index(index);
+  /**
+   * Copy the new lladdr into the key - since we know that there is no
+   * conflicting entry.
+   */
+  memcpy(&key->lladdr, new_addr, sizeof(linkaddr_t));
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
 #if DEBUG
 static void
 print_table()
diff --git a/core/net/nbr-table.h b/core/net/nbr-table.h
index 88a90a46c..c797a44ec 100644
--- a/core/net/nbr-table.h
+++ b/core/net/nbr-table.h
@@ -109,6 +109,7 @@ int nbr_table_unlock(nbr_table_t *table, nbr_table_item_t *item);
 /** \name Neighbor tables: address manipulation */
 /** @{ */
 linkaddr_t *nbr_table_get_lladdr(nbr_table_t *table, const nbr_table_item_t *item);
+int nbr_table_update_lladdr(const linkaddr_t *old_addr, const linkaddr_t *new_addr, int remove_if_duplicate);
 /** @} */
 
 #endif /* NBR_TABLE_H_ */

From d9f4d97a41496d0bd7f92cc6e5856adcceffc87d Mon Sep 17 00:00:00 2001
From: Pere Tuset <peretuset@gmail.com>
Date: Tue, 19 Apr 2016 22:35:31 +0200
Subject: [PATCH 181/393] Adapted OpenMote-CC2538 sensor drivers to Contiki
 sensor API.

---
 examples/openmote-cc2538/openmote-demo.c |  55 +++++------
 platform/openmote-cc2538/dev/adxl346.c   | 111 ++++++++++++---------
 platform/openmote-cc2538/dev/adxl346.h   |  36 ++-----
 platform/openmote-cc2538/dev/max44009.c  |  97 ++++++++++++++++---
 platform/openmote-cc2538/dev/max44009.h  |  31 ++----
 platform/openmote-cc2538/dev/sht21.c     | 117 +++++++++++++++++++----
 platform/openmote-cc2538/dev/sht21.h     |  43 +++------
 7 files changed, 304 insertions(+), 186 deletions(-)

diff --git a/examples/openmote-cc2538/openmote-demo.c b/examples/openmote-cc2538/openmote-demo.c
index f36c3a0b4..46a301511 100644
--- a/examples/openmote-cc2538/openmote-demo.c
+++ b/examples/openmote-cc2538/openmote-demo.c
@@ -83,31 +83,29 @@ static struct broadcast_conn bc;
 PROCESS_THREAD(openmote_demo_process, ev, data)
 {
   static struct etimer et;
-  static unsigned int raw, counter;
-  static uint8_t adxl346_present, max44009_present, sht21_present;
-  static float light, temperature, humidity;
+  static int16_t counter;
+  static uint16_t adxl346_present, sht21_present, max44009_present;
+  static uint16_t accel, light, temperature, humidity;
 
   PROCESS_EXITHANDLER(broadcast_close(&bc))
 
   PROCESS_BEGIN();
 
-  adxl346_init();
-  adxl346_present = adxl346_is_present();
-  if(!adxl346_present) {
+  /* Initialize and activate the ADXL346 sensor */
+  adxl346_present = SENSORS_ACTIVATE(adxl346);
+  if(adxl346_present == ADXL346_ERROR) {
     printf("ADXL346 sensor is NOT present!\n");
     leds_on(LEDS_YELLOW);
   }
 
-  max44009_init();
-  max44009_present = max44009_is_present();
-  if(!max44009_present) {
+  max44009_present = SENSORS_ACTIVATE(max44009);
+  if(max44009_present == MAX44009_ERROR) {
     printf("MAX44009 sensor is NOT present!\n");
     leds_on(LEDS_ORANGE);
   }
 
-  sht21_init();
-  sht21_present = sht21_is_present();
-  if(!sht21_present) {
+  sht21_present = SENSORS_ACTIVATE(sht21);
+  if(sht21_present == SHT21_ERROR) {
     printf("SHT21 sensor is NOT present!\n");
     leds_on(LEDS_RED);
   }
@@ -123,33 +121,30 @@ PROCESS_THREAD(openmote_demo_process, ev, data)
     PROCESS_YIELD();
 
     if(ev == PROCESS_EVENT_TIMER) {
-      if(adxl346_present) {
+      if(adxl346_present != ADXL346_ERROR) {
         leds_on(LEDS_YELLOW);
-        raw = adxl346_read_x();
-        printf("X Acceleration: %u\n", raw);
-        raw = adxl346_read_y();
-        printf("Y Acceleration: %u\n", raw);
-        raw = adxl346_read_z();
-        printf("Z Acceleration: %u\n", raw);
+        accel = adxl346.value(ADXL346_READ_X);
+        printf("X Acceleration: %u\n", accel);
+        accel = adxl346.value(ADXL346_READ_Y);
+        printf("Y Acceleration: %u\n", accel);
+        accel = adxl346.value(ADXL346_READ_Z);
+        printf("Z Acceleration: %u\n", accel);
         leds_off(LEDS_YELLOW);
       }
 
-      if(max44009_present) {
+      if(max44009_present != MAX44009_ERROR) {
         leds_on(LEDS_ORANGE);
-        raw = max44009_read_light();
-        light = max44009_convert_light(raw);
-        printf("Light: %u.%ulux\n", (unsigned int)light, (unsigned int)(light * 100) % 100);
+        light = max44009.value(MAX44009_READ_LIGHT);
+        printf("Light: %u.%ulux\n", light / 100, light % 100);
         leds_off(LEDS_ORANGE);
       }
 
-      if(sht21_present) {
+      if(sht21_present != SHT21_ERROR) {
         leds_on(LEDS_RED);
-        raw = sht21_read_temperature();
-        temperature = sht21_convert_temperature(raw);
-        printf("Temperature: %u.%uC\n", (unsigned int)temperature, (unsigned int)(temperature * 100) % 100);
-        raw = sht21_read_humidity();
-        humidity = sht21_convert_humidity(raw);
-        printf("Rel. humidity: %u.%u%%\n", (unsigned int)humidity, (unsigned int)(humidity * 100) % 100);
+        temperature = sht21.value(SHT21_READ_TEMP);
+        printf("Temperature: %u.%uC\n", temperature / 100, temperature % 100);
+        humidity = sht21.value(SHT21_READ_RHUM);
+        printf("Rel. humidity: %u.%u%%\n", humidity / 100, humidity % 100);
         leds_off(LEDS_RED);
       }
 
diff --git a/platform/openmote-cc2538/dev/adxl346.c b/platform/openmote-cc2538/dev/adxl346.c
index 650b7cfda..7fb406051 100644
--- a/platform/openmote-cc2538/dev/adxl346.c
+++ b/platform/openmote-cc2538/dev/adxl346.c
@@ -43,6 +43,14 @@
 /*---------------------------------------------------------------------------*/
 #include "dev/i2c.h"
 #include "dev/adxl346.h"
+#include "lib/sensors.h"
+/*---------------------------------------------------------------------------*/
+#define DEBUG 0
+#if DEBUG
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
 /*---------------------------------------------------------------------------*/
 /**
  * \name ADXL346 address and device identifier
@@ -147,7 +155,9 @@
 #define ADXL346_DATA_FORMAT_RANGE_PM_16g    (3)
 /** @} */
 /*---------------------------------------------------------------------------*/
-void
+static uint8_t enabled;
+/*---------------------------------------------------------------------------*/
+static void
 adxl346_init(void)
 {
   uint8_t config[2];
@@ -167,12 +177,7 @@ adxl346_init(void)
   i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
 }
 /*---------------------------------------------------------------------------*/
-void
-adxl346_reset(void)
-{
-}
-/*---------------------------------------------------------------------------*/
-uint8_t
+static uint8_t
 adxl346_is_present(void)
 {
   uint8_t is_present;
@@ -183,47 +188,15 @@ adxl346_is_present(void)
   return is_present == ADXL346_DEVID_VALUE;
 }
 /*---------------------------------------------------------------------------*/
-uint16_t
-adxl346_read_x(void)
-{
-  uint8_t acceleration[2];
-  uint16_t x;
-
-  i2c_single_send(ADXL346_ADDRESS, ADXL346_DATAX0_ADDR);
-  i2c_single_receive(ADXL346_ADDRESS, &acceleration[0]);
-  i2c_single_send(ADXL346_ADDRESS, ADXL346_DATAX1_ADDR);
-  i2c_single_receive(ADXL346_ADDRESS, &acceleration[1]);
-
-  x = (acceleration[0] << 8) | acceleration[1];
-
-  return x;
-}
-/*---------------------------------------------------------------------------*/
-uint16_t
-adxl346_read_y(void)
-{
-  uint8_t acceleration[2];
-  uint16_t y;
-
-  i2c_single_send(ADXL346_ADDRESS, ADXL346_DATAY0_ADDR);
-  i2c_single_receive(ADXL346_ADDRESS, &acceleration[0]);
-  i2c_single_send(ADXL346_ADDRESS, ADXL346_DATAY1_ADDR);
-  i2c_single_receive(ADXL346_ADDRESS, &acceleration[1]);
-
-  y = (acceleration[0] << 8) | acceleration[1];
-
-  return y;
-}
-/*---------------------------------------------------------------------------*/
-uint16_t
-adxl346_read_z(void)
+static uint16_t
+adxl346_read_accel(uint8_t addr1, uint8_t addr2)
 {
   uint8_t acceleration[2];
   uint16_t z;
 
-  i2c_single_send(ADXL346_ADDRESS, ADXL346_DATAZ0_ADDR);
+  i2c_single_send(ADXL346_ADDRESS, addr1);
   i2c_single_receive(ADXL346_ADDRESS, &acceleration[0]);
-  i2c_single_send(ADXL346_ADDRESS, ADXL346_DATAZ1_ADDR);
+  i2c_single_send(ADXL346_ADDRESS, addr2);
   i2c_single_receive(ADXL346_ADDRESS, &acceleration[1]);
 
   z = (acceleration[0] << 8) | acceleration[1];
@@ -231,4 +204,56 @@ adxl346_read_z(void)
   return z;
 }
 /*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+  case SENSORS_READY:
+    return enabled;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  if(!enabled) {
+    PRINTF("ADXL346: sensor not started\n");
+    return ADXL346_ERROR;
+  }
+
+  if(type == ADXL346_READ_X) {
+    return adxl346_read_accel(ADXL346_DATAX0_ADDR, ADXL346_DATAX1_ADDR);
+  } else if(type == ADXL346_READ_Y) {
+    return adxl346_read_accel(ADXL346_DATAY0_ADDR, ADXL346_DATAY1_ADDR);
+  } else if(type == ADXL346_READ_Z) {
+    return adxl346_read_accel(ADXL346_DATAZ0_ADDR, ADXL346_DATAZ1_ADDR);
+  } else {
+    PRINTF("ADXL346: invalid value requested\n");
+    return ADXL346_ERROR;
+  }
+
+  return ADXL346_ERROR;
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int value)
+{
+  if(type == ADXL346_ACTIVATE) {
+    if(!adxl346_is_present()) {
+      PRINTF("ADXL346: is not present\n");
+      return ADXL346_ERROR;
+    } else {
+      adxl346_init();
+      enabled = 1;
+      return ADXL346_SUCCESS;
+    }
+  }
+
+  return ADXL346_ERROR;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(adxl346, ADXL346_SENSOR, value, configure, status);
+/*---------------------------------------------------------------------------*/
 /** @} */
diff --git a/platform/openmote-cc2538/dev/adxl346.h b/platform/openmote-cc2538/dev/adxl346.h
index d5751ce70..acd0d21f5 100644
--- a/platform/openmote-cc2538/dev/adxl346.h
+++ b/platform/openmote-cc2538/dev/adxl346.h
@@ -47,35 +47,17 @@
 #ifndef ADXL346_H_
 #define ADXL346_H_
 /*---------------------------------------------------------------------------*/
-/**
- * \brief Initialize the ADXL346 sensor
- */
-void adxl346_init(void);
+#define ADXL346_ERROR             (-1)
+#define ADXL346_SUCCESS           (0)
+#define ADXL346_ACTIVATE          (SENSORS_ACTIVE)
+#define ADXL346_READ_X            (2)
+#define ADXL346_READ_Y            (3)
+#define ADXL346_READ_Z            (4)
+#define ADXL346_NONE              (5)
 /*---------------------------------------------------------------------------*/
-/**
- * \brief Reset the ADXL346 sensor
- */
-void adxl346_reset(void);
+#define ADXL346_SENSOR "ADXL346 Sensor"
 /*---------------------------------------------------------------------------*/
-/**
- * \brief Check if the ADXL346 sensor is present
- */
-uint8_t adxl346_is_present(void);
-/*---------------------------------------------------------------------------*/
-/**
- * \brief Read the x-axis from the ADXL346 sensor
- */
-uint16_t adxl346_read_x(void);
-/*---------------------------------------------------------------------------*/
-/**
- * \brief Read the y-axis from the ADXL346 sensor
- */
-uint16_t adxl346_read_y(void);
-/*---------------------------------------------------------------------------*/
-/**
- * \brief Read the z-axis from the ADXL346 sensor
- */
-uint16_t adxl346_read_z(void);
+extern const struct sensors_sensor adxl346;
 /*---------------------------------------------------------------------------*/
 #endif /* ADXL346_H_ */
 /*---------------------------------------------------------------------------*/
diff --git a/platform/openmote-cc2538/dev/max44009.c b/platform/openmote-cc2538/dev/max44009.c
index 233b07d13..d7f4e90d9 100644
--- a/platform/openmote-cc2538/dev/max44009.c
+++ b/platform/openmote-cc2538/dev/max44009.c
@@ -43,6 +43,14 @@
 /*---------------------------------------------------------------------------*/
 #include "dev/i2c.h"
 #include "dev/max44009.h"
+#include "lib/sensors.h"
+/*---------------------------------------------------------------------------*/
+#define DEBUG 1
+#if DEBUG
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
 /*---------------------------------------------------------------------------*/
 /**
  * \name MAX44009 address and device identifier
@@ -94,9 +102,17 @@
                                              MAX44009_CONFIG_AUTO | \
                                              MAX44009_CONFIG_CDR_NORMAL | \
                                              MAX44009_CONFIG_INTEGRATION_100ms)
+
+#define MAX44009_USER_CONFIGURATION         (MAX44009_CONFIG_DEFAULT | \
+                                             MAX44009_CONFIG_AUTO | \
+                                             MAX44009_CONFIG_CDR_NORMAL | \
+                                             MAX44009_CONFIG_INTEGRATION_800ms)
+
 /** @} */
 /*---------------------------------------------------------------------------*/
-void
+static uint8_t enabled;
+/*---------------------------------------------------------------------------*/
+static void
 max44009_init(void)
 {
   uint8_t max44009_address[5] = { MAX44009_INT_ENABLE_ADDR, MAX44009_CONFIG_ADDR, \
@@ -106,8 +122,8 @@ max44009_init(void)
   uint8_t max44009_data[2];
   uint8_t i;
 
-  max44009_value[0] = (MAX44009_INT_STATUS_ON);
-  max44009_value[1] = (MAX44009_DEFAULT_CONFIGURATION);
+  max44009_value[0] = (MAX44009_INT_STATUS_OFF);
+  max44009_value[1] = (MAX44009_USER_CONFIGURATION);
   max44009_value[2] = (0xFF);
   max44009_value[3] = (0x00);
   max44009_value[4] = (0xFF);
@@ -119,7 +135,7 @@ max44009_init(void)
   }
 }
 /*---------------------------------------------------------------------------*/
-void
+static void
 max44009_reset(void)
 {
   uint8_t max44009_address[5] = { MAX44009_INT_ENABLE_ADDR, MAX44009_CONFIG_ADDR, \
@@ -136,7 +152,7 @@ max44009_reset(void)
   }
 }
 /*---------------------------------------------------------------------------*/
-uint8_t
+static uint8_t
 max44009_is_present(void)
 {
   uint8_t status;
@@ -151,12 +167,12 @@ max44009_is_present(void)
   return is_present != MAX44009_NOT_FOUND;
 }
 /*---------------------------------------------------------------------------*/
-uint16_t
+static uint16_t
 max44009_read_light(void)
 {
   uint8_t exponent, mantissa;
   uint8_t max44009_data[2];
-  uint16_t result;
+  uint32_t result;
 
   i2c_single_send(MAX44009_ADDRESS, MAX44009_LUX_HIGH_ADDR);
   i2c_single_receive(MAX44009_ADDRESS, &max44009_data[0]);
@@ -171,20 +187,77 @@ max44009_read_light(void)
   return result;
 }
 /*---------------------------------------------------------------------------*/
-float
+static uint16_t
 max44009_convert_light(uint16_t lux)
 {
   uint8_t exponent, mantissa;
-  float result = 0.045;
+  uint32_t result;
 
   exponent = (lux >> 8) & 0xFF;
   exponent = (exponent == 0x0F ? exponent & 0x0E : exponent);
-
   mantissa = (lux >> 0) & 0xFF;
 
-  result *= 2 ^ exponent * mantissa;
+  result = 45 * (2 ^ exponent * mantissa) / 10;
 
-  return result;
+  return (uint16_t)result;
 }
 /*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+  case SENSORS_READY:
+    return enabled;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  uint16_t value;
+
+  if(!enabled) {
+    PRINTF("MAX44009: sensor not started\n");
+    return MAX44009_ERROR;
+  }
+
+  if(type == MAX44009_READ_RAW_LIGHT) {
+    return max44009_read_light();
+  } else if(type == MAX44009_READ_LIGHT) {
+    value = max44009_read_light();
+    return max44009_convert_light(value);
+  } else {
+    PRINTF("MAX44009: invalid value requested\n");
+    return MAX44009_ERROR;
+  }
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int value)
+{
+  if(type == MAX44009_ACTIVATE) {
+    if(!max44009_is_present()) {
+      return MAX44009_ERROR;
+    } else {
+      max44009_init();
+      enabled = 1;
+      return MAX44009_SUCCESS;
+    }
+  }
+
+  if((type == MAX44009_RESET) && enabled) {
+    max44009_reset();
+    return MAX44009_SUCCESS;
+  } else {
+    PRINTF("MAX44009: is not enabled\n");
+    return MAX44009_ERROR;
+  }
+
+  return MAX44009_ERROR;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(max44009, MAX44009_SENSOR, value, configure, status);
+/*---------------------------------------------------------------------------*/
 /** @} */
diff --git a/platform/openmote-cc2538/dev/max44009.h b/platform/openmote-cc2538/dev/max44009.h
index e94a91fca..32ba101e8 100644
--- a/platform/openmote-cc2538/dev/max44009.h
+++ b/platform/openmote-cc2538/dev/max44009.h
@@ -47,30 +47,17 @@
 #ifndef MAX44009_H_
 #define MAX44009_H_
 /*---------------------------------------------------------------------------*/
-/**
- * \brief Initialize the MAX44009 sensor
- */
-void max44009_init(void);
+#define MAX44009_ERROR            (-1)
+#define MAX44009_SUCCESS          (0)
+#define MAX44009_ACTIVATE         (SENSORS_ACTIVE)
+#define MAX44009_READ_RAW_LIGHT   (2)
+#define MAX44009_READ_LIGHT       (3)
+#define MAX44009_RESET            (4)
+#define MAX44009_NONE             (5)
 /*---------------------------------------------------------------------------*/
-/**
- * \brief Reset the MAX44009 sensor
- */
-void max44009_reset(void);
+#define MAX44009_SENSOR "MAX44009 Sensor"
 /*---------------------------------------------------------------------------*/
-/**
- * \brief Check if the MAX44009 sensor is present
- */
-uint8_t max44009_is_present(void);
-/*---------------------------------------------------------------------------*/
-/**
- * \brief Read the light from the MAX44009 sensor
- */
-uint16_t max44009_read_light(void);
-/*---------------------------------------------------------------------------*/
-/**
- * \brief Convert the light from the MAX44009 sensor
- */
-float max44009_convert_light(uint16_t light);
+extern const struct sensors_sensor max44009;
 /*---------------------------------------------------------------------------*/
 #endif /* MAX44009_H_ */
 /*---------------------------------------------------------------------------*/
diff --git a/platform/openmote-cc2538/dev/sht21.c b/platform/openmote-cc2538/dev/sht21.c
index 989fe2905..4fd577e01 100644
--- a/platform/openmote-cc2538/dev/sht21.c
+++ b/platform/openmote-cc2538/dev/sht21.c
@@ -41,8 +41,16 @@
  * Pere Tuset <peretuset@openmote.com>
  */
 /*---------------------------------------------------------------------------*/
-#include "i2c.h"
-#include "sht21.h"
+#include "dev/i2c.h"
+#include "dev/sht21.h"
+#include "lib/sensors.h"
+/*---------------------------------------------------------------------------*/
+#define DEBUG 0
+#if DEBUG
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
 /*---------------------------------------------------------------------------*/
 /**
  * \name SHT21 address
@@ -87,13 +95,15 @@
                                          SHT21_BATTERY_ABOVE_2V25 | \
                                          SHT21_OTP_RELOAD_DISABLE)
 
-#define SHT21_USER_CONFIG               (SHT21_RESOLUTION_8b_12b | \
+#define SHT21_USER_CONFIG               (SHT21_RESOLUTION_12b_14b | \
                                          SHT21_ONCHIP_HEATER_DISABLE | \
                                          SHT21_BATTERY_ABOVE_2V25 | \
                                          SHT21_OTP_RELOAD_DISABLE)
 /** @} */
 /*---------------------------------------------------------------------------*/
-void
+static uint8_t enabled;
+/*---------------------------------------------------------------------------*/
+static void
 sht21_init(void)
 {
   uint8_t config[2];
@@ -116,14 +126,14 @@ sht21_init(void)
   i2c_burst_send(SHT21_ADDRESS, config, sizeof(config));
 }
 /*---------------------------------------------------------------------------*/
-void
+static void
 sht21_reset(void)
 {
   /* Send a soft-reset command according to the datasheet (pag. 9, fig. 17) */
   i2c_single_send(SHT21_ADDRESS, SHT21_RESET_CMD);
 }
 /*---------------------------------------------------------------------------*/
-uint8_t
+static uint8_t
 sht21_is_present(void)
 {
   uint8_t status;
@@ -142,7 +152,7 @@ sht21_is_present(void)
   return (is_present == SHT21_USER_CONFIG) || (is_present == SHT21_DEFAULT_CONFIG);
 }
 /*---------------------------------------------------------------------------*/
-uint16_t
+static uint32_t
 sht21_read_temperature(void)
 {
   uint8_t sht21_temperature[2];
@@ -152,23 +162,24 @@ sht21_read_temperature(void)
   i2c_single_send(SHT21_ADDRESS, SHT21_TEMPERATURE_HM_CMD);
   i2c_burst_receive(SHT21_ADDRESS, sht21_temperature, sizeof(sht21_temperature));
 
-  temperature = (sht21_temperature[0] << 8) | (sht21_temperature[1] & SHT21_STATUS_MASK);
+  temperature = (sht21_temperature[0] << 8) | ((sht21_temperature[1] & SHT21_STATUS_MASK));
 
   return temperature;
 }
 /*---------------------------------------------------------------------------*/
-float
-sht21_convert_temperature(uint16_t temperature)
+static int16_t
+sht21_convert_temperature(uint32_t temperature)
 {
-  float result;
+  int16_t result;
 
-  result = -46.85;
-  result += 175.72 * (float)temperature / 65536.0;
+  temperature *= 17572;
+  temperature = temperature >> 16;
+  result = (int16_t)temperature - 4685;
 
   return result;
 }
 /*---------------------------------------------------------------------------*/
-uint16_t
+static uint32_t
 sht21_read_humidity(void)
 {
   uint8_t sht21_humidity[2];
@@ -178,20 +189,86 @@ sht21_read_humidity(void)
   i2c_single_send(SHT21_ADDRESS, SHT21_HUMIDITY_HM_CMD);
   i2c_burst_receive(SHT21_ADDRESS, sht21_humidity, sizeof(sht21_humidity));
 
-  humidity = (sht21_humidity[0] << 8) | (sht21_humidity[1] & SHT21_STATUS_MASK);
+  humidity = (sht21_humidity[0] << 8) | ((sht21_humidity[1] & SHT21_STATUS_MASK));
 
   return humidity;
 }
 /*---------------------------------------------------------------------------*/
-float
-sht21_convert_humidity(uint16_t humidity)
+static int16_t
+sht21_convert_humidity(uint32_t humidity)
 {
-  float result;
+  int16_t result;
 
-  result = -6.0;
-  result += 125.0 * (float)humidity / 65536.0;
+  humidity *= 12500;
+  humidity = humidity >> 16;
+  result = (int16_t)humidity - 600;
+  result = (result > 10000) ? 10000 : result;
 
   return result;
 }
 /*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+  case SENSORS_READY:
+    return enabled;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  uint32_t value;
+
+  if(!enabled) {
+    PRINTF("SHT21: sensor not started\n");
+    return SHT21_ERROR;
+  }
+
+  if(type == SHT21_READ_RAW_TEMP) {
+    return sht21_read_temperature();
+  } else if(type == SHT21_READ_RAW_RHUM) {
+    return sht21_read_humidity();
+  } else if(type == SHT21_READ_TEMP) {
+    value = sht21_read_temperature();
+    return sht21_convert_temperature(value);
+  } else if(type == SHT21_READ_RHUM) {
+    value = sht21_read_humidity();
+    return sht21_convert_humidity(value);
+  } else {
+    PRINTF("SHT21: invalid value requested\n");
+    return SHT21_ERROR;
+  }
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int value)
+{
+  if(type == SHT21_ACTIVATE) {
+    if(!sht21_is_present()) {
+      PRINTF("SHT21: is not present\n");
+      return SHT21_ERROR;
+    } else {
+      sht21_init();
+      enabled = 1;
+      return SHT21_SUCCESS;
+    }
+  }
+
+  if(type == SHT21_RESET && enabled) {
+    sht21_reset();
+    return SHT21_SUCCESS;
+  } else {
+    PRINTF("SHT21: is not enabled\n");
+    return SHT21_ERROR;
+  }
+
+  return SHT21_ERROR;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(sht21, SHT21_SENSOR, value, configure, status);
+/*---------------------------------------------------------------------------*/
 /** @} */
diff --git a/platform/openmote-cc2538/dev/sht21.h b/platform/openmote-cc2538/dev/sht21.h
index 1483a70a9..3304d915e 100644
--- a/platform/openmote-cc2538/dev/sht21.h
+++ b/platform/openmote-cc2538/dev/sht21.h
@@ -47,40 +47,19 @@
 #ifndef SHT21_H_
 #define SHT21_H_
 /*---------------------------------------------------------------------------*/
-/**
- * \brief Initialize the SHT21 sensor
- */
-void sht21_init(void);
+#define SHT21_ERROR             (-1)
+#define SHT21_SUCCESS           (0)
+#define SHT21_ACTIVATE          (SENSORS_ACTIVE)
+#define SHT21_READ_RAW_TEMP     (2)
+#define SHT21_READ_RAW_RHUM     (3)
+#define SHT21_READ_TEMP         (4)
+#define SHT21_READ_RHUM         (5)
+#define SHT21_RESET             (6)
+#define SHT21_NONE              (7)
 /*---------------------------------------------------------------------------*/
-/**
- * \brief Reset the SHT21 sensor
- */
-void sht21_reset(void);
+#define SHT21_SENSOR "SHT21 Sensor"
 /*---------------------------------------------------------------------------*/
-/**
- * \brief Check if the SHT21 sensor is present
- */
-uint8_t sht21_is_present(void);
-/*---------------------------------------------------------------------------*/
-/**
- * \brief Read the temperature from the SHT21 sensor
- */
-uint16_t sht21_read_temperature(void);
-/*---------------------------------------------------------------------------*/
-/**
- * \brief Convert the temperature from the SHT21 sensor
- */
-float sht21_convert_temperature(uint16_t temperature);
-/*---------------------------------------------------------------------------*/
-/**
- * \brief Read the relative humidity from the SHT21 sensor
- */
-uint16_t sht21_read_humidity(void);
-/*---------------------------------------------------------------------------*/
-/**
- * \brief Convert the relative humidity from the SHT21 sensor
- */
-float sht21_convert_humidity(uint16_t humidity);
+extern const struct sensors_sensor sht21;
 /*---------------------------------------------------------------------------*/
 #endif /* SHT21_H_ */
 /*---------------------------------------------------------------------------*/

From 2ad3d85d412b765bb6415ae96f937172f44aa6fa Mon Sep 17 00:00:00 2001
From: Bernhard Hackl <bernhard@fittrack.io>
Date: Wed, 20 Apr 2016 08:14:08 +0000
Subject: [PATCH 182/393] Fix slip config switch statement

---
 examples/ipv6/native-border-router/slip-config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/ipv6/native-border-router/slip-config.c b/examples/ipv6/native-border-router/slip-config.c
index 782259f8c..d6b6e0660 100644
--- a/examples/ipv6/native-border-router/slip-config.c
+++ b/examples/ipv6/native-border-router/slip-config.c
@@ -67,7 +67,7 @@ int
 slip_config_handle_arguments(int argc, char **argv)
 {
   const char *prog;
-  char c;
+  int c;
   int baudrate = 115200;
 
   slip_config_verbose = 0;

From 7f700c9564dfb6ec0b3308412187fc04579b8ae5 Mon Sep 17 00:00:00 2001
From: Nicolas Tsiftes <nvt@sics.se>
Date: Wed, 20 Apr 2016 12:47:37 +0200
Subject: [PATCH 183/393] Remove the protected memory code associated with
 sensornet checkpointing because this functionality has been removed from
 Contiki.

---
 core/cfs/cfs-coffee.c | 49 ++++++++++++++++---------------------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/core/cfs/cfs-coffee.c b/core/cfs/cfs-coffee.c
index 4b08d4544..ea158dfb9 100644
--- a/core/cfs/cfs-coffee.c
+++ b/core/cfs/cfs-coffee.c
@@ -201,21 +201,13 @@ struct log_param {
 };
 
 /*
- * The protected memory consists of structures that should not be
- * overwritten during system checkpointing because they may be used by
- * the checkpointing implementation. These structures need not be
- * protected if checkpointing is not used.
+ * Variables that keep track of opened files and internal
+ * optimization information for Coffee.
  */
-static struct protected_mem_t {
-  struct file coffee_files[COFFEE_MAX_OPEN_FILES];
-  struct file_desc coffee_fd_set[COFFEE_FD_SET_SIZE];
-  coffee_page_t next_free;
-  char gc_wait;
-} protected_mem;
-static struct file *const coffee_files = protected_mem.coffee_files;
-static struct file_desc *const coffee_fd_set = protected_mem.coffee_fd_set;
-static coffee_page_t *const next_free = &protected_mem.next_free;
-static char *const gc_wait = &protected_mem.gc_wait;
+static struct file coffee_files[COFFEE_MAX_OPEN_FILES];
+static struct file_desc coffee_fd_set[COFFEE_FD_SET_SIZE];
+static coffee_page_t next_free;
+static char gc_wait;
 
 /*---------------------------------------------------------------------------*/
 static void
@@ -387,8 +379,8 @@ collect_garbage(int mode)
     if((mode == GC_RELUCTANT && stats.free == 0) ||
        (mode == GC_GREEDY && stats.obsolete > 0)) {
       first_page = sector * COFFEE_PAGES_PER_SECTOR;
-      if(first_page < *next_free) {
-        *next_free = first_page;
+      if(first_page < next_free) {
+        next_free = first_page;
       }
 
       if(isolation_count > 0) {
@@ -539,7 +531,7 @@ find_contiguous_pages(coffee_page_t amount)
   struct file_header hdr;
 
   start = INVALID_PAGE;
-  for(page = *next_free; page < COFFEE_PAGE_COUNT;) {
+  for(page = next_free; page < COFFEE_PAGE_COUNT;) {
     read_header(&hdr, page);
     if(HDR_FREE(hdr)) {
       if(start == INVALID_PAGE) {
@@ -555,8 +547,8 @@ find_contiguous_pages(coffee_page_t amount)
       page = next_file(page, &hdr);
 
       if(start + amount <= page) {
-        if(start == *next_free) {
-          *next_free = start + amount;
+        if(start == next_free) {
+          next_free = start + amount;
         }
         return start;
       }
@@ -589,7 +581,7 @@ remove_by_page(coffee_page_t page, int remove_log, int close_fds,
   hdr.flags |= HDR_FLAG_OBSOLETE;
   write_header(&hdr, page);
 
-  *gc_wait = 0;
+  gc_wait = 0;
 
   /* Close all file descriptors that reference the removed file. */
   if(close_fds) {
@@ -638,13 +630,13 @@ reserve(const char *name, coffee_page_t pages,
 
   page = find_contiguous_pages(pages);
   if(page == INVALID_PAGE) {
-    if(*gc_wait) {
+    if(gc_wait) {
       return NULL;
     }
     collect_garbage(GC_GREEDY);
     page = find_contiguous_pages(pages);
     if(page == INVALID_PAGE) {
-      *gc_wait = 1;
+      gc_wait = 1;
       return NULL;
     }
   }
@@ -1346,24 +1338,19 @@ cfs_coffee_format(void)
 
   PRINTF("Coffee: Formatting %u sectors", COFFEE_SECTOR_COUNT);
 
-  *next_free = 0;
-
   for(i = 0; i < COFFEE_SECTOR_COUNT; i++) {
     COFFEE_ERASE(i);
     PRINTF(".");
   }
 
   /* Formatting invalidates the file information. */
-  memset(&protected_mem, 0, sizeof(protected_mem));
+  memset(&coffee_files, 0, sizeof(coffee_files));
+  memset(&coffee_fd_set, 0, sizeof(coffee_fd_set));
+  next_free = 0;
+  gc_wait = 1;
 
   PRINTF(" done!\n");
 
   return 0;
 }
 /*---------------------------------------------------------------------------*/
-void *
-cfs_coffee_get_protected_mem(unsigned *size)
-{
-  *size = sizeof(protected_mem);
-  return &protected_mem;
-}

From 86733e87020686306fd16bdb191ad4c64759dd1c Mon Sep 17 00:00:00 2001
From: Nicolas Tsiftes <nvt@sics.se>
Date: Wed, 20 Apr 2016 14:30:20 +0200
Subject: [PATCH 184/393] Clarified and cleaned up Coffee's documentation and
 the debug statements. Formatted some source code for easier reading.

---
 core/cfs/cfs-coffee.c | 77 ++++++++++++++++++++++---------------------
 core/cfs/cfs-coffee.h | 41 ++++++++++-------------
 2 files changed, 56 insertions(+), 62 deletions(-)

diff --git a/core/cfs/cfs-coffee.c b/core/cfs/cfs-coffee.c
index ea158dfb9..6391e173c 100644
--- a/core/cfs/cfs-coffee.c
+++ b/core/cfs/cfs-coffee.c
@@ -114,41 +114,41 @@
 #define GC_RELUCTANT    1
 
 /* File descriptor macros. */
-#define FD_VALID(fd) \
-  ((fd) >= 0 && (fd) < COFFEE_FD_SET_SIZE && \
-   coffee_fd_set[(fd)].flags != COFFEE_FD_FREE)
+#define FD_VALID(fd)      ((fd) >= 0 && (fd) < COFFEE_FD_SET_SIZE && \
+                           coffee_fd_set[(fd)].flags != COFFEE_FD_FREE)
 #define FD_READABLE(fd)   (coffee_fd_set[(fd)].flags & CFS_READ)
 #define FD_WRITABLE(fd)   (coffee_fd_set[(fd)].flags & CFS_WRITE)
 #define FD_APPENDABLE(fd) (coffee_fd_set[(fd)].flags & CFS_APPEND)
 
 /* File object macros. */
-#define FILE_MODIFIED(file) ((file)->flags & COFFEE_FILE_MODIFIED)
-#define FILE_FREE(file)   ((file)->max_pages == 0)
+#define FILE_MODIFIED(file)     ((file)->flags & COFFEE_FILE_MODIFIED)
+#define FILE_FREE(file)         ((file)->max_pages == 0)
 #define FILE_UNREFERENCED(file) ((file)->references == 0)
 
 /* File header flags. */
-#define HDR_FLAG_VALID    0x1 /* Completely written header. */
-#define HDR_FLAG_ALLOCATED  0x2 /* Allocated file. */
-#define HDR_FLAG_OBSOLETE 0x4 /* File marked for GC. */
-#define HDR_FLAG_MODIFIED 0x8 /* Modified file, log exists. */
-#define HDR_FLAG_LOG    0x10  /* Log file. */
-#define HDR_FLAG_ISOLATED 0x20  /* Isolated page. */
+#define HDR_FLAG_VALID     0x01 /* Completely written header. */
+#define HDR_FLAG_ALLOCATED 0x02 /* Allocated file. */
+#define HDR_FLAG_OBSOLETE  0x04 /* File marked for GC. */
+#define HDR_FLAG_MODIFIED  0x08 /* Modified file, log exists. */
+#define HDR_FLAG_LOG       0x10 /* Log file. */
+#define HDR_FLAG_ISOLATED  0x20 /* Isolated page. */
 
 /* File header macros. */
 #define CHECK_FLAG(hdr, flag) ((hdr).flags & (flag))
-#define HDR_VALID(hdr)    CHECK_FLAG(hdr, HDR_FLAG_VALID)
-#define HDR_ALLOCATED(hdr)  CHECK_FLAG(hdr, HDR_FLAG_ALLOCATED)
-#define HDR_FREE(hdr)   !HDR_ALLOCATED(hdr)
-#define HDR_LOG(hdr)    CHECK_FLAG(hdr, HDR_FLAG_LOG)
-#define HDR_MODIFIED(hdr) CHECK_FLAG(hdr, HDR_FLAG_MODIFIED)
-#define HDR_ISOLATED(hdr) CHECK_FLAG(hdr, HDR_FLAG_ISOLATED)
-#define HDR_OBSOLETE(hdr)   CHECK_FLAG(hdr, HDR_FLAG_OBSOLETE)
-#define HDR_ACTIVE(hdr)   (HDR_ALLOCATED(hdr) && \
-                           !HDR_OBSOLETE(hdr) && \
-                           !HDR_ISOLATED(hdr))
+#define HDR_VALID(hdr)        CHECK_FLAG(hdr, HDR_FLAG_VALID)
+#define HDR_ALLOCATED(hdr)    CHECK_FLAG(hdr, HDR_FLAG_ALLOCATED)
+#define HDR_FREE(hdr)         !HDR_ALLOCATED(hdr)
+#define HDR_LOG(hdr)          CHECK_FLAG(hdr, HDR_FLAG_LOG)
+#define HDR_MODIFIED(hdr)     CHECK_FLAG(hdr, HDR_FLAG_MODIFIED)
+#define HDR_ISOLATED(hdr)     CHECK_FLAG(hdr, HDR_FLAG_ISOLATED)
+#define HDR_OBSOLETE(hdr)     CHECK_FLAG(hdr, HDR_FLAG_OBSOLETE)
+#define HDR_ACTIVE(hdr)       (HDR_ALLOCATED(hdr) && \
+                               !HDR_OBSOLETE(hdr) && \
+                               !HDR_ISOLATED(hdr))
 
 /* Shortcuts derived from the hardware-dependent configuration of Coffee. */
-#define COFFEE_SECTOR_COUNT (unsigned)(COFFEE_SIZE / COFFEE_SECTOR_SIZE)
+#define COFFEE_SECTOR_COUNT \
+  (coffee_page_t)(COFFEE_SIZE / COFFEE_SECTOR_SIZE)
 #define COFFEE_PAGE_COUNT \
   ((coffee_page_t)(COFFEE_SIZE / COFFEE_PAGE_SIZE))
 #define COFFEE_PAGES_PER_SECTOR \
@@ -235,7 +235,7 @@ absolute_offset(coffee_page_t page, cfs_offset_t offset)
 }
 /*---------------------------------------------------------------------------*/
 static coffee_page_t
-get_sector_status(uint16_t sector, struct sector_status *stats)
+get_sector_status(coffee_page_t sector, struct sector_status *stats)
 {
   static coffee_page_t skip_pages;
   static char last_pages_are_active;
@@ -305,7 +305,7 @@ get_sector_status(uint16_t sector, struct sector_status *stats)
   /*
    * Determine the amount of pages in the following sectors that
    * should be remembered for the next iteration. This is necessary
-   * because no page except the first of a file contains information
+   * because no file page except the first contains information
    * about what type of page it is. A side effect of remembering this
    * amount is that there is no need to read in the headers of each
    * of these pages from the storage.
@@ -356,11 +356,11 @@ isolate_pages(coffee_page_t start, coffee_page_t skip_pages)
 static void
 collect_garbage(int mode)
 {
-  uint16_t sector;
+  coffee_page_t sector;
   struct sector_status stats;
   coffee_page_t first_page, isolation_count;
 
-  PRINTF("Coffee: Running the file system garbage collector in %s mode\n",
+  PRINTF("Coffee: Running the garbage collector in %s mode\n",
          mode == GC_RELUCTANT ? "reluctant" : "greedy");
   /*
    * The garbage collector erases as many sectors as possible. A sector is
@@ -369,7 +369,7 @@ collect_garbage(int mode)
   for(sector = 0; sector < COFFEE_SECTOR_COUNT; sector++) {
     isolation_count = get_sector_status(sector, &stats);
     PRINTF("Coffee: Sector %u has %u active, %u obsolete, and %u free pages.\n",
-           sector, (unsigned)stats.active,
+           (unsigned)sector, (unsigned)stats.active,
            (unsigned)stats.obsolete, (unsigned)stats.free);
 
     if(stats.active > 0) {
@@ -402,7 +402,7 @@ next_file(coffee_page_t page, struct file_header *hdr)
 {
   /*
    * The quick-skip algorithm for finding file extents is the most
-   * essential part of Coffee. The file allocation rules enables this
+   * essential part of Coffee. The file allocation rules enable this
    * algorithm to quickly jump over free areas and allocated extents
    * after reading single headers and determining their status.
    *
@@ -648,7 +648,7 @@ reserve(const char *name, coffee_page_t pages,
   write_header(&hdr, page);
 
   PRINTF("Coffee: Reserved %u pages starting from %u for file %s\n",
-         pages, page, name);
+         (unsigned)pages, (unsigned)page, name);
 
   file = load_file(page, &hdr);
   if(file != NULL) {
@@ -843,7 +843,7 @@ merge_log(coffee_page_t file_page, int extend)
     return -1;
   }
 
-  /* Copy the log configuration and the EOF hint. */
+  /* Copy the log configuration. */
   read_header(&hdr2, new_file->page);
   hdr2.log_record_size = hdr.log_record_size;
   hdr2.log_records = hdr.log_records;
@@ -1102,7 +1102,7 @@ cfs_read(int fd, void *buf, unsigned size)
     size = file->end - fdp->offset;
   }
 
-  /* If the file is allocated, read directly in the file. */
+  /* If the file is not modified, read directly from the file extent. */
   if(!FILE_MODIFIED(file)) {
     COFFEE_READ(buf, size, absolute_offset(file->page, fdp->offset));
     fdp->offset += size;
@@ -1113,8 +1113,9 @@ cfs_read(int fd, void *buf, unsigned size)
   read_header(&hdr, file->page);
 
   /*
-   * Fill the buffer by copying from the log in first hand, or the
-   * ordinary file if the page has no log record.
+   * Copy the contents of the most recent log record. If there is
+   * no log record for the file area to read from, we simply read
+   * from the original file extent.
    */
   for(bytes_left = size; bytes_left > 0; bytes_left -= r) {
     lp.offset = fdp->offset;
@@ -1242,8 +1243,8 @@ int
 cfs_opendir(struct cfs_dir *dir, const char *name)
 {
   /*
-   * Coffee is only guaranteed to support "/" and ".", but it does not
-   * currently enforce this.
+   * Coffee is only guaranteed to support the directory names "/" and ".",
+   * but it does not enforce this currently.
    */
   memset(dir->dummy_space, 0, sizeof(coffee_page_t));
   return 0;
@@ -1254,13 +1255,13 @@ cfs_readdir(struct cfs_dir *dir, struct cfs_dirent *record)
 {
   struct file_header hdr;
   coffee_page_t page;
+  coffee_page_t next_page;
 
   memcpy(&page, dir->dummy_space, sizeof(coffee_page_t));
 
   while(page < COFFEE_PAGE_COUNT) {
     read_header(&hdr, page);
     if(HDR_ACTIVE(hdr) && !HDR_LOG(hdr)) {
-      coffee_page_t next_page;
       memcpy(record->name, hdr.name, sizeof(record->name));
       record->name[sizeof(record->name) - 1] = '\0';
       record->size = file_end(page);
@@ -1334,9 +1335,9 @@ cfs_coffee_set_io_semantics(int fd, unsigned flags)
 int
 cfs_coffee_format(void)
 {
-  unsigned i;
+  coffee_page_t i;
 
-  PRINTF("Coffee: Formatting %u sectors", COFFEE_SECTOR_COUNT);
+  PRINTF("Coffee: Formatting %u sectors", (unsigned)COFFEE_SECTOR_COUNT);
 
   for(i = 0; i < COFFEE_SECTOR_COUNT; i++) {
     COFFEE_ERASE(i);
diff --git a/core/cfs/cfs-coffee.h b/core/cfs/cfs-coffee.h
index a227792a1..2c62f2512 100644
--- a/core/cfs/cfs-coffee.h
+++ b/core/cfs/cfs-coffee.h
@@ -46,15 +46,15 @@
  * invoke its own micro logs when file modifications occur.
  *
  * This semantical I/O setting is useful when implementing flash storage
- * algorithms on top of Coffee.
+ * algorithms such as database indices on top of Coffee.
  *
  * \sa cfs_coffee_set_io_semantics()
  */
 #define CFS_COFFEE_IO_FLASH_AWARE	0x1
 
 /**
- * Instruct Coffee not to attempt to extend the file when there is
- * an attempt to write past the reserved file size.
+ * Instruct Coffee not to attempt to extend the file upon a request
+ * to write past the reserved file size.
  *
  * A case when this is necessary is when the file has a firm size limit,
  * and a safeguard is needed to protect against writes beyond this limit.
@@ -75,8 +75,8 @@
 
 /**
  * \brief Reserve space for a file.
- * \param name The filename.
- * \param size The size of the file.
+ * \param name The file name.
+ * \param size The initial size to be reserved for the file.
  * \return 0 on success, -1 on failure.
  *
  * Coffee uses sequential page structures for files. The sequential 
@@ -88,15 +88,15 @@ int cfs_coffee_reserve(const char *name, cfs_offset_t size);
 
 /**
  * \brief Configure the on-demand log file.
- * \param file The filename.
- * \param log_size The total log size.
+ * \param file The file name.
+ * \param log_size The total log file size.
  * \param log_entry_size The log entry size.
  * \return 0 on success, -1 on failure.
  *
  * When file data is first modified, Coffee creates a micro log for the
- * file. The micro log stores a table of modifications whose 
- * parameters--the log size and the log entry size--can be modified 
- * through the cfs_coffee_configure_log function.
+ * file. The micro log stores a table of modifications whose parameters --
+ * the log size and the log entry size -- can be modified through the
+ * cfs_coffee_configure_log function.
  */
 int cfs_coffee_configure_log(const char *file, unsigned log_size,
                              unsigned log_entry_size);
@@ -109,8 +109,8 @@ int cfs_coffee_configure_log(const char *file, unsigned log_size,
  *
  * Coffee is used on a wide range of storage types, and the default 
  * I/O file semantics may not be optimal for the access pattern 
- * of a certain file. Hence, this functions allows programmers to 
- * switch the /O semantics on a file that is accessed through a 
+ * of a certain file. Hence, this function allows programmers to
+ * switch the I/O semantics on a file that is accessed through a
  * particular file descriptor.
  *
  */
@@ -123,21 +123,14 @@ int cfs_coffee_set_io_semantics(int fd, unsigned flags);
  * Coffee formats the underlying storage by setting all bits to zero.
  * Formatting must be done before using Coffee for the first time in
  * a mote.
+ *
+ * Notice that the erased bits may be set to 1 on the physical storage
+ * when using flash memory. In this case, Coffee requires that the
+ * COFFEE_READ and COFFEE_WRITE functions used to access the flash memory
+ * invert all bits.
  */
 int cfs_coffee_format(void);
 
-/**
- * \brief Points out a memory region that may not be altered during
- * checkpointing operations that use the file system.
- * \param size
- * \return A pointer to the protected memory.
- *
- * This function returns the protected memory pointer and writes its size
- * to the given parameter. Mainly used by sensornet checkpointing to protect
- * the coffee state during CFS-based checkpointing operations.
- */
-void *cfs_coffee_get_protected_mem(unsigned *size);
-
 /** @} */
 /** @} */
 

From 79df347afa86f0c4c8e2a1e9cf3e03a08ba16f0f Mon Sep 17 00:00:00 2001
From: Boernsman <bernhard.trinnes@guh.guru>
Date: Sat, 19 Mar 2016 14:18:51 +0100
Subject: [PATCH 185/393] added guhRF; added atmega256rfr2 support

---
 cpu/avr/dev/clock-avr.h                       |   2 +-
 cpu/avr/dev/rs232.c                           |   2 +-
 cpu/avr/dev/rs232.h                           |   2 +
 cpu/avr/dev/rs232_atmega256rfr2.h             | 142 ++++
 .../radio/rf230bb/atmega256rfr2_registermap.h | 457 +++++++++++++
 cpu/avr/radio/rf230bb/hal.h                   |   7 +-
 cpu/avr/radio/rf230bb/halbb.c                 |  29 +-
 cpu/avr/radio/rf230bb/rf230bb.c               |  27 +-
 cpu/avr/radio/rf230bb/rf230bb.h               |   4 +-
 platform/RaspBee/Makefile.RaspBee             |  73 ++
 platform/RaspBee/contiki-conf.h               | 324 +++++++++
 platform/RaspBee/contiki-main.c               | 625 ++++++++++++++++++
 platform/RaspBee/dev/Arduino.h                | 172 +++++
 platform/RaspBee/dev/adc.c                    |  84 +++
 platform/RaspBee/dev/adc.h                    |  65 ++
 platform/RaspBee/dev/batmon.c                 |  55 ++
 platform/RaspBee/dev/batmon.h                 |   8 +
 platform/RaspBee/dev/battery-sensor.c         |  90 +++
 platform/RaspBee/dev/battery-sensor.h         |  48 ++
 platform/RaspBee/dev/binary.h                 | 515 +++++++++++++++
 platform/RaspBee/dev/button-sensor.c          |  87 +++
 platform/RaspBee/dev/dht11.c                  | 125 ++++
 platform/RaspBee/dev/dht11.h                  |  67 ++
 platform/RaspBee/dev/ds1820.c                 | 291 ++++++++
 platform/RaspBee/dev/ds1820.h                 |  45 ++
 platform/RaspBee/dev/hw-arduino.h             |  83 +++
 platform/RaspBee/dev/i2c.c                    | 391 +++++++++++
 platform/RaspBee/dev/i2c.h                    | 131 ++++
 platform/RaspBee/dev/key.c                    |  73 ++
 platform/RaspBee/dev/key.h                    |  50 ++
 platform/RaspBee/dev/led.c                    |  90 +++
 platform/RaspBee/dev/led.h                    |  54 ++
 platform/RaspBee/dev/leds-arch.c              |  84 +++
 platform/RaspBee/dev/leds-arch.h              |  36 +
 platform/RaspBee/dev/optriac-sensor.c         | 102 +++
 platform/RaspBee/dev/optriac-sensor.h         |  54 ++
 platform/RaspBee/dev/pins_arduino.h           | 218 ++++++
 platform/RaspBee/dev/pir-sensor.c             |  85 +++
 platform/RaspBee/dev/pir-sensor.h             |  48 ++
 platform/RaspBee/dev/relay-sensor.c           | 109 +++
 platform/RaspBee/dev/relay-sensor.h           |  66 ++
 platform/RaspBee/dev/relay.c                  |  76 +++
 platform/RaspBee/dev/relay.h                  |  54 ++
 platform/RaspBee/dev/servo-sensor.c           | 100 +++
 platform/RaspBee/dev/servo-sensor.h           |  50 ++
 platform/RaspBee/dev/servo.c                  | 152 +++++
 platform/RaspBee/dev/servo.h                  |  44 ++
 platform/RaspBee/dev/sg-ready.c               | 218 ++++++
 platform/RaspBee/dev/sg-ready.h               |  55 ++
 platform/RaspBee/dev/t4-servo-sensor.c        | 101 +++
 platform/RaspBee/dev/t4-servo-sensor.h        |  52 ++
 platform/RaspBee/dev/t4-servo.c               | 139 ++++
 platform/RaspBee/dev/t4-servo.h               |  61 ++
 platform/RaspBee/dev/temperature-sensor.c     |  66 ++
 platform/RaspBee/dev/temperature-sensor.h     |  49 ++
 platform/RaspBee/dev/wiring_digital.c         | 104 +++
 platform/RaspBee/dev/wiring_private.h         |  69 ++
 platform/RaspBee/node-id.c                    |  79 +++
 platform/RaspBee/node-id.h                    |  44 ++
 platform/RaspBee/params.c                     | 273 ++++++++
 platform/RaspBee/params.h                     | 105 +++
 platform/RaspBee/slip_uart0.c                 |  93 +++
 platform/guhRF/Makefile.guhRF                 |  95 +++
 platform/guhRF/contiki-conf.h                 | 315 +++++++++
 platform/guhRF/contiki-main.c                 | 595 +++++++++++++++++
 platform/guhRF/dev/Arduino.h                  | 172 +++++
 platform/guhRF/dev/adc.c                      |  84 +++
 platform/guhRF/dev/adc.h                      |  65 ++
 platform/guhRF/dev/batmon.c                   |  55 ++
 platform/guhRF/dev/batmon.h                   |   8 +
 platform/guhRF/dev/battery-sensor.c           |  90 +++
 platform/guhRF/dev/battery-sensor.h           |  48 ++
 platform/guhRF/dev/binary.h                   | 515 +++++++++++++++
 platform/guhRF/dev/button-sensor.c            |  78 +++
 platform/guhRF/dev/dht11.c                    | 125 ++++
 platform/guhRF/dev/dht11.h                    |  67 ++
 platform/guhRF/dev/ds1820.c                   | 291 ++++++++
 platform/guhRF/dev/ds1820.h                   |  45 ++
 platform/guhRF/dev/hw-arduino.h               |  83 +++
 platform/guhRF/dev/i2c.c                      | 391 +++++++++++
 platform/guhRF/dev/i2c.h                      | 131 ++++
 platform/guhRF/dev/key.c                      |  73 ++
 platform/guhRF/dev/key.h                      |  50 ++
 platform/guhRF/dev/led.c                      |  72 ++
 platform/guhRF/dev/led.h                      |  52 ++
 platform/guhRF/dev/leds-arch.c                |  71 ++
 platform/guhRF/dev/leds-arch.h                |  26 +
 platform/guhRF/dev/optriac-sensor.c           | 102 +++
 platform/guhRF/dev/optriac-sensor.h           |  54 ++
 platform/guhRF/dev/pins_arduino.h             | 218 ++++++
 platform/guhRF/dev/pir-sensor.c               |  85 +++
 platform/guhRF/dev/pir-sensor.h               |  48 ++
 platform/guhRF/dev/relay-sensor.c             | 109 +++
 platform/guhRF/dev/relay-sensor.h             |  66 ++
 platform/guhRF/dev/relay.c                    |  76 +++
 platform/guhRF/dev/relay.h                    |  54 ++
 platform/guhRF/dev/servo-sensor.c             | 100 +++
 platform/guhRF/dev/servo-sensor.h             |  50 ++
 platform/guhRF/dev/servo.c                    | 152 +++++
 platform/guhRF/dev/servo.h                    |  44 ++
 platform/guhRF/dev/sg-ready.c                 | 240 +++++++
 platform/guhRF/dev/sg-ready.h                 |  65 ++
 platform/guhRF/dev/t4-servo-sensor.c          | 101 +++
 platform/guhRF/dev/t4-servo-sensor.h          |  52 ++
 platform/guhRF/dev/t4-servo.c                 | 139 ++++
 platform/guhRF/dev/t4-servo.h                 |  61 ++
 platform/guhRF/dev/temperature-sensor.c       |  66 ++
 platform/guhRF/dev/temperature-sensor.h       |  49 ++
 platform/guhRF/dev/wiring_digital.c           | 104 +++
 platform/guhRF/dev/wiring_private.h           |  69 ++
 platform/guhRF/node-id.c                      |  79 +++
 platform/guhRF/node-id.h                      |  44 ++
 platform/guhRF/params.c                       | 273 ++++++++
 platform/guhRF/params.h                       | 105 +++
 platform/guhRF/slip_uart0.c                   |  93 +++
 115 files changed, 13276 insertions(+), 23 deletions(-)
 create mode 100644 cpu/avr/dev/rs232_atmega256rfr2.h
 create mode 100644 cpu/avr/radio/rf230bb/atmega256rfr2_registermap.h
 create mode 100644 platform/RaspBee/Makefile.RaspBee
 create mode 100644 platform/RaspBee/contiki-conf.h
 create mode 100644 platform/RaspBee/contiki-main.c
 create mode 100644 platform/RaspBee/dev/Arduino.h
 create mode 100644 platform/RaspBee/dev/adc.c
 create mode 100644 platform/RaspBee/dev/adc.h
 create mode 100644 platform/RaspBee/dev/batmon.c
 create mode 100644 platform/RaspBee/dev/batmon.h
 create mode 100644 platform/RaspBee/dev/battery-sensor.c
 create mode 100644 platform/RaspBee/dev/battery-sensor.h
 create mode 100644 platform/RaspBee/dev/binary.h
 create mode 100644 platform/RaspBee/dev/button-sensor.c
 create mode 100644 platform/RaspBee/dev/dht11.c
 create mode 100644 platform/RaspBee/dev/dht11.h
 create mode 100644 platform/RaspBee/dev/ds1820.c
 create mode 100644 platform/RaspBee/dev/ds1820.h
 create mode 100644 platform/RaspBee/dev/hw-arduino.h
 create mode 100644 platform/RaspBee/dev/i2c.c
 create mode 100644 platform/RaspBee/dev/i2c.h
 create mode 100644 platform/RaspBee/dev/key.c
 create mode 100644 platform/RaspBee/dev/key.h
 create mode 100644 platform/RaspBee/dev/led.c
 create mode 100644 platform/RaspBee/dev/led.h
 create mode 100644 platform/RaspBee/dev/leds-arch.c
 create mode 100644 platform/RaspBee/dev/leds-arch.h
 create mode 100644 platform/RaspBee/dev/optriac-sensor.c
 create mode 100644 platform/RaspBee/dev/optriac-sensor.h
 create mode 100644 platform/RaspBee/dev/pins_arduino.h
 create mode 100644 platform/RaspBee/dev/pir-sensor.c
 create mode 100644 platform/RaspBee/dev/pir-sensor.h
 create mode 100644 platform/RaspBee/dev/relay-sensor.c
 create mode 100644 platform/RaspBee/dev/relay-sensor.h
 create mode 100644 platform/RaspBee/dev/relay.c
 create mode 100644 platform/RaspBee/dev/relay.h
 create mode 100644 platform/RaspBee/dev/servo-sensor.c
 create mode 100644 platform/RaspBee/dev/servo-sensor.h
 create mode 100644 platform/RaspBee/dev/servo.c
 create mode 100644 platform/RaspBee/dev/servo.h
 create mode 100644 platform/RaspBee/dev/sg-ready.c
 create mode 100644 platform/RaspBee/dev/sg-ready.h
 create mode 100644 platform/RaspBee/dev/t4-servo-sensor.c
 create mode 100644 platform/RaspBee/dev/t4-servo-sensor.h
 create mode 100644 platform/RaspBee/dev/t4-servo.c
 create mode 100644 platform/RaspBee/dev/t4-servo.h
 create mode 100644 platform/RaspBee/dev/temperature-sensor.c
 create mode 100644 platform/RaspBee/dev/temperature-sensor.h
 create mode 100644 platform/RaspBee/dev/wiring_digital.c
 create mode 100644 platform/RaspBee/dev/wiring_private.h
 create mode 100644 platform/RaspBee/node-id.c
 create mode 100644 platform/RaspBee/node-id.h
 create mode 100644 platform/RaspBee/params.c
 create mode 100644 platform/RaspBee/params.h
 create mode 100644 platform/RaspBee/slip_uart0.c
 create mode 100644 platform/guhRF/Makefile.guhRF
 create mode 100644 platform/guhRF/contiki-conf.h
 create mode 100644 platform/guhRF/contiki-main.c
 create mode 100644 platform/guhRF/dev/Arduino.h
 create mode 100644 platform/guhRF/dev/adc.c
 create mode 100644 platform/guhRF/dev/adc.h
 create mode 100644 platform/guhRF/dev/batmon.c
 create mode 100644 platform/guhRF/dev/batmon.h
 create mode 100644 platform/guhRF/dev/battery-sensor.c
 create mode 100644 platform/guhRF/dev/battery-sensor.h
 create mode 100644 platform/guhRF/dev/binary.h
 create mode 100644 platform/guhRF/dev/button-sensor.c
 create mode 100644 platform/guhRF/dev/dht11.c
 create mode 100644 platform/guhRF/dev/dht11.h
 create mode 100644 platform/guhRF/dev/ds1820.c
 create mode 100644 platform/guhRF/dev/ds1820.h
 create mode 100644 platform/guhRF/dev/hw-arduino.h
 create mode 100644 platform/guhRF/dev/i2c.c
 create mode 100644 platform/guhRF/dev/i2c.h
 create mode 100644 platform/guhRF/dev/key.c
 create mode 100644 platform/guhRF/dev/key.h
 create mode 100644 platform/guhRF/dev/led.c
 create mode 100644 platform/guhRF/dev/led.h
 create mode 100644 platform/guhRF/dev/leds-arch.c
 create mode 100644 platform/guhRF/dev/leds-arch.h
 create mode 100644 platform/guhRF/dev/optriac-sensor.c
 create mode 100644 platform/guhRF/dev/optriac-sensor.h
 create mode 100644 platform/guhRF/dev/pins_arduino.h
 create mode 100644 platform/guhRF/dev/pir-sensor.c
 create mode 100644 platform/guhRF/dev/pir-sensor.h
 create mode 100644 platform/guhRF/dev/relay-sensor.c
 create mode 100644 platform/guhRF/dev/relay-sensor.h
 create mode 100644 platform/guhRF/dev/relay.c
 create mode 100644 platform/guhRF/dev/relay.h
 create mode 100644 platform/guhRF/dev/servo-sensor.c
 create mode 100644 platform/guhRF/dev/servo-sensor.h
 create mode 100644 platform/guhRF/dev/servo.c
 create mode 100644 platform/guhRF/dev/servo.h
 create mode 100644 platform/guhRF/dev/sg-ready.c
 create mode 100644 platform/guhRF/dev/sg-ready.h
 create mode 100644 platform/guhRF/dev/t4-servo-sensor.c
 create mode 100644 platform/guhRF/dev/t4-servo-sensor.h
 create mode 100644 platform/guhRF/dev/t4-servo.c
 create mode 100644 platform/guhRF/dev/t4-servo.h
 create mode 100644 platform/guhRF/dev/temperature-sensor.c
 create mode 100644 platform/guhRF/dev/temperature-sensor.h
 create mode 100644 platform/guhRF/dev/wiring_digital.c
 create mode 100644 platform/guhRF/dev/wiring_private.h
 create mode 100644 platform/guhRF/node-id.c
 create mode 100644 platform/guhRF/node-id.h
 create mode 100644 platform/guhRF/params.c
 create mode 100644 platform/guhRF/params.h
 create mode 100644 platform/guhRF/slip_uart0.c

diff --git a/cpu/avr/dev/clock-avr.h b/cpu/avr/dev/clock-avr.h
index 97a79ee23..f6ab5e5cb 100644
--- a/cpu/avr/dev/clock-avr.h
+++ b/cpu/avr/dev/clock-avr.h
@@ -73,7 +73,7 @@
   TIMSK0 = _BV (OCIE0A);
 
   
-#elif defined (__AVR_ATmega1284P__) || (__AVR_AT90USB1287__) || (__AVR_ATmega1281__) || defined (__AVR_ATmega128RFA1__)
+#elif defined (__AVR_ATmega1284P__) || (__AVR_AT90USB1287__) || (__AVR_ATmega1281__) || defined (__AVR_ATmega128RFA1__) || defined (__AVR_ATmega256RFR2__)
 /*
   The Raven has a 32768Hz watch crystal that can be used to clock the timer
   while the 1284p is sleeping. The Jackdaw has pads for a crystal. The crystal
diff --git a/cpu/avr/dev/rs232.c b/cpu/avr/dev/rs232.c
index 94cf5035f..8591b825e 100644
--- a/cpu/avr/dev/rs232.c
+++ b/cpu/avr/dev/rs232.c
@@ -83,7 +83,7 @@
 #define NUMPORTS RS232_CONF_NUMPORTS
 #endif
 
-#if defined (__AVR_ATmega128__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1281__) || defined(__AVR_ATmega128RFA1__)
+#if defined (__AVR_ATmega128__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega1281__) || defined(__AVR_ATmega128RFA1__)  || defined(__AVR_ATmega256RFR2__)
 #ifndef NUMPORTS
 #define NUMPORTS 2
 #elif NUMPORTS > 2
diff --git a/cpu/avr/dev/rs232.h b/cpu/avr/dev/rs232.h
index 08a3d4f9f..077373acf 100644
--- a/cpu/avr/dev/rs232.h
+++ b/cpu/avr/dev/rs232.h
@@ -49,6 +49,8 @@
 #include "dev/rs232_at90usb1287.h"
 #elif defined (__AVR_ATmega128RFA1__)
 #include "dev/rs232_atmega128rfa1.h"
+#elif defined (__AVR_ATmega256RFR2__)
+#include "dev/rs232_atmega256rfr2.h"
 #elif defined (__AVR_ATmega644__) || defined (__AVR_ATmega328P__)
 #include "dev/rs232_atmega644.h"
 #elif defined (__AVR_ATmega8__) || defined (__AVR_ATmega8515__) \
diff --git a/cpu/avr/dev/rs232_atmega256rfr2.h b/cpu/avr/dev/rs232_atmega256rfr2.h
new file mode 100644
index 000000000..abd32f7b7
--- /dev/null
+++ b/cpu/avr/dev/rs232_atmega256rfr2.h
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2006, Technical University of Munich
+ * 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
+ *         AVR specific definitions for the rs232 port.
+ *
+ * \author
+ *         Simon Barner <barner@in.tum.de
+ */
+
+#ifndef __RS232_ATMEGA256RFR2__
+#define __RS232_ATMEGA256RFR2__
+/******************************************************************************/
+/***   Includes                                                               */
+/******************************************************************************/
+#include <avr/io.h>
+
+/******************************************************************************/
+/***   RS232 ports                                                            */
+/******************************************************************************/
+#define RS232_PORT_0 0
+#define RS232_PORT_1 1
+
+/******************************************************************************/
+/***   Baud rates                                                             */
+/******************************************************************************/
+#if (F_CPU == 16000000UL)
+/* Single speed operation (U2X = 0)*/
+#define USART_BAUD_2400 416
+#define USART_BAUD_4800 207
+#define USART_BAUD_9600 103
+#define USART_BAUD_14400 68
+#define USART_BAUD_19200 51
+#define USART_BAUD_28800 34
+#define USART_BAUD_38400 25
+#define USART_BAUD_57600 16
+#define USART_BAUD_76800 12
+#define USART_BAUD_115200 8
+#define USART_BAUD_230400 3
+#define USART_BAUD_250000 3
+#define USART_BAUD_500000 1
+#define USART_BAUD_1000000 0
+#elif (F_CPU == 8000000UL)
+/* Single speed operation (U2X = 0)*/
+#define USART_BAUD_2400 207
+#define USART_BAUD_4800 103
+#define USART_BAUD_9600 51
+#define USART_BAUD_14400 34
+#define USART_BAUD_19200 25
+#define USART_BAUD_28800 16
+#define USART_BAUD_38400 12
+#define USART_BAUD_57600 8
+#define USART_BAUD_76800 6
+#define USART_BAUD_115200 3
+#define USART_BAUD_230400 1
+#define USART_BAUD_250000 1
+#define USART_BAUD_500000 0
+#else
+#error "Please define the baud rates for your CPU clock (see ATmega256rfr2 datasheet) \
+or set the rate in contiki-conf.h"
+#endif
+
+
+/******************************************************************************/
+/***   Interrupt settings                                                     */
+/******************************************************************************/
+#define USART_INTERRUPT_RX_COMPLETE _BV (RXCIE0)
+#define USART_INTERRUPT_TX_COMPLETE _BV (TXCIE0)
+#define USART_INTERRUPT_DATA_REG_EMPTY _BV (UDRIE0)
+
+/******************************************************************************/
+/***   Receiver / transmitter                                                 */
+/******************************************************************************/
+#define USART_RECEIVER_ENABLE _BV (RXEN0)
+#define USART_TRANSMITTER_ENABLE _BV (TXEN0)
+
+/******************************************************************************/
+/***   Mode select                                                            */
+/******************************************************************************/
+#define USART_MODE_ASYNC 0x00
+#define USART_MODE_SYNC _BV (UMSEL00)
+
+/******************************************************************************/
+/***   Parity                                                                 */
+/******************************************************************************/
+#define USART_PARITY_NONE 0x00
+#define USART_PARITY_EVEN _BV (UPM01)
+#define USART_PARITY_ODD  _BV (UPM01) | _BV (UPM00)
+
+/******************************************************************************/
+/***   Stop bits                                                              */
+/******************************************************************************/
+#define USART_STOP_BITS_1 0x00
+#define USART_STOP_BITS_2 _BV (USBS)
+
+/******************************************************************************/
+/***   Character size                                                         */
+/******************************************************************************/
+#define USART_DATA_BITS_5 0x00
+#define USART_DATA_BITS_6 _BV (UCSZ00)
+#define USART_DATA_BITS_7 _BV (UCSZ01)
+#define USART_DATA_BITS_8 _BV (UCSZ01) | _BV (UCSZ00)
+// #define USART_DATA_BITS_9 (needs also UCSZ2 bit in UCSRnB)
+
+/******************************************************************************/
+/***   Clock polarity                                                         */
+/******************************************************************************/
+#define USART_RISING_XCKN_EDGE 0x00
+#define USART_FALLING_XCKN_EDGE _BV (UCPOL0)
+
+#endif /* #ifndef __RS232_ATMEGA128RFA1__ */
diff --git a/cpu/avr/radio/rf230bb/atmega256rfr2_registermap.h b/cpu/avr/radio/rf230bb/atmega256rfr2_registermap.h
new file mode 100644
index 000000000..25fc1a224
--- /dev/null
+++ b/cpu/avr/radio/rf230bb/atmega256rfr2_registermap.h
@@ -0,0 +1,457 @@
+/**
+ * @file
+ * @brief This file contains RF230-formatted register definitions for the atmega128rfa1
+ */
+/*   Copyright (c) 2008, 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:
+
+   * 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.
+*/
+
+#ifndef PHY256RFR2_REGISTERMAP_EXTERNAL_H
+#define PHY256RFR2_REGISTERMAP_EXTERNAL_H
+
+/* RF230 register access is through SPI which transfers 8 bits address/8 bits data.
+ * ATmega256rfr2 registers are defined in I/O space, e.g. in gcc /include/avr/iom128rfa1.h
+ * A typical definition is #define TRX_STATUS _SFR_MEM8(0x141)
+ * Registers can be read with a macro, but the args for subregisters don't expand properly so the actual address
+ * is used with explicit _SFR_MEM8 in the subregister read/write routines.
+ */
+#define RG_TRX_STATUS         TRX_STATUS
+#define SR_TRX_STATUS         0x141, 0x1f, 0
+#define SR_TRX_CMD            0x142, 0x1f, 0
+#define STATE_TRANSITION      (31)
+#define SR_TX_PWR             0x145, 0x0f, 0
+#define RG_VERSION_NUM        VERSION_NUM
+#define RG_MAN_ID_0           MAN_ID_0
+#define RG_IRQ_MASK           IRQ_MASK
+#define SR_MAX_FRAME_RETRIES  0x16C, 0xf0, 4
+#define SR_TX_AUTO_CRC_ON     0x144, 0x20, 5
+#define SR_TRAC_STATUS        0x142, 0xe0, 5
+#define SR_CHANNEL            0x148, 0x1f, 0
+#define SR_CCA_MODE           0x148, 0x60, 5
+#define SR_CCA_REQUEST        0x148, 0x80, 7
+#define RG_PAN_ID_0           PAN_ID_0
+#define RG_PAN_ID_1           PAN_ID_1
+#define RG_SHORT_ADDR_0       SHORT_ADDR_0
+#define RG_SHORT_ADDR_1       SHORT_ADDR_1
+#define RG_IEEE_ADDR_0        IEEE_ADDR_0
+#define RG_IEEE_ADDR_1        IEEE_ADDR_1
+#define RG_IEEE_ADDR_2        IEEE_ADDR_2
+#define RG_IEEE_ADDR_3        IEEE_ADDR_3
+#define RG_IEEE_ADDR_4        IEEE_ADDR_4
+#define RG_IEEE_ADDR_5        IEEE_ADDR_5
+#define RG_IEEE_ADDR_6        IEEE_ADDR_6
+#define RG_IEEE_ADDR_7        IEEE_ADDR_7
+//#define SR_ED_LEVEL           0x147, 0xff, 0
+#define RG_PHY_ED_LEVEL       PHY_ED_LEVEL
+#define RG_RX_SYN             RX_SYN
+#define SR_RSSI               0x146, 0x1f, 0
+#define SR_PLL_CF_START       0x15a, 0x80, 7
+#define SR_PLL_DCU_START      0x15b, 0x80, 7
+#define SR_MAX_CSMA_RETRIES   0x16c, 0x0e, 1
+#define RG_CSMA_BE            CSMA_BE
+#define RG_CSMA_SEED_0        CSMA_SEED_0
+#define RG_PHY_RSSI           PHY_RSSI
+//#define SR_CCA_CS_THRES       0x149, 0xf0, 4
+#define SR_CCA_ED_THRES        0x149, 0x0f, 0
+#define SR_CCA_DONE            0x141, 0x80, 7
+#define SR_CCA_STATUS          0x141, 0x40, 6
+#define SR_AACK_SET_PD         0x16e, 0x20, 5
+//rfr2 special
+#define CMD_NOP                         0
+#define CMD_TX_START                    2
+#define CMD_FORCE_TRX_OFF               3
+#define CMD_FORCE_PLL_ON                4
+#define CMD_RX_ON                       6
+#define CMD_TRX_OFF                     8
+#define CMD_PLL_ON                      9
+#define CMD_RX_AACK_ON                  22
+#define CMD_TX_ARET_ON                  25
+#define TRAC_SUCCESS                    0
+#define TRAC_SUCCESS_DATA_PENDING       1
+#define TRAC_SUCCESS_WAIT_FOR_ACK       2
+#define TRAC_CHANNEL_ACCESS_FAILURE     3
+#define TRAC_NO_ACK                     5
+#define TRAC_INVALID                    7
+
+#define P_ON                            0
+#define BUSY_RX                         1
+#define BUSY_TX                         2
+#define RX_ON                           6
+#define TRX_OFF                         8
+#define PLL_ON                          9
+#define SLEEP                           15
+#define BUSY_RX_AACK                    17
+#define BUSY_TX_ARET                    18
+#define RX_AACK_ON                      22
+#define TX_ARET_ON                      25
+#define STATE_TRANSITION_IN_PROGRESS    31
+#define TST_DISABLED                    0
+#define TST_ENABLED                     1
+#define CCA_BUSY                        0
+#define CCA_IDLE                        1
+#define CCA_NOT_FIN                     0
+#define CCA_FIN                         1
+
+#define CMD_NOP                         0
+#define CMD_TX_START                    2
+#define CMD_FORCE_TRX_OFF               3
+#define CMD_FORCE_PLL_ON                4
+#define CMD_RX_ON                       6
+#define CMD_TRX_OFF                     8
+#define CMD_PLL_ON                      9
+#define CMD_RX_AACK_ON                  22
+#define CMD_TX_ARET_ON                  25
+#define TRAC_SUCCESS                    0
+#define TRAC_SUCCESS_DATA_PENDING       1
+#define TRAC_SUCCESS_WAIT_FOR_ACK       2
+#define TRAC_CHANNEL_ACCESS_FAILURE     3
+#define TRAC_NO_ACK                     5
+#define TRAC_INVALID                    7
+
+/** Offset for register TRX_CTRL_0 */
+#define RG_TRX_CTRL_0                   0x143
+/** Offset for register TRX_CTRL_1 */
+#define RG_TRX_CTRL_1                   0x144
+
+#define SR_PA_EXT_EN			0x144, 0x80, 7
+#define SR_IRQ_2_EXT_EN			0x144, 0x40, 6
+#define SR_ANT_EXT_SW_EN		0x14d, 0x04, 2
+#define SR_ANT_DIV_EN			0x14d, 0x08, 3
+#define SR_SET_OUT_ANT0			0x14d, 0x03, 1
+#define SR_SET_OUT_ANT1			0x14d, 0x03, 0
+
+/* RF230 register assignments, for reference */
+#if 0
+#define HAVE_REGISTER_MAP (1)
+/** Offset for register TRX_STATUS */
+#define RG_TRX_STATUS                    (0x01)
+/** Access parameters for sub-register CCA_DONE in register @ref RG_TRX_STATUS */
+#define SR_CCA_DONE                  0x01, 0x80, 7
+/** Access parameters for sub-register CCA_STATUS in register @ref RG_TRX_STATUS */
+#define SR_CCA_STATUS                0x01, 0x40, 6
+#define SR_reserved_01_3             0x01, 0x20, 5
+/** Access parameters for sub-register TRX_STATUS in register @ref RG_TRX_STATUS */
+#define SR_TRX_STATUS                0x01, 0x1f, 0
+/** Constant P_ON for sub-register @ref SR_TRX_STATUS */
+#define P_ON                     (0)
+/** Constant BUSY_RX for sub-register @ref SR_TRX_STATUS */
+#define BUSY_RX                  (1)
+/** Constant BUSY_TX for sub-register @ref SR_TRX_STATUS */
+#define BUSY_TX                  (2)
+/** Constant RX_ON for sub-register @ref SR_TRX_STATUS */
+#define RX_ON                    (6)
+/** Constant TRX_OFF for sub-register @ref SR_TRX_STATUS */
+#define TRX_OFF                  (8)
+/** Constant PLL_ON for sub-register @ref SR_TRX_STATUS */
+#define PLL_ON                   (9)
+/** Constant SLEEP for sub-register @ref SR_TRX_STATUS */
+#define SLEEP                    (15)
+/** Constant BUSY_RX_AACK for sub-register @ref SR_TRX_STATUS */
+#define BUSY_RX_AACK             (17)
+/** Constant BUSY_TX_ARET for sub-register @ref SR_TRX_STATUS */
+#define BUSY_TX_ARET             (18)
+/** Constant RX_AACK_ON for sub-register @ref SR_TRX_STATUS */
+#define RX_AACK_ON               (22)
+/** Constant TX_ARET_ON for sub-register @ref SR_TRX_STATUS */
+#define TX_ARET_ON               (25)
+/** Constant RX_ON_NOCLK for sub-register @ref SR_TRX_STATUS */
+#define RX_ON_NOCLK              (28)
+/** Constant RX_AACK_ON_NOCLK for sub-register @ref SR_TRX_STATUS */
+#define RX_AACK_ON_NOCLK         (29)
+/** Constant BUSY_RX_AACK_NOCLK for sub-register @ref SR_TRX_STATUS */
+#define BUSY_RX_AACK_NOCLK       (30)
+/** Constant STATE_TRANSITION for sub-register @ref SR_TRX_STATUS */
+#define STATE_TRANSITION         (31)
+
+/** Offset for register TRX_STATE */
+#define RG_TRX_STATE                     (0x02)
+/** Access parameters for sub-register TRAC_STATUS in register @ref RG_TRX_STATE */
+#define SR_TRAC_STATUS               0x02, 0xe0, 5
+/** Access parameters for sub-register TRX_CMD in register @ref RG_TRX_STATE */
+#define SR_TRX_CMD                   0x02, 0x1f, 0
+/** Constant CMD_NOP for sub-register @ref SR_TRX_CMD */
+#define CMD_NOP                  (0)
+/** Constant CMD_TX_START for sub-register @ref SR_TRX_CMD */
+#define CMD_TX_START             (2)
+/** Constant CMD_FORCE_TRX_OFF for sub-register @ref SR_TRX_CMD */
+#define CMD_FORCE_TRX_OFF        (3)
+/** Constant CMD_RX_ON for sub-register @ref SR_TRX_CMD */
+#define CMD_RX_ON                (6)
+/** Constant CMD_TRX_OFF for sub-register @ref SR_TRX_CMD */
+#define CMD_TRX_OFF              (8)
+/** Constant CMD_PLL_ON for sub-register @ref SR_TRX_CMD */
+#define CMD_PLL_ON               (9)
+/** Constant CMD_RX_AACK_ON for sub-register @ref SR_TRX_CMD */
+#define CMD_RX_AACK_ON           (22)
+/** Constant CMD_TX_ARET_ON for sub-register @ref SR_TRX_CMD */
+#define CMD_TX_ARET_ON           (25)
+/** Offset for register TRX_CTRL_0 */
+#define RG_TRX_CTRL_0                    (0x03)
+/** Offset for register TRX_CTRL_1 */
+#define RG_TRX_CTRL_1                    (0x04)
+/** Access parameters for sub-register PAD_IO in register @ref RG_TRX_CTRL_0 */
+#define SR_PAD_IO                    0x03, 0xc0, 6
+/** Access parameters for sub-register PAD_IO_CLKM in register @ref RG_TRX_CTRL_0 */
+#define SR_PAD_IO_CLKM               0x03, 0x30, 4
+/** Constant CLKM_2mA for sub-register @ref SR_PAD_IO_CLKM */
+#define CLKM_2mA                 (0)
+/** Constant CLKM_4mA for sub-register @ref SR_PAD_IO_CLKM */
+#define CLKM_4mA                 (1)
+/** Constant CLKM_6mA for sub-register @ref SR_PAD_IO_CLKM */
+#define CLKM_6mA                 (2)
+/** Constant CLKM_8mA for sub-register @ref SR_PAD_IO_CLKM */
+#define CLKM_8mA                 (3)
+/** Access parameters for sub-register CLKM_SHA_SEL in register @ref RG_TRX_CTRL_0 */
+#define SR_CLKM_SHA_SEL              0x03, 0x08, 3
+/** Access parameters for sub-register CLKM_CTRL in register @ref RG_TRX_CTRL_0 */
+#define SR_CLKM_CTRL                 0x03, 0x07, 0
+/** Constant CLKM_no_clock for sub-register @ref SR_CLKM_CTRL */
+#define CLKM_no_clock            (0)
+/** Constant CLKM_1MHz for sub-register @ref SR_CLKM_CTRL */
+#define CLKM_1MHz                (1)
+/** Constant CLKM_2MHz for sub-register @ref SR_CLKM_CTRL */
+#define CLKM_2MHz                (2)
+/** Constant CLKM_4MHz for sub-register @ref SR_CLKM_CTRL */
+#define CLKM_4MHz                (3)
+/** Constant CLKM_8MHz for sub-register @ref SR_CLKM_CTRL */
+#define CLKM_8MHz                (4)
+/** Constant CLKM_16MHz for sub-register @ref SR_CLKM_CTRL */
+#define CLKM_16MHz               (5)
+/** Offset for register PHY_TX_PWR */
+#define RG_PHY_TX_PWR                    (0x05)
+/** Access parameters for sub-register TX_AUTO_CRC_ON in register @ref RG_PHY_TX_PWR */
+#define SR_TX_AUTO_CRC_ON            0x05, 0x80, 7
+#define SR_reserved_05_2             0x05, 0x70, 4
+/** Access parameters for sub-register TX_PWR in register @ref RG_PHY_TX_PWR */
+#define SR_TX_PWR                    0x05, 0x0f, 0
+/** Offset for register PHY_RSSI */
+#define RG_PHY_RSSI                      (0x06)
+#define SR_reserved_06_1             0x06, 0xe0, 5
+/** Access parameters for sub-register RSSI in register @ref RG_PHY_RSSI */
+#define SR_RSSI                      0x06, 0x1f, 0
+/** Offset for register PHY_ED_LEVEL */
+#define RG_PHY_ED_LEVEL                  (0x07)
+/** Access parameters for sub-register ED_LEVEL in register @ref RG_PHY_ED_LEVEL */
+#define SR_ED_LEVEL                  0x07, 0xff, 0
+/** Offset for register PHY_CC_CCA */
+#define RG_PHY_CC_CCA                    (0x08)
+/** Access parameters for sub-register CCA_REQUEST in register @ref RG_PHY_CC_CCA */
+#define SR_CCA_REQUEST               0x08, 0x80, 7
+/** Access parameters for sub-register CCA_MODE in register @ref RG_PHY_CC_CCA */
+#define SR_CCA_MODE                  0x08, 0x60, 5
+/** Access parameters for sub-register CHANNEL in register @ref RG_PHY_CC_CCA */
+#define SR_CHANNEL                   0x08, 0x1f, 0
+/** Offset for register CCA_THRES */
+#define RG_CCA_THRES                     (0x09)
+/** Access parameters for sub-register CCA_CS_THRES in register @ref RG_CCA_THRES */
+#define SR_CCA_CS_THRES              0x09, 0xf0, 4
+/** Access parameters for sub-register CCA_ED_THRES in register @ref RG_CCA_THRES */
+#define SR_CCA_ED_THRES              0x09, 0x0f, 0
+/** Offset for register IRQ_MASK */
+#define RG_IRQ_MASK                      (0x0e)
+/** Access parameters for sub-register IRQ_MASK in register @ref RG_IRQ_MASK */
+#define SR_IRQ_MASK                  0x0e, 0xff, 0
+/** Offset for register IRQ_STATUS */
+#define RG_IRQ_STATUS                    (0x0f)
+/** Access parameters for sub-register IRQ_7_BAT_LOW in register @ref RG_IRQ_STATUS */
+#define SR_IRQ_7_BAT_LOW             0x0f, 0x80, 7
+/** Access parameters for sub-register IRQ_6_TRX_UR in register @ref RG_IRQ_STATUS */
+#define SR_IRQ_6_TRX_UR              0x0f, 0x40, 6
+/** Access parameters for sub-register IRQ_5 in register @ref RG_IRQ_STATUS */
+#define SR_IRQ_5                     0x0f, 0x20, 5
+/** Access parameters for sub-register IRQ_4 in register @ref RG_IRQ_STATUS */
+#define SR_IRQ_4                     0x0f, 0x10, 4
+/** Access parameters for sub-register IRQ_3_TRX_END in register @ref RG_IRQ_STATUS */
+#define SR_IRQ_3_TRX_END             0x0f, 0x08, 3
+/** Access parameters for sub-register IRQ_2_RX_START in register @ref RG_IRQ_STATUS */
+#define SR_IRQ_2_RX_START            0x0f, 0x04, 2
+/** Access parameters for sub-register IRQ_1_PLL_UNLOCK in register @ref RG_IRQ_STATUS */
+#define SR_IRQ_1_PLL_UNLOCK          0x0f, 0x02, 1
+/** Access parameters for sub-register IRQ_0_PLL_LOCK in register @ref RG_IRQ_STATUS */
+#define SR_IRQ_0_PLL_LOCK            0x0f, 0x01, 0
+/** Offset for register VREG_CTRL */
+#define RG_VREG_CTRL                     (0x10)
+/** Access parameters for sub-register AVREG_EXT in register @ref RG_VREG_CTRL */
+#define SR_AVREG_EXT                 0x10, 0x80, 7
+/** Access parameters for sub-register AVDD_OK in register @ref RG_VREG_CTRL */
+#define SR_AVDD_OK                   0x10, 0x40, 6
+/** Access parameters for sub-register AVREG_TRIM in register @ref RG_VREG_CTRL */
+#define SR_AVREG_TRIM                0x10, 0x30, 4
+/** Constant AVREG_1_80V for sub-register @ref SR_AVREG_TRIM */
+#define AVREG_1_80V              (0)
+/** Constant AVREG_1_75V for sub-register @ref SR_AVREG_TRIM */
+#define AVREG_1_75V              (1)
+/** Constant AVREG_1_84V for sub-register @ref SR_AVREG_TRIM */
+#define AVREG_1_84V              (2)
+/** Constant AVREG_1_88V for sub-register @ref SR_AVREG_TRIM */
+#define AVREG_1_88V              (3)
+/** Access parameters for sub-register DVREG_EXT in register @ref RG_VREG_CTRL */
+#define SR_DVREG_EXT                 0x10, 0x08, 3
+/** Access parameters for sub-register DVDD_OK in register @ref RG_VREG_CTRL */
+#define SR_DVDD_OK                   0x10, 0x04, 2
+/** Access parameters for sub-register DVREG_TRIM in register @ref RG_VREG_CTRL */
+#define SR_DVREG_TRIM                0x10, 0x03, 0
+/** Constant DVREG_1_80V for sub-register @ref SR_DVREG_TRIM */
+#define DVREG_1_80V              (0)
+/** Constant DVREG_1_75V for sub-register @ref SR_DVREG_TRIM */
+#define DVREG_1_75V              (1)
+/** Constant DVREG_1_84V for sub-register @ref SR_DVREG_TRIM */
+#define DVREG_1_84V              (2)
+/** Constant DVREG_1_88V for sub-register @ref SR_DVREG_TRIM */
+#define DVREG_1_88V              (3)
+/** Offset for register BATMON */
+#define RG_BATMON                        (0x11)
+#define SR_reserved_11_1             0x11, 0xc0, 6
+/** Access parameters for sub-register BATMON_OK in register @ref RG_BATMON */
+#define SR_BATMON_OK                 0x11, 0x20, 5
+/** Access parameters for sub-register BATMON_HR in register @ref RG_BATMON */
+#define SR_BATMON_HR                 0x11, 0x10, 4
+/** Access parameters for sub-register BATMON_VTH in register @ref RG_BATMON */
+#define SR_BATMON_VTH                0x11, 0x0f, 0
+/** Offset for register XOSC_CTRL */
+#define RG_XOSC_CTRL                     (0x12)
+/** Offset for register RX_SYN */
+#define RG_RX_SYN                        0x15
+/** Offset for register XAH_CTRL_1 */
+#define RG_XAH_CTRL_1                      0x17
+/** Access parameters for sub-register XTAL_MODE in register @ref RG_XOSC_CTRL */
+#define SR_XTAL_MODE                 0x12, 0xf0, 4
+/** Access parameters for sub-register XTAL_TRIM in register @ref RG_XOSC_CTRL */
+#define SR_XTAL_TRIM                 0x12, 0x0f, 0
+/** Offset for register FTN_CTRL */
+#define RG_FTN_CTRL                      (0x18)
+/** Access parameters for sub-register FTN_START in register @ref RG_FTN_CTRL */
+#define SR_FTN_START                 0x18, 0x80, 7
+#define SR_reserved_18_2             0x18, 0x40, 6
+/** Access parameters for sub-register FTNV in register @ref RG_FTN_CTRL */
+#define SR_FTNV                      0x18, 0x3f, 0
+/** Offset for register PLL_CF */
+#define RG_PLL_CF                        (0x1a)
+/** Access parameters for sub-register PLL_CF_START in register @ref RG_PLL_CF */
+#define SR_PLL_CF_START              0x1a, 0x80, 7
+#define SR_reserved_1a_2             0x1a, 0x70, 4
+/** Access parameters for sub-register PLL_CF in register @ref RG_PLL_CF */
+#define SR_PLL_CF                    0x1a, 0x0f, 0
+/** Offset for register PLL_DCU */
+#define RG_PLL_DCU                       (0x1b)
+/** Access parameters for sub-register PLL_DCU_START in register @ref RG_PLL_DCU */
+#define SR_PLL_DCU_START             0x1b, 0x80, 7
+#define SR_reserved_1b_2             0x1b, 0x40, 6
+/** Access parameters for sub-register PLL_DCUW in register @ref RG_PLL_DCU */
+#define SR_PLL_DCUW                  0x1b, 0x3f, 0
+/** Offset for register PART_NUM */
+#define RG_PART_NUM                      (0x1c)
+/** Access parameters for sub-register PART_NUM in register @ref RG_PART_NUM */
+#define SR_PART_NUM                  0x1c, 0xff, 0
+/** Constant RF230 for sub-register @ref SR_PART_NUM */
+#define RF230                    (2)
+/** Offset for register VERSION_NUM */
+#define RG_VERSION_NUM                   (0x1d)
+/** Access parameters for sub-register VERSION_NUM in register @ref RG_VERSION_NUM */
+#define SR_VERSION_NUM               0x1d, 0xff, 0
+/** Offset for register MAN_ID_0 */
+#define RG_MAN_ID_0                      (0x1e)
+/** Access parameters for sub-register MAN_ID_0 in register @ref RG_MAN_ID_0 */
+#define SR_MAN_ID_0                  0x1e, 0xff, 0
+/** Offset for register MAN_ID_1 */
+#define RG_MAN_ID_1                      (0x1f)
+/** Access parameters for sub-register MAN_ID_1 in register @ref RG_MAN_ID_1 */
+#define SR_MAN_ID_1                  0x1f, 0xff, 0
+/** Offset for register SHORT_ADDR_0 */
+#define RG_SHORT_ADDR_0                  (0x20)
+/** Access parameters for sub-register SHORT_ADDR_0 in register @ref RG_SHORT_ADDR_0 */
+#define SR_SHORT_ADDR_0              0x20, 0xff, 0
+/** Offset for register SHORT_ADDR_1 */
+#define RG_SHORT_ADDR_1                  (0x21)
+/** Access parameters for sub-register SHORT_ADDR_1 in register @ref RG_SHORT_ADDR_1 */
+#define SR_SHORT_ADDR_1              0x21, 0xff, 0
+/** Offset for register PAN_ID_0 */
+#define RG_PAN_ID_0                      (0x22)
+/** Access parameters for sub-register PAN_ID_0 in register @ref RG_PAN_ID_0 */
+#define SR_PAN_ID_0                  0x22, 0xff, 0
+/** Offset for register PAN_ID_1 */
+#define RG_PAN_ID_1                      (0x23)
+/** Access parameters for sub-register PAN_ID_1 in register @ref RG_PAN_ID_1 */
+#define SR_PAN_ID_1                  0x23, 0xff, 0
+/** Offset for register IEEE_ADDR_0 */
+#define RG_IEEE_ADDR_0                   (0x24)
+/** Access parameters for sub-register IEEE_ADDR_0 in register @ref RG_IEEE_ADDR_0 */
+#define SR_IEEE_ADDR_0               0x24, 0xff, 0
+/** Offset for register IEEE_ADDR_1 */
+#define RG_IEEE_ADDR_1                   (0x25)
+/** Access parameters for sub-register IEEE_ADDR_1 in register @ref RG_IEEE_ADDR_1 */
+#define SR_IEEE_ADDR_1               0x25, 0xff, 0
+/** Offset for register IEEE_ADDR_2 */
+#define RG_IEEE_ADDR_2                   (0x26)
+/** Access parameters for sub-register IEEE_ADDR_2 in register @ref RG_IEEE_ADDR_2 */
+#define SR_IEEE_ADDR_2               0x26, 0xff, 0
+/** Offset for register IEEE_ADDR_3 */
+#define RG_IEEE_ADDR_3                   (0x27)
+/** Access parameters for sub-register IEEE_ADDR_3 in register @ref RG_IEEE_ADDR_3 */
+#define SR_IEEE_ADDR_3               0x27, 0xff, 0
+/** Offset for register IEEE_ADDR_4 */
+#define RG_IEEE_ADDR_4                   (0x28)
+/** Access parameters for sub-register IEEE_ADDR_4 in register @ref RG_IEEE_ADDR_4 */
+#define SR_IEEE_ADDR_4               0x28, 0xff, 0
+/** Offset for register IEEE_ADDR_5 */
+#define RG_IEEE_ADDR_5                   (0x29)
+/** Access parameters for sub-register IEEE_ADDR_5 in register @ref RG_IEEE_ADDR_5 */
+#define SR_IEEE_ADDR_5               0x29, 0xff, 0
+/** Offset for register IEEE_ADDR_6 */
+#define RG_IEEE_ADDR_6                   (0x2a)
+/** Access parameters for sub-register IEEE_ADDR_6 in register @ref RG_IEEE_ADDR_6 */
+#define SR_IEEE_ADDR_6               0x2a, 0xff, 0
+/** Offset for register IEEE_ADDR_7 */
+#define RG_IEEE_ADDR_7                   (0x2b)
+/** Access parameters for sub-register IEEE_ADDR_7 in register @ref RG_IEEE_ADDR_7 */
+#define SR_IEEE_ADDR_7               0x2b, 0xff, 0
+/** Offset for register XAH_CTRL */
+#define RG_XAH_CTRL_0                     (0x2c)
+/** Access parameters for sub-register MAX_FRAME_RETRIES in register @ref RG_XAH_CTRL_0 */
+#define SR_MAX_FRAME_RETRIES         0x2c, 0xf0, 4
+/** Access parameters for sub-register MAX_CSMA_RETRIES in register @ref RG_XAH_CTRL_0 */
+#define SR_MAX_CSMA_RETRIES          0x2c, 0x0e, 1
+#define SR_reserved_2c_3             0x2c, 0x01, 0
+/** Offset for register CSMA_SEED_0 */
+#define RG_CSMA_SEED_0                   (0x2d)
+/** Access parameters for sub-register CSMA_SEED_0 in register @ref RG_CSMA_SEED_0 */
+#define SR_CSMA_SEED_0               0x2d, 0xff, 0
+/** Offset for register CSMA_SEED_1 */
+#define RG_CSMA_SEED_1                   (0x2e)
+/** Offset for register CSMA_BE */
+#define RG_CSMA_BE                      0x2f
+/** Access parameters for sub-register MIN_BE in register @ref RG_CSMA_SEED_1 */
+#define SR_MIN_BE                    0x2e, 0xc0, 6
+#define SR_reserved_2e_2             0x2e, 0x30, 4
+/** Access parameters for sub-register I_AM_COORD in register @ref RG_CSMA_SEED_1 */
+#define SR_I_AM_COORD                0x2e, 0x08, 3
+/** Access parameters for sub-register CSMA_SEED_1 in register @ref RG_CSMA_SEED_1 */
+#define SR_CSMA_SEED_1               0x2e, 0x07, 0
+#endif
+#endif /* PHY128RFA1_REGISTERMAP_EXTERNAL_H */
diff --git a/cpu/avr/radio/rf230bb/hal.h b/cpu/avr/radio/rf230bb/hal.h
index 737680d68..5c905e954 100644
--- a/cpu/avr/radio/rf230bb/hal.h
+++ b/cpu/avr/radio/rf230bb/hal.h
@@ -78,6 +78,7 @@
 #define ZIGBIT			4
 #define IRIS			5
 #define ATMEGA128RFA1   6
+#define ATMEGA256RFR2   7
 
 #if PLATFORM_TYPE == RCB_B
 /* 1281 rcb */
@@ -140,7 +141,7 @@
 #   define SLPTRPORT  B
 #   define SLPTRPIN   (0x04)
 
-#elif PLATFORM_TYPE == ATMEGA128RFA1
+#elif PLATFORM_TYPE == ATMEGA128RFA1 || PLATFORM_TYPE == ATMEGA256RFR2
 /* ATmega1281 with internal AT86RF231 radio */
 #   define SLPTRPORT  TRXPR
 #   define SLPTRPIN   1
@@ -233,7 +234,7 @@
  *       that the source code can directly use.
  * \{
  */
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__)
 
 #define hal_set_rst_low( )    ( TRXPR &= ~( 1 << TRXRST ) ) /**< This macro pulls the RST pin low. */
 #define hal_set_rst_high( )   ( TRXPR |= ( 1 << TRXRST ) ) /**< This macro pulls the RST pin high. */
@@ -367,7 +368,7 @@ typedef struct{
 void hal_init( void );
 
 /* Hack for atmega128rfa1 with integrated radio. Access registers directly, not through SPI */
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__)
 //#define hal_register_read(address) _SFR_MEM8((uint16_t)address)
 #define hal_register_read(address) address
 uint8_t hal_subregister_read( uint16_t address, uint8_t mask, uint8_t position );
diff --git a/cpu/avr/radio/rf230bb/halbb.c b/cpu/avr/radio/rf230bb/halbb.c
index 1f7c36ee5..622a4aecd 100644
--- a/cpu/avr/radio/rf230bb/halbb.c
+++ b/cpu/avr/radio/rf230bb/halbb.c
@@ -76,6 +76,9 @@ extern uint8_t debugflowsize,debugflow[DEBUGFLOWSIZE];
 #if defined(__AVR_ATmega128RFA1__)
 #include <avr/io.h>
 #include "atmega128rfa1_registermap.h"
+#elif defined(__AVR_ATmega256RFR2__)
+#include <avr/io.h>
+#include "atmega256rfr2_registermap.h"
 #else
 #include "at86rf230_registermap.h"
 #endif
@@ -88,7 +91,7 @@ volatile extern signed char rf230_last_rssi;
 
 
 /*============================ IMPLEMENTATION ================================*/
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__)
 
 /* AVR1281 with internal RF231 radio */
 #include <avr/interrupt.h>
@@ -158,7 +161,7 @@ inline uint8_t spiWrite(uint8_t byte)
  
 /** \brief  This function initializes the Hardware Abstraction Layer.
  */
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__)
 
 void
 hal_init(void)
@@ -242,7 +245,7 @@ hal_init(void)
 #endif  /* !__AVR__ */
 
 
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__)
 /* Hack for internal radio registers. hal_register_read and hal_register_write are
    handled through defines, but the preprocesser can't parse a macro containing
    another #define with multiple arguments, e.g. using
@@ -279,7 +282,7 @@ hal_subregister_write(uint16_t address, uint8_t mask, uint8_t position,
     HAL_LEAVE_CRITICAL_REGION();
 }
 
-#else /* defined(__AVR_ATmega128RFA1__) */
+#else /* defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__)*/
 /*----------------------------------------------------------------------------*/
 /** \brief  This function reads data from one of the radio transceiver's registers.
  *
@@ -383,7 +386,7 @@ hal_subregister_write(uint8_t address, uint8_t mask, uint8_t position,
     /* Write the modified register value. */
     hal_register_write(address, value);
 }
-#endif /* defined(__AVR_ATmega128RFA1__) */
+#endif /* defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__) */
 /*----------------------------------------------------------------------------*/
 /** \brief  Transfer a frame from the radio transceiver to a RAM buffer
  *
@@ -399,7 +402,7 @@ hal_subregister_write(uint8_t address, uint8_t mask, uint8_t position,
 void
 hal_frame_read(hal_rx_frame_t *rx_frame)
 {
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__)
 
     uint8_t frame_length,*rx_data,*rx_buffer;
  
@@ -431,8 +434,8 @@ hal_frame_read(hal_rx_frame_t *rx_frame)
      * Else show the crc has passed the hardware check.
      */
     rx_frame->crc   = true;
-    
-#else /* defined(__AVR_ATmega128RFA1__) */
+
+#else /* defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__) */
 
     uint8_t frame_length, *rx_data;
 
@@ -487,7 +490,7 @@ hal_frame_read(hal_rx_frame_t *rx_frame)
 
     HAL_SPI_TRANSFER_CLOSE();
 
-#endif /* defined(__AVR_ATmega128RFA1__) */
+#endif /* defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__) */
 }
 
 /*----------------------------------------------------------------------------*/
@@ -500,7 +503,7 @@ hal_frame_read(hal_rx_frame_t *rx_frame)
 void
 hal_frame_write(uint8_t *write_buffer, uint8_t length)
 {
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__)
     uint8_t *tx_buffer;
     tx_buffer=(uint8_t *)0x180;  //start of fifo in i/o space
     /* Write frame length, including the two byte checksum */
@@ -632,7 +635,7 @@ volatile char rf230interruptflag;
 #define INTERRUPTDEBUG(arg)
 #endif
 
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__)
 /* The atmega128rfa1 has individual interrupts for the integrated radio'
  * Whichever are enabled by the RF230 driver must be present even if not used!
  */
@@ -715,7 +718,7 @@ ISR(TRX24_CCA_ED_DONE_vect)
 	rf230_ccawait=0;
 }
 
-#else /* defined(__AVR_ATmega128RFA1__) */
+#else /* defined(__AVR_ATmega128RFA1__)  || defined(__AVR_ATmega256RFR2__)*/
 /* Separate RF230 has a single radio interrupt and the source must be read from the IRQ_STATUS register */
 HAL_RF230_ISR()
 {
@@ -805,7 +808,7 @@ HAL_RF230_ISR()
         ;
     }
 }
-#endif /* defined(__AVR_ATmega128RFA1__) */ 
+#endif /* defined(__AVR_ATmega128RFA1__)  || defined(__AVR_ATmega256RFR2__)*/
 #   endif /* defined(DOXYGEN) */
 
 /** @} */
diff --git a/cpu/avr/radio/rf230bb/rf230bb.c b/cpu/avr/radio/rf230bb/rf230bb.c
index d00a24d72..4ee5351ae 100644
--- a/cpu/avr/radio/rf230bb/rf230bb.c
+++ b/cpu/avr/radio/rf230bb/rf230bb.c
@@ -212,7 +212,7 @@ static unsigned long total_time_for_transmission, total_transmission_len;
 static int num_transmissions;
 #endif
 
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__)
 volatile uint8_t rf230_wakewait, rf230_txendwait, rf230_ccawait;
 #endif
 
@@ -585,7 +585,7 @@ radio_on(void)
 #if RF230BB_CONF_LEDONPORTE1
     PORTE|=(1<<PE1); //ledon
 #endif
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__)
     /* Use the poweron interrupt for delay */
     rf230_wakewait=1;
     {
@@ -908,6 +908,25 @@ void rf230_warm_reset(void) {
   hal_subregister_write(SR_CCA_ED_THRES,(RF230_CONF_CCA_THRES+91)/2);  
 #endif
 #endif
+    
+
+    /*set external PA in on state, used for Dresden Elektronik m12 modules*/
+    /*needed for guhRF Modules and RaspBee Boarder Router*/
+#if defined( _EXT_PA_ )
+    hal_subregister_write(SR_PA_EXT_EN, 1);
+    hal_subregister_write(SR_IRQ_2_EXT_EN, 0); //Must be disabled for antenna diversity
+    hal_subregister_write(SR_ANT_EXT_SW_EN, 1);
+    //   hal_subregister_write(SR_ANT_DIV_EN, 1);
+    
+    /* Registers for fixed Antenna out - Diversity disabled */
+    // hal_subregister_write(SR_ANT_DIV_EN, 0);
+    // hal_subregister_write(SR_SET_OUT_ANT1, 1); //Set Antenna 1 RFOUT1-deRFmega256-23M12
+    hal_subregister_write(SR_SET_OUT_ANT0, 1); //Set Antenna 0 RFOUT2-deRFmega256-23M12
+    DDRD  |= (1<<PD6); // PIND6 High to wake amplifier
+    PORTD |= (1<<PD6);
+    
+#endif
+
 
   /* Use automatic CRC unless manual is specified */
 #if RF230_CONF_CHECKSUM
@@ -937,7 +956,7 @@ rf230_transmit(unsigned short payload_len)
   /* If radio is sleeping we have to turn it on first */
   /* This automatically does the PLL calibrations */
   if (hal_get_slptr()) {
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__)
 	ENERGEST_ON(ENERGEST_TYPE_LED_RED);
 #if RF230BB_CONF_LEDONPORTE1
     PORTE|=(1<<PE1); //ledon
@@ -1658,7 +1677,7 @@ rf230_cca(void)
 
   /* Start the CCA, wait till done, return result */
   /* Note reading the TRX_STATUS register clears both CCA_STATUS and CCA_DONE bits */
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__) || defined(__AVR_ATmega256RFR2__)
 #if 1  //interrupt method
     /* Disable rx transitions to busy (RX_PDT_BIT) */
     /* Note: for speed this resets rx threshold to the compiled default */
diff --git a/cpu/avr/radio/rf230bb/rf230bb.h b/cpu/avr/radio/rf230bb/rf230bb.h
index 30de9a1e5..1c93de3e5 100644
--- a/cpu/avr/radio/rf230bb/rf230bb.h
+++ b/cpu/avr/radio/rf230bb/rf230bb.h
@@ -57,6 +57,8 @@
 #include "hal.h"
 #if defined(__AVR_ATmega128RFA1__)
 #include "atmega128rfa1_registermap.h"
+#elif defined(__AVR_ATmega256RFR2__)
+#include "atmega256rfr2_registermap.h"
 #else
 #include "at86rf230_registermap.h"
 #endif
@@ -68,7 +70,7 @@
 #define RF230_REVB                              ( 2 )
 #define SUPPORTED_MANUFACTURER_ID               ( 31 )
 
-#if defined(__AVR_ATmega128RFA1__)
+#if defined(__AVR_ATmega128RFA1__)  || defined(__AVR_ATmega256RFR2__)
 #define RF230_SUPPORTED_INTERRUPT_MASK          ( 0xFF )
 #else
 /* RF230 does not support RX_START interrupts in extended mode, but it seems harmless to always enable it. */
diff --git a/platform/RaspBee/Makefile.RaspBee b/platform/RaspBee/Makefile.RaspBee
new file mode 100644
index 000000000..a4ba6342b
--- /dev/null
+++ b/platform/RaspBee/Makefile.RaspBee
@@ -0,0 +1,73 @@
+CONTIKI_TARGET_DIRS = . dev apps net loader
+
+CONTIKI_CORE=contiki-main
+CONTIKI_TARGET_MAIN = ${CONTIKI_CORE}.o
+CONTIKI_TARGET_SOURCEFILES += contiki-main.c params.c node-id.c
+#Needed for slip
+CONTIKI_TARGET_SOURCEFILES += temperature-sensor.c adc.c led.c sensors.c slip_uart0.c slip.c leds-arch.c
+#Needed for Button
+CONTIKI_TARGET_SOURCEFILES += button-sensor.c
+# i2c Master
+CONTIKI_TARGET_SOURCEFILES += i2c.c
+
+#Needed for Battery test
+CONTIKI_TARGET_SOURCEFILES += battery-sensor.c batmon.c
+
+CONTIKIAVR=$(CONTIKI)/cpu/avr
+
+
+#-------------------------------------------------------------------------------
+# guh Source Files
+
+
+# Smart Grid Ready Interface
+CONTIKI_TARGET_SOURCEFILES += sg-ready.c
+
+
+
+#-------------------------------------------------------------------------------
+
+
+CONTIKIBOARD=.
+BOOTLOADER_START = 0x1F000
+CONTIKI_PLAT_DEFS = -DF_CPU=16000000UL -DAUTO_CRC_PADDING=2 -DPLAT_TIMER=5
+
+MCU=atmega256rfr2
+
+AVRDUDE_PROGRAMMER=jtag2
+
+# For usb devices, you may either use PORT=usb, or (e.g. if you have more than one
+# programmer connected) you can use the following trick to find out the serial number:
+#
+# The example is for an JTAGICE mkII used to program an atmega256:
+# avrdude -v -P usb:xxxx -c jtag2 -p atmega256
+AVRDUDE_PORT=usb:00B000000D79
+
+
+# Additional avrdude options
+# Verify off
+AVRDUDE_OPTIONS=-V
+AVRDUDE_MCU=m256rfr2
+
+#debug
+# CFLAGS  += -save-temps
+# Bootloader bonsai
+# LDFLAGS  += -save-temps
+# For the old bonsai bootloader compiled with squeeze gcc-avr we
+# directly used the address of the bootloader:
+#BOOTLOADER_GET_MAC=0x0001f3a0
+# For newer bonsai we have a jump table at the end of the bootloader
+# section:
+BOOTLOADER_GET_MAC=0x0001ff80
+
+LDFLAGS  += -Wl,--defsym,bootloader_get_mac=$(BOOTLOADER_GET_MAC)
+
+
+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/ipv6 core/net/ipv4 core/net/ip \
+#     core/net/rime \
+#     core/net/rpl \
diff --git a/platform/RaspBee/contiki-conf.h b/platform/RaspBee/contiki-conf.h
new file mode 100644
index 000000000..b62ce80c9
--- /dev/null
+++ b/platform/RaspBee/contiki-conf.h
@@ -0,0 +1,324 @@
+/*
+ * Copyright (c) 2006, Technical University of Munich
+ * 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
+ *         Configuration for Atmel ATMEGA256RFR2
+ * \author
+ *         David Kopf <dak664@embarqmail.com>
+	   Bernhard Trinnes <bernhard.trinnes@guh.guru>
+ */
+
+#ifndef CONTIKI_CONF_H_
+#define CONTIKI_CONF_H_
+
+/* Platform name, type, and MCU clock rate */
+#define PLATFORM_NAME  "guhRF"
+#define PLATFORM_TYPE  ATMEGA256RFR2
+#ifndef F_CPU
+#define F_CPU          16000000UL
+#endif
+
+#include <stdint.h>
+
+#define IEEE802154_CONF_PANID     0xABCD // default panid
+
+/* The AVR tick interrupt usually is done with an 8 bit counter around 128 Hz.
+ * 125 Hz needs slightly more overhead during the interrupt, as does a 32 bit
+ * clock_time_t.
+ */
+ /* Clock ticks per second */
+#define CLOCK_CONF_SECOND 128
+#if 1
+/* 16 bit counter overflows every ~10 minutes */
+typedef unsigned short clock_time_t;
+#define CLOCK_LT(a,b)  ((signed short)((a)-(b)) < 0)
+#define INFINITE_TIME 0xffff
+#define RIME_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME INFINITE_TIME/CLOCK_CONF_SECOND /* Default uses 600 */
+#define COLLECT_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME INFINITE_TIME/CLOCK_CONF_SECOND /* Default uses 600 */
+#else
+typedef unsigned long clock_time_t;
+#define CLOCK_LT(a,b)  ((signed long)((a)-(b)) < 0)
+#define INFINITE_TIME 0xffffffff
+#endif
+/* These routines are not part of the contiki core but can be enabled in cpu/avr/clock.c */
+void clock_delay_msec(uint16_t howlong);
+void clock_adjust_ticks(clock_time_t howmany);
+
+
+/* and theoretically can use TIMER2 with it to keep time. Else TIMER0 is used. */
+/* The sleep timer requires the crystal and adds a TIMER2 interrupt routine if not already define by clock.c */
+#define AVR_CONF_USE32KCRYSTAL 0
+
+/* However this results in disabling UART0. */
+#define RF230BB_CONF_LEDONPORTE1  0
+
+/* COM port to be used for SLIP connection. This is usually UART0, but see above */
+#if RF230BB_CONF_LEDONPORTE1
+#define SLIP_PORT RS232_PORT_1
+#else
+#define SLIP_PORT RS232_PORT_0
+#endif
+
+/* Pre-allocated memory for loadable modules heap space (in bytes)*/
+/* Default is 4096. Currently used only when elfloader is present. Not tested on Raven */
+//#define MMEM_CONF_SIZE 256
+
+/* Starting address for code received via the codeprop facility. Not tested. */
+typedef unsigned long off_t;
+//#define EEPROMFS_ADDR_CODEPROP 0x8000
+
+/* Logging adds 200 bytes to program size. RS232 output slows down webserver. */
+//#define LOG_CONF_ENABLED         1
+
+/* RADIOSTATS is used in rf230bb, clock.c and the webserver cgi to report radio usage */
+/* It has less overhead than ENERGEST */
+//#define RADIOSTATS                1
+
+/* More extensive stats, via main loop printfs or webserver status pages */
+//#define ENERGEST_CONF_ON          1
+
+/* Packet statistics */
+typedef unsigned short uip_stats_t;
+//#define UIP_STATISTICS            1
+
+/* Available watchdog timeouts depend on mcu. Default is WDTO_2S. -1 Disables the watchdog. */
+/* AVR Studio simulator tends to reboot due to clocking the WD 8 times too fast */
+//#define WATCHDOG_CONF_TIMEOUT -1
+
+/* Debugflow macro, useful for tracing path through mac and radio interrupts */
+//#define DEBUGFLOWSIZE 128
+
+
+/* Define MAX_*X_POWER to reduce tx power and ignore weak rx packets for testing a miniature multihop network.
+ * Leave undefined for full power and sensitivity.
+ * tx=0 (3dbm, default) to 15 (-17.2dbm)
+ * RF230_CONF_AUTOACK sets the extended mode using the energy-detect register with rx=0 (-91dBm) to 84 (-7dBm)
+ *   else the rssi register is used having range 0 (91dBm) to 28 (-10dBm)
+ *   For simplicity RF230_MIN_RX_POWER is based on the energy-detect value and divided by 3 when autoack is not set.
+ * On the RF230 a reduced rx power threshold will not prevent autoack if enabled and requested.
+ * These numbers applied to both Raven and Jackdaw give a maximum communication distance of about 15 cm
+ * and a 10 meter range to a full-sensitivity RF230 sniffer.
+
+#define RF230_MAX_TX_POWER 15
+#define RF230_MIN_RX_POWER 30
+
+ */
+  /* The rf231 and ATMEGA256RFR2 can use an rssi threshold for triggering rx_busy that saves 0.5ma in rx mode */
+/* 1 - 15 maps into -90 to -48 dBm; the register is written with RF230_MIN_RX_POWER/6 + 1. Undefine for -100dBm sensitivity */
+//#define RF230_MIN_RX_POWER        0
+
+/* Network setup */
+/* TX routine passes the cca/ack result in the return parameter */
+#define RDC_CONF_HARDWARE_ACK    1
+/* TX routine does automatic cca and optional backoffs */
+#define RDC_CONF_HARDWARE_CSMA   1
+/* Allow MCU sleeping between channel checks */
+#define RDC_CONF_MCU_SLEEP       1
+
+/* External Amplifier installed */
+#define _EXT_PA_ 		1
+
+#if NETSTACK_CONF_WITH_IPV6
+#define LINKADDR_CONF_SIZE        8
+#define UIP_CONF_ICMP6            1
+#define UIP_CONF_UDP              1
+#define UIP_CONF_TCP              1
+#define NETSTACK_CONF_NETWORK     sicslowpan_driver
+#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
+#else
+/* ip4 should build but is largely untested */
+#define LINKADDR_CONF_SIZE        2
+#define NETSTACK_CONF_NETWORK     rime_driver
+#endif
+
+#define UIP_CONF_LL_802154        1
+#define UIP_CONF_LLH_LEN          0
+
+/* 10 bytes per stateful address context - see sicslowpan.c */
+/* Default is 1 context with prefix aaaa::/64 */
+/* These must agree with all the other nodes or there will be a failure to communicate! */
+#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 1
+#define SICSLOWPAN_CONF_ADDR_CONTEXT_0 {addr_contexts[0].prefix[0]=0xaa;addr_contexts[0].prefix[1]=0xaa;}
+#define SICSLOWPAN_CONF_ADDR_CONTEXT_1 {addr_contexts[1].prefix[0]=0xbb;addr_contexts[1].prefix[1]=0xbb;}
+#define SICSLOWPAN_CONF_ADDR_CONTEXT_2 {addr_contexts[2].prefix[0]=0x20;addr_contexts[2].prefix[1]=0x01;addr_contexts[2].prefix[2]=0x49;addr_contexts[2].prefix[3]=0x78,addr_contexts[2].prefix[4]=0x1d;addr_contexts[2].prefix[5]=0xb1;}
+
+/* Take the default TCP maximum segment size for efficiency and simpler wireshark captures */
+/* Use this to prevent 6LowPAN fragmentation (whether or not fragmentation is enabled) */
+//#define UIP_CONF_TCP_MSS       48
+
+#define UIP_CONF_IP_FORWARD      0
+#define UIP_CONF_FWCACHE_SIZE    0
+
+#define UIP_CONF_IPV6_CHECKS     1
+#define UIP_CONF_IPV6_QUEUE_PKT  1
+#define UIP_CONF_IPV6_REASSEMBLY 0
+
+#define UIP_CONF_UDP_CHECKSUMS   1
+#define UIP_CONF_TCP_SPLIT       1
+#define UIP_CONF_DHCP_LIGHT      1
+
+
+//#if 1 /* No radio cycling */
+#if 0 /* radio cycling */
+
+#define NETSTACK_CONF_MAC         nullmac_driver
+#define NETSTACK_CONF_RDC         sicslowmac_driver
+#define NETSTACK_CONF_FRAMER      framer_802154
+#define NETSTACK_CONF_RADIO       rf230_driver
+/* AUTOACK receive mode gives better rssi measurements, even if ACK is never requested */
+#define RF230_CONF_AUTOACK        1
+/* Request 802.15.4 ACK on all packets sent (else autoretry). This is primarily for testing. */
+#define SICSLOWPAN_CONF_ACK_ALL   0
+/* 1 + Number of auto retry attempts 0-15 (0 implies don't use extended TX_ARET_ON mode) */
+#define RF230_CONF_FRAME_RETRIES    2
+/* Number of csma retry attempts 0-5 in extended tx mode (7 does immediate tx with no csma) */
+#define RF230_CONF_CSMA_RETRIES   5
+/* Default is one RAM buffer for received packets. More than one may benefit multiple TCP connections or ports */
+#define RF230_CONF_RX_BUFFERS     3
+#define SICSLOWPAN_CONF_FRAG      1
+/* Most browsers reissue GETs after 3 seconds which stops fragment reassembly so a longer MAXAGE does no good */
+#define SICSLOWPAN_CONF_MAXAGE    3
+/* How long to wait before terminating an idle TCP connection. Smaller to allow faster sleep. Default is 120 seconds */
+/* If wait is too short the connection can be reset as a result of multiple fragment reassembly timeouts */
+#define UIP_CONF_WAIT_TIMEOUT    20
+/* 211 bytes per queue buffer */
+#define QUEUEBUF_CONF_NUM         8
+/* 54 bytes per queue ref buffer */
+#define QUEUEBUF_CONF_REF_NUM     2
+/* Allocate remaining RAM as desired */
+/* 30 bytes per TCP connection */
+/* 6LoWPAN does not do well with concurrent TCP streams, as new browser GETs collide with packets coming */
+/* from previous GETs, causing decreased throughput, retransmissions, and timeouts. Increase to study this. */
+/* ACKs to other ports become interleaved with computation-intensive GETs, so ACKs are particularly missed. */
+/* Increasing the number of packet receive buffers in RAM helps to keep ACKs from being lost */
+#define UIP_CONF_MAX_CONNECTIONS  4
+/* 2 bytes per TCP listening port */
+#define UIP_CONF_MAX_LISTENPORTS  4
+/* 25 bytes per UDP connection */
+#define UIP_CONF_UDP_CONNS       10
+/* See uip-ds6.h */
+#define NBR_TABLE_CONF_MAX_NEIGHBORS      20
+#define UIP_CONF_DS6_DEFRT_NBU    2
+#define UIP_CONF_DS6_PREFIX_NBU   3
+#define UIP_CONF_MAX_ROUTES    20
+#define UIP_CONF_DS6_ADDR_NBU     3
+#define UIP_CONF_DS6_MADDR_NBU    0
+#define UIP_CONF_DS6_AADDR_NBU    0
+
+
+#elif 1  /* Contiki-mac radio cycling */
+//#define NETSTACK_CONF_MAC         nullmac_driver
+/* csma needed for burst mode at present. Webserver won't work without it */
+#define NETSTACK_CONF_MAC         csma_driver
+#define NETSTACK_CONF_RDC         contikimac_driver
+/* Default is two CCA separated by 500 usec */
+#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE   8
+/* So without the header this needed for RPL mesh to form */
+#define CONTIKIMAC_FRAMER_CONF_SHORTEST_PACKET_SIZE   43-18  //multicast RPL DIS length
+/* Not tested much yet */
+#define CONTIKIMAC_CONF_WITH_PHASE_OPTIMIZATION 0
+#define CONTIKIMAC_CONF_COMPOWER               1
+#define RIMESTATS_CONF_ENABLED                 0
+
+#if NETSTACK_CONF_WITH_IPV6
+#define NETSTACK_CONF_FRAMER      framer_802154
+#else /* NETSTACK_CONF_WITH_IPV6 */
+#define NETSTACK_CONF_FRAMER      contikimac_framer
+#endif /* NETSTACK_CONF_WITH_IPV6 */
+
+#define NETSTACK_CONF_RADIO       rf230_driver
+/* The radio needs to interrupt during an rtimer interrupt */
+#define RTIMER_CONF_NESTED_INTERRUPTS 1
+#define RF230_CONF_AUTOACK        1
+/* A 0 here means non-extended mode; 1 means extended mode with no retry, >1 for retrys */
+/* Contikimac strobes on its own, but hardware retries are faster */
+#define RF230_CONF_FRAME_RETRIES  1
+/* Long csma backoffs will compromise radio cycling; set to 0 for 1 csma */
+#define RF230_CONF_CSMA_RETRIES   0
+#define SICSLOWPAN_CONF_FRAG      1
+#define SICSLOWPAN_CONF_MAXAGE    3
+/* 211 bytes per queue buffer. Contikimac burst mode needs 15 for a 1280 byte MTU */
+#define QUEUEBUF_CONF_NUM         15
+/* 54 bytes per queue ref buffer */
+#define QUEUEBUF_CONF_REF_NUM     2
+/* Allocate remaining RAM. Not much left due to queuebuf increase  */
+#define UIP_CONF_MAX_CONNECTIONS  2
+#define UIP_CONF_MAX_LISTENPORTS  4
+#define UIP_CONF_UDP_CONNS        5
+#define NBR_TABLE_CONF_MAX_NEIGHBORS      20
+#define UIP_CONF_DS6_DEFRT_NBU    2
+#define UIP_CONF_DS6_PREFIX_NBU   3
+#define UIP_CONF_MAX_ROUTES    4
+#define UIP_CONF_DS6_ADDR_NBU     3
+#define UIP_CONF_DS6_MADDR_NBU    0
+#define UIP_CONF_DS6_AADDR_NBU    0
+
+#else
+#error Network configuration not specified!
+#endif   /* Network setup */
+
+/* ************************************************************************** */
+//#pragma mark RPL Settings
+/* ************************************************************************** */
+#if UIP_CONF_IPV6_RPL
+
+#define UIP_CONF_ROUTER                 1
+#define UIP_CONF_ND6_SEND_RA		    0
+#define UIP_CONF_ND6_REACHABLE_TIME     600000
+#define UIP_CONF_ND6_RETRANS_TIMER      10000
+
+/* For slow slip connections, to prevent buffer overruns */
+//#define UIP_CONF_RECEIVE_WINDOW 300
+#undef UIP_CONF_FWCACHE_SIZE
+#define UIP_CONF_FWCACHE_SIZE    30
+#define UIP_CONF_BROADCAST       1
+#define UIP_ARCH_IPCHKSUM        1
+#define UIP_CONF_PINGADDRCONF    0
+#define UIP_CONF_LOGGING         0
+
+#endif /* RPL */
+
+#define CCIF
+#define CLIF
+#ifndef CC_CONF_INLINE
+#define CC_CONF_INLINE inline
+#endif
+
+/* include the project config */
+/* PROJECT_CONF_H might be defined in the project Makefile */
+#ifdef PROJECT_CONF_H
+#include PROJECT_CONF_H
+#endif
+
+#endif /* CONTIKI_CONF_H_ */
diff --git a/platform/RaspBee/contiki-main.c b/platform/RaspBee/contiki-main.c
new file mode 100644
index 000000000..6c1f5c7e7
--- /dev/null
+++ b/platform/RaspBee/contiki-main.c
@@ -0,0 +1,625 @@
+/*
+ * Copyright (c) 2006, Technical University of Munich
+ * 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.
+ *
+ */
+#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
+
+#define ANNOUNCE_BOOT 1    //adds about 600 bytes to program size
+#if ANNOUNCE_BOOT
+#define PRINTA(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
+#else
+#define PRINTA(...)
+#endif
+
+#define DEBUG 0
+#if DEBUG
+#define PRINTD(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
+#else
+#define PRINTD(...)
+#endif
+
+#include <avr/pgmspace.h>
+#include <avr/fuse.h>
+#include <avr/eeprom.h>
+#include <avr/io.h>
+#include <stdio.h>
+#include <string.h>
+#include <dev/watchdog.h>
+
+#include "loader/symbols-def.h"
+#include "loader/symtab.h"
+
+#include "params.h"
+#include "radio/rf230bb/rf230bb.h"
+#include "net/mac/frame802154.h"
+#include "net/mac/framer-802154.h"
+#include "net/ipv6/sicslowpan.h"
+
+#include "contiki.h"
+#include "contiki-net.h"
+#include "contiki-lib.h"
+
+#include "dev/rs232.h"
+#include "dev/serial-line.h"
+#include "dev/slip.h"
+
+#ifdef RAVEN_LCD_INTERFACE
+#include "raven-lcd.h"
+#endif
+
+#if AVR_WEBSERVER
+#include "httpd-fs.h"
+#include "httpd-cgi.h"
+#endif
+
+#ifdef COFFEE_FILES
+#include "cfs/cfs.h"
+#include "cfs/cfs-coffee.h"
+#endif
+
+#if UIP_CONF_ROUTER&&0
+#include "net/routing/rimeroute.h"
+#include "net/rime/rime-udp.h"
+#endif
+
+#include "net/rime/rime.h"
+
+/* Track interrupt flow through mac, rdc and radio driver */
+//#define DEBUGFLOWSIZE 32
+#if DEBUGFLOWSIZE
+uint8_t debugflowsize,debugflow[DEBUGFLOWSIZE];
+#define DEBUGFLOW(c) if (debugflowsize<(DEBUGFLOWSIZE-1)) debugflow[debugflowsize++]=c
+#else
+#define DEBUGFLOW(c)
+#endif
+
+/* Get periodic prints from idle loop, from clock seconds or rtimer interrupts */
+/* Use of rtimer will conflict with other rtimer interrupts such as contikimac radio cycling */
+/* STAMPS will print ENERGEST outputs if that is enabled. */
+#define PERIODICPRINTS 1
+#if PERIODICPRINTS
+//#define PINGS 64
+#define ROUTES 600
+#define STAMPS 60
+#define STACKMONITOR 1024
+uint32_t clocktime;
+#define TESTRTIMER 0
+#if TESTRTIMER
+uint8_t rtimerflag=1;
+struct rtimer rt;
+void rtimercycle(void) {rtimerflag=1;}
+#endif
+#endif
+
+//uint16_t ledtimer;
+
+/*-------------------------------------------------------------------------*/
+/*----------------------Configuration of the .elf file---------------------*/
+#if 1
+/* The proper way to set the signature is */
+#include <avr/signature.h>
+#else
+/* Older avr-gcc's may not define the needed SIGNATURE bytes. Do it manually if you get an error */
+typedef struct {const unsigned char B2;const unsigned char B1;const unsigned char B0;} __signature_t;
+#define SIGNATURE __signature_t __signature __attribute__((section (".signature")))
+SIGNATURE = {
+  .B2 = 0x02,//SIGNATURE_2, //ATMEGA256rfr2
+  .B1 = 0xA8,//SIGNATURE_1, //256KB flash
+  .B0 = 0x1E,//SIGNATURE_0, //Atmel
+};
+#endif
+
+#if 1
+/* JTAG+SPI enabled, External osc 1kck4ms1 , Boot 4096 words @ $1F000, TXC1K+4,1msec delay, Brownout 1.8 volts */
+FUSES ={.low = 0xF6, .high = 0x98, .extended = 0xfe,};
+#define BOOTLOADER_START = 0x1F000
+#else
+/* JTAG+SPI, Boot 4096 words @ $F000, Internal  oscillator, startup 6 CK +0 ms, Brownout 1.8 volts */
+FUSES ={.low = 0xC2, .high = 0x99, .extended = 0xfe,};
+#endif
+
+#include "lib/sensors.h"
+#include "dev/battery-sensor.h"
+
+
+uint8_t
+rng_get_uint8(void) {
+#if 1
+  /* Upper two RSSI reg bits (RND_VALUE) are random in rf231 */
+  uint8_t j;
+  j = (PHY_RSSI&0xc0) + ((PHY_RSSI>>2)&0x30) + ((PHY_RSSI>>4)&0x0c) + ((PHY_RSSI>>6)&0x03);
+#else
+/* Get a pseudo random number using the ADC */
+  uint8_t i,j;
+  ADCSRA=1<<ADEN;             //Enable ADC, not free running, interrupt disabled, fastest clock
+  for (i=0;i<4;i++) {
+    ADMUX = 0;                //toggle reference to increase noise
+    ADMUX =0x1E;              //Select AREF as reference, measure 1.1 volt bandgap reference.
+    ADCSRA|=1<<ADSC;          //Start conversion
+    while (ADCSRA&(1<<ADSC)); //Wait till done
+	j = (j<<2) + ADC;
+  }
+  ADCSRA=0;                   //Disable ADC
+#endif
+  PRINTD("rng issues %d\n",j);
+  return j;
+}
+
+void
+clock_delay(unsigned int howlong)
+{
+  if(howlong<2) return;
+  clock_delay_usec((45*howlong)>>4);
+}
+/*-------------------------Low level initialization------------------------*/
+/*------Done in a subroutine to keep main routine stack usage small--------*/
+void initialize(void)
+{
+  watchdog_init();
+  watchdog_start();
+
+/* The Raven implements a serial command and data interface via uart0 to a 3290p,
+ * which could be duplicated using another host computer.
+ */
+#if !RF230BB_CONF_LEDONPORTE1   //Conflicts with USART0
+#ifdef RAVEN_LCD_INTERFACE
+  rs232_init(RS232_PORT_0, USART_BAUD_38400,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
+  rs232_set_input(0,raven_lcd_serial_input);
+#else
+  /* Generic or slip connection on uart0 */
+  rs232_init(RS232_PORT_0, USART_BAUD_38400,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
+#endif
+#endif
+
+  /* Second rs232 port for debugging or slip alternative */
+//  rs232_init(RS232_PORT_1, USART_BAUD_57600,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
+  /* Redirect stdout */
+#if RF230BB_CONF_LEDONPORTE1 || defined(RAVEN_LCD_INTERFACE)
+  rs232_redirect_stdout(RS232_PORT_1);
+#else
+  rs232_redirect_stdout(RS232_PORT_0);
+#endif
+  clock_init();
+
+  if(MCUSR & (1<<PORF )) PRINTD("Power-on reset.\n");
+  if(MCUSR & (1<<EXTRF)) PRINTD("External reset!\n");
+  if(MCUSR & (1<<BORF )) PRINTD("Brownout reset!\n");
+  if(MCUSR & (1<<WDRF )) PRINTD("Watchdog reset!\n");
+  if(MCUSR & (1<<JTRF )) PRINTD("JTAG reset!\n");
+
+#if STACKMONITOR
+  /* Simple stack pointer highwater monitor. Checks for magic numbers in the main
+   * loop. In conjuction with PERIODICPRINTS, never-used stack will be printed
+   * every STACKMONITOR seconds.
+   */
+{
+extern uint16_t __bss_end;
+uint16_t p=(uint16_t)&__bss_end;
+    do {
+      *(uint16_t *)p = 0x4242;
+      p+=10;
+    } while (p<SP-10); //don't overwrite our own stack
+}
+#endif
+
+#define CONF_CALIBRATE_OSCCAL 0
+#if CONF_CALIBRATE_OSCCAL
+void calibrate_rc_osc_32k();
+{
+extern uint8_t osccal_calibrated;
+uint8_t i;
+  PRINTD("\nBefore calibration OSCCAL=%x\n",OSCCAL);
+  for (i=0;i<10;i++) { 
+    calibrate_rc_osc_32k();  
+    PRINTD("Calibrated=%x\n",osccal_calibrated);
+//#include <util/delay_basic.h>
+//#define delay_us( us )   ( _delay_loop_2(1+(us*F_CPU)/4000000UL) ) 
+//   delay_us(50000);
+ }
+   clock_init();
+}
+#endif 
+
+  PRINTA("\n*******Booting %s*******\n",CONTIKI_VERSION_STRING);
+
+/* rtimers needed for radio cycling */
+  rtimer_init();
+
+ /* Initialize process subsystem */
+  process_init();
+
+  /* etimers must be started before ctimer_init */
+  process_start(&etimer_process, NULL);
+  ctimer_init();
+
+  /* Start radio and radio receive process */
+  NETSTACK_RADIO.init();
+
+/* Get a random seed for the 802.15.4 packet sequence number.
+ * Some layers will ignore duplicates found in a history (e.g. Contikimac)
+ * causing the initial packets to be ignored after a short-cycle restart.
+ */
+  random_init(rng_get_uint8());
+
+  /* Set addresses BEFORE starting tcpip process */
+
+	linkaddr_t addr;
+
+  if (params_get_eui64(addr.u8)) {
+      PRINTA("Random EUI64 address generated\n");
+  }
+ 
+#if NETSTACK_CONF_WITH_IPV6 
+  memcpy(&uip_lladdr.addr, &addr.u8, sizeof(linkaddr_t));
+#elif WITH_NODE_ID
+  node_id=get_panaddr_from_eeprom();
+  addr.u8[1]=node_id&0xff;
+  addr.u8[0]=(node_id&0xff00)>>8;
+  PRINTA("Node ID from eeprom: %X\n",node_id);
+#endif  
+  linkaddr_set_node_addr(&addr); 
+
+  PRINTA("Panid:%x\n", params_get_panid());
+//  framer_802154_set_panid(params_get_panid());
+  rf230_set_pan_addr(params_get_panid(),params_get_panaddr(),(uint8_t *)&addr.u8);
+  rf230_set_channel(params_get_channel());
+  rf230_set_txpower(params_get_txpower());
+
+#if NETSTACK_CONF_WITH_IPV6
+  PRINTA("EUI-64 MAC: %x-%x-%x-%x-%x-%x-%x-%x\n",addr.u8[0],addr.u8[1],addr.u8[2],addr.u8[3],addr.u8[4],addr.u8[5],addr.u8[6],addr.u8[7]);
+#else
+  PRINTA("MAC address ");
+  uint8_t i;
+  for (i=sizeof(linkaddr_t); i>0; i--){
+    PRINTA("%x:",addr.u8[i-1]);
+  }
+  PRINTA("\n");
+#endif
+
+  /* Initialize stack protocols */
+  queuebuf_init();
+  NETSTACK_RDC.init();
+  NETSTACK_MAC.init();
+  NETSTACK_NETWORK.init();
+
+#if ANNOUNCE_BOOT
+  PRINTA("%s %s, channel %u , check rate %u Hz tx power %u\n",NETSTACK_MAC.name, NETSTACK_RDC.name, rf230_get_channel(),
+    CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1:NETSTACK_RDC.channel_check_interval()),
+    rf230_get_txpower());	  
+#if UIP_CONF_IPV6_RPL
+  PRINTA("RPL Enabled\n");
+#endif
+#if UIP_CONF_ROUTER
+  PRINTA("Routing Enabled\n");
+#endif
+
+#endif /* ANNOUNCE_BOOT */
+
+#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
+  process_start(&tcpip_process, NULL);
+#endif
+
+#ifdef RAVEN_LCD_INTERFACE
+  process_start(&raven_lcd_process, NULL);
+#endif
+
+  process_start(&sensors_process, NULL);
+
+  /* Autostart other processes */
+  autostart_start(autostart_processes);
+
+  /*---If using coffee file system create initial web content if necessary---*/
+#if COFFEE_FILES
+  int fa = cfs_open( "/index.html", CFS_READ);
+  if (fa<0) {     //Make some default web content
+    PRINTA("No index.html file found, creating upload.html!\n");
+    PRINTA("Formatting FLASH file system for coffee...");
+    cfs_coffee_format();
+    PRINTA("Done!\n");
+    fa = cfs_open( "/index.html", CFS_WRITE);
+    int r = cfs_write(fa, &"It works!", 9);
+    if (r<0) PRINTA("Can''t create /index.html!\n");
+    cfs_close(fa);
+//  fa = cfs_open("upload.html"), CFW_WRITE);
+// <html><body><form action="upload.html" enctype="multipart/form-data" method="post"><input name="userfile" type="file" size="50" /><input value="Upload" type="submit" /></form></body></html>
+  }
+#endif /* COFFEE_FILES */
+
+/* Add addresses for testing */
+#if 0
+{  
+  uip_ip6addr_t ipaddr;
+  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
+//  uip_ds6_prefix_add(&ipaddr,64,0);
+}
+#endif
+
+/*--------------------------Announce the configuration---------------------*/
+#if ANNOUNCE_BOOT
+#if AVR_WEBSERVER
+{ uint8_t i;
+  char buf[80];
+  unsigned int size;
+
+  for (i=0;i<UIP_DS6_ADDR_NB;i++) {
+	if (uip_ds6_if.addr_list[i].isused) {	  
+	   httpd_cgi_sprint_ip6(uip_ds6_if.addr_list[i].ipaddr,buf);
+       PRINTA("IPv6 Address: %s\n",buf);
+	}
+  }
+   cli();
+   eeprom_read_block (buf,eemem_server_name, sizeof(eemem_server_name));
+   sei();
+   buf[sizeof(eemem_server_name)]=0;
+   PRINTA("%s",buf);
+   cli();
+   eeprom_read_block (buf,eemem_domain_name, sizeof(eemem_domain_name));
+   sei();
+   buf[sizeof(eemem_domain_name)]=0;
+   size=httpd_fs_get_size();
+#ifndef COFFEE_FILES
+   PRINTA(".%s online with fixed %u byte web content\n",buf,size);
+#elif COFFEE_FILES==1
+   PRINTA(".%s online with static %u byte EEPROM file system\n",buf,size);
+#elif COFFEE_FILES==2
+   PRINTA(".%s online with dynamic %u KB EEPROM file system\n",buf,size>>10);
+#elif COFFEE_FILES==3
+   PRINTA(".%s online with static %u byte program memory file system\n",buf,size);
+#elif COFFEE_FILES==4
+   PRINTA(".%s online with dynamic %u KB program memory file system\n",buf,size>>10);
+#endif /* COFFEE_FILES */
+}
+#else
+   PRINTA("Online\n");
+#endif
+#endif /* ANNOUNCE_BOOT */
+
+#if RF230BB_CONF_LEDONPORTE1
+  /* NB: PORTE1 conflicts with UART0 */
+  DDRE|=(1<<DDE1);  //set led pin to output (Micheal Hatrtman board)
+  PORTE&=~(1<<PE1); //and low to turn led off
+#endif
+}
+
+#if ROUTES && NETSTACK_CONF_WITH_IPV6
+static void
+ipaddr_add(const uip_ipaddr_t *addr)
+{
+  uint16_t a;
+  int8_t i, f;
+  for(i = 0, f = 0; i < sizeof(uip_ipaddr_t); i += 2) {
+    a = (addr->u8[i] << 8) + addr->u8[i + 1];
+    if(a == 0 && f >= 0) {
+      if(f++ == 0) PRINTF("::");
+    } else {
+      if(f > 0) {
+        f = -1;
+      } else if(i > 0) {
+        PRINTF(":");
+      }
+      PRINTF("%x",a);
+    }
+  }
+}
+#endif
+
+/*-------------------------------------------------------------------------*/
+/*------------------------- Main Scheduler loop----------------------------*/
+/*-------------------------------------------------------------------------*/
+int
+main(void)
+{
+#if NETSTACK_CONF_WITH_IPV6
+  uip_ds6_nbr_t *nbr;
+#endif /* NETSTACK_CONF_WITH_IPV6 */	
+  initialize();
+
+  while(1) {
+    process_run();
+    watchdog_periodic();
+
+#if 0
+    /* Turn off LED after a while */
+    if (ledtimer) {
+      if (--ledtimer==0) {
+#if RF230BB_CONF_LEDONPORTE1
+        PORTE&=~(1<<PE1);
+#endif
+#if defined(RAVEN_LCD_INTERFACE)&&0
+       /* ledtimer can be set by received ping; ping the other way for testing */
+       extern void raven_ping6(void);         
+       raven_ping6();
+#endif
+      }
+    }
+#endif
+
+#if 0
+/* Various entry points for debugging in the AVR Studio simulator.
+ * Set as next statement and step into the routine.
+ */
+    NETSTACK_RADIO.send(packetbuf_hdrptr(), 42);
+    process_poll(&rf230_process);
+    packetbuf_clear();
+    len = rf230_read(packetbuf_dataptr(), PACKETBUF_SIZE);
+    packetbuf_set_datalen(42);
+    NETSTACK_RDC.input();
+#endif
+
+#if 0
+/* Clock.c can trigger a periodic PLL calibration in the RF230BB driver.
+ * This can show when that happens.
+ */
+    extern uint8_t rf230_calibrated;
+    if (rf230_calibrated) {
+      PRINTD("\nRF230 calibrated!\n");
+      rf230_calibrated=0;
+    }
+#endif
+
+/* Set DEBUGFLOWSIZE in contiki-conf.h to track path through MAC, RDC, and RADIO */
+#if DEBUGFLOWSIZE
+  if (debugflowsize) {
+    debugflow[debugflowsize]=0;
+    PRINTF("%s",debugflow);
+    debugflowsize=0;
+   }
+#endif
+
+#if PERIODICPRINTS
+#if TESTRTIMER
+/* Timeout can be increased up to 8 seconds maximum.
+ * A one second cycle is convenient for triggering the various debug printouts.
+ * The triggers are staggered to avoid printing everything at once.
+ */
+    if (rtimerflag) {
+      rtimer_set(&rt, RTIMER_NOW()+ RTIMER_ARCH_SECOND*1UL, 1,(void *) rtimercycle, NULL);
+      rtimerflag=0;
+#else
+  if (clocktime!=clock_seconds()) {
+     clocktime=clock_seconds();
+#endif
+
+#if STAMPS
+if ((clocktime%STAMPS)==0) {
+#if ENERGEST_CONF_ON
+#include "lib/print-stats.h"
+	print_stats();
+#elif RADIOSTATS
+extern volatile unsigned long radioontime;
+  PRINTF("%u(%u)s\n",clocktime,radioontime);
+#else
+  PRINTF("%us\n",clocktime);
+#endif
+
+}
+#endif
+#if TESTRTIMER
+      clocktime+=1;
+#endif
+
+#if PINGS && NETSTACK_CONF_WITH_IPV6
+extern void raven_ping6(void); 
+if ((clocktime%PINGS)==1) {
+  PRINTF("**Ping\n");
+  raven_ping6();
+}
+#endif
+
+#if ROUTES && NETSTACK_CONF_WITH_IPV6
+if ((clocktime%ROUTES)==2) {
+      
+extern uip_ds6_netif_t uip_ds6_if;
+
+  uint8_t i,j=0;
+  PRINTF("\nAddresses [%u max]\n",UIP_DS6_ADDR_NB);
+  for (i=0;i<UIP_DS6_ADDR_NB;i++) {
+    if (uip_ds6_if.addr_list[i].isused) {
+      ipaddr_add(&uip_ds6_if.addr_list[i].ipaddr);
+      PRINTF("\n");
+    }
+  }
+
+  PRINTF("\nNeighbors [%u max]\n",NBR_TABLE_MAX_NEIGHBORS);
+
+  for(nbr = nbr_table_head(ds6_neighbors);
+      nbr != NULL;
+      nbr = nbr_table_next(ds6_neighbors, nbr)) {
+    ipaddr_add(&nbr->ipaddr);
+    PRINTF("\n");
+    j=0;
+  }
+
+  if (j) PRINTF("  <none>");
+  PRINTF("\nRoutes [%u max]\n",UIP_DS6_ROUTE_NB);
+  {
+    uip_ds6_route_t *r;
+    j = 1;
+    for(r = uip_ds6_route_head();
+        r != NULL;
+        r = uip_ds6_route_next(r)) {
+      ipaddr_add(&r->ipaddr);
+      PRINTF("/%u (via ", r->length);
+      ipaddr_add(uip_ds6_route_nexthop(r));
+      PRINTF(") %lus\n", r->state.lifetime);
+      j = 0;
+    }
+  }
+  if (j) PRINTF("  <none>");
+  PRINTF("\n---------\n");
+
+}
+#endif
+
+#if STACKMONITOR
+if ((clocktime%STACKMONITOR)==3) {
+  extern uint16_t __bss_end;
+  uint16_t p=(uint16_t)&__bss_end;
+  do {
+    if (*(uint16_t *)p != 0x4242) {
+      PRINTF("Never-used stack > %d bytes\n",p-(uint16_t)&__bss_end);
+      break;
+    }
+    p+=10;
+  } while (p<RAMEND-10);
+}
+#endif
+
+    }
+#endif /* PERIODICPRINTS */
+
+#if RF230BB&&0
+extern uint8_t rf230processflag;
+    if (rf230processflag) {
+      PRINTF("rf230p%d",rf230processflag);
+      rf230processflag=0;
+    }
+#endif
+
+#if RF230BB&&0
+extern uint8_t rf230_interrupt_flag;
+    if (rf230_interrupt_flag) {
+ //   if (rf230_interrupt_flag!=11) {
+        PRINTF("**RI%u",rf230_interrupt_flag);
+ //   }
+      rf230_interrupt_flag=0;
+    }
+#endif
+  }
+  return 0;
+}
+
+/*---------------------------------------------------------------------------*/
+
+void log_message(char *m1, char *m2)
+{
+  PRINTF("%s%s\n", m1, m2);
+}
diff --git a/platform/RaspBee/dev/Arduino.h b/platform/RaspBee/dev/Arduino.h
new file mode 100644
index 000000000..e0ea47b10
--- /dev/null
+++ b/platform/RaspBee/dev/Arduino.h
@@ -0,0 +1,172 @@
+#ifndef Arduino_h
+#define Arduino_h
+
+#include <hw-arduino.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include <avr/pgmspace.h>
+#include <avr/io.h>
+#include <avr/interrupt.h>
+
+#include "binary.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#define HIGH 0x1
+#define LOW  0x0
+
+#define INPUT 0x0
+#define OUTPUT 0x1
+#define INPUT_PULLUP 0x2
+
+#define true 0x1
+#define false 0x0
+
+#define PI 3.1415926535897932384626433832795
+#define HALF_PI 1.5707963267948966192313216916398
+#define TWO_PI 6.283185307179586476925286766559
+#define DEG_TO_RAD 0.017453292519943295769236907684886
+#define RAD_TO_DEG 57.295779513082320876798154814105
+
+#define SERIAL  0x0
+#define DISPLAY 0x1
+
+#define LSBFIRST 0
+#define MSBFIRST 1
+
+#define CHANGE 1
+#define FALLING 2
+#define RISING 3
+
+#define DEFAULT  ADC_DEFAULT
+#define EXTERNAL ADC_EXTERNAL
+
+// undefine stdlib's abs if encountered
+#ifdef abs
+#undef abs
+#endif
+
+#define min(a,b) ((a)<(b)?(a):(b))
+#define max(a,b) ((a)>(b)?(a):(b))
+#define abs(x) ((x)>0?(x):-(x))
+#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
+#define round(x)     ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
+#define radians(deg) ((deg)*DEG_TO_RAD)
+#define degrees(rad) ((rad)*RAD_TO_DEG)
+#define sq(x) ((x)*(x))
+
+#define interrupts() sei()
+#define noInterrupts() cli()
+
+#define lowByte(w) ((uint8_t) ((w) & 0xff))
+#define highByte(w) ((uint8_t) ((w) >> 8))
+
+#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
+#define bitSet(value, bit) ((value) |= (1UL << (bit)))
+#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
+#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
+
+
+typedef unsigned int word;
+
+#define bit(b) (1UL << (b))
+
+typedef uint8_t boolean;
+typedef uint8_t byte;
+
+void pinMode(uint8_t, uint8_t);
+void digitalWrite(uint8_t, uint8_t);
+int digitalRead(uint8_t);
+
+unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
+
+void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
+uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
+
+void attachInterrupt(uint8_t, void (*)(void), int mode);
+void detachInterrupt(uint8_t);
+
+void setup(void);
+void loop(void);
+
+// Get the bit location within the hardware port of the given virtual pin.
+// This comes from the pins_*.c file for the active board configuration.
+
+#define analogInPinToBit(P) (P)
+
+// On the ATmega1280, the addresses of some of the port registers are
+// greater than 255, so we can't store them in uint8_t's.
+extern const uint16_t PROGMEM port_to_mode_PGM[];
+extern const uint16_t PROGMEM port_to_input_PGM[];
+extern const uint16_t PROGMEM port_to_output_PGM[];
+
+extern const uint8_t PROGMEM digital_pin_to_port_PGM[];
+// extern const uint8_t PROGMEM digital_pin_to_bit_PGM[];
+extern const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[];
+
+// Get the bit location within the hardware port of the given virtual pin.
+// This comes from the pins_*.c file for the active board configuration.
+// 
+// These perform slightly better as macros compared to inline functions
+//
+#define digitalPinToPort(P) ( pgm_read_byte( digital_pin_to_port_PGM + (P) ) )
+#define digitalPinToBitMask(P) ( pgm_read_byte( digital_pin_to_bit_mask_PGM + (P) ) )
+#define analogInPinToBit(P) (P)
+#define portOutputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_output_PGM + (P))) )
+#define portInputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_input_PGM + (P))) )
+#define portModeRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_mode_PGM + (P))) )
+
+#define NOT_A_PIN 0
+#define NOT_A_PORT 0
+
+#ifdef ARDUINO_MAIN
+#define PA 1
+#define PB 2
+#define PC 3
+#define PD 4
+#define PE 5
+#define PF 6
+#define PG 7
+#define PH 8
+#define PJ 10
+#define PK 11
+#define PL 12
+#endif
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#ifdef __cplusplus
+// look at this again when considering implementing serial
+//#include "WCharacter.h"
+//#include "WString.h"
+//#include "HardwareSerial.h"
+
+uint16_t makeWord(uint16_t w);
+uint16_t makeWord(byte h, byte l);
+
+#define word(...) makeWord(__VA_ARGS__)
+
+unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
+
+void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0);
+void noTone(uint8_t _pin);
+
+// WMath prototypes
+long random(long);
+long random(long, long);
+void randomSeed(unsigned int);
+long map(long, long, long, long, long);
+
+#endif
+
+#include "pins_arduino.h"
+
+#include "dev/arduino/arduino-compat.h"
+
+#endif
diff --git a/platform/RaspBee/dev/adc.c b/platform/RaspBee/dev/adc.c
new file mode 100644
index 000000000..7efde72e1
--- /dev/null
+++ b/platform/RaspBee/dev/adc.c
@@ -0,0 +1,84 @@
+/*
+* Copyright (c) 2012, BinaryLabs.
+* 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.
+*
+* @(#)$Id: adc.c,v 1.1 2010/08/25 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* ADC file for Atmega128rfa1.
+* \author
+* Paulo Louro <paulolouro@binarylabs.dk>
+*/
+
+#include "adc.h"
+
+static uint8_t analog_reference = ADC_DEFAULT;
+
+/*
+ * For arduino interface for setting external reference voltage
+ * Note that applying an external voltage *and* then setting the analog
+ * reference to something internal will short the internal and the
+ * external reference voltage and most likely destroy the processor.
+ */
+void analogReference(uint8_t mode)
+{
+    analog_reference = mode;
+}
+
+int readADC(uint8_t pin)
+{
+  int result = 0;
+
+  adc_setup (analog_reference, pin);
+  result = adc_read ();
+  adc_fin ();
+  return result;
+}
+
+/**
+* \return Internal temperature in 0.01C, e.g. 25C is 2500
+*/
+int readInternalTemp(void)
+{
+  int reading = 0;
+
+  ADCSRB |= _BV(MUX5);
+  ADMUX = _BV(REFS1) | _BV(REFS0) | 0b1001 ;
+  ADCSRA = _BV(ADEN) | _BV(ADPS0) | _BV(ADPS2) ;
+
+  ADCSRA |= 1 << ADSC;
+  loop_until_bit_is_clear(ADCSRA,ADSC);
+  reading = ADC;
+
+  ADCSRB=0; //disable ADC, need to write B first for MUX5 bit
+  ADCSRA=0; //disable ADC
+  ADMUX=0; //turn off internal vref
+
+  return reading * 113 - 27280;
+}
diff --git a/platform/RaspBee/dev/adc.h b/platform/RaspBee/dev/adc.h
new file mode 100644
index 000000000..e3ff516b1
--- /dev/null
+++ b/platform/RaspBee/dev/adc.h
@@ -0,0 +1,65 @@
+#ifndef __ADC_ARCH_H__
+#define __ADC_ARCH_H__
+
+#include <avr/io.h>
+
+/*
+ * Reference voltage
+ * The default is 1.6V reference voltage
+ * The selected reference voltage is the maximum voltage that can be
+ * measured.
+ * Directly provide shifted variants so we don't need to shift.
+ */
+#define ADC_1_5      (2<<6)
+#define ADC_1_6      (3<<6)
+#define ADC_1_8      (1<<6)
+#define ADC_EXTERNAL (0<<6)
+#define ADC_DEFAULT  ADC_1_6
+
+/* sometimes it's desirable to decouple setup / finish from sampling */
+
+static inline void adc_setup (uint8_t ref_volt, uint8_t pin)
+{
+  ADMUX = ref_volt | (pin & 0x7);
+  ADCSRA = _BV(ADEN) | _BV(ADPS0) | _BV(ADPS2);
+}
+
+static inline int adc_read (void)
+{
+  ADCSRA |= (1 << ADSC);
+  loop_until_bit_is_clear (ADCSRA, ADSC);
+  return ADC;
+}
+
+static inline void adc_fin (void)
+{
+    ADCSRA = 0;
+    ADMUX  = 0;
+}
+  
+static inline void adc_init (void)
+{
+    uint8_t temp;
+    ADCSRC = 0;
+    ADCSRB = 0;
+    adc_fin ();
+    /*
+     * Disable JTAG interface
+     * Hardware manual about JTD bit:
+     * "In order to avoid unintentional disabling or enabling of the
+     * JTAG interface, a timed sequence must be followed when changing
+     * this bit: The application software must write this bit to the
+     * desired value twice within four cycles to change its value."
+     * 15.4.1 "MCUCR - MCU Control Register", p. 219
+     */
+    temp = MCUCR | (1 << JTD);
+    MCUCR = temp;
+    MCUCR = temp;
+}
+
+int readADC(uint8_t pin);
+long readVcc();
+int readInternalTemp(void);
+void analogReference(uint8_t mode);
+
+#endif /* __ADC_ARCH_H__ */
diff --git a/platform/RaspBee/dev/batmon.c b/platform/RaspBee/dev/batmon.c
new file mode 100644
index 000000000..5c61d125f
--- /dev/null
+++ b/platform/RaspBee/dev/batmon.c
@@ -0,0 +1,55 @@
+#include "contiki.h"
+#include "batmon.h"
+#include <util/delay.h>
+
+
+
+
+int8_t batmon_init()
+{
+	return 0;
+}	
+
+int8_t batmon_get_voltage(uint16_t* voltage)
+{
+	uint16_t volt = 0;
+	uint16_t resolution = 75;
+	uint16_t offset = 2550;
+	int8_t ctr = 0;
+	
+	BATMON = 0 | _BV(BATMON_HR);
+	_delay_us(2);
+	
+	if(BATMON & _BV(BATMON_OK))
+	{
+		// voltage above 2.550 V
+		resolution = 75;
+		offset = 2550;
+		for(ctr=15; ctr>=0; ctr--)
+		{
+			BATMON = (BATMON & 0xF0) | (ctr);
+			_delay_us(2);
+			if(BATMON & _BV(BATMON_OK)) break;
+		}
+	}
+	else
+	{
+		// voltage below 2.550 V
+		resolution = 50;
+		offset = 1700;
+		
+		BATMON &= ~_BV(BATMON_HR);
+		
+		for(ctr=15; ctr>=0; ctr--)
+		{
+			BATMON = (BATMON & 0xF0) | (ctr);
+			_delay_us(2);
+			if(BATMON & _BV(BATMON_OK)) break;
+		}
+	}
+	
+	volt = resolution*ctr+offset;
+	*voltage=volt; 
+	
+	return 0;
+}
diff --git a/platform/RaspBee/dev/batmon.h b/platform/RaspBee/dev/batmon.h
new file mode 100644
index 000000000..c05f48200
--- /dev/null
+++ b/platform/RaspBee/dev/batmon.h
@@ -0,0 +1,8 @@
+#ifndef BATMON_H_
+#define BATMON_H_
+
+int8_t batmon_init();
+int8_t batmon_get_voltage(uint16_t* voltage);
+
+
+#endif /* BATMON_H_ */
diff --git a/platform/RaspBee/dev/battery-sensor.c b/platform/RaspBee/dev/battery-sensor.c
new file mode 100644
index 000000000..1eb7906b4
--- /dev/null
+++ b/platform/RaspBee/dev/battery-sensor.c
@@ -0,0 +1,90 @@
+/*
+* Copyright (c) 2012, BinaryLabs.
+* 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.
+*
+* @(#)$Id: battery-sensor.h,v 1.1 2012/08/25 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* Battery sensor file for Atmega128rfa1.
+* \author
+* Paulo Louro <paulolouro@binarylabs.dk>
+* Harald Pichler <harald@the-develop.net>
+*/
+
+/**
+*The atmel rf23x radios have a low voltage detector that can be configured in units of 75 millivolts. Here is example *code for the ATmega128rfa1, where the BATMON register is in extended io space [dak664]
+*/
+
+#include "dev/battery-sensor.h"
+#include "dev/batmon.h"
+
+const struct sensors_sensor battery_sensor;
+/*---------------------------------------------------------------------------*/
+
+/**
+* \return Voltage on battery measurement with BATMON register.
+*/
+static int
+value(int type)
+{
+
+  uint16_t h;
+/*
+  uint8_t p1;
+  BATMON = 16; //give BATMON time to stabilize at highest range and lowest voltage
+
+// Bandgap can't be measured against supply voltage in this chip.
+// Use BATMON register instead
+  for ( p1=16; p1<31; p1++) {
+    BATMON = p1;
+    clock_delay_usec(100); // delay needed !!
+    if ((BATMON&(1<<BATMON_OK))==0) break;
+  }
+  h=2550-75*16-75+75*p1; //-75 to take the floor of the 75 mv transition window
+*/
+  batmon_get_voltage(&h);
+  return h;
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int c)
+{
+  // No configuration needed. readADC() handles all the config needed.
+  batmon_init();
+  return type == SENSORS_ACTIVE;
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  // analog sensors are always ready
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(battery_sensor, BATTERY_SENSOR, value, configure, status);
diff --git a/platform/RaspBee/dev/battery-sensor.h b/platform/RaspBee/dev/battery-sensor.h
new file mode 100644
index 000000000..20e0c8c92
--- /dev/null
+++ b/platform/RaspBee/dev/battery-sensor.h
@@ -0,0 +1,48 @@
+/*
+* Copyright (c) 2012, BinaryLabs.
+* 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.
+*
+* @(#)$Id: battery-sensor.h,v 1.1 2012/08/25 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* Battery sensor header file for Atmega128rfa1.
+* \author
+* Paulo Louro <paulolouro@binarylabs.dk>
+*/
+
+#ifndef __BATTERY_SENSOR_H__
+#define __BATTERY_SENSOR_H__
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor battery_sensor;
+
+#define BATTERY_SENSOR "Battery"
+
+#endif /* __BATTERY_SENSOR_H__ */
\ No newline at end of file
diff --git a/platform/RaspBee/dev/binary.h b/platform/RaspBee/dev/binary.h
new file mode 100644
index 000000000..af1498033
--- /dev/null
+++ b/platform/RaspBee/dev/binary.h
@@ -0,0 +1,515 @@
+#ifndef Binary_h
+#define Binary_h
+
+#define B0 0
+#define B00 0
+#define B000 0
+#define B0000 0
+#define B00000 0
+#define B000000 0
+#define B0000000 0
+#define B00000000 0
+#define B1 1
+#define B01 1
+#define B001 1
+#define B0001 1
+#define B00001 1
+#define B000001 1
+#define B0000001 1
+#define B00000001 1
+#define B10 2
+#define B010 2
+#define B0010 2
+#define B00010 2
+#define B000010 2
+#define B0000010 2
+#define B00000010 2
+#define B11 3
+#define B011 3
+#define B0011 3
+#define B00011 3
+#define B000011 3
+#define B0000011 3
+#define B00000011 3
+#define B100 4
+#define B0100 4
+#define B00100 4
+#define B000100 4
+#define B0000100 4
+#define B00000100 4
+#define B101 5
+#define B0101 5
+#define B00101 5
+#define B000101 5
+#define B0000101 5
+#define B00000101 5
+#define B110 6
+#define B0110 6
+#define B00110 6
+#define B000110 6
+#define B0000110 6
+#define B00000110 6
+#define B111 7
+#define B0111 7
+#define B00111 7
+#define B000111 7
+#define B0000111 7
+#define B00000111 7
+#define B1000 8
+#define B01000 8
+#define B001000 8
+#define B0001000 8
+#define B00001000 8
+#define B1001 9
+#define B01001 9
+#define B001001 9
+#define B0001001 9
+#define B00001001 9
+#define B1010 10
+#define B01010 10
+#define B001010 10
+#define B0001010 10
+#define B00001010 10
+#define B1011 11
+#define B01011 11
+#define B001011 11
+#define B0001011 11
+#define B00001011 11
+#define B1100 12
+#define B01100 12
+#define B001100 12
+#define B0001100 12
+#define B00001100 12
+#define B1101 13
+#define B01101 13
+#define B001101 13
+#define B0001101 13
+#define B00001101 13
+#define B1110 14
+#define B01110 14
+#define B001110 14
+#define B0001110 14
+#define B00001110 14
+#define B1111 15
+#define B01111 15
+#define B001111 15
+#define B0001111 15
+#define B00001111 15
+#define B10000 16
+#define B010000 16
+#define B0010000 16
+#define B00010000 16
+#define B10001 17
+#define B010001 17
+#define B0010001 17
+#define B00010001 17
+#define B10010 18
+#define B010010 18
+#define B0010010 18
+#define B00010010 18
+#define B10011 19
+#define B010011 19
+#define B0010011 19
+#define B00010011 19
+#define B10100 20
+#define B010100 20
+#define B0010100 20
+#define B00010100 20
+#define B10101 21
+#define B010101 21
+#define B0010101 21
+#define B00010101 21
+#define B10110 22
+#define B010110 22
+#define B0010110 22
+#define B00010110 22
+#define B10111 23
+#define B010111 23
+#define B0010111 23
+#define B00010111 23
+#define B11000 24
+#define B011000 24
+#define B0011000 24
+#define B00011000 24
+#define B11001 25
+#define B011001 25
+#define B0011001 25
+#define B00011001 25
+#define B11010 26
+#define B011010 26
+#define B0011010 26
+#define B00011010 26
+#define B11011 27
+#define B011011 27
+#define B0011011 27
+#define B00011011 27
+#define B11100 28
+#define B011100 28
+#define B0011100 28
+#define B00011100 28
+#define B11101 29
+#define B011101 29
+#define B0011101 29
+#define B00011101 29
+#define B11110 30
+#define B011110 30
+#define B0011110 30
+#define B00011110 30
+#define B11111 31
+#define B011111 31
+#define B0011111 31
+#define B00011111 31
+#define B100000 32
+#define B0100000 32
+#define B00100000 32
+#define B100001 33
+#define B0100001 33
+#define B00100001 33
+#define B100010 34
+#define B0100010 34
+#define B00100010 34
+#define B100011 35
+#define B0100011 35
+#define B00100011 35
+#define B100100 36
+#define B0100100 36
+#define B00100100 36
+#define B100101 37
+#define B0100101 37
+#define B00100101 37
+#define B100110 38
+#define B0100110 38
+#define B00100110 38
+#define B100111 39
+#define B0100111 39
+#define B00100111 39
+#define B101000 40
+#define B0101000 40
+#define B00101000 40
+#define B101001 41
+#define B0101001 41
+#define B00101001 41
+#define B101010 42
+#define B0101010 42
+#define B00101010 42
+#define B101011 43
+#define B0101011 43
+#define B00101011 43
+#define B101100 44
+#define B0101100 44
+#define B00101100 44
+#define B101101 45
+#define B0101101 45
+#define B00101101 45
+#define B101110 46
+#define B0101110 46
+#define B00101110 46
+#define B101111 47
+#define B0101111 47
+#define B00101111 47
+#define B110000 48
+#define B0110000 48
+#define B00110000 48
+#define B110001 49
+#define B0110001 49
+#define B00110001 49
+#define B110010 50
+#define B0110010 50
+#define B00110010 50
+#define B110011 51
+#define B0110011 51
+#define B00110011 51
+#define B110100 52
+#define B0110100 52
+#define B00110100 52
+#define B110101 53
+#define B0110101 53
+#define B00110101 53
+#define B110110 54
+#define B0110110 54
+#define B00110110 54
+#define B110111 55
+#define B0110111 55
+#define B00110111 55
+#define B111000 56
+#define B0111000 56
+#define B00111000 56
+#define B111001 57
+#define B0111001 57
+#define B00111001 57
+#define B111010 58
+#define B0111010 58
+#define B00111010 58
+#define B111011 59
+#define B0111011 59
+#define B00111011 59
+#define B111100 60
+#define B0111100 60
+#define B00111100 60
+#define B111101 61
+#define B0111101 61
+#define B00111101 61
+#define B111110 62
+#define B0111110 62
+#define B00111110 62
+#define B111111 63
+#define B0111111 63
+#define B00111111 63
+#define B1000000 64
+#define B01000000 64
+#define B1000001 65
+#define B01000001 65
+#define B1000010 66
+#define B01000010 66
+#define B1000011 67
+#define B01000011 67
+#define B1000100 68
+#define B01000100 68
+#define B1000101 69
+#define B01000101 69
+#define B1000110 70
+#define B01000110 70
+#define B1000111 71
+#define B01000111 71
+#define B1001000 72
+#define B01001000 72
+#define B1001001 73
+#define B01001001 73
+#define B1001010 74
+#define B01001010 74
+#define B1001011 75
+#define B01001011 75
+#define B1001100 76
+#define B01001100 76
+#define B1001101 77
+#define B01001101 77
+#define B1001110 78
+#define B01001110 78
+#define B1001111 79
+#define B01001111 79
+#define B1010000 80
+#define B01010000 80
+#define B1010001 81
+#define B01010001 81
+#define B1010010 82
+#define B01010010 82
+#define B1010011 83
+#define B01010011 83
+#define B1010100 84
+#define B01010100 84
+#define B1010101 85
+#define B01010101 85
+#define B1010110 86
+#define B01010110 86
+#define B1010111 87
+#define B01010111 87
+#define B1011000 88
+#define B01011000 88
+#define B1011001 89
+#define B01011001 89
+#define B1011010 90
+#define B01011010 90
+#define B1011011 91
+#define B01011011 91
+#define B1011100 92
+#define B01011100 92
+#define B1011101 93
+#define B01011101 93
+#define B1011110 94
+#define B01011110 94
+#define B1011111 95
+#define B01011111 95
+#define B1100000 96
+#define B01100000 96
+#define B1100001 97
+#define B01100001 97
+#define B1100010 98
+#define B01100010 98
+#define B1100011 99
+#define B01100011 99
+#define B1100100 100
+#define B01100100 100
+#define B1100101 101
+#define B01100101 101
+#define B1100110 102
+#define B01100110 102
+#define B1100111 103
+#define B01100111 103
+#define B1101000 104
+#define B01101000 104
+#define B1101001 105
+#define B01101001 105
+#define B1101010 106
+#define B01101010 106
+#define B1101011 107
+#define B01101011 107
+#define B1101100 108
+#define B01101100 108
+#define B1101101 109
+#define B01101101 109
+#define B1101110 110
+#define B01101110 110
+#define B1101111 111
+#define B01101111 111
+#define B1110000 112
+#define B01110000 112
+#define B1110001 113
+#define B01110001 113
+#define B1110010 114
+#define B01110010 114
+#define B1110011 115
+#define B01110011 115
+#define B1110100 116
+#define B01110100 116
+#define B1110101 117
+#define B01110101 117
+#define B1110110 118
+#define B01110110 118
+#define B1110111 119
+#define B01110111 119
+#define B1111000 120
+#define B01111000 120
+#define B1111001 121
+#define B01111001 121
+#define B1111010 122
+#define B01111010 122
+#define B1111011 123
+#define B01111011 123
+#define B1111100 124
+#define B01111100 124
+#define B1111101 125
+#define B01111101 125
+#define B1111110 126
+#define B01111110 126
+#define B1111111 127
+#define B01111111 127
+#define B10000000 128
+#define B10000001 129
+#define B10000010 130
+#define B10000011 131
+#define B10000100 132
+#define B10000101 133
+#define B10000110 134
+#define B10000111 135
+#define B10001000 136
+#define B10001001 137
+#define B10001010 138
+#define B10001011 139
+#define B10001100 140
+#define B10001101 141
+#define B10001110 142
+#define B10001111 143
+#define B10010000 144
+#define B10010001 145
+#define B10010010 146
+#define B10010011 147
+#define B10010100 148
+#define B10010101 149
+#define B10010110 150
+#define B10010111 151
+#define B10011000 152
+#define B10011001 153
+#define B10011010 154
+#define B10011011 155
+#define B10011100 156
+#define B10011101 157
+#define B10011110 158
+#define B10011111 159
+#define B10100000 160
+#define B10100001 161
+#define B10100010 162
+#define B10100011 163
+#define B10100100 164
+#define B10100101 165
+#define B10100110 166
+#define B10100111 167
+#define B10101000 168
+#define B10101001 169
+#define B10101010 170
+#define B10101011 171
+#define B10101100 172
+#define B10101101 173
+#define B10101110 174
+#define B10101111 175
+#define B10110000 176
+#define B10110001 177
+#define B10110010 178
+#define B10110011 179
+#define B10110100 180
+#define B10110101 181
+#define B10110110 182
+#define B10110111 183
+#define B10111000 184
+#define B10111001 185
+#define B10111010 186
+#define B10111011 187
+#define B10111100 188
+#define B10111101 189
+#define B10111110 190
+#define B10111111 191
+#define B11000000 192
+#define B11000001 193
+#define B11000010 194
+#define B11000011 195
+#define B11000100 196
+#define B11000101 197
+#define B11000110 198
+#define B11000111 199
+#define B11001000 200
+#define B11001001 201
+#define B11001010 202
+#define B11001011 203
+#define B11001100 204
+#define B11001101 205
+#define B11001110 206
+#define B11001111 207
+#define B11010000 208
+#define B11010001 209
+#define B11010010 210
+#define B11010011 211
+#define B11010100 212
+#define B11010101 213
+#define B11010110 214
+#define B11010111 215
+#define B11011000 216
+#define B11011001 217
+#define B11011010 218
+#define B11011011 219
+#define B11011100 220
+#define B11011101 221
+#define B11011110 222
+#define B11011111 223
+#define B11100000 224
+#define B11100001 225
+#define B11100010 226
+#define B11100011 227
+#define B11100100 228
+#define B11100101 229
+#define B11100110 230
+#define B11100111 231
+#define B11101000 232
+#define B11101001 233
+#define B11101010 234
+#define B11101011 235
+#define B11101100 236
+#define B11101101 237
+#define B11101110 238
+#define B11101111 239
+#define B11110000 240
+#define B11110001 241
+#define B11110010 242
+#define B11110011 243
+#define B11110100 244
+#define B11110101 245
+#define B11110110 246
+#define B11110111 247
+#define B11111000 248
+#define B11111001 249
+#define B11111010 250
+#define B11111011 251
+#define B11111100 252
+#define B11111101 253
+#define B11111110 254
+#define B11111111 255
+
+#endif
diff --git a/platform/RaspBee/dev/button-sensor.c b/platform/RaspBee/dev/button-sensor.c
new file mode 100644
index 000000000..b402a3658
--- /dev/null
+++ b/platform/RaspBee/dev/button-sensor.c
@@ -0,0 +1,87 @@
+/* Sensor routine */
+
+#include "lib/sensors.h"
+#include "dev/button-sensor.h"
+
+#include <avr/interrupt.h>
+#include <avr/io.h>
+#include "led.h" // debug
+
+const struct sensors_sensor button_sensor;
+
+static struct timer debouncetimer;
+static int status(int type);
+static int enabled = 0;
+struct sensors_sensor *sensors[1];
+unsigned char sensors_flags[1];
+
+#define BUTTON_BIT INTF4
+#define BUTTON_CHECK_IRQ() (EIFR & BUTTON_BIT) ? 0 : 1
+
+#define PRINTF(...) printf(__VA_ARGS__)
+/*---------------------------------------------------------------------------*/
+ISR(INT4_vect)
+{
+
+//  leds_toggle(LEDS_RED);
+  
+  if(BUTTON_CHECK_IRQ()) {
+    if(timer_expired(&debouncetimer)) {
+      led1_on();
+      timer_set(&debouncetimer, CLOCK_SECOND / 4);
+      sensors_changed(&button_sensor);
+      led1_off();
+    }
+  }
+
+}
+/*---------------------------------------------------------------------------*/
+
+static int
+value(int type)
+{
+ return (PINE & _BV(PE4) ? 0 : 1) || !timer_expired(&debouncetimer);
+
+ //return 0;
+}
+
+static int
+configure(int type, int c)
+{
+	switch (type) {
+	case SENSORS_ACTIVE:
+		if (c) {
+			if(!status(SENSORS_ACTIVE)) {
+    led1_on();
+				timer_set(&debouncetimer, 0);
+				DDRE |= (0<<DDRE4); // Set pin as input
+				PORTE |= (1<<PORTE4); // Set port PORTE bint 5 with pullup resistor
+				EICRB |= (1<<ISC40); // For falling edge
+				EIMSK |= (1<<INT4); // Set int
+				enabled = 1;
+				sei();
+    led1_off();
+			}
+		} else {
+				enabled = 0;
+				EIMSK &= ~(1<<INT4); // clear int
+		}
+		return 1;
+	}
+	return 0;
+}
+
+static int
+status(int type)
+{
+	switch (type) {
+	case SENSORS_ACTIVE:
+	case SENSORS_READY:
+		return enabled;//(EIMSK & (1<<INT5) ? 0 : 1);//BUTTON_IRQ_ENABLED();
+	}
+	return 0;
+}
+
+SENSORS_SENSOR(button_sensor, BUTTON_SENSOR,
+	       value, configure, status);
+
diff --git a/platform/RaspBee/dev/dht11.c b/platform/RaspBee/dev/dht11.c
new file mode 100644
index 000000000..39e1a7701
--- /dev/null
+++ b/platform/RaspBee/dev/dht11.c
@@ -0,0 +1,125 @@
+/*
+ DHT-11 Library
+ (c) Created by Charalampos Andrianakis on 18/12/11.
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
+
+#include <avr/io.h>
+#include "contiki.h"
+#include "dht11.h"
+#include "led.h" // debug
+
+#define udelay(u) clock_delay_usec(u)
+#define mdelay(u) clock_delay_msec(u)
+
+// todo: set DHT22 or DHT11 in project file
+// define for DHT11 else for DHT22, RHT03 
+//   #define DHT11	1
+
+uint8_t DHT_Read_Data(uint16_t *temperature, uint16_t *humidity){
+
+    //data[5] is 8byte table where data come from DHT are stored
+    //laststate holds laststate value
+    //counter is used to count microSeconds
+    uint8_t data[5], laststate = 0, counter = 0, j = 0, i = 0;
+    
+    //Clear array
+    data[0] = data[1] = data[2] = data[3] = data[4] = 0;
+
+    uint8_t volatile sreg;
+    sreg = SREG;    /* Save status register before disabling interrupts. */
+    cli();          /* Disable interrupts. */
+
+    //Set pin Output
+    //Pin High
+    DHT_DRIVE();
+    mdelay(100);                     //Wait for 100mS
+    
+    //Send Request Signal
+    //Pin Low
+    OUTP_0();                      //20ms Low 
+    mdelay(20);
+    //Pin High
+    OUTP_1();
+    udelay(40);                      //40us High
+    
+    //Set pin Input to read Bus
+    //Set pin Input
+    DHT_RELEASE();
+    laststate=DHT_INP();             //Read Pin value
+    
+    //Repeat for each Transistions
+    for (i=0; i<MAXTIMINGS; i++) {
+        //While state is the same count microseconds
+   //led1_on();
+   //led1_off();
+ 
+       while (laststate==DHT_INP()) {
+            udelay(1);
+            counter++;
+            if (counter>254) break;
+        }
+
+        if (counter>254) break;
+        
+        //laststate==_BV(DHT_PIN) checks if laststate was High
+        //ignore the first 2 transitions which are the DHT Response
+        //if (laststate==_BV(DHT_PIN) && (i > 2)) {
+        if ((i&0x01) && (i > 2)) {
+            //Save bits in segments of bytes
+            //Shift data[] value 1 position left
+            //Example. 01010100 if we shift it left one time it will be
+            //10101000
+ 
+            data[j/8]<<=1;
+            if (counter >= 15) {    //If it was high for more than 40uS
+   //led1_on();
+                data[j/8]|=1;       //it means it is bit '1' so make a logic
+   //led1_off();
+            }                       //OR with the value (save it)
+            j++;                    //making an OR by 1 to this value 10101000
+        }                           //we will have the resault 10101001
+                                    //1 in 8-bit binary is 00000001
+        //j/8 changes table record every 8 bits which means a byte has been saved
+        //so change to next record. 0/8=0 1/8=0 ... 7/8=0 8/8=1 ... 15/8=1 16/8=2
+        laststate=DHT_INP();     //save current state
+        counter=0;                  //reset counter
+        
+    }
+    SREG = sreg;    /* Enable interrupts. */
+    //printf("HUM %d %d %d %d %d %d",data[0],data[1],data[2],data[3],data[4],(uint8_t)(data[0] + data[1] + data[2] + data[3]) );
+    //Check if data received are correct by checking the CheckSum
+    if ((uint8_t)(data[0] + data[1] + data[2] + data[3]) == data[4]) {
+#ifdef DHT11
+        *humidity = data[0]*100;
+        *temperature = data[2]*100;
+#else
+        *humidity = ((uint16_t)data[0]<<8 | data[1])*10;
+        *temperature = ((uint16_t)data[2]<<8 | data[3])*10;
+#endif
+        return 0;
+    }else{
+        *humidity = 2;
+        *temperature = 2;
+//        uart_puts("\r\nCheck Sum Error");
+    }
+ 
+     return 0xff;  // Check Sum Error
+}
diff --git a/platform/RaspBee/dev/dht11.h b/platform/RaspBee/dev/dht11.h
new file mode 100644
index 000000000..6cf757e5d
--- /dev/null
+++ b/platform/RaspBee/dev/dht11.h
@@ -0,0 +1,67 @@
+/*
+ DHT-11 Library
+ (c) Created by Charalampos Andrianakis on 18/12/11.
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <avr/io.h>
+#include <util/delay.h>
+
+/* DHT 1-wire is at PortE.6 */
+#define DHT_PIN_READ PINE
+#define DHT_PIN_MASK _BV(PE6)
+#define DHT_PxOUT PORTE
+#define DHT_PxDIR DDRE
+
+#define SET_PIN_INPUT() (DHT_PxDIR &= ~DHT_PIN_MASK)
+#define SET_PIN_OUTPUT() (DHT_PxDIR |= DHT_PIN_MASK)
+
+#define OUTP_0() (DHT_PxOUT &= ~DHT_PIN_MASK)
+#define OUTP_1() (DHT_PxOUT |= DHT_PIN_MASK) 
+
+#define PIN_INIT() do{  \
+                     SET_PIN_INPUT();    \
+                     OUTP_0();           \
+                   } while(0)
+
+
+/* Drive the one wire interface hight */
+#define DHT_DRIVE() do {                    \
+                     SET_PIN_OUTPUT();     \
+                     OUTP_1();             \
+                   } while (0)
+
+/* Release the one wire by turning on the internal pull-up. */
+#define DHT_RELEASE() do {                  \
+                       SET_PIN_INPUT();    \
+                       OUTP_1();           \
+                     } while (0)
+
+/* Read one bit. */
+#define DHT_INP()  (DHT_PIN_READ & DHT_PIN_MASK)
+
+//The packet size is 40bit but each bit consists of low and high state
+//so 40 x 2 = 80 transitions. Also we have 2 transistions DHT response
+//and 2 transitions which indicates End Of Frame. In total 84
+#define MAXTIMINGS  84
+
+//This is the main function which requests and reads the packet
+uint8_t DHT_Read_Data(uint16_t *temperature, uint16_t *humidity);
diff --git a/platform/RaspBee/dev/ds1820.c b/platform/RaspBee/dev/ds1820.c
new file mode 100644
index 000000000..9de3fc8a9
--- /dev/null
+++ b/platform/RaspBee/dev/ds1820.c
@@ -0,0 +1,291 @@
+/*
+ * Copyright (c) 2005, 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.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ * @(#)$Id: ds1820.c,v 1.5 2010/08/25 18:35:52 nifi Exp $
+ */
+/*
+ * Device driver for the Dallas Semiconductor DS1820 chip. Heavily
+ * based on the application note 126 "1-Wire Communications Through
+ * Software".
+ *
+ * http://www.maxim-ic.com/appnotes.cfm/appnote_number/126
+ */
+
+/*
+ * For now we stuff in Moteiv Corporation's unique OUI.
+ * From http://www.ethereal.com/distribution/manuf.txt:
+ * 00:12:75    Moteiv    # Moteiv Corporation
+ *
+ * The EUI-64 is a concatenation of the 24-bit OUI value assigned by
+ * the IEEE Registration Authority and a 40-bit extension identifier
+ * assigned by the organization with that OUI assignment.
+ */
+
+#include <avr/io.h>
+#include <string.h>
+#include "contiki.h"
+#include "ds1820.h"
+
+
+unsigned char ds1820_id[8];
+unsigned char ds1820_ok[8];
+
+/* 1-wire is at PortE.3 */
+#define SERIAL_ID_PIN_READ PINE
+//#define SERIAL_ID_PIN_MASK _BV(PE3)
+#define SERIAL_ID_PIN_MASK _BV(PE4)
+#define SERIAL_ID_PxOUT PORTE
+#define SERIAL_ID_PxDIR DDRE
+
+#define SET_PIN_INPUT() (SERIAL_ID_PxDIR &= ~SERIAL_ID_PIN_MASK)
+#define SET_PIN_OUTPUT() (SERIAL_ID_PxDIR |= SERIAL_ID_PIN_MASK)
+
+#define OUTP_0() (SERIAL_ID_PxOUT &= ~SERIAL_ID_PIN_MASK)
+#define OUTP_1() (SERIAL_ID_PxOUT |= SERIAL_ID_PIN_MASK) 
+
+#define PIN_INIT() do{  \
+                     SET_PIN_INPUT();    \
+                     OUTP_0();           \
+                   } while(0)
+
+
+/* Drive the one wire interface low */
+#define OW_DRIVE() do {                    \
+                     SET_PIN_OUTPUT();     \
+                     OUTP_0();             \
+                   } while (0)
+
+/* Release the one wire by turning on the internal pull-up. */
+#define OW_RELEASE() do {                  \
+                       SET_PIN_INPUT();    \
+                       OUTP_1();           \
+                     } while (0)
+
+/* Read one bit. */
+#define INP()  (SERIAL_ID_PIN_READ & SERIAL_ID_PIN_MASK)
+
+
+/*
+ * Delay times in us.
+ */
+#define tA 6          /* min-5, recommended-6, max-15 */              
+#define tB 64         /* min-59, recommended-64, max-N/A */
+#define tC 60         /* min-60, recommended-60, max-120 */			
+#define tD 10         /* min-5.3, recommended-10, max-N/A */
+#define tE 9          /* min-0.3, recommended-9, max-9.3 */
+#define tF 55         /* min-50, recommended-55, max-N/A */
+#define tG 0          /* min-0, recommended-0, max-0 */
+#define tH 480        /* min-480, recommended-480, max-640 */
+#define tI 70         /* min-60.3, recommended-70, max-75.3 */
+#define tJ 410        /* min-410, recommended-410, max-N/A */
+/*---------------------------------------------------------------------------*/
+#define udelay(u) clock_delay_usec(u)
+/*---------------------------------------------------------------------------*/
+
+static int
+owreset(void)
+{
+  int result;
+
+  OW_DRIVE();
+  udelay(tH);     /* 480 < tH < 640 */
+  OW_RELEASE();    /* Releases the bus */
+  udelay(tI);
+  result = INP();
+  udelay(tJ);
+  return result;
+}
+/*---------------------------------------------------------------------------*/
+static void
+owwriteb(unsigned byte)
+{
+  int i = 7;
+
+  do {
+    if(byte & 0x01) {
+      OW_DRIVE();
+      udelay(tA);
+      OW_RELEASE();    /* Releases the bus */
+      udelay(tB);
+    } else {
+      OW_DRIVE();
+      udelay(tC);
+      OW_RELEASE();    /* Releases the bus */
+      udelay(tD);
+    }
+    if(i == 0) {
+      return;
+    }
+    i--;
+    byte >>= 1;
+  } while(1);
+}
+/*---------------------------------------------------------------------------*/
+static unsigned
+owreadb(void)
+{
+  unsigned result = 0;
+  int i = 7;
+
+  do {
+    OW_DRIVE();
+    udelay(tA);
+    OW_RELEASE();	/* Releases the bus */
+    udelay(tE);
+    if (INP()){
+      result |= 0x80;	/* LSbit first */
+    }
+    udelay(tF);
+    if(i == 0) {
+      return result;
+    }
+    i--;
+    result >>= 1;
+  } while(1);
+}
+/*---------------------------------------------------------------------------*/
+/* Polynomial ^8 + ^5 + ^4 + 1 */
+static unsigned
+crc8_add(unsigned acc, unsigned byte)
+{
+  int i;
+  acc ^= byte;
+  for(i = 0; i < 8; i++) {
+    if(acc & 1) {
+      acc = (acc >> 1) ^ 0x8c;
+    } else {
+      acc >>= 1;
+    }
+  }
+  return acc;
+}
+/*---------------------------------------------------------------------------*/
+int
+ds1820_init()
+{
+  int i;
+  unsigned family, crc, acc;
+
+  PIN_INIT();
+
+  if(owreset() == 0) {	/* Something pulled down 1-wire. */
+
+    owwriteb(0x33);		/* Read ROM command. */
+    family = owreadb();
+    /* We receive 6 bytes in the reverse order, LSbyte first. */
+    for(i = 7; i >= 2; i--) {
+      ds1820_id[i] = owreadb();
+    }
+    crc = owreadb();
+
+    /* Verify family DS1820 and that CRC match. */
+    if(family != 0x10) {
+      goto fail;
+    }
+    acc = crc8_add(0x0, family);
+    for(i = 7; i >= 2; i--) {
+      acc = crc8_add(acc, ds1820_id[i]);
+    }
+    if(acc == crc) {
+      ds1820_id[0] = 0x00;
+      ds1820_id[1] = 0x00;
+      ds1820_id[2] = 0x00;
+      return 1;			/* Success! */
+    }
+  } else {
+  }
+
+
+ fail:
+  memset(ds1820_id, 0x0, sizeof(ds1820_id));
+  return 0;			/* Fail! */
+}
+/*---------------------------------------------------------------------------*/
+int
+ds1820_temp()
+{
+    ds1820_convert();
+// wait max 750ms pin lo
+    clock_wait(CLOCK_SECOND);
+    ds1820_read();
+    return 1;
+}
+
+int
+ds1820_convert()
+{
+  unsigned i;
+
+  PIN_INIT();
+  for(i=0;i<3;i++){
+  if(owreset() == 0) {	/* Something pulled down 1-wire. */
+    owwriteb(0xCC);		/* Skip ROM command. */
+    owwriteb(0x44);		/* Convert T command. */
+    OW_RELEASE();    /* Releases the bus */
+    return 1;
+  } else {
+  }
+  }
+  return 0;			/* Fail! */
+}
+/*---------------------------------------------------------------------------*/
+int
+ds1820_read()
+{
+  int i;
+  unsigned crc, acc;
+
+  if(owreset() == 0) {	/* Something pulled down 1-wire. */
+    owwriteb(0xCC);		/* Skip ROM command. */
+    owwriteb(0xBE);		/* Read Scratchpad command. */
+    /* We receive 8 bytes in the reverse order, LSbyte first. */
+    for(i = 0; i < 8; i++) {
+      ds1820_id[i] = owreadb();
+    }
+      crc = owreadb();
+
+    acc=0;
+    for(i = 0; i < 8; i++) {
+      acc = crc8_add(acc, ds1820_id[i]);
+    }
+    if(acc == crc) {
+      // store temp
+      for(i = 0; i < 8; i++) {
+         ds1820_ok[i]=ds1820_id[i];
+      }
+      return 1;			/* Success! */
+    } else {
+        return 0;			/* Fail! */
+    }
+  } else {
+    return 0;			/* Fail! */
+  }
+  return 1;			/* Fail! */
+}
diff --git a/platform/RaspBee/dev/ds1820.h b/platform/RaspBee/dev/ds1820.h
new file mode 100644
index 000000000..e4178d63e
--- /dev/null
+++ b/platform/RaspBee/dev/ds1820.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2005, 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.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ * @(#)$Id: ds1820.h,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $
+ */
+/* -*- C -*- */
+/* @(#)$Id: ds1820.h,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $ */
+
+#ifndef DS1820_H
+#define DS1820_H
+
+extern unsigned char ds1820_id[8];
+extern unsigned char ds1820_ok[8];
+extern int ds1820_init();
+extern int ds1820_convert();
+extern int ds1820_read();
+extern int ds1820_temp();
+#endif /* DS1820_H */
diff --git a/platform/RaspBee/dev/hw-arduino.h b/platform/RaspBee/dev/hw-arduino.h
new file mode 100644
index 000000000..bcd626ec6
--- /dev/null
+++ b/platform/RaspBee/dev/hw-arduino.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2014, Ralf Schlatterbeck Open Source Consulting
+ * 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.
+ */
+
+/**
+ * \defgroup compatibility Arduino - Contiki
+ *
+ * This defines contiki-compatible hardware definitions for running
+ * arduino sketches (or just to call arduino-compatible function). 
+ * For now only for osd hardware, a similar file should exist for each
+ * arduino-compatible hardware.
+ *
+ * @{
+ */
+
+/**
+ * \file
+ *        Header file for arduino compatibility
+ * \author
+ *        Ralf Schlatterbeck <rsc@runtux.com>
+ *
+ */
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#include "contiki.h"
+
+/*
+ * The OSD hardware only supports timer 3 for PWM, timer 2 is used by
+ * contiki for sleep/wakeup timing and is not usable for PWM.
+ */
+#define digitalPinToTimer(pin)                \
+    ( (pin) == 2                              \
+    ? TIMER3A                                 \
+    : ( (pin) == 3                            \
+      ? TIMER3B                               \
+      : ((pin == 4) ? TIMER3C : NOT_ON_TIMER) \
+      )                                       \
+    )
+
+/* Only init timer 3 with phase correct pwm 8-bit and prescaler 64 */
+#define arduino_pwm_timer_init() \
+  (hwtimer_ini (3, HWT_WGM_PWM_PHASE_8_BIT, HWT_CLOCK_PRESCALER_64, 0))
+
+/*
+ * VI settings, see coding style
+ * ex:ts=8:et:sw=2
+ */
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+/** @} */
diff --git a/platform/RaspBee/dev/i2c.c b/platform/RaspBee/dev/i2c.c
new file mode 100644
index 000000000..0fa295849
--- /dev/null
+++ b/platform/RaspBee/dev/i2c.c
@@ -0,0 +1,391 @@
+/*
+ * Copyright (c) 2014, Ingo Gulyas Intembsys
+ * 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
+ *         I2C driver for ATMEGA128rfa1
+ *
+ * \author
+ *         Ingo Gulyas Intembsys
+ *         office@intembsys.at
+ *         www.intembsys.at
+ */
+
+
+#include "i2c.h"
+#include "contiki-conf.h"
+#include <stdint.h>
+#include <avr/power.h>
+#include <stdbool.h>
+#include <stddef.h>
+
+#if I2C_TD != 0
+#include <stdio.h>
+#include <avr/pgmspace.h>
+#include "system_mgmt.h"
+#define PRINTD(FORMAT,args...) {sleep_acquire_lock(); printf_P(PSTR(FORMAT),##args); sleep_release_lock();}
+#else
+#define PRINTD(...)
+#endif
+
+#if WITH_RTDEBUG == 1
+#include "rtdebug.h"
+#define RTDEBUG_PUSH(x) rtdebug_push(x)
+#else
+#warning "I2C Driver compiling without RTDEBUG!"
+#define RTDEBUG_PUSH(x)
+#endif
+
+#ifndef TIMEOUT_TIMER
+#warning "I2C Driver compiling without TIMEOUT!"
+#endif
+
+
+static int8_t wait_job();
+static int8_t wait_stop();
+
+static int8_t i2c_ioctl(const i2c_driver* const me, uint8_t cmd, uint8_t arg);
+static int8_t i2c_read(const i2c_driver* const me, uint8_t cmd_flags, uint8_t* buffer, uint8_t len);
+static int8_t i2c_write(const i2c_driver* const me, uint8_t cmd_flags, const uint8_t* data, uint8_t len);
+
+
+// static linkage of member functions
+i2c_driver i2c_drv = {i2c_ioctl, i2c_read, i2c_write};
+// lock spi if driver opened to prevent further opening access
+static volatile bool i2c_lock = false;
+
+
+///////////////////////////////////////////////////////////////
+// global functions
+///////////////////////////////////////////////////////////////
+
+i2c_driver* i2c_open(void)
+{
+	if(i2c_lock == true)
+	{
+		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_OPEN__DEVICE_BUSY);
+		return NULL;
+	}	
+	 
+	i2c_lock = true;
+	power_twi_enable();
+	I2C_INIT();	
+
+	TWBR = I2C_FREQ_STANDARD;
+	TWSR &= ~((1<<TWPS1) | (1<<TWPS0));
+	TWSR |= (1<<TWPS0);
+	TWCR = (1<<TWEN);
+	
+	return &i2c_drv;
+}
+
+void i2c_close(i2c_driver* const me)
+{
+	if(me == NULL || i2c_lock == false)
+	{
+		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_CLOSE__NO_DEVICE);
+		return;
+	}
+	
+	i2c_reset();
+	
+	return;
+}
+
+void i2c_reset(void)
+{
+	TWCR &= ~(1<<TWEN);
+	I2C_DEINIT();
+	power_twi_disable();
+	i2c_lock = false;
+	
+	return;
+}
+
+
+///////////////////////////////////////////////////////////////
+// local helper functions
+///////////////////////////////////////////////////////////////
+
+#ifdef TIMEOUT_TIMER
+	static int8_t wait_job()
+	{
+		int8_t status = I2C_OK;	
+		uint16_t timeout = TIMEOUT_TIMER_NOW_ADD(I2C_TIMEOUT);
+	
+
+		while (!(TWCR & (1<<TWINT)))
+		{
+			if(!(TIMEOUT_TIMER_LT(TIMEOUT_TIMER_NOW(), timeout)))
+			{
+				status = I2C_ERROR_TIMEOUT;
+				break;
+			}	
+		}
+	
+		return status;
+	}
+	
+	static int8_t wait_stop()
+	{
+		int8_t status = I2C_OK;	
+		uint16_t timeout = TIMEOUT_TIMER_NOW_ADD(I2C_TIMEOUT);
+	
+
+		while (TWCR & (1<<TWSTO))
+		{
+			if(!(TIMEOUT_TIMER_LT(TIMEOUT_TIMER_NOW(), timeout)))
+			{
+				status = I2C_ERROR_TIMEOUT;
+				break;
+			}	
+		}
+	
+		return status;
+	}
+#else
+	static int8_t wait_job()
+	{
+		while (!(TWCR & (1<<TWINT)));
+		return I2C_OK;
+	}
+	
+	static int8_t wait_stop()
+	{
+		while (TWCR & (1<<TWSTO));
+		return I2C_OK;
+	}
+#endif
+
+
+///////////////////////////////////////////////////////////////
+// member functions
+///////////////////////////////////////////////////////////////
+
+static int8_t i2c_ioctl(const i2c_driver* const me, uint8_t cmd, uint8_t arg)
+{
+	if(me == NULL || i2c_lock == false)
+	{
+		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_IOCTL__DEVICE_CLOSED);
+		return I2C_ERROR_DRIVER;
+	}
+		
+	if(cmd == I2C_IOCTL_CMD_SET_FREQ)
+	{
+		switch(arg)
+		{
+			case I2C_FREQ_400KHZ:	TWBR = I2C_FREQ_400KHZ; break;
+			case I2C_FREQ_250KHZ:	TWBR = I2C_FREQ_250KHZ; break;
+			case I2C_FREQ_100KHZ:	TWBR = I2C_FREQ_100KHZ; break;
+			case I2C_FREQ_50KHZ:	TWBR = I2C_FREQ_50KHZ; break;
+			case I2C_FREQ_10KHZ:	TWBR = I2C_FREQ_10KHZ; break;
+			default:
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_IOCTL__ARG_INVALID);
+				return I2C_ERROR_DRIVER;
+			}			
+		}
+	}
+	else
+	{
+		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_IOCTL__CMD_INVALID);
+		return I2C_ERROR_DRIVER;
+	}
+	
+	return I2C_OK;
+}
+
+static int8_t i2c_read(const i2c_driver* const me, uint8_t cmd_flags, uint8_t* buffer, uint8_t len)
+{
+	uint8_t i = 0;
+	int8_t status = I2C_OK;
+	
+	
+	if(me == NULL || i2c_lock == false)
+	{
+		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__DEVICE_CLOSED);
+		return I2C_ERROR_DRIVER;
+	}	
+	
+	if((len > 0) && (buffer == NULL))
+	{
+		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__ERROR_NULLPOINTER);
+		return I2C_ERROR_DRIVER;
+	}
+	
+	do 
+	{
+		if(cmd_flags & I2C_CMD_FLAG_START)
+		{
+			I2C_START();
+			if(wait_job() != I2C_OK)
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__START_TIMEOUT);
+				status = I2C_ERROR_TIMEOUT;
+				break;
+			}
+			if((I2C_STATUS() != I2C_STATUS_START) && (I2C_STATUS() != I2C_STATUS_START_REP))
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__START_ERROR);
+				status = I2C_ERROR_START;
+				break;
+			}
+			PRINTD("I2C-RD-START\n");
+		}
+		
+		if(len == 0) break;
+		
+		for(i=0; i<(len-1); i++)
+		{
+			I2C_READ_BYTE_ACK();
+			if(wait_job() != I2C_OK)
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__READ_BYTE_ACK_TIMEOUT);
+				status = I2C_ERROR_TIMEOUT;
+				break;
+			}
+			if(I2C_STATUS() != I2C_STATUS_DATAR_ACK)
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__READ_BYTE_ACK_ERROR);
+				status = I2C_ERROR_READ;
+				break;
+			}
+			buffer[i] = I2C_RX_REG;
+			PRINTD("I2C-RD-RACK: 0x%02X\n", buffer[i]);
+		}
+		
+		I2C_READ_BYTE_NACK();
+		if(wait_job() != I2C_OK)
+		{
+			RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__READ_BYTE_NACK_TIMEOUT);
+			status = I2C_ERROR_TIMEOUT;
+			break;
+		}
+		if(I2C_STATUS() != I2C_STATUS_DATAR_NACK)
+		{
+			RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__READ_BYTE_NACK_ERROR);
+			status = I2C_ERROR_READ;
+			break;
+		}
+		buffer[i] = I2C_RX_REG;
+		PRINTD("I2C-RD-RNACK: 0x%02X\n", buffer[i]);
+		
+	} while (0);
+	
+	if(cmd_flags & I2C_CMD_FLAG_STOP)
+	{
+		I2C_STOP();
+		if(wait_stop() != I2C_OK)
+		{
+			RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__STOP_TIMEOUT);
+			status = I2C_ERROR_TIMEOUT;
+		}
+		PRINTD("I2C-RD_STOP\n");
+	}
+	
+	return status;
+}
+
+static int8_t i2c_write(const i2c_driver* const me, uint8_t cmd_flags, const uint8_t* data, uint8_t len)
+{
+	uint8_t i = 0;
+	int8_t status = I2C_OK;
+	
+	
+	if(me == NULL || i2c_lock == false)
+	{
+		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__DEVICE_CLOSED);
+		return I2C_ERROR_DRIVER;
+	}
+	
+	if((len > 0) && (data == NULL))
+	{
+		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__ERROR_NULLPOINTER);
+		return I2C_ERROR_DRIVER;
+	}
+	
+	do 
+	{		
+		if(cmd_flags & I2C_CMD_FLAG_START)
+		{
+			I2C_START();
+			if(wait_job() != I2C_OK)
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__START_TIMEOUT);
+				status = I2C_ERROR_TIMEOUT;
+				break;
+			}
+			if((I2C_STATUS() != I2C_STATUS_START) && (I2C_STATUS() != I2C_STATUS_START_REP))
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__START_ERROR);
+				status = I2C_ERROR_START;
+				break;
+			}
+			PRINTD("I2C-WR-START\n");
+		}
+		
+		
+	
+		for(i=0; i<len; i++)
+		{
+			I2C_TX_REG = data[i];
+			I2C_WRITE_BYTE();
+			if(wait_job() != I2C_OK)
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__WRITE_BYTE_TIMEOUT);
+				status = I2C_ERROR_TIMEOUT;
+				break;
+			}
+			if((I2C_STATUS() != I2C_STATUS_DATAW_ACK) && (I2C_STATUS() != I2C_STATUS_SLAW_ACK) && (I2C_STATUS() != I2C_STATUS_SLAR_ACK))
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__WRITE_BYTE_ERROR);
+				status = I2C_ERROR_WRITE;
+				break;
+			}
+			PRINTD("I2C-WR-BYTE: 0x%02X\n", data[i]);
+		}
+
+	} while (0);
+	
+	if(cmd_flags & I2C_CMD_FLAG_STOP)
+	{
+		I2C_STOP();
+		if(wait_stop() != I2C_OK)
+		{
+			RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__STOP_TIMEOUT);
+			status = I2C_ERROR_TIMEOUT;
+		}
+		PRINTD("I2C-WR-STOP\n");
+	}
+	
+	return status;
+}
diff --git a/platform/RaspBee/dev/i2c.h b/platform/RaspBee/dev/i2c.h
new file mode 100644
index 000000000..bed70fc0a
--- /dev/null
+++ b/platform/RaspBee/dev/i2c.h
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2014, Ingo Gulyas Intembsys
+ * 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
+ *         I2C driver for ATMEGA128rfa1
+ *
+ * \author
+ *         Ingo Gulyas Intembsys
+ *         office@intembsys.at
+ *         www.intembsys.at
+ */
+ 
+
+#ifndef I2C_H_
+#define I2C_H_
+
+
+#include <stdint.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////
+// CONFIGURATION SECTION:
+
+#define I2C_TD          0			// compiler switch: i2c testdriver code
+
+#define I2C_PORT            PORTD
+#define I2C_DDR             DDRD
+#define I2C_SCL_PIN         0
+#define I2C_SDA_PIN         1
+
+// END OF CONFIGURATION SECTION
+////////////////////////////////////////////////////////////////////////////////////////////
+
+#define I2C_INIT()          ({I2C_DDR &= ~((1<<I2C_SCL_PIN) | (1<<I2C_SDA_PIN)); I2C_PORT |= ((1<<I2C_SCL_PIN) | (1<<I2C_SDA_PIN));})
+#define I2C_DEINIT()        ({I2C_DDR &= ~((1<<I2C_SCL_PIN) | (1<<I2C_SDA_PIN)); I2C_PORT |= ((1<<I2C_SCL_PIN) | (1<<I2C_SDA_PIN));})
+
+#define I2C_FREQ_STANDARD I2C_FREQ_50KHZ
+
+#if F_CPU == 16000000UL
+	#define	I2C_FREQ_400KHZ  0x03
+	#define	I2C_FREQ_250KHZ  0x06
+	#define	I2C_FREQ_100KHZ  0x12
+	#define	I2C_FREQ_50KHZ   0x26
+	#define I2C_FREQ_10KHZ   0xC6
+#else
+	#error "NO I2C FREQUENCY DEFINED -> CHECK F_CPU SETTINGS!"
+#endif
+
+
+#define I2C_STATUS_REG        TWSR
+#define I2C_TX_REG            TWDR
+#define I2C_RX_REG            TWDR
+
+#define I2C_START()           (TWCR = (1<<TWINT) |(1<<TWSTA) | (1<<TWEN))
+#define I2C_STOP()            (TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO))
+#define I2C_WRITE_BYTE()      (TWCR = (1<<TWINT) | (1<<TWEN))
+#define I2C_READ_BYTE_ACK()   (TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWEA))
+#define I2C_READ_BYTE_NACK()  (TWCR = (1<<TWINT) | (1<<TWEN))
+#define I2C_STATUS()          (I2C_STATUS_REG & I2C_STATUS_MASK)
+
+#define I2C_STATUS_MASK       0xF8
+#define I2C_STATUS_START      0x08
+#define I2C_STATUS_START_REP  0x10
+#define I2C_STATUS_SLAW_ACK   0x18
+#define I2C_STATUS_DATAW_ACK  0x28
+#define I2C_STATUS_SLAR_ACK   0x40
+#define I2C_STATUS_DATAR_ACK  0x50
+#define I2C_STATUS_DATAR_NACK 0x58
+
+#define I2C_ADR_WR(adr)       ((adr<<1) & ~(1<<0))
+#define I2C_ADR_RD(adr)       ((adr<<1) | (1<<0))
+
+#define I2C_CMD_FLAG_NONE     0x00
+#define I2C_CMD_FLAG_START    (1<<0)
+#define I2C_CMD_FLAG_STOP     (1<<1)
+
+
+#define I2C_OK                0
+#define I2C_ERROR_DRIVER      -1
+#define I2C_ERROR_TIMEOUT     -2
+#define I2C_ERROR_START       -3
+#define I2C_ERROR_WRITE       -4
+#define I2C_ERROR_READ        -5
+
+
+#define I2C_IOCTL_CMD_SET_FREQ 0x01
+
+
+typedef struct i2c_driver i2c_driver;
+struct i2c_driver
+{
+	int8_t (*ioctl)(const i2c_driver* const me, uint8_t cmd, uint8_t arg);
+	int8_t (*read)(const i2c_driver* const me, uint8_t cmd_flags, uint8_t* buffer, uint8_t len);
+	int8_t (*write)(const i2c_driver* const me, uint8_t cmd_flags, const uint8_t* data, uint8_t len);
+};
+
+i2c_driver* i2c_open(void);
+void i2c_close(i2c_driver* const me);
+void i2c_reset(void);
+
+
+#endif /* I2C_H_ */
diff --git a/platform/RaspBee/dev/key.c b/platform/RaspBee/dev/key.c
new file mode 100644
index 000000000..20d852c18
--- /dev/null
+++ b/platform/RaspBee/dev/key.c
@@ -0,0 +1,73 @@
+/*
+ *  Copyright (c) 2010  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 KEY support.
+ *
+ * \author
+ *      Harald Pichler harald@the-develop.net
+ *
+ */
+
+#include "key.h"
+
+/*---------------------------------------------------------------------------*/
+
+/**
+ *   \brief This will intialize the KEY for button readings.
+*/
+void
+key_init(void)
+{
+    /* Enter is input w/pullup */
+    DDRF &= ~(1<<PINF1);
+}
+
+/*---------------------------------------------------------------------------*/
+
+/**
+ *   \brief This will poll run key_task() to determine if a button has been pressed.
+ *
+ *   \retval True if button is pressed
+ *   \retval False if button is not pressed
+*/
+uint8_t
+is_button(void)
+{
+    /* Return true if button has been pressed. */
+    if ( PINF & (1<<PINF1) ) {
+        return 0;
+    }
+    else{
+        return 1;
+    }
+}
diff --git a/platform/RaspBee/dev/key.h b/platform/RaspBee/dev/key.h
new file mode 100644
index 000000000..8d64b8423
--- /dev/null
+++ b/platform/RaspBee/dev/key.h
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2010  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 Key support.
+ *
+ * \author
+ *      Harald Pixhlwe harald@the-develop.net
+ *
+ */
+
+#ifndef __KEY_H__
+#define __KEY_H__
+
+#include <stdint.h>
+#include <avr/io.h>
+
+void	key_init(void);
+uint8_t	is_button(void);
+
+#endif /* __KEY_H__ */
diff --git a/platform/RaspBee/dev/led.c b/platform/RaspBee/dev/led.c
new file mode 100644
index 000000000..f9a7163d0
--- /dev/null
+++ b/platform/RaspBee/dev/led.c
@@ -0,0 +1,90 @@
+/*
+ *  Copyright (c) 2012  Bernhard Trinnes
+ *  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 RaspBee LED support.
+ *
+ * \author
+ *      Bernhard Trinnes bernhard.trinnes@guh.guru
+ *
+ */
+
+#include "led.h"
+
+/**
+ * \addtogroup relay
+ * \{
+*/
+/*---------------------------------------------------------------------------*/
+
+/**
+ * \brief Turns  LED1 on.
+*/
+void
+led1_on(void)
+{
+    PORTD &= ~(1<<PIND7);
+    DDRD  |=  (1<<PIND7);
+}
+
+/*---------------------------------------------------------------------------*/
+
+/**
+ *  \brief Turns LED1 off.
+*/
+void
+led1_off(void)
+{
+    PORTD |= (1<<PIND7);
+    DDRD  |= (1<<PIND7);
+}
+/*---------------------------------------------------------------------------*/
+
+void
+led2_on(void)
+{
+    PORTG &= ~(1<<PING2);
+    DDRG  |=  (1<<PING2);
+}
+
+/*---------------------------------------------------------------------------*/
+
+/**
+ *  \brief Turns LED2 off.
+*/
+void
+led2_off(void)
+{
+    PORTG |= (1<<PING2);
+    DDRG  |= (1<<PING2);
+}
+/*---------------------------------------------------------------------------*/
diff --git a/platform/RaspBee/dev/led.h b/platform/RaspBee/dev/led.h
new file mode 100644
index 000000000..ffa753859
--- /dev/null
+++ b/platform/RaspBee/dev/led.h
@@ -0,0 +1,54 @@
+/*
+ *  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 __LED_H__
+#define __LED_H__
+
+#include <avr/io.h>
+
+/** @name LED Functions */
+/** @{ */
+void led1_on(void);
+void led1_off(void);
+void led2_on(void);
+void led2_off(void);
+/** @} */
+
+#endif /* __LED_H__ */
diff --git a/platform/RaspBee/dev/leds-arch.c b/platform/RaspBee/dev/leds-arch.c
new file mode 100644
index 000000000..e82eb114c
--- /dev/null
+++ b/platform/RaspBee/dev/leds-arch.c
@@ -0,0 +1,84 @@
+/*
+* Copyright (c) 2005, 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.
+*
+* This file is part of the Contiki operating system.
+*
+* $Id: leds-arch.c,v 1.1 2006/06/17 22:41:31 adamdunkels Exp $
+*/
+
+/**
+* \file
+* Leds arch. for STK600-Atmega128rfa1.
+* \author
+* Paulo Louro <paulolouro@binarylabs.dk>
+*/
+
+
+ // WARNING : Blink function is disabled on the core leds.c file
+ 
+#include "contiki.h"
+#include "dev/leds.h"
+#include "leds-arch.h"
+
+/*---------------------------------------------------------------------------*/
+void
+leds_arch_init(void)
+{
+DDRE|=(1<<DDRE5);	// Set pins as output since leds are mounted on the VDD bus
+LEDS_OFF();
+}
+/*---------------------------------------------------------------------------*/
+unsigned char
+leds_arch_get(void)
+{
+  return ((LED_OUT & BIT_RED) ? 0 : LEDS_RED)
+    | ((LED_OUT & BIT_GREEN) ? 0 : LEDS_GREEN)
+    | ((LED_OUT & BIT_YELLOW) ? 0 : LEDS_YELLOW);
+
+}
+/*---------------------------------------------------------------------------*/
+void
+leds_arch_set(unsigned char leds)
+{
+  if(leds & LEDS_GREEN) {
+    LED_OUT &= ~BIT_GREEN;
+  } else {
+    LED_OUT |= BIT_GREEN;
+  }
+  if(leds & LEDS_YELLOW) {
+    LED_OUT &= ~BIT_YELLOW;
+  } else {
+    LED_OUT |= BIT_YELLOW;
+  }
+  if(leds & LEDS_RED) {
+    LED_OUT &= ~BIT_RED;
+  } else {
+    LED_OUT |= BIT_RED;
+  }
+}
+/*---------------------------------------------------------------------------*/
diff --git a/platform/RaspBee/dev/leds-arch.h b/platform/RaspBee/dev/leds-arch.h
new file mode 100644
index 000000000..dc3ba332e
--- /dev/null
+++ b/platform/RaspBee/dev/leds-arch.h
@@ -0,0 +1,36 @@
+/*
+	guhRF Platform has just one green LED on PIN E5
+
+*/
+
+#ifndef __LEDS_ARCH_H__
+#define __LEDS_ARCH_H__
+
+#define LED_OUT PORTE
+
+#define BIT_RED   _BV(PE5)
+#define BIT_BLUE   BIT_RED
+#define BIT_GREEN  BIT_RED
+#define BIT_YELLOW BIT_RED
+
+#define LED_GREEN_ON() LED_OUT &= ~BIT_GREEN
+#define LED_GREEN_OFF() LED_OUT |= BIT_GREEN
+#define LED_YELLOW_ON() LED_OUT &= ~BIT_YELLOW
+#define LED_YELLOW_OFF() LED_OUT |= BIT_YELLOW
+#define LED_RED_ON() LED_OUT &= ~BIT_RED
+#define LED_RED_OFF() LED_OUT |= BIT_RED
+
+
+#define LED_GREEN_TOGGLE() LED_OUT ^= BIT_GREEN
+#define LED_YELLOW_TOGGLE() LED_OUT ^= BIT_YELLOW
+#define LED_RED_TOGGLE() LED_OUT ^= BIT_RED
+
+#define LEDS_ON() LED_OUT &= ~(BIT_BLUE | BIT_GREEN | BIT_RED)
+#define LEDS_OFF() LED_OUT |= (BIT_BLUE | BIT_GREEN | BIT_RED)
+
+
+void leds_arch_init(void);
+unsigned char leds_arch_get(void);
+void leds_arch_set(unsigned char leds);
+
+#endif /* __LEDS_ARCH_H__ */
diff --git a/platform/RaspBee/dev/optriac-sensor.c b/platform/RaspBee/dev/optriac-sensor.c
new file mode 100644
index 000000000..2f0566bc4
--- /dev/null
+++ b/platform/RaspBee/dev/optriac-sensor.c
@@ -0,0 +1,102 @@
+/*
+* Copyright (c) , 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:
+* 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.
+*
+* @(#)$Id: servo-sensor.c,v 1.0 2013/02/20 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* optriac sensor header file for Atmega128rfa1.
+* \author
+* Harald Pichler <harald@the-develop.net>
+*/
+
+#include "contiki.h"
+#include "Arduino.h"
+#include "dev/optriac-sensor.h"
+
+#define PRINTF(...) printf(__VA_ARGS__)
+
+const struct sensors_sensor optriac_sensor;
+static int status(int type);
+static int enabled = 0;
+static int optriac[2]={0,0};
+static int optriacpin[8]={OPTRIAC_PIN_1,OPTRIAC_PIN_2};
+
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  return optriac[type];
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int c)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+    if(c) {
+      if(!status(SENSORS_ACTIVE)) {
+		pinMode(optriacpin[OPTRIAC_SENSOR_1], OUTPUT);
+		digitalWrite(optriacpin[OPTRIAC_SENSOR_1], LOW);
+		pinMode(optriacpin[OPTRIAC_SENSOR_2], OUTPUT);
+		digitalWrite(optriacpin[OPTRIAC_SENSOR_2], LOW);
+
+        enabled = 1;
+      }
+    } else {
+      enabled = 1;
+    }
+    break;
+  case OPTRIAC_SENSOR_1:
+  case OPTRIAC_SENSOR_2:
+
+    if(c==0){
+	digitalWrite(optriacpin[type], LOW);
+	optriac[type]=0;
+    }else{
+	digitalWrite(optriacpin[type], HIGH);
+	optriac[type]=1;
+    };
+    break;
+  }
+  return 0;	
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+  case SENSORS_READY:
+    return enabled;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(optriac_sensor, OPTRIAC_SENSOR, value, configure, status); 
diff --git a/platform/RaspBee/dev/optriac-sensor.h b/platform/RaspBee/dev/optriac-sensor.h
new file mode 100644
index 000000000..8cec46c14
--- /dev/null
+++ b/platform/RaspBee/dev/optriac-sensor.h
@@ -0,0 +1,54 @@
+/*
+* Copyright (c), 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:
+* 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.
+*
+* @(#)$Id: servo-sensor.h,v 1.0 2013/02/20 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* Servo sensor header file for Atmega128rfa1.
+* \author
+* Harald Pichler <harald@the-develop.net>
+*/
+
+#ifndef __OPTRIAC_SENSOR_H__
+#define __OPTRIAC_SENSOR_H__
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor optriac_sensor;
+
+#define OPTRIAC_SENSOR "TRIAC"
+#define OPTRIAC_SENSOR_1          0
+#define OPTRIAC_SENSOR_2          1
+
+/* default pins Arduino-Merkurboard */
+#define OPTRIAC_PIN_1          2
+#define OPTRIAC_PIN_2          3
+
+#endif /* __OPTRIAC_SENSOR_H__ */ 
diff --git a/platform/RaspBee/dev/pins_arduino.h b/platform/RaspBee/dev/pins_arduino.h
new file mode 100644
index 000000000..d3b439299
--- /dev/null
+++ b/platform/RaspBee/dev/pins_arduino.h
@@ -0,0 +1,218 @@
+/*
+  pins_arduino.h - Pin definition functions for Arduino
+  Part of Arduino - http://www.arduino.cc/
+
+  Copyright (c) 2014 Harald Pichler
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General
+  Public License along with this library; if not, write to the
+  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+
+  $Id: wiring.h 249 2014-04-18 17:35:12Z pichler $
+*/
+
+/*
+	This version of pins_arduino.h is for the Merkur Dev Board r1
+	Harald Pichler 2014 Apr 18
+*/
+
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <avr/pgmspace.h>
+
+#define NUM_DIGITAL_PINS            15
+#define NUM_ANALOG_INPUTS           6
+#define analogInputToDigitalPin(p)  ((p < NUM_ANALOG_INPUTS) ? (p) + NUM_DIGITAL_PINS  : -1)
+#define digitalPinHasPWM(p)         ((p) == 2 ||(p) == 3 ||(p) == 4 ||(p) == 14 )
+
+// Dev board specific defines: RF RX and TX LEDs:
+#define RXLED_DDR  DDRB
+#define RXLED_PORT PORTB
+#define RXLED_POS  PB6
+
+#define TXLED_DDR  DDRB
+#define TXLED_PORT PORTB
+#define TXLED_POS  PB7  
+
+const static uint8_t SS   = 10;
+const static uint8_t MOSI = 11;
+const static uint8_t MISO = 13;
+const static uint8_t SCK  = 12;
+
+const static uint8_t SDA = 9;
+const static uint8_t SCL = 8;
+const static uint8_t LED = 4;
+const static uint8_t LED1 = 4;
+const static uint8_t LED2 = 5;
+
+const static uint8_t A0 = 7;
+const static uint8_t A1 = 6;
+const static uint8_t A2 = 5;
+const static uint8_t A3 = 4;
+const static uint8_t A4 = 0;
+const static uint8_t A5 = 1;
+
+// A majority of the pins are NOT PCINTs, SO BE WARNED (i.e. you cannot use them as receive pins)
+// Only pins available for RECEIVE (TRANSMIT can be on any pin):
+// Pins: 10, 11, 12, 13, 14
+
+#define digitalPinToPCICR(p)    ( (((p) >= 10) && ((p) <= 14)) || ? (&PCICR) : ((uint8_t *)0) )
+
+#define digitalPinToPCICRbit(p) ( 0 ) 
+
+#define digitalPinToPCMSK(p)    ( (((p) >= 10) && ((p) <= 14))  ? (&PCMSK0) : ((uint8_t *)0) )
+
+#define digitalPinToPCMSKbit(p) ( ((p) == 10) ? 6 : \
+                                ( ((p) == 11) ? 5 : \
+                                ( ((p) == 12) ? 1 : \
+                                ( ((p) == 13) ? 3 : \
+                                ( ((p) == 14) ? 7 : \
+                                0 ) ) ) ) )
+
+#ifdef ARDUINO_MAIN
+
+const uint16_t PROGMEM port_to_mode_PGM[] = {
+	NOT_A_PORT,
+	NOT_A_PORT,
+	(uint16_t)&DDRB,
+	NOT_A_PORT,
+	(uint16_t)&DDRD,
+	(uint16_t)&DDRE,
+	(uint16_t)&DDRF,
+	(uint16_t)&DDRG,
+	NOT_A_PORT,
+	NOT_A_PORT,
+	NOT_A_PORT,
+	NOT_A_PORT,
+	NOT_A_PORT,
+};
+
+const uint16_t PROGMEM port_to_output_PGM[] = {
+	NOT_A_PORT,
+	NOT_A_PORT,
+	(uint16_t)&PORTB,
+	NOT_A_PORT,
+	(uint16_t)&PORTD,
+	(uint16_t)&PORTE,
+	(uint16_t)&PORTF,
+	(uint16_t)&PORTG,
+	NOT_A_PORT,
+	NOT_A_PORT,
+	NOT_A_PORT,
+	NOT_A_PORT,
+	NOT_A_PORT,
+};
+
+const uint16_t PROGMEM port_to_input_PGM[] = {
+	NOT_A_PIN,
+	NOT_A_PIN,
+	NOT_A_PIN,
+	(uint16_t)&PINC,
+	(uint16_t)&PIND,
+	(uint16_t)&PINE,
+	(uint16_t)&PINF,
+	(uint16_t)&PING,
+	NOT_A_PIN,
+	NOT_A_PIN,
+	NOT_A_PIN,
+	NOT_A_PIN,
+	NOT_A_PIN,
+};
+
+const uint8_t PROGMEM digital_pin_to_port_PGM[] = {
+	// PORTLIST		
+	// -------------------------------------------		
+	PE	, // PE 1 ** 0 ** D0 / USART0_TX	
+	PE	, // PE 0 ** 1 ** D1 / USART0_RX	
+	PE	, // PE 3 ** 2 ** D2 / PWM
+	PE	, // PE 4 ** 3 ** D3 / PWM
+	PE	, // PE 5 ** 4 ** D4 / PWM / LED1 / LED 
+	PE	, // PE 6 ** 5 ** D5 / LED2
+	PD	, // PD 3 ** 6 ** D6 / USART1_TX
+	PD	, // PD 2 ** 7 ** D7 / USART1_RX
+	PD	, // PD 0 ** 8 ** D8 / I2C_SCL
+	PD	, // PD 1 ** 9 ** D9 / I2C_SDA
+	PB	, // PB 0 ** 10 ** D10 / SPI_SSN
+	PB	, // PB 2 ** 11 ** D11 / SPI_MOSI
+	PB	, // PB 1 ** 12 ** D12 / SPI_SCK
+	PB	, // PB 3 ** 13 ** D13 / SPI_MISO
+	PB	, // PB 4 ** 14 ** D14 / PWM 
+	PF	, // PF 7 ** 15 ** A0 / D15
+	PF	, // PF 6 ** 16 ** A1 / D16	
+	PF	, // PF 5 ** 17 ** A2 / D17	
+	PF	, // PF 4 ** 18 ** A3 / D18	
+	PF	, // PF 0 ** 19 ** A4 / D19
+	PF	, // PF 1 ** 20 ** A5 / D20
+//	PB	, // PB 6 ** 34 ** D34 / LED1 / LED / PWM
+//	PB	, // PB 7 ** 35 ** D35 / LED2 / PWM
+//	PE	, // PE 2 ** 2 ** D2
+//	PE	, // PE 7 ** 7 ** D7
+//	PB	, // PB 5 ** 8 ** D8 / PWM
+//	PG	, // PG 0 ** 16 ** D16
+//	PG	, // PG 1 ** 17 ** D17
+//	PG	, // PG 2 ** 18 ** D18
+//	PG	, // PG 5 ** 19 ** D19 / PWM
+//	PD	, // PD 4 ** 22 ** D22
+//	PD	, // PD 5 ** 23 ** D23
+//	PD	, // PD 6 ** 24 ** D24
+//	PD	, // PD 7 ** 25 ** D25
+//	PF	, // PF 2 ** 28 ** A2 / D28
+//	PF	, // PF 3 ** 29 ** A3 / D29
+};
+
+const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = {
+	// PIN IN PORT		
+	// -------------------------------------------		
+	_BV( 1 )	, // PE 1 ** 0 ** USART0_TX	
+	_BV( 0 )	, // PE 0 ** 1 ** USART0_RX	
+	_BV( 3 )	, // PE 3 ** 2 ** D3 / PWM
+	_BV( 4 )	, // PE 4 ** 3 ** D4 / PWM
+	_BV( 5 )	, // PE 5 ** 4 ** D5 / PWM
+	_BV( 6 )	, // PE 6 ** 5 ** D6
+	_BV( 3 )	, // PD 3 ** 6 ** D21 / USART1_TX
+	_BV( 2 )	, // PD 2 ** 7 ** D20 / USART1_RX
+	_BV( 0 )	, // PD 0 ** 8 ** D15 / I2C_SCL
+	_BV( 1 )	, // PD 1 ** 9 ** D14 / I2C_SDA
+	_BV( 0 )	, // PB 0 ** 10 ** D10 / SPI_SSN
+	_BV( 2 )	, // PB 2 ** 11 ** D11 / SPI_MOSI
+	_BV( 1 )	, // PB 1 ** 12 ** D13 / SPI_SCK
+	_BV( 3 )	, // PB 3 ** 13 ** D12 / SPI_MISO
+	_BV( 4 )	, // PB 4 ** 14 ** D9 / PWM
+	_BV( 7 )	, // PF 7 ** 15 ** A0 / D33
+	_BV( 6 )	, // PF 6 ** 16 ** A1 / D32
+	_BV( 5 )	, // PF 5 ** 17 ** A2 / D31
+	_BV( 4 )	, // PF 4 ** 18 ** A3 / D30			
+	_BV( 0 )	, // PF 0 ** 19 ** A4 / D26
+	_BV( 1 )	, // PF 1 ** 20 ** A5 / D27
+//	_BV( 2 )	, // PE 2 ** 2 ** D2
+//	_BV( 7 )	, // PE 7 ** 7 ** D7
+//	_BV( 5 )	, // PB 5 ** 8 ** D8 / PWM
+//	_BV( 0 )	, // PG 0 ** 16 ** D16
+//	_BV( 1 )	, // PG 1 ** 17 ** D17	
+//	_BV( 2 )	, // PG 2 ** 18 ** D18	
+//	_BV( 5 )	, // PG 5 ** 19 ** D19 / PWM
+//	_BV( 4 )	, // PD 4 ** 22 ** D22
+//	_BV( 5 )  	, // PD 5 ** 23 ** D23
+//	_BV( 6 )  	, // PD 6 ** 24 ** D24
+//	_BV( 7 )	, // PD 7 ** 25 ** D25
+//	_BV( 2 )	, // PF 2 ** 28 ** A2 / D28
+//	_BV( 3 )	, // PF 3 ** 29 ** A3 / D29
+//	_BV( 6 )	, // PB 6 ** 34 ** D34 / LED1 / LED / PWM
+//	_BV( 7 )	, // PB 7 ** 35 ** D35 / LED2 / PWM
+};
+
+#endif
+
+#endif
diff --git a/platform/RaspBee/dev/pir-sensor.c b/platform/RaspBee/dev/pir-sensor.c
new file mode 100644
index 000000000..37a97c025
--- /dev/null
+++ b/platform/RaspBee/dev/pir-sensor.c
@@ -0,0 +1,85 @@
+/* Sensor routine */
+#include "contiki.h"
+#include "lib/sensors.h"
+#include "dev/pir-sensor.h"
+
+#include <avr/interrupt.h>
+#include "led.h" // debug
+
+const struct sensors_sensor pir_sensor;
+
+static struct timer debouncetimer;
+static int status(int type);
+static int enabled = 0;
+struct sensors_sensor *sensors[1];
+unsigned char sensors_flags[1];
+
+#define PIR_BIT INTF6
+#define PIR_CHECK_IRQ() (EIFR & PIR_BIT) ? 0 : 1
+
+#define PRINTF(...) printf(__VA_ARGS__)
+/*---------------------------------------------------------------------------*/
+ISR(INT6_vect)
+{
+
+//  leds_toggle(LEDS_YELLOW);
+  
+  if(PIR_CHECK_IRQ()) {
+    if(timer_expired(&debouncetimer)) {
+ //   led1_on();
+      timer_set(&debouncetimer, CLOCK_SECOND / 4);
+      sensors_changed(&pir_sensor);
+ //   led1_off();
+    }
+  }
+
+}
+/*---------------------------------------------------------------------------*/
+
+static int
+value(int type)
+{
+ return (PORTE & _BV(PE6) ? 0 : 1) || !timer_expired(&debouncetimer);
+ //return 0;
+}
+
+static int
+configure(int type, int c)
+{
+	switch (type) {
+	case SENSORS_ACTIVE:
+		if (c) {
+			if(!status(SENSORS_ACTIVE)) {
+  //  led1_on();
+				timer_set(&debouncetimer, 0);
+				DDRE |= (0<<DDRE6); // Set pin as input
+				PORTE |= (1<<PORTE6); // Set port PORTE bint 6 with pullup resistor
+				EICRB |= (3<<ISC60); // For rising edge
+				EIMSK |= (1<<INT6); // Set int
+				enabled = 1;
+				sei();
+  //  led1_off();
+			}
+		} else {
+				enabled = 0;
+				EIMSK &= ~(1<<INT6); // clear int
+		}
+		return 1;
+	}
+	return 0;
+}
+
+static int
+status(int type)
+{
+	switch (type) {
+	case SENSORS_ACTIVE:
+	case SENSORS_READY:
+		return enabled;//(EIMSK & (1<<INT6) ? 0 : 1);//PIR_IRQ_ENABLED();
+	}
+	return 0;
+}
+
+SENSORS_SENSOR(pir_sensor, PIR_SENSOR,
+	       value, configure, status);
+
diff --git a/platform/RaspBee/dev/pir-sensor.h b/platform/RaspBee/dev/pir-sensor.h
new file mode 100644
index 000000000..ac59e0f9f
--- /dev/null
+++ b/platform/RaspBee/dev/pir-sensor.h
@@ -0,0 +1,48 @@
+/*
+* Copyright (c) 2012, BinaryLabs.
+* 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.
+*
+* @(#)$Id: battery-sensor.h,v 1.1 2012/08/25 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* PIR sensor header file for Atmega128rfa1.
+* \author
+* Harald Pichler <harald@the-develop.net>
+*/
+
+#ifndef __PIR_SENSOR_H__
+#define __PIR_SENSOR_H__
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor pir_sensor;
+
+#define PIR_SENSOR "PIR"
+
+#endif /* __PIR_SENSOR_H__ */
\ No newline at end of file
diff --git a/platform/RaspBee/dev/relay-sensor.c b/platform/RaspBee/dev/relay-sensor.c
new file mode 100644
index 000000000..6415926c9
--- /dev/null
+++ b/platform/RaspBee/dev/relay-sensor.c
@@ -0,0 +1,109 @@
+/*
+* Copyright (c) , 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:
+* 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.
+*
+* @(#)$Id: relay-sensor.c,v 1.0 2013/11/22 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* relay sensor header file for Atmega128rfa1.
+* \author
+* Harald Pichler <harald@the-develop.net>
+*/
+
+#include "contiki.h"
+#include "dev/relay.h"
+#include "dev/relay-sensor.h"
+
+#define PRINTF(...) printf(__VA_ARGS__)
+
+const struct sensors_sensor relay_sensor;
+static int status(int type);
+static int enabled = 0;
+static int relay[8]={0,0,0,0,0,0,0,0};
+static int relaypin[8]={RELAY_PIN_1,RELAY_PIN_2,RELAY_PIN_3,RELAY_PIN_4,RELAY_PIN_5,RELAY_PIN_6,RELAY_PIN_7,RELAY_PIN_8};
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+    return relay[type];
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int c)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+    if(c) {
+      if(!status(SENSORS_ACTIVE)) {
+		relay_init(relaypin[RELAY_SENSOR_1]);
+		relay_init(relaypin[RELAY_SENSOR_2]);
+		relay_init(relaypin[RELAY_SENSOR_3]);
+		relay_init(relaypin[RELAY_SENSOR_4]);
+		relay_init(relaypin[RELAY_SENSOR_5]);
+		relay_init(relaypin[RELAY_SENSOR_6]);
+		relay_init(relaypin[RELAY_SENSOR_7]);
+		relay_init(relaypin[RELAY_SENSOR_8]);
+        enabled = 1;
+      }
+    } else {
+      enabled = 1;
+    }
+    break;
+  case RELAY_SENSOR_1:
+  case RELAY_SENSOR_2:
+  case RELAY_SENSOR_3:
+  case RELAY_SENSOR_4:
+  case RELAY_SENSOR_5:
+  case RELAY_SENSOR_6:
+  case RELAY_SENSOR_7:
+  case RELAY_SENSOR_8:
+    if(c==0){
+	relay_off(relaypin[type]);
+	relay[type]=0;
+    }else{
+	relay_on(relaypin[type]);
+	relay[type]=1;
+    };
+    break;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+  case SENSORS_READY:
+    return enabled;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(relay_sensor, RELAY_SENSOR, value, configure, status); 
diff --git a/platform/RaspBee/dev/relay-sensor.h b/platform/RaspBee/dev/relay-sensor.h
new file mode 100644
index 000000000..88b9dd0f5
--- /dev/null
+++ b/platform/RaspBee/dev/relay-sensor.h
@@ -0,0 +1,66 @@
+/*
+* Copyright (c), 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:
+* 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.
+*
+* @(#)$Id: relay-sensor.h,v 1.0 2013/11/22 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* Relay sensor header file for Atmega128rfa1.
+* \author
+* Harald Pichler <harald@the-develop.net>
+*/
+
+#ifndef __RELAY_SENSOR_H__
+#define __RELAY_SENSOR_H__
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor relay_sensor;
+
+#define RELAY_SENSOR "RELAY"
+#define RELAY_SENSOR_1          0
+#define RELAY_SENSOR_2          1
+#define RELAY_SENSOR_3          2
+#define RELAY_SENSOR_4          3
+#define RELAY_SENSOR_5          4
+#define RELAY_SENSOR_6          5
+#define RELAY_SENSOR_7          6
+#define RELAY_SENSOR_8          7
+
+/* default pins Arduino-Merkurboard */
+#define RELAY_PIN_1          10
+#define RELAY_PIN_2          11
+#define RELAY_PIN_3          12
+#define RELAY_PIN_4          13
+#define RELAY_PIN_5          15
+#define RELAY_PIN_6          16
+#define RELAY_PIN_7          17
+#define RELAY_PIN_8          18
+
+#endif /* __RELAY_SENSOR_H__ */ 
diff --git a/platform/RaspBee/dev/relay.c b/platform/RaspBee/dev/relay.c
new file mode 100644
index 000000000..67d9c7f5b
--- /dev/null
+++ b/platform/RaspBee/dev/relay.c
@@ -0,0 +1,76 @@
+/*
+ *  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 "Arduino.h"
+#include "relay.h"
+
+/**
+ * \addtogroup relay
+ * \{
+*/
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief  init RELAY PINS.
+*/
+void
+relay_init(uint8_t pin)
+{
+   pinMode(pin, OUTPUT);
+   digitalWrite(pin, LOW);
+}
+/**
+ * \brief Turns the RELAY on.
+*/
+
+void
+relay_on(uint8_t pin)
+{
+   digitalWrite(pin, HIGH);
+}
+
+/*---------------------------------------------------------------------------*/
+
+/**
+ *  \brief Turns the RELAY off
+*/
+void
+relay_off(uint8_t pin)
+{
+   digitalWrite(pin, LOW);
+}
diff --git a/platform/RaspBee/dev/relay.h b/platform/RaspBee/dev/relay.h
new file mode 100644
index 000000000..3b9b48759
--- /dev/null
+++ b/platform/RaspBee/dev/relay.h
@@ -0,0 +1,54 @@
+/*
+ *  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 relay_init(uint8_t pin);
+void relay_on(uint8_t pin);
+void relay_off(uint8_t pin);
+
+/** @} */
+
+#endif /* __RELAY_H__ */
diff --git a/platform/RaspBee/dev/servo-sensor.c b/platform/RaspBee/dev/servo-sensor.c
new file mode 100644
index 000000000..9da3caf80
--- /dev/null
+++ b/platform/RaspBee/dev/servo-sensor.c
@@ -0,0 +1,100 @@
+/*
+* Copyright (c) , 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:
+* 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.
+*
+* @(#)$Id: servo-sensor.c,v 1.0 2013/02/20 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* Servo sensor header file for Atmega128rfa1.
+* \author
+* Harald Pichler <harald@the-develop.net>
+*/
+
+#include "contiki.h"
+#include "dev/servo.h"
+#include "dev/servo-sensor.h"
+
+#define PRINTF(...) printf(__VA_ARGS__)
+
+const struct sensors_sensor servo_sensor;
+static int status(int type);
+static int enabled = 0;
+
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  switch(type) {
+  case SERVO_SENSOR_A:
+    return servo_get(0);;
+
+    /* Total Solar Radiation. */
+  case SERVO_SENSOR_B:
+    return servo_get(1);
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int c)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+    if(c) {
+      if(!status(SENSORS_ACTIVE)) {
+	servo_init();
+        enabled = 1;
+      }
+    } else {
+      servo_off();
+      enabled = 1;
+    }
+    break;
+  case SERVO_SENSOR_A:
+    servo_set(0,c);
+    break;
+  case SERVO_SENSOR_B:
+    servo_set(1,c);
+    break;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+  case SENSORS_READY:
+    return enabled;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(servo_sensor, SERVO_SENSOR, value, configure, status); 
diff --git a/platform/RaspBee/dev/servo-sensor.h b/platform/RaspBee/dev/servo-sensor.h
new file mode 100644
index 000000000..44e50c0f8
--- /dev/null
+++ b/platform/RaspBee/dev/servo-sensor.h
@@ -0,0 +1,50 @@
+/*
+* Copyright (c), 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:
+* 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.
+*
+* @(#)$Id: servo-sensor.h,v 1.0 2013/02/20 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* Servo sensor header file for Atmega128rfa1.
+* \author
+* Harald Pichler <harald@the-develop.net>
+*/
+
+#ifndef __SERVO_SENSOR_H__
+#define __SERVO_SENSOR_H__
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor servo_sensor;
+
+#define SERVO_SENSOR "Servo"
+#define SERVO_SENSOR_A          0
+#define SERVO_SENSOR_B          1
+
+#endif /* __SERVO_SENSOR_H__ */ 
diff --git a/platform/RaspBee/dev/servo.c b/platform/RaspBee/dev/servo.c
new file mode 100644
index 000000000..874e98b89
--- /dev/null
+++ b/platform/RaspBee/dev/servo.c
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2007, 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.
+ *
+ */
+
+/*
+ * Device driver for the Sensirion SHT1x/SHT7x family of humidity and
+ * temperature sensors.
+ */
+
+#include "contiki.h"
+#include <stdio.h>
+#include <dev/servo.h>
+
+#define DEBUG 0
+
+#if DEBUG
+#include <stdio.h>
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+/*
+ * servo device
+ */
+
+unsigned int servoa=SERVO_INIT;
+unsigned int servob=SERVO_INIT;
+
+void
+servo_init(void)
+{
+  // Port E initialization
+  // Set Pin 3 and 4 to output mode for OCR1A and OCR2A
+  DDRE |= 1<<3 | 1<<4;
+
+  // Timer/Counter 3 initialization
+  // Clock source: System Clock
+  // Clock value: 2000.000 kHz
+  // Mode: Ph. & fr. cor. PWM top=ICR1
+  // OC3A output: Connected
+  // OC3B output: Connected
+  // OC3C output: Connected
+  // Noise Canceler: Off
+  // Input Capture on Falling Edge
+  // Timer3 Overflow Interrupt: Off
+  // Input Capture Interrupt: Off
+  // Compare A Match Interrupt: Off
+  // Compare B Match Interrupt: Off
+  // Compare C Match Interrupt: Off
+
+  /* TCCR3A = [COM3A1|COM3A0|COM3B1|COM3B0||FOC3A|FOC3B|WGM31|WGM30] */
+  /*                1      0      1      0      1     0     0     0  */
+  TCCR3A=0xA8;
+  /* TCCR3B = [ ICNC3| ICES3|     -| WGM33||WGM32| CS32| CS31| CS30] */
+  /*                0      0      0      1      0     0     1     0  */
+  TCCR3B=0x12;
+  TCNT3H=0x00;
+  TCNT3L=0x00;
+  // ICR3 has a computed value of 20,000 - see the chip manual for how this
+  // value was derived.
+  // 20000 == 0x4e20 so that's what goes into the high and low byte of the ICR3 register
+  // alternatively, Codevision would let you just do ICR3 = 20000;
+  ICR3H=0x4E;
+  ICR3L=0x20;
+
+  // OCR3A will govern the steering servo, OCR3B will govern throttle
+  OCR3A = servoa;  // set it to an initial position somewhere in the middle of the 1 to 2ms range
+
+  // OCR3A will govern the steering servo, OCR3B will govern throttle
+  OCR3B = servob;  // set it to an initial position somewhere in the middle of the 1 to 2ms range
+  // start with motor off - no duty cycle at all
+  OCR3CH=0x00;
+  OCR3CL=0x00;
+}
+/*---------------------------------------------------------------------------*/
+/*
+ * Power of device.
+ */
+void
+servo_off(void)
+{
+
+}
+/*---------------------------------------------------------------------------*/
+/*
+ * get servo position
+ */
+unsigned int
+servo_get(unsigned int i)
+{
+  if(i==0)
+    return servoa;
+  if(i==1)
+    return servob;
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+/*
+ * Set servo position
+ */
+unsigned int
+servo_set(unsigned i,unsigned int j)
+{
+  if(j > SERVO_MAX)
+    j=SERVO_MAX;
+  if(j < SERVO_MIN)
+    j=SERVO_MIN;
+
+  if(i==0)
+  {
+    servoa=j;
+    OCR3A = servoa;
+    return 1;
+  }
+  if(i==1)
+  {
+    servob=j;
+    OCR3B = servob;
+    return 1;
+  }
+
+  return 0;
+}
diff --git a/platform/RaspBee/dev/servo.h b/platform/RaspBee/dev/servo.h
new file mode 100644
index 000000000..c6ae4ab57
--- /dev/null
+++ b/platform/RaspBee/dev/servo.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2007, 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 SERVO_H
+#define SERVO_H
+
+#define SERVO_MIN   575
+#define SERVO_MAX  2425
+#define SERVO_INIT 1500
+
+void servo_init(void);
+void servo_off(void);
+
+unsigned int servo_get(unsigned int i);
+unsigned int servo_set(unsigned i,unsigned int j);
+
+#endif /* SHT11_H */
diff --git a/platform/RaspBee/dev/sg-ready.c b/platform/RaspBee/dev/sg-ready.c
new file mode 100644
index 000000000..0f34d94b7
--- /dev/null
+++ b/platform/RaspBee/dev/sg-ready.c
@@ -0,0 +1,218 @@
+/*
+ *  Copyright (c) 2015 Bernhard Trinnes
+ *  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
+ *      Smart Grid Ready Module - guhRF
+ *
+ * \author
+ *      Bernhard Trinnes bernhard.trinnes@guh.guru
+ *
+ */
+
+#include "sg-ready.h"
+#define LATCH_TIME 3000 // time in micro seconds
+
+#define RELAY1_ON     (1<<DDRB4)
+#define RELAY1_OFF    (1<<DDRB5)
+#define RELAY2_ON     (1<<DDRB6)
+#define RELAY2_OFF    (1<<DDRB7)
+#define RELAY1_FB     (1<<DDRD5)
+#define RELAY2_FB     (1<<DDRD7)
+
+/**
+ * \addtogroup relay
+ * \{
+*/
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief  init RELAY PINS - direction & pull-ups
+*/
+void
+releay_init()
+{
+   /*2 latching dual coal relay
+   RELAY 1 Coil 1   PB4 - ON
+           Coil 2   PB5 - OFF
+           Feedback PD5
+   RELAY 2 Coil 1   PB6 - ON
+           Coil 2   PB7 - OFF
+           Feedback PD7
+
+   */ 
+   DDRB |= (RELAY1_ON | RELAY1_OFF | RELAY2_ON | RELAY2_OFF);
+   PORTB &= ~(RELAY1_ON | RELAY1_OFF | RELAY2_ON | RELAY2_OFF);
+
+   DDRD &= ~(RELAY1_FB | RELAY2_FB);
+   PORTD |= (RELAY1_FB | RELAY2_FB);
+}
+/**
+ * \brief 
+*/
+
+void
+set_state(uint8_t state)
+{
+   /* State 1 - Relays 1:0
+      State 2 - Relays 0:0  
+      State 3 - Relays 0:1
+      State 4 - Relays 1:1
+   */
+   uint8_t i = 0;
+   uint8_t current_state;
+   current_state = get_state();
+   while ( i<=3 || (current_state != state)){
+      i++;
+      switch_difference(current_state, state);
+      current_state = get_state();  
+   } 
+}
+/**
+ * \brief 
+*/
+
+
+uint8_t
+get_state()
+{
+   uint8_t state;
+   /* Pull up -> Pin high = Relay Open */
+   if ((~PIND & RELAY1_FB) && (~PIND & RELAY2_FB)){ 
+      state = 4;
+   }else if  (~PIND & RELAY1_FB){ 
+      state = 1; 
+   } else if (~PIND & RELAY2_FB){
+      state = 3;
+   } else {
+      state = 2;
+   }
+   return state;
+}
+/**
+ * \brief 
+*/
+
+void 
+switch_difference(uint8_t old, uint8_t new)
+{
+   switch(old) {
+      case 1: 
+          switch(new) {
+              case 2: 
+                 PORTB |=   RELAY1_OFF;
+                 PORTB &= ~(RELAY1_ON | RELAY2_ON | RELAY2_OFF);
+                 clock_delay_usec (LATCH_TIME);
+                 PORTB &= ~(RELAY1_OFF); 
+              break;
+              case 3: 
+                 PORTB |=  (RELAY1_OFF | RELAY2_ON );
+                 PORTB &= ~(RELAY1_ON  | RELAY2_OFF);
+                 clock_delay_usec (LATCH_TIME);
+                 PORTB &= ~(RELAY1_OFF | RELAY2_ON);   
+              break;
+              case 4: 
+                 PORTB |=   RELAY2_ON;
+                 PORTB &= ~(RELAY1_ON | RELAY1_OFF | RELAY2_OFF);
+                 clock_delay_usec (LATCH_TIME);
+                 PORTB &= ~(RELAY2_ON); 
+              break;
+          }
+      break;
+      case 2: 
+          switch(new) {
+              case 1: 
+                 PORTB |=   RELAY1_ON;
+                 PORTB &= ~(RELAY1_OFF | RELAY2_ON | RELAY2_OFF);
+                 clock_delay_usec (LATCH_TIME);
+                 PORTB &= ~(RELAY1_ON); 
+              break;
+              case 3: 
+                 PORTB |=  (RELAY2_ON);
+                 PORTB &= ~(RELAY1_ON | RELAY1_OFF | RELAY2_OFF);
+                 clock_delay_usec (LATCH_TIME);
+                 PORTB &= ~(RELAY2_ON); 
+              break;
+              case 4: 
+                 PORTB |=  (RELAY1_ON  | RELAY2_ON);
+                 PORTB &= ~(RELAY1_OFF | RELAY2_OFF);
+                 clock_delay_usec (LATCH_TIME);
+                 PORTB &= ~(RELAY1_ON  | RELAY2_ON); 
+              break;
+          }
+  
+      break;
+      case 3:
+          switch(new) {
+              case 1: 
+                 PORTB |=  (RELAY1_ON  | RELAY2_OFF);
+                 PORTB &= ~(RELAY1_OFF | RELAY2_ON);
+                 clock_delay_usec (LATCH_TIME);
+                 PORTB &= ~(RELAY1_ON  | RELAY2_OFF); 
+              break;
+              case 2: 
+                 PORTB |=   RELAY2_OFF;
+                 PORTB &= ~(RELAY1_ON  | RELAY1_OFF | RELAY2_ON);
+                 clock_delay_usec (LATCH_TIME);
+                 PORTB &= ~(RELAY2_OFF);   
+              break;
+              case 4: 
+                 PORTB |=   RELAY1_ON;
+                 PORTB &= ~(RELAY1_OFF | RELAY2_ON | RELAY2_OFF);
+                 clock_delay_usec (LATCH_TIME);
+                 PORTB &= ~(RELAY1_ON); 
+              break;
+          }
+      break;
+      case 4: 
+          switch(new) {
+              case 1: 
+                 PORTB |=   RELAY2_OFF;
+                 PORTB &= ~(RELAY1_ON | RELAY1_OFF | RELAY2_ON);
+                 clock_delay_usec (LATCH_TIME);
+                 PORTB &= ~(RELAY2_OFF); 
+              break;
+              case 2: 
+                 PORTB |=  (RELAY1_OFF | RELAY2_OFF);
+                 PORTB &= ~(RELAY1_ON  | RELAY2_ON );
+                 clock_delay_usec (LATCH_TIME);
+                 PORTB &= ~(RELAY1_OFF | RELAY2_OFF);  
+              break;
+              case 3: 
+                 PORTB |=   RELAY1_OFF;
+                 PORTB &= ~(RELAY1_ON | RELAY2_ON | RELAY2_OFF);
+                 clock_delay_usec (LATCH_TIME);
+                 PORTB &= ~(RELAY1_OFF); 
+              break;
+          }
+      break;
+   }
+}
+
diff --git a/platform/RaspBee/dev/sg-ready.h b/platform/RaspBee/dev/sg-ready.h
new file mode 100644
index 000000000..81ba3f0c9
--- /dev/null
+++ b/platform/RaspBee/dev/sg-ready.h
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (c) 2015 Bernhard Trinnes
+ *  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
+ *     
+ *
+ * \author
+ *      Bernhard Trinnes bernhard.trinnes@guh.guru
+ *
+ */
+
+#ifndef __SGREADY_H__
+#define __SGREADY_H__
+
+#include <avr/io.h>
+
+/** @name Smart Grid Ready Functions */
+/** @{ */
+void relay_init(uint8_t pin);
+void set_state(uint8_t pin);
+uint8_t get_state();
+void switch_difference(uint8_t old, uint8_t new); 
+
+/** @} */
+
+#endif /* __SGREADY_H__ */
diff --git a/platform/RaspBee/dev/t4-servo-sensor.c b/platform/RaspBee/dev/t4-servo-sensor.c
new file mode 100644
index 000000000..a35b2de02
--- /dev/null
+++ b/platform/RaspBee/dev/t4-servo-sensor.c
@@ -0,0 +1,101 @@
+/*
+** Copyright (C) 2013-2014 Marcus Priesch, All rights reserved
+** In Prandnern 31, A--2122 Riedenthal, Austria. office@priesch.co.at
+**
+** 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.
+**
+**++
+** Name
+**    t4-servo-sensor
+**
+** Purpose
+**    Implements a sensor around t4servo.c
+**
+**
+** Revision Dates
+**    31-Mar-2013 (MPR) Creation
+**    12-Mar-2014 (MPR) Factored to support configurable amount of pwm's
+**    ««revision-date»»···
+**--
+*/
+
+#include "contiki.h"
+#include "dev/t4-servo.h"
+#include "dev/t4-servo-sensor.h"
+
+const struct sensors_sensor t4_servo_sensor;
+
+static int status(int type);
+static int enabled = 0;
+
+static int value (int channel)
+  {
+    if (channel >= SERVO_COUNT)
+      return -1;
+    else if (channel < 0)
+      return -2;
+    else
+      return t4_servo_get (channel);
+  }
+
+static int configure (int type, int c) // type, c: SENSORS_ACTIVE, 1 -> act.
+                                       // type, c: SENSORS_ACTIVE, 0 -> deact.
+  {
+    switch (type)
+      {
+        case SENSORS_ACTIVE :
+          if (c == 0)
+            {
+              t4_servo_off ();
+            }
+          else if (c == 1)
+            {
+              t4_servo_init ();
+            }
+          break;
+
+        default :
+          if (type >= SERVO_COUNT)
+            return -1;
+          else
+            t4_servo_set (type, c);
+          break;
+
+      }
+    return 0;
+  }
+
+static int status(int type)
+  {
+    switch (type)
+      {
+        case SENSORS_ACTIVE:
+        case SENSORS_READY:
+          return enabled;
+      }
+    return 0;
+  }
+
+SENSORS_SENSOR(t4_servo_sensor, T4_SENSOR_NAME, value, configure, status);
diff --git a/platform/RaspBee/dev/t4-servo-sensor.h b/platform/RaspBee/dev/t4-servo-sensor.h
new file mode 100644
index 000000000..099bb4c66
--- /dev/null
+++ b/platform/RaspBee/dev/t4-servo-sensor.h
@@ -0,0 +1,52 @@
+/*
+** Copyright (C) 2013-2014 Marcus Priesch, All rights reserved
+** In Prandnern 31, A--2122 Riedenthal, Austria. office@priesch.co.at
+**
+** 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.
+**
+**++
+** Name
+**    t4-servo-sensor
+**
+** Purpose
+**    Implements a sensor around t4servo.c
+**
+**
+** Revision Dates
+**    31-Mar-2013 (MPR) Creation
+**    12-Mar-2014 (MPR) Factored to support configurable amount of pwm's
+      ««revision-date»»···
+**--
+*/
+
+#ifndef __T4_SERVO_SENSOR_H__
+#define __T4_SERVO_SENSOR_H__
+
+#include "lib/sensors.h"
+#include "t4-servo-config.h"
+
+extern const struct sensors_sensor t4_servo_sensor;
+
+#endif /* __T4_SERVO_SENSOR_H__ */
diff --git a/platform/RaspBee/dev/t4-servo.c b/platform/RaspBee/dev/t4-servo.c
new file mode 100644
index 000000000..45f74ad9b
--- /dev/null
+++ b/platform/RaspBee/dev/t4-servo.c
@@ -0,0 +1,139 @@
+/*
+** Copyright (C) 2013-2014 Marcus Priesch, All rights reserved
+** In Prandnern 31, A--2122 Riedenthal, Austria. office@priesch.co.at
+**
+** 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.
+**
+**++
+** Name
+**    t4-servo
+**
+** Purpose
+**    Implements software pwm on any portpins via timer 4
+**
+**
+** Revision Dates
+**    31-Mar-2013 (MPR) Creation
+**    12-Mar-2014 (MPR) Factored to support configurable amount of pwm's
+**    ««revision-date»»···
+**--
+*/
+
+#include "t4-servo.h"
+#include "t4-servo-config.h"
+#include "t4-servo-hardware.h"
+#include <avr/io.h>
+#include <avr/interrupt.h>
+
+// static servo_channel_type servo_channels [SERVO_COUNT];
+
+// timer 4: CTC OCR4A
+#define WGM4 0x4
+
+void t4_servo_init (void)
+{
+  unsigned char channel;
+
+  for (channel = 0; channel < SERVO_COUNT;  channel ++)
+    {
+      _SFR_IO8 (servo_channels [channel].ddr ) |=   servo_channels [channel].pin;
+      _SFR_IO8 (servo_channels [channel].port) &= ~(servo_channels [channel].pin);
+    }
+
+  cli ();
+  TCCR4A               = 0x00;
+  TCCR4A_struct.wgm4   =  WGM4 & 0x3;
+  TCCR4B_struct.wgm4   = (WGM4 & 0xc) >> 2;
+  TCCR4B_struct.cs4    = 0x1; // No prescaler
+  TCCR4C               = 0x00;
+  OCR4A                = (T4_VALUE);
+  TIMSK4_struct.ocie4a = 1;
+  TIMSK4_struct.toie4  = 1;
+  sei();
+}
+
+void t4_servo_off (void)
+  {
+    TIMSK4_struct.toie4  = 0;
+    TIMSK4_struct.ocie4a = 0;
+  }
+
+int t4_servo_get (unsigned int channel)
+  {
+    if (channel >= SERVO_COUNT)
+      return -1;
+    //printf ("t4_servo_get: %d, %d\n", channel, servo_channels [channel].duty);
+    return servo_channels [channel].duty;
+  }
+
+int t4_servo_set (unsigned int channel, unsigned char duty)
+  {
+    //printf ("t4_servo_set: %d, %d\n", channel, duty);
+
+    if (channel >= SERVO_COUNT)
+      return -1;
+
+    if (duty > SERVO_MAX)
+      return -2;
+
+    if (duty < SERVO_MIN)
+      return -3;
+
+    servo_channels [channel].duty = duty;
+    return 0;
+  }
+
+ISR (TIMER4_COMPA_vect, ISR_NOBLOCK)
+  {
+    unsigned char channel;
+    static unsigned int tick_count = 0;
+
+  cli ();
+    for (channel = 0; channel < SERVO_COUNT;  channel ++)
+      {
+        if (tick_count < servo_channels [channel].duty)
+          {
+            // turn on
+//            _SFR_IO8 (servo_channels [channel].ddr ) |= servo_channels [channel].pin;
+            _SFR_IO8 (servo_channels [channel].port) |= servo_channels [channel].pin;
+          }
+        else
+          {
+            // turn off
+            _SFR_IO8 (servo_channels [channel].port) &= ~(servo_channels [channel].pin);
+//            _SFR_IO8 (servo_channels [channel].ddr ) |=   servo_channels [channel].pin;
+          }
+      }
+
+    tick_count ++;
+
+    if (tick_count >= (SERVO_MAX + SERVO_OFFSET))
+      {
+        tick_count = 0;
+      }
+  sei();
+
+  }
+
diff --git a/platform/RaspBee/dev/t4-servo.h b/platform/RaspBee/dev/t4-servo.h
new file mode 100644
index 000000000..5acdc4013
--- /dev/null
+++ b/platform/RaspBee/dev/t4-servo.h
@@ -0,0 +1,61 @@
+/*
+** Copyright (C) 2013-2014 Marcus Priesch, All rights reserved
+** In Prandnern 31, A--2122 Riedenthal, Austria. office@priesch.co.at
+**
+** 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.
+**
+**++
+** Name
+**    t4-servo
+**
+** Purpose
+**    Implements software pwm on any portpins via timer 4
+**
+**
+** Revision Dates
+**    31-Mar-2013 (MPR) Creation
+**    12-Mar-2014 (MPR) Factored to support configurable amount of pwm's
+      ««revision-date»»···
+**--
+*/
+
+#ifndef __T4_SERVO_H__
+#define __T4_SERVO_H__
+
+typedef struct struct_servo_channel
+{
+  unsigned char port;
+  unsigned char ddr;
+  unsigned char pin;
+  unsigned char duty;
+} servo_channel_type;
+
+void t4_servo_init(void);
+void t4_servo_off(void);
+
+int t4_servo_get(unsigned int channel);
+int t4_servo_set(unsigned int channel, unsigned char duty);
+
+#endif /* __T4_SERVO_H__ */
diff --git a/platform/RaspBee/dev/temperature-sensor.c b/platform/RaspBee/dev/temperature-sensor.c
new file mode 100644
index 000000000..c85896178
--- /dev/null
+++ b/platform/RaspBee/dev/temperature-sensor.c
@@ -0,0 +1,66 @@
+/*
+* Copyright (c) 2012, BinaryLabs.
+* 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.
+*
+* @(#)$Id: temperature-sensor.c,v 1.1 2010/08/25 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* Temperature sensor header file for Atmega128rfa1.
+* \author
+* Paulo Louro <paulolouro@binarylabs.dk>
+*/
+
+#include "contiki.h"
+#include "dev/temperature-sensor.h"
+
+#define PRINTF(...) printf(__VA_ARGS__)
+
+
+const struct sensors_sensor temperature_sensor;
+
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  return readInternalTemp();
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int c)
+{
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(temperature_sensor, TEMPERATURE_SENSOR, value, configure, status);
\ No newline at end of file
diff --git a/platform/RaspBee/dev/temperature-sensor.h b/platform/RaspBee/dev/temperature-sensor.h
new file mode 100644
index 000000000..6cf5dbf26
--- /dev/null
+++ b/platform/RaspBee/dev/temperature-sensor.h
@@ -0,0 +1,49 @@
+/*
+* Copyright (c) 2012, BinaryLabs.
+* 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.
+*
+* @(#)$Id: temperature-sensor.h,v 1.1 2012/08/25 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* Temperature sensor header file for Atmega128rfa1.
+* \author
+* Paulo Louro <paulolouro@binarylabs.dk>
+*/
+
+#ifndef __TEMPERATURE_SENSOR_H__
+#define __TEMPERATURE_SENSOR_H__
+
+#include "lib/sensors.h"
+#include "dev/adc.h"
+
+extern const struct sensors_sensor temperature_sensor;
+
+#define TEMPERATURE_SENSOR "Temperature"
+
+#endif /* __TEMPERATURE_SENSOR_H__ */
\ No newline at end of file
diff --git a/platform/RaspBee/dev/wiring_digital.c b/platform/RaspBee/dev/wiring_digital.c
new file mode 100644
index 000000000..75b6745d6
--- /dev/null
+++ b/platform/RaspBee/dev/wiring_digital.c
@@ -0,0 +1,104 @@
+/*
+  wiring_digital.c - digital input and output functions
+  Part of Arduino - http://www.arduino.cc/
+
+  Copyright (c) 2005-2006 David A. Mellis
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General
+  Public License along with this library; if not, write to the
+  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+
+  Modified 28 September 2010 by Mark Sproul
+
+  $Id: wiring.c 248 2007-02-03 15:36:30Z mellis $
+*/
+
+#define ARDUINO_MAIN
+#include "wiring_private.h"
+#include "pins_arduino.h"
+
+void pinMode(uint8_t pin, uint8_t mode)
+{
+	uint8_t bit = digitalPinToBitMask(pin);
+	uint8_t port = digitalPinToPort(pin);
+	volatile uint8_t *reg, *out;
+
+	if (port == NOT_A_PIN) return;
+
+	// JWS: can I let the optimizer do this?
+	reg = portModeRegister(port);
+	out = portOutputRegister(port);
+
+	if (mode == INPUT) { 
+		uint8_t oldSREG = SREG;
+                cli();
+		*reg &= ~bit;
+		*out &= ~bit;
+		SREG = oldSREG;
+	} else if (mode == INPUT_PULLUP) {
+		uint8_t oldSREG = SREG;
+                cli();
+		*reg &= ~bit;
+		*out |= bit;
+		SREG = oldSREG;
+	} else {
+		uint8_t oldSREG = SREG;
+                cli();
+		*reg |= bit;
+		SREG = oldSREG;
+	}
+}
+
+void digitalWrite(uint8_t pin, uint8_t val)
+{
+	uint8_t timer = digitalPinToTimer(pin);
+	uint8_t bit = digitalPinToBitMask(pin);
+	uint8_t port = digitalPinToPort(pin);
+	volatile uint8_t *out;
+
+	if (port == NOT_A_PIN) return;
+
+	// If the pin that support PWM output, we need to turn it off
+	// before doing a digital write.
+	if (timer != NOT_ON_TIMER) turnOffPWM(timer);
+
+	out = portOutputRegister(port);
+
+	uint8_t oldSREG = SREG;
+	cli();
+
+	if (val == LOW) {
+		*out &= ~bit;
+	} else {
+		*out |= bit;
+	}
+
+	SREG = oldSREG;
+}
+
+int digitalRead(uint8_t pin)
+{
+	uint8_t timer = digitalPinToTimer(pin);
+	uint8_t bit = digitalPinToBitMask(pin);
+	uint8_t port = digitalPinToPort(pin);
+
+	if (port == NOT_A_PIN) return LOW;
+
+	// If the pin that support PWM output, we need to turn it off
+	// before getting a digital reading.
+	if (timer != NOT_ON_TIMER) turnOffPWM(timer);
+
+	if (*portInputRegister(port) & bit) return HIGH;
+	return LOW;
+}
diff --git a/platform/RaspBee/dev/wiring_private.h b/platform/RaspBee/dev/wiring_private.h
new file mode 100644
index 000000000..37c263352
--- /dev/null
+++ b/platform/RaspBee/dev/wiring_private.h
@@ -0,0 +1,69 @@
+/*
+  wiring_private.h - Internal header file.
+  Part of Arduino - http://www.arduino.cc/
+
+  Copyright (c) 2005-2006 David A. Mellis
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General
+  Public License along with this library; if not, write to the
+  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+
+  $Id: wiring.h 239 2007-01-12 17:58:39Z mellis $
+*/
+
+#ifndef WiringPrivate_h
+#define WiringPrivate_h
+
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Arduino.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#ifndef cbi
+#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
+#endif
+#ifndef sbi
+#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
+#endif
+
+#define EXTERNAL_INT_0 0
+#define EXTERNAL_INT_1 1
+#define EXTERNAL_INT_2 2
+#define EXTERNAL_INT_3 3
+#define EXTERNAL_INT_4 4
+#define EXTERNAL_INT_5 5
+#define EXTERNAL_INT_6 6
+#define EXTERNAL_INT_7 7
+
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+#define EXTERNAL_NUM_INTERRUPTS 8
+#elif defined(__AVR_ATmega128RFA1__) || (__AVR_ATmega256RFR2__)
+#define EXTERNAL_NUM_INTERRUPTS 8
+#else
+#define EXTERNAL_NUM_INTERRUPTS 2
+#endif
+
+typedef void (*voidFuncPtr)(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif
diff --git a/platform/RaspBee/node-id.c b/platform/RaspBee/node-id.c
new file mode 100644
index 000000000..8698b1855
--- /dev/null
+++ b/platform/RaspBee/node-id.c
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2006, 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.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ * $Id: node-id.c,v 1.1 2007/03/23 09:59:08 nifi Exp $
+ */
+
+/**
+ * \file
+ *         Utility to store a node id in the external flash
+ * \author
+ *         Adam Dunkels <adam@sics.se>
+ */
+
+#include "node-id.h"
+#include "contiki-conf.h"
+#include "dev/xmem.h"
+
+unsigned short node_id = 0;
+
+/*---------------------------------------------------------------------------*/
+void
+node_id_restore(void)
+{
+/* todo */
+/*
+  unsigned char buf[4];
+  xmem_pread(buf, 4, NODE_ID_XMEM_OFFSET);
+  if(buf[0] == 0xad &&
+     buf[1] == 0xde) {
+    node_id = (buf[2] << 8) | buf[3];
+  } else {
+    node_id = 0;
+  }
+*/
+ node_id = 0;
+}
+/*---------------------------------------------------------------------------*/
+void
+node_id_burn(unsigned short id)
+{
+/* todo */
+/*
+  unsigned char buf[4];
+  buf[0] = 0xad;
+  buf[1] = 0xde;
+  buf[2] = id >> 8;
+  buf[3] = id & 0xff;
+  xmem_erase(XMEM_ERASE_UNIT_SIZE, NODE_ID_XMEM_OFFSET);
+  xmem_pwrite(buf, 4, NODE_ID_XMEM_OFFSET);
+*/
+}
+/*---------------------------------------------------------------------------*/
diff --git a/platform/RaspBee/node-id.h b/platform/RaspBee/node-id.h
new file mode 100644
index 000000000..592379fc9
--- /dev/null
+++ b/platform/RaspBee/node-id.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2006, 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.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ * $Id: node-id.h,v 1.1 2007/03/23 09:59:08 nifi Exp $
+ */
+
+#ifndef __NODE_ID_H__
+#define __NODE_ID_H__
+
+void node_id_restore(void);
+void node_id_burn(unsigned short node_id);
+
+extern unsigned short node_id;
+
+#endif /* __NODE_ID_H__ */
diff --git a/platform/RaspBee/params.c b/platform/RaspBee/params.c
new file mode 100644
index 000000000..4b0252387
--- /dev/null
+++ b/platform/RaspBee/params.c
@@ -0,0 +1,273 @@
+/*
+ * Copyright (c) 2011, 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.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ */
+#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
+
+#define DEBUG 1
+#if DEBUG
+#define PRINTD(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
+#else
+#define PRINTD(...)
+#endif
+
+#include "contiki.h"
+#include <avr/pgmspace.h>
+#include <avr/eeprom.h>
+#include <stdio.h>
+#include <string.h>
+
+#if AVR_WEBSERVER
+//#include "httpd-fs.h"
+//#include "httpd-cgi.h"
+#endif
+
+#include "contiki-net.h"
+#include "params.h"
+
+#if WITH_NODE_ID
+uint16_t node_id;
+#endif
+
+#if CONTIKI_CONF_RANDOM_MAC
+extern uint8_t rng_get_uint8(void);
+static void
+generate_new_eui64(uint8_t eui64[8]) {
+  eui64[0] = 0x02;
+  eui64[1] = rng_get_uint8();
+  eui64[2] = rng_get_uint8();
+  eui64[3] = 0xFF;
+  eui64[4] = 0xFE;
+  eui64[5] = rng_get_uint8();
+  eui64[6] = rng_get_uint8();
+  eui64[7] = rng_get_uint8();
+}
+#endif
+
+#if AVR_WEBSERVER
+/* Webserver builds can set these in httpd-fsdata.c via makefsdata.h */
+extern uint8_t default_mac_address[8];
+extern uint8_t default_server_name[16];
+extern uint8_t default_domain_name[30];
+#else
+const uint8_t default_mac_address[8] PROGMEM = PARAMS_EUI64ADDR;
+const uint8_t default_server_name[] PROGMEM = PARAMS_SERVERNAME;
+const uint8_t default_domain_name[] PROGMEM = PARAMS_DOMAINNAME;
+#endif
+
+#if PARAMETER_STORAGE==0
+/* 0 Hard coded, minmal program and eeprom usage. */
+
+extern uint8_t bootloader_get_mac(uint8_t);
+
+uint8_t
+params_get_eui64(uint8_t *eui64) {
+#if CONTIKI_CONF_RANDOM_MAC
+    PRINTD("Generating random EUI64 MAC\n");
+    generate_new_eui64(eui64);
+    return 1;
+#else
+    uint8_t i;
+#if BOOTLOADER_GET_MAC
+    for (i=0;i<sizeof(default_mac_address);i++){
+      eui64[i] =  bootloader_get_mac(i);
+    }
+#else
+    for (i=0;i<sizeof(default_mac_address);i++) eui64[i] = pgm_read_byte_near(default_mac_address+i);
+#endif
+    return 0;
+#endif
+}
+#elif PARAMETER_STORAGE==1
+/* 1 Stored in fixed eeprom locations, rewritten from flash if corrupt.
+ * They can be manually changed and kept over program reflash.
+ * The channel and bit complement are used to check EEMEM integrity,
+ * If corrupt all values will be rewritten with the default flash values.
+ * To make this work, get the channel before anything else.
+ */
+#if !AVR_WEBSERVER
+uint8_t eemem_mac_address[] EEMEM = PARAMS_EUI64ADDR;
+uint8_t eemem_server_name[] EEMEM = PARAMS_SERVERNAME;
+uint8_t eemem_domain_name[] EEMEM = PARAMS_DOMAINNAME;
+#endif /*AVR_WEBSERVER */
+
+uint16_t eemem_nodeid EEMEM = PARAMS_NODEID;
+uint8_t eemem_channel[2] EEMEM = {CHANNEL_802_15_4, ~CHANNEL_802_15_4};
+uint16_t eemem_panid EEMEM = IEEE802154_CONF_PANID;
+uint16_t eemem_panaddr EEMEM = PARAMS_PANADDR;
+uint8_t eemem_txpower EEMEM = PARAMS_TXPOWER;
+
+#if CONTIKI_CONF_RANDOM_MAC
+static uint8_t randomeui64;
+#endif
+
+uint8_t
+params_get_channel(void) {
+  uint8_t x[2];
+  *(uint16_t *)x = eeprom_read_word ((uint16_t *)&eemem_channel);
+/* Don't return an invalid channel number */
+  if( (x[0]<11) || (x[0] > 26)) x[1]=x[0];
+/* Do exclusive or test on the two values read */
+  if((uint8_t)x[0]!=(uint8_t)~x[1]) {//~x[1] can promote comparison to 16 bit
+/* Verification fails, rewrite everything */
+    uint8_t i,buffer[32];
+    PRINTD("EEPROM is corrupt, rewriting with defaults.\n");
+#if CONTIKI_CONF_RANDOM_MAC
+    PRINTD("Generating random EUI64 MAC\n");
+    generate_new_eui64(&buffer);
+    randomeui64=1;
+#else
+    for (i=0;i<sizeof(default_mac_address);i++) buffer[i] = pgm_read_byte_near(default_mac_address+i);
+#endif
+/* eeprom_write_block should not be interrupted */
+    cli();
+    eeprom_write_block(&buffer,  &eemem_mac_address, sizeof(eemem_mac_address));
+    for (i=0;i<sizeof(default_server_name);i++) buffer[i] = pgm_read_byte_near(default_server_name+i);
+    eeprom_write_block(&buffer,  &eemem_server_name, sizeof(eemem_server_name));
+    for (i=0;i<sizeof(default_domain_name);i++) buffer[i] = pgm_read_byte_near(default_domain_name+i);
+    eeprom_write_block(&buffer,  &eemem_domain_name, sizeof(eemem_domain_name));
+    eeprom_write_word(&eemem_panid  , IEEE802154_CONF_PANID);
+    eeprom_write_word(&eemem_panaddr, PARAMS_PANADDR);
+    eeprom_write_byte(&eemem_txpower, PARAMS_TXPOWER);
+    eeprom_write_word(&eemem_nodeid, PARAMS_NODEID);
+    x[0] = CHANNEL_802_15_4;
+    x[1]= ~x[0];
+    eeprom_write_word((uint16_t *)&eemem_channel, *(uint16_t *)x);
+    sei();
+  }
+/* Always returns a valid channel */
+  return x[0];
+}
+uint8_t
+params_get_eui64(uint8_t *eui64) {
+  cli();
+  eeprom_read_block ((void *)eui64, &eemem_mac_address, sizeof(linkaddr_t));
+  sei();
+#if CONTIKI_CONF_RANDOM_MAC
+  return randomeui64;
+#else
+  return 0;
+#endif
+}
+uint16_t
+params_get_panid(void) {
+  return eeprom_read_word(&eemem_panid);
+}
+uint16_t
+params_get_panaddr(void) {
+  return eeprom_read_word (&eemem_panaddr);
+}
+uint8_t
+params_get_txpower(void)
+{
+  return eeprom_read_byte(&eemem_txpower);
+}
+
+#else /* CONTIKI_CONF_SETTINGS_MANAGER */
+
+uint8_t
+params_get_channel() {
+  uint8_t x;
+  size_t  size = 1;
+  if (settings_get(SETTINGS_KEY_CHANNEL, 0,(unsigned char*)&x, &size) == SETTINGS_STATUS_OK) {
+    PRINTD("<-Get RF channel %u\n",x);
+  } else {
+    x = CHANNEL_802_15_4;
+    if (settings_add_uint8(SETTINGS_KEY_CHANNEL,x ) == SETTINGS_STATUS_OK) {
+      PRINTD("->Set EEPROM RF channel to %d\n",x);
+    }
+  }
+  return x;
+}
+uint8_t
+params_get_eui64(uint8_t *eui64) {
+  size_t size = sizeof(linkaddr_t); 
+  if(settings_get(SETTINGS_KEY_EUI64, 0, (unsigned char*)eui64, &size) == SETTINGS_STATUS_OK) {
+    PRINTD("<-Get EUI64 MAC\n");
+    return 0;		
+  }
+#if CONTIKI_CONF_RANDOM_MAC
+  PRINTD("Generating random EUI64 MAC\n");
+  generate_new_eui64(eui64);
+#else
+  {uint8_t i;for (i=0;i<8;i++) eui64[i] = pgm_read_byte_near(default_mac_address+i);} //test this
+#endif
+  if (settings_add(SETTINGS_KEY_EUI64,(unsigned char*)eui64,8) == SETTINGS_STATUS_OK) {
+    PRINTD("->Set EEPROM MAC address\n");
+  }
+#if CONTIKI_CONF_RANDOM_MAC
+  return 1;
+#else
+  return 0;
+#endif
+}
+uint16_t
+params_get_panid(void) {
+  uint16_t x;
+  size_t  size = 2;
+  if (settings_get(SETTINGS_KEY_PAN_ID, 0,(unsigned char*)&x, &size) == SETTINGS_STATUS_OK) {
+    PRINTD("<-Get PAN ID of %04x\n",x);
+  } else {
+    x=IEEE802154_PANID;
+    if (settings_add_uint16(SETTINGS_KEY_PAN_ID,x)==SETTINGS_STATUS_OK) {
+      PRINTD("->Set EEPROM PAN ID to %04x\n",x);
+    }
+  }
+  return x;
+}
+uint16_t
+params_get_panaddr(void) {
+  uint16_t x;
+  size_t  size = 2;
+  if (settings_get(SETTINGS_KEY_PAN_ADDR, 0,(unsigned char*)&x, &size) == SETTINGS_STATUS_OK) {
+    PRINTD("<-Get PAN address of %04x\n",x);
+  } else {
+    x=PARAMS_PANADDR;
+    if (settings_add_uint16(SETTINGS_KEY_PAN_ADDR,x)==SETTINGS_STATUS_OK) {
+      PRINTD("->Set EEPROM PAN address to %04x\n",x);
+    }
+  }        
+  return x;
+}
+uint8_t
+params_get_txpower(void) {
+  uint8_t x;
+  size_t  size = 1;
+  if (settings_get(SETTINGS_KEY_TXPOWER, 0,(unsigned char*)&x, &size) == SETTINGS_STATUS_OK) {
+    PRINTD("<-Get tx power of %d (0=max)\n",x);
+  } else {
+    x=PARAMS_TXPOWER;
+    if (settings_add_uint8(SETTINGS_KEY_TXPOWER,x)==SETTINGS_STATUS_OK) {
+      PRINTD("->Set EEPROM tx power of %d (0=max)\n",x);
+    }
+  }
+  return x;
+}
+#endif /* CONTIKI_CONF_SETTINGS_MANAGER */
diff --git a/platform/RaspBee/params.h b/platform/RaspBee/params.h
new file mode 100644
index 000000000..68c717dec
--- /dev/null
+++ b/platform/RaspBee/params.h
@@ -0,0 +1,105 @@
+#ifndef PARAMS_H_
+#define PARAMS_H_
+/* PARAMETER_STORAGE =
+ * 0 Hard coded, minmal program and eeprom usage.
+ * 1 Stored in fixed eeprom locations, rewritten from flash if corrupt.
+ *   This allows parameter changes using a hardware programmer or custom application code.
+ *   Corruption test is based on channel verify so get the channel before anything else!
+ * 2 Obtained from eeprom using the general settings manager and read from program flash if not present.
+ *   Useful for for testing builds without wearing out flash memory.
+ * 3 Obtained from eeprom using the settings manager and rewritten from flash if not present.
+ *   This ensures all parameters are present in upper eeprom flash.
+ *
+ * Note the parameters in this file can be changed without forcing a complete rebuild.
+ */
+// default settings
+#define CHANNEL_802_15_4          26     // default frequency (11-26) 
+
+// end default settings
+
+#define CONTIKI_CONF_RANDOM_MAC 1        //adds 78 bytes
+#define CONTIKI_CONF_SETTINGS_MANAGER 0  //adds 1696 bytes
+#define BOOTLOADER_GET_MAC 0             // get mac form boolaoder, need bootlaoder bonsai, PARAMETER_STORAGE 0
+
+#if CONTIKI_CONF_SETTINGS_MANAGER
+//#define PARAMETER_STORAGE 2
+#define PARAMETER_STORAGE 2
+#else
+//#define PARAMETER_STORAGE 1
+#define PARAMETER_STORAGE 1           // get mac form boolaoder, need bootlaoder bonsai, PARAMETER_STORAGE 0
+#endif
+
+/* Include settings.h, then dummy out the write routines */
+#include "settings.h"
+#if PARAMETER_STORAGE==2
+#define settings_add(...) 0
+#define settings_add_uint8(...) 0
+#define settings_add_uint16(...) 0
+#endif
+
+#if AVR_WEBSERVER
+/* Webserver builds can set some defaults in httpd-fsdata.c via makefsdata.h */
+extern uint8_t eemem_mac_address[8];
+extern uint8_t eemem_server_name[16];
+extern uint8_t eemem_domain_name[30];
+#endif
+#ifdef SERVER_NAME
+#define PARAMS_SERVERNAME SERVER_NAME
+#else
+#define PARAMS_SERVERNAME "ATMEGA256rfr2"
+#endif
+#ifdef DOMAIN_NAME
+#define PARAMS_DOMAINNAME DOMAIN_NAME
+#else
+#define PARAMS_DOMAINNAME "localhost"
+#endif
+#ifdef NODE_ID
+#define PARAMS_NODEID NODE_ID
+#else
+#define PARAMS_NODEID 0
+#endif
+#ifdef IEEE802154_PANADDR
+#define PARAMS_PANADDR IEEE802154_PANADDR
+#else
+#define PARAMS_PANADDR 0
+#endif
+#ifdef RF230_MAX_TX_POWER
+#define PARAMS_TXPOWER RF230_MAX_TX_POWER
+#else
+#define PARAMS_TXPOWER 0
+#endif
+#ifdef EUI64_ADDRESS
+#define PARAMS_EUI64ADDR EUI64_ADDRESS
+#else
+/* This form of of EUI64 mac allows full 6LoWPAN header compression from mac address */
+#if UIP_CONF_LL_802154
+//#define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN}
+//#define PARAMS_EUI64ADDR {0x00, 0x21, 0x2e, 0xff, 0xff, 0x00, 0x1E, 0xFB}
+#define PARAMS_EUI64ADDR {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01}
+#else
+//#define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xff, 0xfe, 0xNN, 0xNN, 0xNN}
+#define PARAMS_EUI64ADDR {0x00, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x03}
+#endif
+/* This form of of EUI64 mac allows 16 bit 6LoWPAN header compression on multihops */
+//#define PARAMS_EUI64ADDR {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0xNN, 0xNN}
+#endif
+
+uint8_t params_get_eui64(uint8_t *eui64);
+#if PARAMETER_STORAGE==0
+/* Hard coded program flash parameters */
+#define params_get_servername(...) 
+#define params_get_nodeid(...)  PARAMS_NODEID
+#define params_get_channel(...) CHANNEL_802_15_4
+#define params_get_panid(...)   IEEE802154_PANID
+#define params_get_panaddr(...) PARAMS_PANADDR
+#define params_get_txpower(...) PARAMS_TXPOWER
+#else
+/* Parameters stored in eeprom */
+uint16_t params_get_nodeid(void);
+uint8_t params_get_channel(void);
+uint16_t params_get_panid(void);
+uint16_t params_get_panaddr(void);
+uint8_t params_get_txpower(void);
+#endif
+
+#endif /* PARAMS_H_ */
diff --git a/platform/RaspBee/slip_uart0.c b/platform/RaspBee/slip_uart0.c
new file mode 100644
index 000000000..edff55385
--- /dev/null
+++ b/platform/RaspBee/slip_uart0.c
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2010, University of Colombo School of Computing
+ * 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
+ *         Machine dependent AVR SLIP routines for UART0.
+ * \author
+ *         Kasun Hewage <kasun.ch@gmail.com>
+ */
+
+#include <stdio.h>
+#include "contiki.h"
+#include "dev/rs232.h"
+#include "slip.h"
+
+/*---------------------------------------------------------------------------*/
+static int
+slip_putchar(char c, FILE *stream)
+{
+#define SLIP_END 0300
+  static char debug_frame = 0;
+
+  if (!debug_frame) {        /* Start of debug output */
+    slip_arch_writeb(SLIP_END);
+    slip_arch_writeb('\r'); /* Type debug line == '\r' */
+    debug_frame = 1;
+  }
+
+  slip_arch_writeb((unsigned char)c);
+          
+  /*
+   * Line buffered output, a newline marks the end of debug output and
+   * implicitly flushes debug output.         
+   */
+  if (c == '\n') {
+    slip_arch_writeb(SLIP_END);
+    debug_frame = 0;
+  }
+
+  return c;
+}
+/*---------------------------------------------------------------------------*/
+static FILE slip_stdout = FDEV_SETUP_STREAM(slip_putchar, NULL,
+                                            _FDEV_SETUP_WRITE);
+/*---------------------------------------------------------------------------*/
+void
+slip_arch_init(unsigned long ubr)
+{
+  rs232_set_input(SLIP_PORT, slip_input_byte);
+  stdout = &slip_stdout;
+}
+/*---------------------------------------------------------------------------*/
+/*
+ XXX:
+      Currently, the following function is in cpu/avr/dev/rs232.c file. this
+      should be moved to here from there hence this is a platform specific slip 
+      related function. 
+void
+slip_arch_writeb(unsigned char c)
+{
+  rs232_send(RS232_PORT_0, c);
+}
+*/
diff --git a/platform/guhRF/Makefile.guhRF b/platform/guhRF/Makefile.guhRF
new file mode 100644
index 000000000..2a5b159ef
--- /dev/null
+++ b/platform/guhRF/Makefile.guhRF
@@ -0,0 +1,95 @@
+CONTIKI_TARGET_DIRS = . dev apps net loader
+
+CONTIKI_CORE=contiki-main
+CONTIKI_TARGET_MAIN = ${CONTIKI_CORE}.o
+CONTIKI_TARGET_SOURCEFILES += contiki-main.c params.c node-id.c
+
+#Needed for slip
+CONTIKI_TARGET_SOURCEFILES += led.c sensors.c slip_uart0.c slip.c leds-arch.c
+
+#CONTIKI_TARGET_SOURCEFILES += temperature-sensor.c adc.c 
+#Needed for Button
+CONTIKI_TARGET_SOURCEFILES += button-sensor.c
+
+# i2c Master
+#CONTIKI_TARGET_SOURCEFILES += i2c.c
+#Needed for DHT11 humidity sensor
+#CONTIKI_TARGET_SOURCEFILES += dht11.c
+#Needed for DS18S20 temperature sensor
+#CONTIKI_TARGET_SOURCEFILES += ds1820.c
+
+#Needed for Battery test
+CONTIKI_TARGET_SOURCEFILES += battery-sensor.c batmon.c
+
+#Needed for PIR
+#CONTIKI_TARGET_SOURCEFILES += pir-sensor.c
+#Needed for OPTRIAC
+#CONTIKI_TARGET_SOURCEFILES += optriac-sensor.c
+
+CONTIKIAVR=$(CONTIKI)/cpu/avr
+
+#Needed for SERVO
+#CONTIKI_TARGET_SOURCEFILES += servo.c servo-sensor.c
+#Needed for Timer4 Servo
+##CONTIKI_TARGET_SOURCEFILES += t4-servo.c t4-servo-sensor.c
+#Needed for Relay 1 to 4
+#CONTIKI_TARGET_SOURCEFILES += relay.c relay-sensor.c
+
+#-------------------------------------------------------------------------------
+# guh Source Files
+
+
+# Smart Grid Ready Interface
+CONTIKI_TARGET_SOURCEFILES += sg-ready.c
+
+
+
+#-------------------------------------------------------------------------------
+
+
+CONTIKIBOARD=.
+#BOOTLOADER_START = 0x1F000
+BOOTLOADER_START = 0x3E000
+CONTIKI_PLAT_DEFS = -DF_CPU=16000000UL -DAUTO_CRC_PADDING=2 -DPLAT_TIMER=5
+
+MCU=atmega256rfr2
+
+AVRDUDE_PROGRAMMER=jtag2
+
+# For usb devices, you may either use PORT=usb, or (e.g. if you have more than one
+# programmer connected) you can use the following trick to find out the serial number:
+#
+# The example is for an JTAGICE mkII used to program an atmega256:
+# avrdude -v -P usb:xxxx -c jtag2 -p atmega256
+AVRDUDE_PORT=usb:00B000000D79
+
+
+# Additional avrdude options
+# Verify off
+AVRDUDE_OPTIONS=-V
+AVRDUDE_MCU=m256rfr2
+
+#debug
+# CFLAGS  += -save-temps
+# Bootloader bonsai
+# LDFLAGS  += -save-temps
+# For the old bonsai bootloader compiled with squeeze gcc-avr we
+# directly used the address of the bootloader:
+#BOOTLOADER_GET_MAC=0x0001f3a0
+# For newer bonsai we have a jump table at the end of the bootloader
+# section:
+#BOOTLOADER_GET_MAC=0x0001ff80
+#guhRF Bootloader MAC Address
+BOOTLOADER_GET_MAC=0x0003ff80
+
+LDFLAGS  += -Wl,--defsym,bootloader_get_mac=$(BOOTLOADER_GET_MAC)
+
+
+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/ipv6 core/net/ipv4 core/net/ip \
+#     core/net/rime \
+#     core/net/rpl \
diff --git a/platform/guhRF/contiki-conf.h b/platform/guhRF/contiki-conf.h
new file mode 100644
index 000000000..27745193d
--- /dev/null
+++ b/platform/guhRF/contiki-conf.h
@@ -0,0 +1,315 @@
+/*
+ * Copyright (c) 2006, Technical University of Munich
+ * 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
+ *         Configuration for Atmel ATMEGA256RFR2
+ * \author
+ *         David Kopf <dak664@embarqmail.com>
+	   Bernhard Trinnes <bernhard.trinnes@guh.guru>
+ */
+
+#ifndef CONTIKI_CONF_H_
+#define CONTIKI_CONF_H_
+
+/* Platform name, type, and MCU clock rate */
+#define PLATFORM_NAME  "guhRF"
+#define PLATFORM_TYPE  ATMEGA256RFR2
+#ifndef F_CPU
+#define F_CPU          16000000UL
+#endif
+
+
+#include <stdint.h>
+
+#define IEEE802154_CONF_PANID     0xABCD // default panid
+
+/* The AVR tick interrupt usually is done with an 8 bit counter around 128 Hz.
+ * 125 Hz needs slightly more overhead during the interrupt, as does a 32 bit
+ * clock_time_t.
+ */
+ /* Clock ticks per second */
+#define CLOCK_CONF_SECOND 128
+#if 1
+/* 16 bit counter overflows every ~10 minutes */
+typedef unsigned short clock_time_t;
+#define CLOCK_LT(a,b)  ((signed short)((a)-(b)) < 0)
+#define INFINITE_TIME 0xffff
+#define RIME_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME INFINITE_TIME/CLOCK_CONF_SECOND /* Default uses 600 */
+#define COLLECT_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME INFINITE_TIME/CLOCK_CONF_SECOND /* Default uses 600 */
+#else
+typedef unsigned long clock_time_t;
+#define CLOCK_LT(a,b)  ((signed long)((a)-(b)) < 0)
+#define INFINITE_TIME 0xffffffff
+#endif
+/* These routines are not part of the contiki core but can be enabled in cpu/avr/clock.c */
+void clock_delay_msec(uint16_t howlong);
+void clock_adjust_ticks(clock_time_t howmany);
+
+
+/* and theoretically can use TIMER2 with it to keep time. Else TIMER0 is used. */
+/* The sleep timer requires the crystal and adds a TIMER2 interrupt routine if not already define by clock.c */
+#define AVR_CONF_USE32KCRYSTAL 0
+
+
+/* COM port to be used for SLIP connection. This is usually UART0, but see above */
+#define SLIP_PORT RS232_PORT_0
+
+/* Pre-allocated memory for loadable modules heap space (in bytes)*/
+/* Default is 4096. Currently used only when elfloader is present. Not tested on Raven */
+//#define MMEM_CONF_SIZE 256
+
+/* Starting address for code received via the codeprop facility. Not tested. */
+typedef unsigned long off_t;
+//#define EEPROMFS_ADDR_CODEPROP 0x8000
+
+/* Logging adds 200 bytes to program size. RS232 output slows down webserver. */
+//#define LOG_CONF_ENABLED         1
+
+/* RADIOSTATS is used in rf230bb, clock.c and the webserver cgi to report radio usage */
+/* It has less overhead than ENERGEST */
+//#define RADIOSTATS                1
+
+/* More extensive stats, via main loop printfs or webserver status pages */
+//#define ENERGEST_CONF_ON          1
+
+/* Packet statistics */
+typedef unsigned short uip_stats_t;
+//#define UIP_STATISTICS            1
+
+/* Available watchdog timeouts depend on mcu. Default is WDTO_2S. -1 Disables the watchdog. */
+/* AVR Studio simulator tends to reboot due to clocking the WD 8 times too fast */
+//#define WATCHDOG_CONF_TIMEOUT -1
+
+/* Debugflow macro, useful for tracing path through mac and radio interrupts */
+//#define DEBUGFLOWSIZE 128
+
+
+/* Define MAX_*X_POWER to reduce tx power and ignore weak rx packets for testing a miniature multihop network.
+ * Leave undefined for full power and sensitivity.
+ * tx=0 (3dbm, default) to 15 (-17.2dbm)
+ * RF230_CONF_AUTOACK sets the extended mode using the energy-detect register with rx=0 (-91dBm) to 84 (-7dBm)
+ *   else the rssi register is used having range 0 (91dBm) to 28 (-10dBm)
+ *   For simplicity RF230_MIN_RX_POWER is based on the energy-detect value and divided by 3 when autoack is not set.
+ * On the RF230 a reduced rx power threshold will not prevent autoack if enabled and requested.
+ * These numbers applied to both Raven and Jackdaw give a maximum communication distance of about 15 cm
+ * and a 10 meter range to a full-sensitivity RF230 sniffer.
+#define RF230_MAX_TX_POWER 15
+#define RF230_MIN_RX_POWER 30
+ */
+  /* The rf231 and ATMEGA256RFR2 can use an rssi threshold for triggering rx_busy that saves 0.5ma in rx mode */
+/* 1 - 15 maps into -90 to -48 dBm; the register is written with RF230_MIN_RX_POWER/6 + 1. Undefine for -100dBm sensitivity */
+//#define RF230_MIN_RX_POWER        0
+
+/* Network setup */
+/* TX routine passes the cca/ack result in the return parameter */
+#define RDC_CONF_HARDWARE_ACK    1
+/* TX routine does automatic cca and optional backoffs */
+#define RDC_CONF_HARDWARE_CSMA   1
+/* Allow MCU sleeping between channel checks */
+#define RDC_CONF_MCU_SLEEP        1
+
+
+#if NETSTACK_CONF_WITH_IPV6
+#define LINKADDR_CONF_SIZE        8
+#define UIP_CONF_ICMP6            1
+#define UIP_CONF_UDP              1
+#define UIP_CONF_TCP              1
+#define NETSTACK_CONF_NETWORK     sicslowpan_driver
+#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
+#else
+/* ip4 should build but is largely untested */
+#define LINKADDR_CONF_SIZE        2
+#define NETSTACK_CONF_NETWORK     rime_driver
+#endif
+
+#define UIP_CONF_LL_802154        1
+#define UIP_CONF_LLH_LEN          0
+
+/* 10 bytes per stateful address context - see sicslowpan.c */
+/* Default is 1 context with prefix aaaa::/64 */
+/* These must agree with all the other nodes or there will be a failure to communicate! */
+#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 1
+#define SICSLOWPAN_CONF_ADDR_CONTEXT_0 {addr_contexts[0].prefix[0]=0xaa;addr_contexts[0].prefix[1]=0xaa;}
+#define SICSLOWPAN_CONF_ADDR_CONTEXT_1 {addr_contexts[1].prefix[0]=0xbb;addr_contexts[1].prefix[1]=0xbb;}
+#define SICSLOWPAN_CONF_ADDR_CONTEXT_2 {addr_contexts[2].prefix[0]=0x20;addr_contexts[2].prefix[1]=0x01;addr_contexts[2].prefix[2]=0x49;addr_contexts[2].prefix[3]=0x78,addr_contexts[2].prefix[4]=0x1d;addr_contexts[2].prefix[5]=0xb1;}
+
+/* Take the default TCP maximum segment size for efficiency and simpler wireshark captures */
+/* Use this to prevent 6LowPAN fragmentation (whether or not fragmentation is enabled) */
+//#define UIP_CONF_TCP_MSS       48
+
+#define UIP_CONF_IP_FORWARD      0
+#define UIP_CONF_FWCACHE_SIZE    0
+
+#define UIP_CONF_IPV6_CHECKS     1
+#define UIP_CONF_IPV6_QUEUE_PKT  1
+#define UIP_CONF_IPV6_REASSEMBLY 0
+
+#define UIP_CONF_UDP_CHECKSUMS   1
+#define UIP_CONF_TCP_SPLIT       1
+#define UIP_CONF_DHCP_LIGHT      1
+
+
+//#if 1 /* No radio cycling */
+#if 0 /* radio cycling */
+
+#define NETSTACK_CONF_MAC         nullmac_driver
+#define NETSTACK_CONF_RDC         sicslowmac_driver
+#define NETSTACK_CONF_FRAMER      framer_802154
+#define NETSTACK_CONF_RADIO       rf230_driver
+/* AUTOACK receive mode gives better rssi measurements, even if ACK is never requested */
+#define RF230_CONF_AUTOACK        1
+/* Request 802.15.4 ACK on all packets sent (else autoretry). This is primarily for testing. */
+#define SICSLOWPAN_CONF_ACK_ALL   0
+/* 1 + Number of auto retry attempts 0-15 (0 implies don't use extended TX_ARET_ON mode) */
+#define RF230_CONF_FRAME_RETRIES    2
+/* Number of csma retry attempts 0-5 in extended tx mode (7 does immediate tx with no csma) */
+#define RF230_CONF_CSMA_RETRIES   5
+/* Default is one RAM buffer for received packets. More than one may benefit multiple TCP connections or ports */
+#define RF230_CONF_RX_BUFFERS     3
+#define SICSLOWPAN_CONF_FRAG      1
+/* Most browsers reissue GETs after 3 seconds which stops fragment reassembly so a longer MAXAGE does no good */
+#define SICSLOWPAN_CONF_MAXAGE    3
+/* How long to wait before terminating an idle TCP connection. Smaller to allow faster sleep. Default is 120 seconds */
+/* If wait is too short the connection can be reset as a result of multiple fragment reassembly timeouts */
+#define UIP_CONF_WAIT_TIMEOUT    20
+/* 211 bytes per queue buffer */
+#define QUEUEBUF_CONF_NUM         8
+/* 54 bytes per queue ref buffer */
+#define QUEUEBUF_CONF_REF_NUM     2
+/* Allocate remaining RAM as desired */
+/* 30 bytes per TCP connection */
+/* 6LoWPAN does not do well with concurrent TCP streams, as new browser GETs collide with packets coming */
+/* from previous GETs, causing decreased throughput, retransmissions, and timeouts. Increase to study this. */
+/* ACKs to other ports become interleaved with computation-intensive GETs, so ACKs are particularly missed. */
+/* Increasing the number of packet receive buffers in RAM helps to keep ACKs from being lost */
+#define UIP_CONF_MAX_CONNECTIONS  4
+/* 2 bytes per TCP listening port */
+#define UIP_CONF_MAX_LISTENPORTS  4
+/* 25 bytes per UDP connection */
+#define UIP_CONF_UDP_CONNS       10
+/* See uip-ds6.h */
+#define NBR_TABLE_CONF_MAX_NEIGHBORS      20
+#define UIP_CONF_DS6_DEFRT_NBU    2
+#define UIP_CONF_DS6_PREFIX_NBU   3
+#define UIP_CONF_MAX_ROUTES       20
+#define UIP_CONF_DS6_ADDR_NBU     3
+#define UIP_CONF_DS6_MADDR_NBU    0
+#define UIP_CONF_DS6_AADDR_NBU    0
+
+
+#elif 1  /* Contiki-mac radio cycling */
+//#define NETSTACK_CONF_MAC         nullmac_driver
+/* csma needed for burst mode at present. Webserver won't work without it */
+#define NETSTACK_CONF_MAC         csma_driver
+#define NETSTACK_CONF_RDC         contikimac_driver
+/* Default is two CCA separated by 500 usec */
+#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE   8
+/* So without the header this needed for RPL mesh to form */
+#define CONTIKIMAC_FRAMER_CONF_SHORTEST_PACKET_SIZE   43-18  //multicast RPL DIS length
+/* Not tested much yet */
+#define CONTIKIMAC_CONF_WITH_PHASE_OPTIMIZATION 0
+#define CONTIKIMAC_CONF_COMPOWER               1
+#define RIMESTATS_CONF_ENABLED                 0
+
+#if NETSTACK_CONF_WITH_IPV6
+#define NETSTACK_CONF_FRAMER      framer_802154
+#else /* NETSTACK_CONF_WITH_IPV6 */
+#define NETSTACK_CONF_FRAMER      contikimac_framer
+#endif /* NETSTACK_CONF_WITH_IPV6 */
+
+#define NETSTACK_CONF_RADIO       rf230_driver
+/* The radio needs to interrupt during an rtimer interrupt */
+#define RTIMER_CONF_NESTED_INTERRUPTS 1
+#define RF230_CONF_AUTOACK        1
+/* A 0 here means non-extended mode; 1 means extended mode with no retry, >1 for retrys */
+/* Contikimac strobes on its own, but hardware retries are faster */
+#define RF230_CONF_FRAME_RETRIES  1
+/* Long csma backoffs will compromise radio cycling; set to 0 for 1 csma */
+#define RF230_CONF_CSMA_RETRIES   0
+#define SICSLOWPAN_CONF_FRAG      1
+#define SICSLOWPAN_CONF_MAXAGE    3
+/* 211 bytes per queue buffer. Contikimac burst mode needs 15 for a 1280 byte MTU */
+#define QUEUEBUF_CONF_NUM         15
+/* 54 bytes per queue ref buffer */
+#define QUEUEBUF_CONF_REF_NUM     2
+/* Allocate remaining RAM. Not much left due to queuebuf increase  */
+#define UIP_CONF_MAX_CONNECTIONS  2
+#define UIP_CONF_MAX_LISTENPORTS  4
+#define UIP_CONF_UDP_CONNS        5
+#define NBR_TABLE_CONF_MAX_NEIGHBORS      20
+#define UIP_CONF_DS6_DEFRT_NBU    2
+#define UIP_CONF_DS6_PREFIX_NBU   3
+#define UIP_CONF_MAX_ROUTES       4
+#define UIP_CONF_DS6_ADDR_NBU     3
+#define UIP_CONF_DS6_MADDR_NBU    0
+#define UIP_CONF_DS6_AADDR_NBU    0
+
+#else
+#error Network configuration not specified!
+#endif   /* Network setup */
+
+/* ************************************************************************** */
+//#pragma mark RPL Settings
+/* ************************************************************************** */
+#if UIP_CONF_IPV6_RPL
+
+#define UIP_CONF_ROUTER                 1
+#define UIP_CONF_ND6_SEND_RA		0
+#define UIP_CONF_ND6_REACHABLE_TIME     600000
+#define UIP_CONF_ND6_RETRANS_TIMER      10000
+
+/* For slow slip connections, to prevent buffer overruns */
+//#define UIP_CONF_RECEIVE_WINDOW 300
+#undef UIP_CONF_FWCACHE_SIZE
+#define UIP_CONF_FWCACHE_SIZE    30
+#define UIP_CONF_BROADCAST       1
+#define UIP_ARCH_IPCHKSUM        1
+#define UIP_CONF_PINGADDRCONF    0
+#define UIP_CONF_LOGGING         0
+
+#endif /* RPL */
+
+#define CCIF
+#define CLIF
+#ifndef CC_CONF_INLINE
+#define CC_CONF_INLINE inline
+#endif
+
+/* include the project config */
+/* PROJECT_CONF_H might be defined in the project Makefile */
+#ifdef PROJECT_CONF_H
+#include PROJECT_CONF_H
+#endif
+
+#endif /* CONTIKI_CONF_H_ */
diff --git a/platform/guhRF/contiki-main.c b/platform/guhRF/contiki-main.c
new file mode 100644
index 000000000..1b12f3da5
--- /dev/null
+++ b/platform/guhRF/contiki-main.c
@@ -0,0 +1,595 @@
+/*
+ * Copyright (c) 2006, Technical University of Munich
+ * 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.
+ *
+ */
+#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
+
+#define ANNOUNCE_BOOT 1    //adds about 600 bytes to program size
+#if ANNOUNCE_BOOT
+#define PRINTA(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
+#else
+#define PRINTA(...)
+#endif
+
+#define DEBUG 0
+#if DEBUG
+#define PRINTD(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
+#else
+#define PRINTD(...)
+#endif
+
+#include <avr/pgmspace.h>
+#include <avr/fuse.h>
+#include <avr/eeprom.h>
+#include <avr/io.h>
+#include <stdio.h>
+#include <string.h>
+#include <dev/watchdog.h>
+
+#include "loader/symbols-def.h"
+#include "loader/symtab.h"
+
+#include "params.h"
+#include "radio/rf230bb/rf230bb.h"
+#include "net/mac/frame802154.h"
+#include "net/mac/framer-802154.h"
+#include "net/ipv6/sicslowpan.h"
+
+#include "contiki.h"
+#include "contiki-net.h"
+#include "contiki-lib.h"
+
+#include "dev/rs232.h"
+#include "dev/serial-line.h"
+#include "dev/slip.h"
+
+#if AVR_WEBSERVER
+#include "httpd-fs.h"
+#include "httpd-cgi.h"
+#endif
+
+#ifdef COFFEE_FILES
+#include "cfs/cfs.h"
+#include "cfs/cfs-coffee.h"
+#endif
+
+#if UIP_CONF_ROUTER&&0
+#include "net/routing/rimeroute.h"
+#include "net/rime/rime-udp.h"
+#endif
+
+#include "net/rime/rime.h"
+
+/* Track interrupt flow through mac, rdc and radio driver */
+//#define DEBUGFLOWSIZE 32
+#if DEBUGFLOWSIZE
+uint8_t debugflowsize,debugflow[DEBUGFLOWSIZE];
+#define DEBUGFLOW(c) if (debugflowsize<(DEBUGFLOWSIZE-1)) debugflow[debugflowsize++]=c
+#else
+#define DEBUGFLOW(c)
+#endif
+
+/* Get periodic prints from idle loop, from clock seconds or rtimer interrupts */
+/* Use of rtimer will conflict with other rtimer interrupts such as contikimac radio cycling */
+/* STAMPS will print ENERGEST outputs if that is enabled. */
+#define PERIODICPRINTS 1
+#if PERIODICPRINTS
+//#define PINGS 64
+#define ROUTES 600
+#define STAMPS 60
+#define STACKMONITOR 1024
+uint32_t clocktime;
+#define TESTRTIMER 0
+#if TESTRTIMER
+uint8_t rtimerflag=1;
+struct rtimer rt;
+void rtimercycle(void) {rtimerflag=1;}
+#endif
+#endif
+
+//uint16_t ledtimer;
+
+/*-------------------------------------------------------------------------*/
+/*----------------------Configuration of the .elf file---------------------*/
+#if 1
+/* The proper way to set the signature is */
+#include <avr/signature.h>
+#else
+/* Older avr-gcc's may not define the needed SIGNATURE bytes. Do it manually if you get an error */
+typedef struct {const unsigned char B2;const unsigned char B1;const unsigned char B0;} __signature_t;
+#define SIGNATURE __signature_t __signature __attribute__((section (".signature")))
+SIGNATURE = {
+  .B2 = 0x02,//SIGNATURE_2, //ATMEGA256rfr2
+  .B1 = 0xA8,//SIGNATURE_1, //256KB flash
+  .B0 = 0x1E,//SIGNATURE_0, //Atmel
+};
+#endif
+
+#if 1
+/* JTAG+SPI enabled, External osc 1kck4ms1 , Boot 4096 words @ $1F000, TXC1K+4,1msec delay, Brownout 1.9 volts */
+FUSES ={.low = 0xF6, .high = 0x98, .extended = 0xfe,};
+#define BOOTLOADER_START = 0x3E000
+#else
+/* JTAG+SPI, Boot 4096 words @ $F000, Internal  oscillator, startup 6 CK +0 ms, Brownout 1.8 volts */
+FUSES ={.low = 0xC2, .high = 0x99, .extended = 0xfe,};
+#endif
+
+#include "lib/sensors.h"
+#include "dev/button-sensor.h"
+#include "dev/battery-sensor.h"
+
+
+uint8_t
+rng_get_uint8(void) {
+#if 1
+  /* Upper two RSSI reg bits (RND_VALUE) are random in rf231 */
+  uint8_t j;
+  j = (PHY_RSSI&0xc0) + ((PHY_RSSI>>2)&0x30) + ((PHY_RSSI>>4)&0x0c) + ((PHY_RSSI>>6)&0x03);
+#else
+/* Get a pseudo random number using the ADC */
+  uint8_t i,j;
+  ADCSRA=1<<ADEN;             //Enable ADC, not free running, interrupt disabled, fastest clock
+  for (i=0;i<4;i++) {
+    ADMUX = 0;                //toggle reference to increase noise
+    ADMUX =0x1E;              //Select AREF as reference, measure 1.1 volt bandgap reference.
+    ADCSRA|=1<<ADSC;          //Start conversion
+    while (ADCSRA&(1<<ADSC)); //Wait till done
+	j = (j<<2) + ADC;
+  }
+  ADCSRA=0;                   //Disable ADC
+#endif
+  PRINTD("rng issues %d\n",j);
+  return j;
+}
+
+void
+clock_delay(unsigned int howlong)
+{
+  if(howlong<2) return;
+  clock_delay_usec((45*howlong)>>4);
+}
+/*-------------------------Low level initialization------------------------*/
+/*------Done in a subroutine to keep main routine stack usage small--------*/
+void initialize(void)
+{
+  watchdog_init();
+  watchdog_start();
+
+  /* Generic or slip connection on uart0 */
+  rs232_init(RS232_PORT_0, USART_BAUD_38400,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
+
+
+  /* Second rs232 port for debugging or slip alternative */
+//  rs232_init(RS232_PORT_1, USART_BAUD_57600,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
+
+  /* Redirect stdout */
+  rs232_redirect_stdout(RS232_PORT_0);
+
+
+  clock_init();
+
+  if(MCUSR & (1<<PORF )) PRINTD("Power-on reset.\n");
+  if(MCUSR & (1<<EXTRF)) PRINTD("External reset!\n");
+  if(MCUSR & (1<<BORF )) PRINTD("Brownout reset!\n");
+  if(MCUSR & (1<<WDRF )) PRINTD("Watchdog reset!\n");
+  if(MCUSR & (1<<JTRF )) PRINTD("JTAG reset!\n");
+
+#if STACKMONITOR
+  /* Simple stack pointer highwater monitor. Checks for magic numbers in the main
+   * loop. In conjuction with PERIODICPRINTS, never-used stack will be printed
+   * every STACKMONITOR seconds.
+   */
+{
+extern uint16_t __bss_end;
+uint16_t p=(uint16_t)&__bss_end;
+    do {
+      *(uint16_t *)p = 0x4242;
+      p+=10;
+    } while (p<SP-10); //don't overwrite our own stack
+}
+#endif
+
+#define CONF_CALIBRATE_OSCCAL 0
+#if CONF_CALIBRATE_OSCCAL
+void calibrate_rc_osc_32k();
+{
+extern uint8_t osccal_calibrated;
+uint8_t i;
+  PRINTD("\nBefore calibration OSCCAL=%x\n",OSCCAL);
+  for (i=0;i<10;i++) { 
+    calibrate_rc_osc_32k();  
+    PRINTD("Calibrated=%x\n",osccal_calibrated);
+//#include <util/delay_basic.h>
+//#define delay_us( us )   ( _delay_loop_2(1+(us*F_CPU)/4000000UL) ) 
+//   delay_us(50000);
+ }
+   clock_init();
+}
+#endif 
+
+  PRINTA("\n*******Booting %s*******\n",CONTIKI_VERSION_STRING);
+
+/* rtimers needed for radio cycling */
+  rtimer_init();
+
+ /* Initialize process subsystem */
+  process_init();
+
+  /* etimers must be started before ctimer_init */
+  process_start(&etimer_process, NULL);
+  ctimer_init();
+
+  /* Start radio and radio receive process */
+  NETSTACK_RADIO.init();
+
+/* Get a random seed for the 802.15.4 packet sequence number.
+ * Some layers will ignore duplicates found in a history (e.g. Contikimac)
+ * causing the initial packets to be ignored after a short-cycle restart.
+ */
+  random_init(rng_get_uint8());
+
+  /* Set addresses BEFORE starting tcpip process */
+
+	linkaddr_t addr;
+
+  if (params_get_eui64(addr.u8)) {
+      PRINTA("Random EUI64 address generated\n");
+  }
+ 
+#if NETSTACK_CONF_WITH_IPV6 
+  memcpy(&uip_lladdr.addr, &addr.u8, sizeof(linkaddr_t));
+#elif WITH_NODE_ID
+  node_id=get_panaddr_from_eeprom();
+  addr.u8[1]=node_id&0xff;
+  addr.u8[0]=(node_id&0xff00)>>8;
+  PRINTA("Node ID from eeprom: %X\n",node_id);
+#endif  
+  linkaddr_set_node_addr(&addr); 
+
+  PRINTA("Panid:%x\n", params_get_panid());
+//  framer_802154_set_panid(params_get_panid());
+  rf230_set_pan_addr(params_get_panid(),params_get_panaddr(),(uint8_t *)&addr.u8);
+  rf230_set_channel(params_get_channel());
+  rf230_set_txpower(params_get_txpower());
+
+#if NETSTACK_CONF_WITH_IPV6
+  PRINTA("EUI-64 MAC: %x-%x-%x-%x-%x-%x-%x-%x\n",addr.u8[0],addr.u8[1],addr.u8[2],addr.u8[3],addr.u8[4],addr.u8[5],addr.u8[6],addr.u8[7]);
+#else
+  PRINTA("MAC address ");
+  uint8_t i;
+  for (i=sizeof(linkaddr_t); i>0; i--){
+    PRINTA("%x:",addr.u8[i-1]);
+  }
+  PRINTA("\n");
+#endif
+
+  /* Initialize stack protocols */
+  queuebuf_init();
+  NETSTACK_RDC.init();
+  NETSTACK_MAC.init();
+  NETSTACK_NETWORK.init();
+
+#if ANNOUNCE_BOOT
+  PRINTA("%s %s, channel %u , check rate %u Hz tx power %u\n",NETSTACK_MAC.name, NETSTACK_RDC.name, rf230_get_channel(),
+    CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1:NETSTACK_RDC.channel_check_interval()),
+    rf230_get_txpower());	  
+#if UIP_CONF_IPV6_RPL
+  PRINTA("RPL Enabled\n");
+#endif
+#if UIP_CONF_ROUTER
+  PRINTA("Routing Enabled\n");
+#endif
+
+#endif /* ANNOUNCE_BOOT */
+
+#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
+  process_start(&tcpip_process, NULL);
+#endif
+
+  process_start(&sensors_process, NULL);
+
+  /* Autostart other processes */
+  autostart_start(autostart_processes);
+
+  /*---If using coffee file system create initial web content if necessary---*/
+#if COFFEE_FILES
+  int fa = cfs_open( "/index.html", CFS_READ);
+  if (fa<0) {     //Make some default web content
+    PRINTA("No index.html file found, creating upload.html!\n");
+    PRINTA("Formatting FLASH file system for coffee...");
+    cfs_coffee_format();
+    PRINTA("Done!\n");
+    fa = cfs_open( "/index.html", CFS_WRITE);
+    int r = cfs_write(fa, &"It works!", 9);
+    if (r<0) PRINTA("Can''t create /index.html!\n");
+    cfs_close(fa);
+//  fa = cfs_open("upload.html"), CFW_WRITE);
+// <html><body><form action="upload.html" enctype="multipart/form-data" method="post"><input name="userfile" type="file" size="50" /><input value="Upload" type="submit" /></form></body></html>
+  }
+#endif /* COFFEE_FILES */
+
+/* Add addresses for testing */
+#if 0
+{  
+  uip_ip6addr_t ipaddr;
+  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
+//  uip_ds6_prefix_add(&ipaddr,64,0);
+}
+#endif
+
+/*--------------------------Announce the configuration---------------------*/
+#if ANNOUNCE_BOOT
+#if AVR_WEBSERVER
+{ uint8_t i;
+  char buf[80];
+  unsigned int size;
+
+  for (i=0;i<UIP_DS6_ADDR_NB;i++) {
+	if (uip_ds6_if.addr_list[i].isused) {	  
+	   httpd_cgi_sprint_ip6(uip_ds6_if.addr_list[i].ipaddr,buf);
+       PRINTA("IPv6 Address: %s\n",buf);
+	}
+  }
+   cli();
+   eeprom_read_block (buf,eemem_server_name, sizeof(eemem_server_name));
+   sei();
+   buf[sizeof(eemem_server_name)]=0;
+   PRINTA("%s",buf);
+   cli();
+   eeprom_read_block (buf,eemem_domain_name, sizeof(eemem_domain_name));
+   sei();
+   buf[sizeof(eemem_domain_name)]=0;
+   size=httpd_fs_get_size();
+#ifndef COFFEE_FILES
+   PRINTA(".%s online with fixed %u byte web content\n",buf,size);
+#elif COFFEE_FILES==1
+   PRINTA(".%s online with static %u byte EEPROM file system\n",buf,size);
+#elif COFFEE_FILES==2
+   PRINTA(".%s online with dynamic %u KB EEPROM file system\n",buf,size>>10);
+#elif COFFEE_FILES==3
+   PRINTA(".%s online with static %u byte program memory file system\n",buf,size);
+#elif COFFEE_FILES==4
+   PRINTA(".%s online with dynamic %u KB program memory file system\n",buf,size>>10);
+#endif /* COFFEE_FILES */
+}
+#else
+   PRINTA("Online\n");
+#endif
+#endif /* ANNOUNCE_BOOT */
+
+}
+
+#if ROUTES && NETSTACK_CONF_WITH_IPV6
+static void
+ipaddr_add(const uip_ipaddr_t *addr)
+{
+  uint16_t a;
+  int8_t i, f;
+  for(i = 0, f = 0; i < sizeof(uip_ipaddr_t); i += 2) {
+    a = (addr->u8[i] << 8) + addr->u8[i + 1];
+    if(a == 0 && f >= 0) {
+      if(f++ == 0) PRINTF("::");
+    } else {
+      if(f > 0) {
+        f = -1;
+      } else if(i > 0) {
+        PRINTF(":");
+      }
+      PRINTF("%x",a);
+    }
+  }
+}
+#endif
+
+/*-------------------------------------------------------------------------*/
+/*------------------------- Main Scheduler loop----------------------------*/
+/*-------------------------------------------------------------------------*/
+int
+main(void)
+{
+#if NETSTACK_CONF_WITH_IPV6
+  uip_ds6_nbr_t *nbr;
+#endif /* NETSTACK_CONF_WITH_IPV6 */	
+  initialize();
+
+  while(1) {
+    process_run();
+    watchdog_periodic();
+
+#if 0
+    /* Turn off LED after a while */
+    if (ledtimer) {
+      if (--ledtimer==0) {
+      }
+    }
+#endif
+
+#if 0
+/* Various entry points for debugging in the AVR Studio simulator.
+ * Set as next statement and step into the routine.
+ */
+    NETSTACK_RADIO.send(packetbuf_hdrptr(), 42);
+    process_poll(&rf230_process);
+    packetbuf_clear();
+    len = rf230_read(packetbuf_dataptr(), PACKETBUF_SIZE);
+    packetbuf_set_datalen(42);
+    NETSTACK_RDC.input();
+#endif
+
+#if 0
+/* Clock.c can trigger a periodic PLL calibration in the RF230BB driver.
+ * This can show when that happens.
+ */
+    extern uint8_t rf230_calibrated;
+    if (rf230_calibrated) {
+      PRINTD("\nRF230 calibrated!\n");
+      rf230_calibrated=0;
+    }
+#endif
+
+/* Set DEBUGFLOWSIZE in contiki-conf.h to track path through MAC, RDC, and RADIO */
+#if DEBUGFLOWSIZE
+  if (debugflowsize) {
+    debugflow[debugflowsize]=0;
+    PRINTF("%s",debugflow);
+    debugflowsize=0;
+   }
+#endif
+
+#if PERIODICPRINTS
+#if TESTRTIMER
+/* Timeout can be increased up to 8 seconds maximum.
+ * A one second cycle is convenient for triggering the various debug printouts.
+ * The triggers are staggered to avoid printing everything at once.
+ */
+    if (rtimerflag) {
+      rtimer_set(&rt, RTIMER_NOW()+ RTIMER_ARCH_SECOND*1UL, 1,(void *) rtimercycle, NULL);
+      rtimerflag=0;
+#else
+  if (clocktime!=clock_seconds()) {
+     clocktime=clock_seconds();
+#endif
+
+#if STAMPS
+if ((clocktime%STAMPS)==0) {
+#if ENERGEST_CONF_ON
+#include "lib/print-stats.h"
+	print_stats();
+#elif RADIOSTATS
+extern volatile unsigned long radioontime;
+  PRINTF("%u(%u)s\n",clocktime,radioontime);
+#else
+  PRINTF("%us\n",clocktime);
+#endif
+
+}
+#endif
+#if TESTRTIMER
+      clocktime+=1;
+#endif
+
+#if PINGS && NETSTACK_CONF_WITH_IPV6
+extern void raven_ping6(void); 
+if ((clocktime%PINGS)==1) {
+  PRINTF("**Ping\n");
+  raven_ping6();
+}
+#endif
+
+#if ROUTES && NETSTACK_CONF_WITH_IPV6
+if ((clocktime%ROUTES)==2) {
+      
+extern uip_ds6_netif_t uip_ds6_if;
+
+  uint8_t i,j=0;
+  PRINTF("\nAddresses [%u max]\n",UIP_DS6_ADDR_NB);
+  for (i=0;i<UIP_DS6_ADDR_NB;i++) {
+    if (uip_ds6_if.addr_list[i].isused) {
+      ipaddr_add(&uip_ds6_if.addr_list[i].ipaddr);
+      PRINTF("\n");
+    }
+  }
+
+  PRINTF("\nNeighbors [%u max]\n",NBR_TABLE_MAX_NEIGHBORS);
+
+  for(nbr = nbr_table_head(ds6_neighbors);
+      nbr != NULL;
+      nbr = nbr_table_next(ds6_neighbors, nbr)) {
+    ipaddr_add(&nbr->ipaddr);
+    PRINTF("\n");
+    j=0;
+  }
+
+  if (j) PRINTF("  <none>");
+  PRINTF("\nRoutes [%u max]\n",UIP_DS6_ROUTE_NB);
+  {
+    uip_ds6_route_t *r;
+    j = 1;
+    for(r = uip_ds6_route_head();
+        r != NULL;
+        r = uip_ds6_route_next(r)) {
+      ipaddr_add(&r->ipaddr);
+      PRINTF("/%u (via ", r->length);
+      ipaddr_add(uip_ds6_route_nexthop(r));
+      PRINTF(") %lus\n", r->state.lifetime);
+      j = 0;
+    }
+  }
+  if (j) PRINTF("  <none>");
+  PRINTF("\n---------\n");
+
+}
+#endif
+
+#if STACKMONITOR
+if ((clocktime%STACKMONITOR)==3) {
+  extern uint16_t __bss_end;
+  uint16_t p=(uint16_t)&__bss_end;
+  do {
+    if (*(uint16_t *)p != 0x4242) {
+      PRINTF("Never-used stack > %d bytes\n",p-(uint16_t)&__bss_end);
+      break;
+    }
+    p+=10;
+  } while (p<RAMEND-10);
+}
+#endif
+
+    }
+#endif /* PERIODICPRINTS */
+
+#if RF230BB&&0
+extern uint8_t rf230processflag;
+    if (rf230processflag) {
+      PRINTF("rf230p%d",rf230processflag);
+      rf230processflag=0;
+    }
+#endif
+
+#if RF230BB&&0
+extern uint8_t rf230_interrupt_flag;
+    if (rf230_interrupt_flag) {
+ //   if (rf230_interrupt_flag!=11) {
+        PRINTF("**RI%u",rf230_interrupt_flag);
+ //   }
+      rf230_interrupt_flag=0;
+    }
+#endif
+  }
+  return 0;
+}
+
+/*---------------------------------------------------------------------------*/
+
+void log_message(char *m1, char *m2)
+{
+  PRINTF("%s%s\n", m1, m2);
+}
diff --git a/platform/guhRF/dev/Arduino.h b/platform/guhRF/dev/Arduino.h
new file mode 100644
index 000000000..e0ea47b10
--- /dev/null
+++ b/platform/guhRF/dev/Arduino.h
@@ -0,0 +1,172 @@
+#ifndef Arduino_h
+#define Arduino_h
+
+#include <hw-arduino.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include <avr/pgmspace.h>
+#include <avr/io.h>
+#include <avr/interrupt.h>
+
+#include "binary.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#define HIGH 0x1
+#define LOW  0x0
+
+#define INPUT 0x0
+#define OUTPUT 0x1
+#define INPUT_PULLUP 0x2
+
+#define true 0x1
+#define false 0x0
+
+#define PI 3.1415926535897932384626433832795
+#define HALF_PI 1.5707963267948966192313216916398
+#define TWO_PI 6.283185307179586476925286766559
+#define DEG_TO_RAD 0.017453292519943295769236907684886
+#define RAD_TO_DEG 57.295779513082320876798154814105
+
+#define SERIAL  0x0
+#define DISPLAY 0x1
+
+#define LSBFIRST 0
+#define MSBFIRST 1
+
+#define CHANGE 1
+#define FALLING 2
+#define RISING 3
+
+#define DEFAULT  ADC_DEFAULT
+#define EXTERNAL ADC_EXTERNAL
+
+// undefine stdlib's abs if encountered
+#ifdef abs
+#undef abs
+#endif
+
+#define min(a,b) ((a)<(b)?(a):(b))
+#define max(a,b) ((a)>(b)?(a):(b))
+#define abs(x) ((x)>0?(x):-(x))
+#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
+#define round(x)     ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
+#define radians(deg) ((deg)*DEG_TO_RAD)
+#define degrees(rad) ((rad)*RAD_TO_DEG)
+#define sq(x) ((x)*(x))
+
+#define interrupts() sei()
+#define noInterrupts() cli()
+
+#define lowByte(w) ((uint8_t) ((w) & 0xff))
+#define highByte(w) ((uint8_t) ((w) >> 8))
+
+#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
+#define bitSet(value, bit) ((value) |= (1UL << (bit)))
+#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
+#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
+
+
+typedef unsigned int word;
+
+#define bit(b) (1UL << (b))
+
+typedef uint8_t boolean;
+typedef uint8_t byte;
+
+void pinMode(uint8_t, uint8_t);
+void digitalWrite(uint8_t, uint8_t);
+int digitalRead(uint8_t);
+
+unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
+
+void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
+uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
+
+void attachInterrupt(uint8_t, void (*)(void), int mode);
+void detachInterrupt(uint8_t);
+
+void setup(void);
+void loop(void);
+
+// Get the bit location within the hardware port of the given virtual pin.
+// This comes from the pins_*.c file for the active board configuration.
+
+#define analogInPinToBit(P) (P)
+
+// On the ATmega1280, the addresses of some of the port registers are
+// greater than 255, so we can't store them in uint8_t's.
+extern const uint16_t PROGMEM port_to_mode_PGM[];
+extern const uint16_t PROGMEM port_to_input_PGM[];
+extern const uint16_t PROGMEM port_to_output_PGM[];
+
+extern const uint8_t PROGMEM digital_pin_to_port_PGM[];
+// extern const uint8_t PROGMEM digital_pin_to_bit_PGM[];
+extern const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[];
+
+// Get the bit location within the hardware port of the given virtual pin.
+// This comes from the pins_*.c file for the active board configuration.
+// 
+// These perform slightly better as macros compared to inline functions
+//
+#define digitalPinToPort(P) ( pgm_read_byte( digital_pin_to_port_PGM + (P) ) )
+#define digitalPinToBitMask(P) ( pgm_read_byte( digital_pin_to_bit_mask_PGM + (P) ) )
+#define analogInPinToBit(P) (P)
+#define portOutputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_output_PGM + (P))) )
+#define portInputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_input_PGM + (P))) )
+#define portModeRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_mode_PGM + (P))) )
+
+#define NOT_A_PIN 0
+#define NOT_A_PORT 0
+
+#ifdef ARDUINO_MAIN
+#define PA 1
+#define PB 2
+#define PC 3
+#define PD 4
+#define PE 5
+#define PF 6
+#define PG 7
+#define PH 8
+#define PJ 10
+#define PK 11
+#define PL 12
+#endif
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#ifdef __cplusplus
+// look at this again when considering implementing serial
+//#include "WCharacter.h"
+//#include "WString.h"
+//#include "HardwareSerial.h"
+
+uint16_t makeWord(uint16_t w);
+uint16_t makeWord(byte h, byte l);
+
+#define word(...) makeWord(__VA_ARGS__)
+
+unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
+
+void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0);
+void noTone(uint8_t _pin);
+
+// WMath prototypes
+long random(long);
+long random(long, long);
+void randomSeed(unsigned int);
+long map(long, long, long, long, long);
+
+#endif
+
+#include "pins_arduino.h"
+
+#include "dev/arduino/arduino-compat.h"
+
+#endif
diff --git a/platform/guhRF/dev/adc.c b/platform/guhRF/dev/adc.c
new file mode 100644
index 000000000..7efde72e1
--- /dev/null
+++ b/platform/guhRF/dev/adc.c
@@ -0,0 +1,84 @@
+/*
+* Copyright (c) 2012, BinaryLabs.
+* 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.
+*
+* @(#)$Id: adc.c,v 1.1 2010/08/25 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* ADC file for Atmega128rfa1.
+* \author
+* Paulo Louro <paulolouro@binarylabs.dk>
+*/
+
+#include "adc.h"
+
+static uint8_t analog_reference = ADC_DEFAULT;
+
+/*
+ * For arduino interface for setting external reference voltage
+ * Note that applying an external voltage *and* then setting the analog
+ * reference to something internal will short the internal and the
+ * external reference voltage and most likely destroy the processor.
+ */
+void analogReference(uint8_t mode)
+{
+    analog_reference = mode;
+}
+
+int readADC(uint8_t pin)
+{
+  int result = 0;
+
+  adc_setup (analog_reference, pin);
+  result = adc_read ();
+  adc_fin ();
+  return result;
+}
+
+/**
+* \return Internal temperature in 0.01C, e.g. 25C is 2500
+*/
+int readInternalTemp(void)
+{
+  int reading = 0;
+
+  ADCSRB |= _BV(MUX5);
+  ADMUX = _BV(REFS1) | _BV(REFS0) | 0b1001 ;
+  ADCSRA = _BV(ADEN) | _BV(ADPS0) | _BV(ADPS2) ;
+
+  ADCSRA |= 1 << ADSC;
+  loop_until_bit_is_clear(ADCSRA,ADSC);
+  reading = ADC;
+
+  ADCSRB=0; //disable ADC, need to write B first for MUX5 bit
+  ADCSRA=0; //disable ADC
+  ADMUX=0; //turn off internal vref
+
+  return reading * 113 - 27280;
+}
diff --git a/platform/guhRF/dev/adc.h b/platform/guhRF/dev/adc.h
new file mode 100644
index 000000000..e3ff516b1
--- /dev/null
+++ b/platform/guhRF/dev/adc.h
@@ -0,0 +1,65 @@
+#ifndef __ADC_ARCH_H__
+#define __ADC_ARCH_H__
+
+#include <avr/io.h>
+
+/*
+ * Reference voltage
+ * The default is 1.6V reference voltage
+ * The selected reference voltage is the maximum voltage that can be
+ * measured.
+ * Directly provide shifted variants so we don't need to shift.
+ */
+#define ADC_1_5      (2<<6)
+#define ADC_1_6      (3<<6)
+#define ADC_1_8      (1<<6)
+#define ADC_EXTERNAL (0<<6)
+#define ADC_DEFAULT  ADC_1_6
+
+/* sometimes it's desirable to decouple setup / finish from sampling */
+
+static inline void adc_setup (uint8_t ref_volt, uint8_t pin)
+{
+  ADMUX = ref_volt | (pin & 0x7);
+  ADCSRA = _BV(ADEN) | _BV(ADPS0) | _BV(ADPS2);
+}
+
+static inline int adc_read (void)
+{
+  ADCSRA |= (1 << ADSC);
+  loop_until_bit_is_clear (ADCSRA, ADSC);
+  return ADC;
+}
+
+static inline void adc_fin (void)
+{
+    ADCSRA = 0;
+    ADMUX  = 0;
+}
+  
+static inline void adc_init (void)
+{
+    uint8_t temp;
+    ADCSRC = 0;
+    ADCSRB = 0;
+    adc_fin ();
+    /*
+     * Disable JTAG interface
+     * Hardware manual about JTD bit:
+     * "In order to avoid unintentional disabling or enabling of the
+     * JTAG interface, a timed sequence must be followed when changing
+     * this bit: The application software must write this bit to the
+     * desired value twice within four cycles to change its value."
+     * 15.4.1 "MCUCR - MCU Control Register", p. 219
+     */
+    temp = MCUCR | (1 << JTD);
+    MCUCR = temp;
+    MCUCR = temp;
+}
+
+int readADC(uint8_t pin);
+long readVcc();
+int readInternalTemp(void);
+void analogReference(uint8_t mode);
+
+#endif /* __ADC_ARCH_H__ */
diff --git a/platform/guhRF/dev/batmon.c b/platform/guhRF/dev/batmon.c
new file mode 100644
index 000000000..5c61d125f
--- /dev/null
+++ b/platform/guhRF/dev/batmon.c
@@ -0,0 +1,55 @@
+#include "contiki.h"
+#include "batmon.h"
+#include <util/delay.h>
+
+
+
+
+int8_t batmon_init()
+{
+	return 0;
+}	
+
+int8_t batmon_get_voltage(uint16_t* voltage)
+{
+	uint16_t volt = 0;
+	uint16_t resolution = 75;
+	uint16_t offset = 2550;
+	int8_t ctr = 0;
+	
+	BATMON = 0 | _BV(BATMON_HR);
+	_delay_us(2);
+	
+	if(BATMON & _BV(BATMON_OK))
+	{
+		// voltage above 2.550 V
+		resolution = 75;
+		offset = 2550;
+		for(ctr=15; ctr>=0; ctr--)
+		{
+			BATMON = (BATMON & 0xF0) | (ctr);
+			_delay_us(2);
+			if(BATMON & _BV(BATMON_OK)) break;
+		}
+	}
+	else
+	{
+		// voltage below 2.550 V
+		resolution = 50;
+		offset = 1700;
+		
+		BATMON &= ~_BV(BATMON_HR);
+		
+		for(ctr=15; ctr>=0; ctr--)
+		{
+			BATMON = (BATMON & 0xF0) | (ctr);
+			_delay_us(2);
+			if(BATMON & _BV(BATMON_OK)) break;
+		}
+	}
+	
+	volt = resolution*ctr+offset;
+	*voltage=volt; 
+	
+	return 0;
+}
diff --git a/platform/guhRF/dev/batmon.h b/platform/guhRF/dev/batmon.h
new file mode 100644
index 000000000..c05f48200
--- /dev/null
+++ b/platform/guhRF/dev/batmon.h
@@ -0,0 +1,8 @@
+#ifndef BATMON_H_
+#define BATMON_H_
+
+int8_t batmon_init();
+int8_t batmon_get_voltage(uint16_t* voltage);
+
+
+#endif /* BATMON_H_ */
diff --git a/platform/guhRF/dev/battery-sensor.c b/platform/guhRF/dev/battery-sensor.c
new file mode 100644
index 000000000..1eb7906b4
--- /dev/null
+++ b/platform/guhRF/dev/battery-sensor.c
@@ -0,0 +1,90 @@
+/*
+* Copyright (c) 2012, BinaryLabs.
+* 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.
+*
+* @(#)$Id: battery-sensor.h,v 1.1 2012/08/25 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* Battery sensor file for Atmega128rfa1.
+* \author
+* Paulo Louro <paulolouro@binarylabs.dk>
+* Harald Pichler <harald@the-develop.net>
+*/
+
+/**
+*The atmel rf23x radios have a low voltage detector that can be configured in units of 75 millivolts. Here is example *code for the ATmega128rfa1, where the BATMON register is in extended io space [dak664]
+*/
+
+#include "dev/battery-sensor.h"
+#include "dev/batmon.h"
+
+const struct sensors_sensor battery_sensor;
+/*---------------------------------------------------------------------------*/
+
+/**
+* \return Voltage on battery measurement with BATMON register.
+*/
+static int
+value(int type)
+{
+
+  uint16_t h;
+/*
+  uint8_t p1;
+  BATMON = 16; //give BATMON time to stabilize at highest range and lowest voltage
+
+// Bandgap can't be measured against supply voltage in this chip.
+// Use BATMON register instead
+  for ( p1=16; p1<31; p1++) {
+    BATMON = p1;
+    clock_delay_usec(100); // delay needed !!
+    if ((BATMON&(1<<BATMON_OK))==0) break;
+  }
+  h=2550-75*16-75+75*p1; //-75 to take the floor of the 75 mv transition window
+*/
+  batmon_get_voltage(&h);
+  return h;
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int c)
+{
+  // No configuration needed. readADC() handles all the config needed.
+  batmon_init();
+  return type == SENSORS_ACTIVE;
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  // analog sensors are always ready
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(battery_sensor, BATTERY_SENSOR, value, configure, status);
diff --git a/platform/guhRF/dev/battery-sensor.h b/platform/guhRF/dev/battery-sensor.h
new file mode 100644
index 000000000..20e0c8c92
--- /dev/null
+++ b/platform/guhRF/dev/battery-sensor.h
@@ -0,0 +1,48 @@
+/*
+* Copyright (c) 2012, BinaryLabs.
+* 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.
+*
+* @(#)$Id: battery-sensor.h,v 1.1 2012/08/25 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* Battery sensor header file for Atmega128rfa1.
+* \author
+* Paulo Louro <paulolouro@binarylabs.dk>
+*/
+
+#ifndef __BATTERY_SENSOR_H__
+#define __BATTERY_SENSOR_H__
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor battery_sensor;
+
+#define BATTERY_SENSOR "Battery"
+
+#endif /* __BATTERY_SENSOR_H__ */
\ No newline at end of file
diff --git a/platform/guhRF/dev/binary.h b/platform/guhRF/dev/binary.h
new file mode 100644
index 000000000..af1498033
--- /dev/null
+++ b/platform/guhRF/dev/binary.h
@@ -0,0 +1,515 @@
+#ifndef Binary_h
+#define Binary_h
+
+#define B0 0
+#define B00 0
+#define B000 0
+#define B0000 0
+#define B00000 0
+#define B000000 0
+#define B0000000 0
+#define B00000000 0
+#define B1 1
+#define B01 1
+#define B001 1
+#define B0001 1
+#define B00001 1
+#define B000001 1
+#define B0000001 1
+#define B00000001 1
+#define B10 2
+#define B010 2
+#define B0010 2
+#define B00010 2
+#define B000010 2
+#define B0000010 2
+#define B00000010 2
+#define B11 3
+#define B011 3
+#define B0011 3
+#define B00011 3
+#define B000011 3
+#define B0000011 3
+#define B00000011 3
+#define B100 4
+#define B0100 4
+#define B00100 4
+#define B000100 4
+#define B0000100 4
+#define B00000100 4
+#define B101 5
+#define B0101 5
+#define B00101 5
+#define B000101 5
+#define B0000101 5
+#define B00000101 5
+#define B110 6
+#define B0110 6
+#define B00110 6
+#define B000110 6
+#define B0000110 6
+#define B00000110 6
+#define B111 7
+#define B0111 7
+#define B00111 7
+#define B000111 7
+#define B0000111 7
+#define B00000111 7
+#define B1000 8
+#define B01000 8
+#define B001000 8
+#define B0001000 8
+#define B00001000 8
+#define B1001 9
+#define B01001 9
+#define B001001 9
+#define B0001001 9
+#define B00001001 9
+#define B1010 10
+#define B01010 10
+#define B001010 10
+#define B0001010 10
+#define B00001010 10
+#define B1011 11
+#define B01011 11
+#define B001011 11
+#define B0001011 11
+#define B00001011 11
+#define B1100 12
+#define B01100 12
+#define B001100 12
+#define B0001100 12
+#define B00001100 12
+#define B1101 13
+#define B01101 13
+#define B001101 13
+#define B0001101 13
+#define B00001101 13
+#define B1110 14
+#define B01110 14
+#define B001110 14
+#define B0001110 14
+#define B00001110 14
+#define B1111 15
+#define B01111 15
+#define B001111 15
+#define B0001111 15
+#define B00001111 15
+#define B10000 16
+#define B010000 16
+#define B0010000 16
+#define B00010000 16
+#define B10001 17
+#define B010001 17
+#define B0010001 17
+#define B00010001 17
+#define B10010 18
+#define B010010 18
+#define B0010010 18
+#define B00010010 18
+#define B10011 19
+#define B010011 19
+#define B0010011 19
+#define B00010011 19
+#define B10100 20
+#define B010100 20
+#define B0010100 20
+#define B00010100 20
+#define B10101 21
+#define B010101 21
+#define B0010101 21
+#define B00010101 21
+#define B10110 22
+#define B010110 22
+#define B0010110 22
+#define B00010110 22
+#define B10111 23
+#define B010111 23
+#define B0010111 23
+#define B00010111 23
+#define B11000 24
+#define B011000 24
+#define B0011000 24
+#define B00011000 24
+#define B11001 25
+#define B011001 25
+#define B0011001 25
+#define B00011001 25
+#define B11010 26
+#define B011010 26
+#define B0011010 26
+#define B00011010 26
+#define B11011 27
+#define B011011 27
+#define B0011011 27
+#define B00011011 27
+#define B11100 28
+#define B011100 28
+#define B0011100 28
+#define B00011100 28
+#define B11101 29
+#define B011101 29
+#define B0011101 29
+#define B00011101 29
+#define B11110 30
+#define B011110 30
+#define B0011110 30
+#define B00011110 30
+#define B11111 31
+#define B011111 31
+#define B0011111 31
+#define B00011111 31
+#define B100000 32
+#define B0100000 32
+#define B00100000 32
+#define B100001 33
+#define B0100001 33
+#define B00100001 33
+#define B100010 34
+#define B0100010 34
+#define B00100010 34
+#define B100011 35
+#define B0100011 35
+#define B00100011 35
+#define B100100 36
+#define B0100100 36
+#define B00100100 36
+#define B100101 37
+#define B0100101 37
+#define B00100101 37
+#define B100110 38
+#define B0100110 38
+#define B00100110 38
+#define B100111 39
+#define B0100111 39
+#define B00100111 39
+#define B101000 40
+#define B0101000 40
+#define B00101000 40
+#define B101001 41
+#define B0101001 41
+#define B00101001 41
+#define B101010 42
+#define B0101010 42
+#define B00101010 42
+#define B101011 43
+#define B0101011 43
+#define B00101011 43
+#define B101100 44
+#define B0101100 44
+#define B00101100 44
+#define B101101 45
+#define B0101101 45
+#define B00101101 45
+#define B101110 46
+#define B0101110 46
+#define B00101110 46
+#define B101111 47
+#define B0101111 47
+#define B00101111 47
+#define B110000 48
+#define B0110000 48
+#define B00110000 48
+#define B110001 49
+#define B0110001 49
+#define B00110001 49
+#define B110010 50
+#define B0110010 50
+#define B00110010 50
+#define B110011 51
+#define B0110011 51
+#define B00110011 51
+#define B110100 52
+#define B0110100 52
+#define B00110100 52
+#define B110101 53
+#define B0110101 53
+#define B00110101 53
+#define B110110 54
+#define B0110110 54
+#define B00110110 54
+#define B110111 55
+#define B0110111 55
+#define B00110111 55
+#define B111000 56
+#define B0111000 56
+#define B00111000 56
+#define B111001 57
+#define B0111001 57
+#define B00111001 57
+#define B111010 58
+#define B0111010 58
+#define B00111010 58
+#define B111011 59
+#define B0111011 59
+#define B00111011 59
+#define B111100 60
+#define B0111100 60
+#define B00111100 60
+#define B111101 61
+#define B0111101 61
+#define B00111101 61
+#define B111110 62
+#define B0111110 62
+#define B00111110 62
+#define B111111 63
+#define B0111111 63
+#define B00111111 63
+#define B1000000 64
+#define B01000000 64
+#define B1000001 65
+#define B01000001 65
+#define B1000010 66
+#define B01000010 66
+#define B1000011 67
+#define B01000011 67
+#define B1000100 68
+#define B01000100 68
+#define B1000101 69
+#define B01000101 69
+#define B1000110 70
+#define B01000110 70
+#define B1000111 71
+#define B01000111 71
+#define B1001000 72
+#define B01001000 72
+#define B1001001 73
+#define B01001001 73
+#define B1001010 74
+#define B01001010 74
+#define B1001011 75
+#define B01001011 75
+#define B1001100 76
+#define B01001100 76
+#define B1001101 77
+#define B01001101 77
+#define B1001110 78
+#define B01001110 78
+#define B1001111 79
+#define B01001111 79
+#define B1010000 80
+#define B01010000 80
+#define B1010001 81
+#define B01010001 81
+#define B1010010 82
+#define B01010010 82
+#define B1010011 83
+#define B01010011 83
+#define B1010100 84
+#define B01010100 84
+#define B1010101 85
+#define B01010101 85
+#define B1010110 86
+#define B01010110 86
+#define B1010111 87
+#define B01010111 87
+#define B1011000 88
+#define B01011000 88
+#define B1011001 89
+#define B01011001 89
+#define B1011010 90
+#define B01011010 90
+#define B1011011 91
+#define B01011011 91
+#define B1011100 92
+#define B01011100 92
+#define B1011101 93
+#define B01011101 93
+#define B1011110 94
+#define B01011110 94
+#define B1011111 95
+#define B01011111 95
+#define B1100000 96
+#define B01100000 96
+#define B1100001 97
+#define B01100001 97
+#define B1100010 98
+#define B01100010 98
+#define B1100011 99
+#define B01100011 99
+#define B1100100 100
+#define B01100100 100
+#define B1100101 101
+#define B01100101 101
+#define B1100110 102
+#define B01100110 102
+#define B1100111 103
+#define B01100111 103
+#define B1101000 104
+#define B01101000 104
+#define B1101001 105
+#define B01101001 105
+#define B1101010 106
+#define B01101010 106
+#define B1101011 107
+#define B01101011 107
+#define B1101100 108
+#define B01101100 108
+#define B1101101 109
+#define B01101101 109
+#define B1101110 110
+#define B01101110 110
+#define B1101111 111
+#define B01101111 111
+#define B1110000 112
+#define B01110000 112
+#define B1110001 113
+#define B01110001 113
+#define B1110010 114
+#define B01110010 114
+#define B1110011 115
+#define B01110011 115
+#define B1110100 116
+#define B01110100 116
+#define B1110101 117
+#define B01110101 117
+#define B1110110 118
+#define B01110110 118
+#define B1110111 119
+#define B01110111 119
+#define B1111000 120
+#define B01111000 120
+#define B1111001 121
+#define B01111001 121
+#define B1111010 122
+#define B01111010 122
+#define B1111011 123
+#define B01111011 123
+#define B1111100 124
+#define B01111100 124
+#define B1111101 125
+#define B01111101 125
+#define B1111110 126
+#define B01111110 126
+#define B1111111 127
+#define B01111111 127
+#define B10000000 128
+#define B10000001 129
+#define B10000010 130
+#define B10000011 131
+#define B10000100 132
+#define B10000101 133
+#define B10000110 134
+#define B10000111 135
+#define B10001000 136
+#define B10001001 137
+#define B10001010 138
+#define B10001011 139
+#define B10001100 140
+#define B10001101 141
+#define B10001110 142
+#define B10001111 143
+#define B10010000 144
+#define B10010001 145
+#define B10010010 146
+#define B10010011 147
+#define B10010100 148
+#define B10010101 149
+#define B10010110 150
+#define B10010111 151
+#define B10011000 152
+#define B10011001 153
+#define B10011010 154
+#define B10011011 155
+#define B10011100 156
+#define B10011101 157
+#define B10011110 158
+#define B10011111 159
+#define B10100000 160
+#define B10100001 161
+#define B10100010 162
+#define B10100011 163
+#define B10100100 164
+#define B10100101 165
+#define B10100110 166
+#define B10100111 167
+#define B10101000 168
+#define B10101001 169
+#define B10101010 170
+#define B10101011 171
+#define B10101100 172
+#define B10101101 173
+#define B10101110 174
+#define B10101111 175
+#define B10110000 176
+#define B10110001 177
+#define B10110010 178
+#define B10110011 179
+#define B10110100 180
+#define B10110101 181
+#define B10110110 182
+#define B10110111 183
+#define B10111000 184
+#define B10111001 185
+#define B10111010 186
+#define B10111011 187
+#define B10111100 188
+#define B10111101 189
+#define B10111110 190
+#define B10111111 191
+#define B11000000 192
+#define B11000001 193
+#define B11000010 194
+#define B11000011 195
+#define B11000100 196
+#define B11000101 197
+#define B11000110 198
+#define B11000111 199
+#define B11001000 200
+#define B11001001 201
+#define B11001010 202
+#define B11001011 203
+#define B11001100 204
+#define B11001101 205
+#define B11001110 206
+#define B11001111 207
+#define B11010000 208
+#define B11010001 209
+#define B11010010 210
+#define B11010011 211
+#define B11010100 212
+#define B11010101 213
+#define B11010110 214
+#define B11010111 215
+#define B11011000 216
+#define B11011001 217
+#define B11011010 218
+#define B11011011 219
+#define B11011100 220
+#define B11011101 221
+#define B11011110 222
+#define B11011111 223
+#define B11100000 224
+#define B11100001 225
+#define B11100010 226
+#define B11100011 227
+#define B11100100 228
+#define B11100101 229
+#define B11100110 230
+#define B11100111 231
+#define B11101000 232
+#define B11101001 233
+#define B11101010 234
+#define B11101011 235
+#define B11101100 236
+#define B11101101 237
+#define B11101110 238
+#define B11101111 239
+#define B11110000 240
+#define B11110001 241
+#define B11110010 242
+#define B11110011 243
+#define B11110100 244
+#define B11110101 245
+#define B11110110 246
+#define B11110111 247
+#define B11111000 248
+#define B11111001 249
+#define B11111010 250
+#define B11111011 251
+#define B11111100 252
+#define B11111101 253
+#define B11111110 254
+#define B11111111 255
+
+#endif
diff --git a/platform/guhRF/dev/button-sensor.c b/platform/guhRF/dev/button-sensor.c
new file mode 100644
index 000000000..a524a99b1
--- /dev/null
+++ b/platform/guhRF/dev/button-sensor.c
@@ -0,0 +1,78 @@
+/* Sensor routine */
+
+#include "lib/sensors.h"
+#include "dev/button-sensor.h"
+
+#include <avr/interrupt.h>
+#include <avr/io.h>
+
+const struct sensors_sensor button_sensor;
+
+static struct timer debouncetimer;
+static int status(int type);
+static int enabled = 0;
+struct sensors_sensor *sensors[1];
+unsigned char sensors_flags[1];
+
+#define BUTTON_BIT INTF4
+#define BUTTON_CHECK_IRQ() (EIFR & BUTTON_BIT) ? 0 : 1
+
+#define PRINTF(...) printf(__VA_ARGS__)
+/*---------------------------------------------------------------------------*/
+ISR(INT4_vect)
+{
+  if(BUTTON_CHECK_IRQ()) {
+    if(timer_expired(&debouncetimer)) {
+      timer_set(&debouncetimer, CLOCK_SECOND / 4);
+      sensors_changed(&button_sensor);
+    }
+  }
+}
+/*---------------------------------------------------------------------------*/
+
+static int
+value(int type)
+{
+ return (PINE & _BV(PE4) ? 0 : 1) || !timer_expired(&debouncetimer);
+
+ //return 0;
+}
+
+static int
+configure(int type, int c)
+{
+	switch (type) {
+	case SENSORS_ACTIVE:
+		if (c) {
+			if(!status(SENSORS_ACTIVE)) {
+				timer_set(&debouncetimer, 0);
+				DDRE  |= (0<<DDRE4); // Set pin as input
+				PORTE |= (1<<PORTE4); // Set port PORTE bint 5 with pullup resistor
+				EICRB |= (1<<ISC40); // For falling edge
+				EIMSK |= (1<<INT4); // Set int
+				enabled = 1;
+				sei();
+			}
+		} else {
+				enabled = 0;
+				EIMSK &= ~(1<<INT4); // clear int
+		}
+		return 1;
+	}
+	return 0;
+}
+
+static int
+status(int type)
+{
+	switch (type) {
+	case SENSORS_ACTIVE:
+	case SENSORS_READY:
+		return enabled;//(EIMSK & (1<<INT5) ? 0 : 1);//BUTTON_IRQ_ENABLED();
+	}
+	return 0;
+}
+
+SENSORS_SENSOR(button_sensor, BUTTON_SENSOR,
+	       value, configure, status);
+
diff --git a/platform/guhRF/dev/dht11.c b/platform/guhRF/dev/dht11.c
new file mode 100644
index 000000000..39e1a7701
--- /dev/null
+++ b/platform/guhRF/dev/dht11.c
@@ -0,0 +1,125 @@
+/*
+ DHT-11 Library
+ (c) Created by Charalampos Andrianakis on 18/12/11.
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
+
+#include <avr/io.h>
+#include "contiki.h"
+#include "dht11.h"
+#include "led.h" // debug
+
+#define udelay(u) clock_delay_usec(u)
+#define mdelay(u) clock_delay_msec(u)
+
+// todo: set DHT22 or DHT11 in project file
+// define for DHT11 else for DHT22, RHT03 
+//   #define DHT11	1
+
+uint8_t DHT_Read_Data(uint16_t *temperature, uint16_t *humidity){
+
+    //data[5] is 8byte table where data come from DHT are stored
+    //laststate holds laststate value
+    //counter is used to count microSeconds
+    uint8_t data[5], laststate = 0, counter = 0, j = 0, i = 0;
+    
+    //Clear array
+    data[0] = data[1] = data[2] = data[3] = data[4] = 0;
+
+    uint8_t volatile sreg;
+    sreg = SREG;    /* Save status register before disabling interrupts. */
+    cli();          /* Disable interrupts. */
+
+    //Set pin Output
+    //Pin High
+    DHT_DRIVE();
+    mdelay(100);                     //Wait for 100mS
+    
+    //Send Request Signal
+    //Pin Low
+    OUTP_0();                      //20ms Low 
+    mdelay(20);
+    //Pin High
+    OUTP_1();
+    udelay(40);                      //40us High
+    
+    //Set pin Input to read Bus
+    //Set pin Input
+    DHT_RELEASE();
+    laststate=DHT_INP();             //Read Pin value
+    
+    //Repeat for each Transistions
+    for (i=0; i<MAXTIMINGS; i++) {
+        //While state is the same count microseconds
+   //led1_on();
+   //led1_off();
+ 
+       while (laststate==DHT_INP()) {
+            udelay(1);
+            counter++;
+            if (counter>254) break;
+        }
+
+        if (counter>254) break;
+        
+        //laststate==_BV(DHT_PIN) checks if laststate was High
+        //ignore the first 2 transitions which are the DHT Response
+        //if (laststate==_BV(DHT_PIN) && (i > 2)) {
+        if ((i&0x01) && (i > 2)) {
+            //Save bits in segments of bytes
+            //Shift data[] value 1 position left
+            //Example. 01010100 if we shift it left one time it will be
+            //10101000
+ 
+            data[j/8]<<=1;
+            if (counter >= 15) {    //If it was high for more than 40uS
+   //led1_on();
+                data[j/8]|=1;       //it means it is bit '1' so make a logic
+   //led1_off();
+            }                       //OR with the value (save it)
+            j++;                    //making an OR by 1 to this value 10101000
+        }                           //we will have the resault 10101001
+                                    //1 in 8-bit binary is 00000001
+        //j/8 changes table record every 8 bits which means a byte has been saved
+        //so change to next record. 0/8=0 1/8=0 ... 7/8=0 8/8=1 ... 15/8=1 16/8=2
+        laststate=DHT_INP();     //save current state
+        counter=0;                  //reset counter
+        
+    }
+    SREG = sreg;    /* Enable interrupts. */
+    //printf("HUM %d %d %d %d %d %d",data[0],data[1],data[2],data[3],data[4],(uint8_t)(data[0] + data[1] + data[2] + data[3]) );
+    //Check if data received are correct by checking the CheckSum
+    if ((uint8_t)(data[0] + data[1] + data[2] + data[3]) == data[4]) {
+#ifdef DHT11
+        *humidity = data[0]*100;
+        *temperature = data[2]*100;
+#else
+        *humidity = ((uint16_t)data[0]<<8 | data[1])*10;
+        *temperature = ((uint16_t)data[2]<<8 | data[3])*10;
+#endif
+        return 0;
+    }else{
+        *humidity = 2;
+        *temperature = 2;
+//        uart_puts("\r\nCheck Sum Error");
+    }
+ 
+     return 0xff;  // Check Sum Error
+}
diff --git a/platform/guhRF/dev/dht11.h b/platform/guhRF/dev/dht11.h
new file mode 100644
index 000000000..6cf757e5d
--- /dev/null
+++ b/platform/guhRF/dev/dht11.h
@@ -0,0 +1,67 @@
+/*
+ DHT-11 Library
+ (c) Created by Charalampos Andrianakis on 18/12/11.
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <avr/io.h>
+#include <util/delay.h>
+
+/* DHT 1-wire is at PortE.6 */
+#define DHT_PIN_READ PINE
+#define DHT_PIN_MASK _BV(PE6)
+#define DHT_PxOUT PORTE
+#define DHT_PxDIR DDRE
+
+#define SET_PIN_INPUT() (DHT_PxDIR &= ~DHT_PIN_MASK)
+#define SET_PIN_OUTPUT() (DHT_PxDIR |= DHT_PIN_MASK)
+
+#define OUTP_0() (DHT_PxOUT &= ~DHT_PIN_MASK)
+#define OUTP_1() (DHT_PxOUT |= DHT_PIN_MASK) 
+
+#define PIN_INIT() do{  \
+                     SET_PIN_INPUT();    \
+                     OUTP_0();           \
+                   } while(0)
+
+
+/* Drive the one wire interface hight */
+#define DHT_DRIVE() do {                    \
+                     SET_PIN_OUTPUT();     \
+                     OUTP_1();             \
+                   } while (0)
+
+/* Release the one wire by turning on the internal pull-up. */
+#define DHT_RELEASE() do {                  \
+                       SET_PIN_INPUT();    \
+                       OUTP_1();           \
+                     } while (0)
+
+/* Read one bit. */
+#define DHT_INP()  (DHT_PIN_READ & DHT_PIN_MASK)
+
+//The packet size is 40bit but each bit consists of low and high state
+//so 40 x 2 = 80 transitions. Also we have 2 transistions DHT response
+//and 2 transitions which indicates End Of Frame. In total 84
+#define MAXTIMINGS  84
+
+//This is the main function which requests and reads the packet
+uint8_t DHT_Read_Data(uint16_t *temperature, uint16_t *humidity);
diff --git a/platform/guhRF/dev/ds1820.c b/platform/guhRF/dev/ds1820.c
new file mode 100644
index 000000000..9de3fc8a9
--- /dev/null
+++ b/platform/guhRF/dev/ds1820.c
@@ -0,0 +1,291 @@
+/*
+ * Copyright (c) 2005, 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.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ * @(#)$Id: ds1820.c,v 1.5 2010/08/25 18:35:52 nifi Exp $
+ */
+/*
+ * Device driver for the Dallas Semiconductor DS1820 chip. Heavily
+ * based on the application note 126 "1-Wire Communications Through
+ * Software".
+ *
+ * http://www.maxim-ic.com/appnotes.cfm/appnote_number/126
+ */
+
+/*
+ * For now we stuff in Moteiv Corporation's unique OUI.
+ * From http://www.ethereal.com/distribution/manuf.txt:
+ * 00:12:75    Moteiv    # Moteiv Corporation
+ *
+ * The EUI-64 is a concatenation of the 24-bit OUI value assigned by
+ * the IEEE Registration Authority and a 40-bit extension identifier
+ * assigned by the organization with that OUI assignment.
+ */
+
+#include <avr/io.h>
+#include <string.h>
+#include "contiki.h"
+#include "ds1820.h"
+
+
+unsigned char ds1820_id[8];
+unsigned char ds1820_ok[8];
+
+/* 1-wire is at PortE.3 */
+#define SERIAL_ID_PIN_READ PINE
+//#define SERIAL_ID_PIN_MASK _BV(PE3)
+#define SERIAL_ID_PIN_MASK _BV(PE4)
+#define SERIAL_ID_PxOUT PORTE
+#define SERIAL_ID_PxDIR DDRE
+
+#define SET_PIN_INPUT() (SERIAL_ID_PxDIR &= ~SERIAL_ID_PIN_MASK)
+#define SET_PIN_OUTPUT() (SERIAL_ID_PxDIR |= SERIAL_ID_PIN_MASK)
+
+#define OUTP_0() (SERIAL_ID_PxOUT &= ~SERIAL_ID_PIN_MASK)
+#define OUTP_1() (SERIAL_ID_PxOUT |= SERIAL_ID_PIN_MASK) 
+
+#define PIN_INIT() do{  \
+                     SET_PIN_INPUT();    \
+                     OUTP_0();           \
+                   } while(0)
+
+
+/* Drive the one wire interface low */
+#define OW_DRIVE() do {                    \
+                     SET_PIN_OUTPUT();     \
+                     OUTP_0();             \
+                   } while (0)
+
+/* Release the one wire by turning on the internal pull-up. */
+#define OW_RELEASE() do {                  \
+                       SET_PIN_INPUT();    \
+                       OUTP_1();           \
+                     } while (0)
+
+/* Read one bit. */
+#define INP()  (SERIAL_ID_PIN_READ & SERIAL_ID_PIN_MASK)
+
+
+/*
+ * Delay times in us.
+ */
+#define tA 6          /* min-5, recommended-6, max-15 */              
+#define tB 64         /* min-59, recommended-64, max-N/A */
+#define tC 60         /* min-60, recommended-60, max-120 */			
+#define tD 10         /* min-5.3, recommended-10, max-N/A */
+#define tE 9          /* min-0.3, recommended-9, max-9.3 */
+#define tF 55         /* min-50, recommended-55, max-N/A */
+#define tG 0          /* min-0, recommended-0, max-0 */
+#define tH 480        /* min-480, recommended-480, max-640 */
+#define tI 70         /* min-60.3, recommended-70, max-75.3 */
+#define tJ 410        /* min-410, recommended-410, max-N/A */
+/*---------------------------------------------------------------------------*/
+#define udelay(u) clock_delay_usec(u)
+/*---------------------------------------------------------------------------*/
+
+static int
+owreset(void)
+{
+  int result;
+
+  OW_DRIVE();
+  udelay(tH);     /* 480 < tH < 640 */
+  OW_RELEASE();    /* Releases the bus */
+  udelay(tI);
+  result = INP();
+  udelay(tJ);
+  return result;
+}
+/*---------------------------------------------------------------------------*/
+static void
+owwriteb(unsigned byte)
+{
+  int i = 7;
+
+  do {
+    if(byte & 0x01) {
+      OW_DRIVE();
+      udelay(tA);
+      OW_RELEASE();    /* Releases the bus */
+      udelay(tB);
+    } else {
+      OW_DRIVE();
+      udelay(tC);
+      OW_RELEASE();    /* Releases the bus */
+      udelay(tD);
+    }
+    if(i == 0) {
+      return;
+    }
+    i--;
+    byte >>= 1;
+  } while(1);
+}
+/*---------------------------------------------------------------------------*/
+static unsigned
+owreadb(void)
+{
+  unsigned result = 0;
+  int i = 7;
+
+  do {
+    OW_DRIVE();
+    udelay(tA);
+    OW_RELEASE();	/* Releases the bus */
+    udelay(tE);
+    if (INP()){
+      result |= 0x80;	/* LSbit first */
+    }
+    udelay(tF);
+    if(i == 0) {
+      return result;
+    }
+    i--;
+    result >>= 1;
+  } while(1);
+}
+/*---------------------------------------------------------------------------*/
+/* Polynomial ^8 + ^5 + ^4 + 1 */
+static unsigned
+crc8_add(unsigned acc, unsigned byte)
+{
+  int i;
+  acc ^= byte;
+  for(i = 0; i < 8; i++) {
+    if(acc & 1) {
+      acc = (acc >> 1) ^ 0x8c;
+    } else {
+      acc >>= 1;
+    }
+  }
+  return acc;
+}
+/*---------------------------------------------------------------------------*/
+int
+ds1820_init()
+{
+  int i;
+  unsigned family, crc, acc;
+
+  PIN_INIT();
+
+  if(owreset() == 0) {	/* Something pulled down 1-wire. */
+
+    owwriteb(0x33);		/* Read ROM command. */
+    family = owreadb();
+    /* We receive 6 bytes in the reverse order, LSbyte first. */
+    for(i = 7; i >= 2; i--) {
+      ds1820_id[i] = owreadb();
+    }
+    crc = owreadb();
+
+    /* Verify family DS1820 and that CRC match. */
+    if(family != 0x10) {
+      goto fail;
+    }
+    acc = crc8_add(0x0, family);
+    for(i = 7; i >= 2; i--) {
+      acc = crc8_add(acc, ds1820_id[i]);
+    }
+    if(acc == crc) {
+      ds1820_id[0] = 0x00;
+      ds1820_id[1] = 0x00;
+      ds1820_id[2] = 0x00;
+      return 1;			/* Success! */
+    }
+  } else {
+  }
+
+
+ fail:
+  memset(ds1820_id, 0x0, sizeof(ds1820_id));
+  return 0;			/* Fail! */
+}
+/*---------------------------------------------------------------------------*/
+int
+ds1820_temp()
+{
+    ds1820_convert();
+// wait max 750ms pin lo
+    clock_wait(CLOCK_SECOND);
+    ds1820_read();
+    return 1;
+}
+
+int
+ds1820_convert()
+{
+  unsigned i;
+
+  PIN_INIT();
+  for(i=0;i<3;i++){
+  if(owreset() == 0) {	/* Something pulled down 1-wire. */
+    owwriteb(0xCC);		/* Skip ROM command. */
+    owwriteb(0x44);		/* Convert T command. */
+    OW_RELEASE();    /* Releases the bus */
+    return 1;
+  } else {
+  }
+  }
+  return 0;			/* Fail! */
+}
+/*---------------------------------------------------------------------------*/
+int
+ds1820_read()
+{
+  int i;
+  unsigned crc, acc;
+
+  if(owreset() == 0) {	/* Something pulled down 1-wire. */
+    owwriteb(0xCC);		/* Skip ROM command. */
+    owwriteb(0xBE);		/* Read Scratchpad command. */
+    /* We receive 8 bytes in the reverse order, LSbyte first. */
+    for(i = 0; i < 8; i++) {
+      ds1820_id[i] = owreadb();
+    }
+      crc = owreadb();
+
+    acc=0;
+    for(i = 0; i < 8; i++) {
+      acc = crc8_add(acc, ds1820_id[i]);
+    }
+    if(acc == crc) {
+      // store temp
+      for(i = 0; i < 8; i++) {
+         ds1820_ok[i]=ds1820_id[i];
+      }
+      return 1;			/* Success! */
+    } else {
+        return 0;			/* Fail! */
+    }
+  } else {
+    return 0;			/* Fail! */
+  }
+  return 1;			/* Fail! */
+}
diff --git a/platform/guhRF/dev/ds1820.h b/platform/guhRF/dev/ds1820.h
new file mode 100644
index 000000000..e4178d63e
--- /dev/null
+++ b/platform/guhRF/dev/ds1820.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2005, 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.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ * @(#)$Id: ds1820.h,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $
+ */
+/* -*- C -*- */
+/* @(#)$Id: ds1820.h,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $ */
+
+#ifndef DS1820_H
+#define DS1820_H
+
+extern unsigned char ds1820_id[8];
+extern unsigned char ds1820_ok[8];
+extern int ds1820_init();
+extern int ds1820_convert();
+extern int ds1820_read();
+extern int ds1820_temp();
+#endif /* DS1820_H */
diff --git a/platform/guhRF/dev/hw-arduino.h b/platform/guhRF/dev/hw-arduino.h
new file mode 100644
index 000000000..bcd626ec6
--- /dev/null
+++ b/platform/guhRF/dev/hw-arduino.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2014, Ralf Schlatterbeck Open Source Consulting
+ * 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.
+ */
+
+/**
+ * \defgroup compatibility Arduino - Contiki
+ *
+ * This defines contiki-compatible hardware definitions for running
+ * arduino sketches (or just to call arduino-compatible function). 
+ * For now only for osd hardware, a similar file should exist for each
+ * arduino-compatible hardware.
+ *
+ * @{
+ */
+
+/**
+ * \file
+ *        Header file for arduino compatibility
+ * \author
+ *        Ralf Schlatterbeck <rsc@runtux.com>
+ *
+ */
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#include "contiki.h"
+
+/*
+ * The OSD hardware only supports timer 3 for PWM, timer 2 is used by
+ * contiki for sleep/wakeup timing and is not usable for PWM.
+ */
+#define digitalPinToTimer(pin)                \
+    ( (pin) == 2                              \
+    ? TIMER3A                                 \
+    : ( (pin) == 3                            \
+      ? TIMER3B                               \
+      : ((pin == 4) ? TIMER3C : NOT_ON_TIMER) \
+      )                                       \
+    )
+
+/* Only init timer 3 with phase correct pwm 8-bit and prescaler 64 */
+#define arduino_pwm_timer_init() \
+  (hwtimer_ini (3, HWT_WGM_PWM_PHASE_8_BIT, HWT_CLOCK_PRESCALER_64, 0))
+
+/*
+ * VI settings, see coding style
+ * ex:ts=8:et:sw=2
+ */
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+/** @} */
diff --git a/platform/guhRF/dev/i2c.c b/platform/guhRF/dev/i2c.c
new file mode 100644
index 000000000..0fa295849
--- /dev/null
+++ b/platform/guhRF/dev/i2c.c
@@ -0,0 +1,391 @@
+/*
+ * Copyright (c) 2014, Ingo Gulyas Intembsys
+ * 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
+ *         I2C driver for ATMEGA128rfa1
+ *
+ * \author
+ *         Ingo Gulyas Intembsys
+ *         office@intembsys.at
+ *         www.intembsys.at
+ */
+
+
+#include "i2c.h"
+#include "contiki-conf.h"
+#include <stdint.h>
+#include <avr/power.h>
+#include <stdbool.h>
+#include <stddef.h>
+
+#if I2C_TD != 0
+#include <stdio.h>
+#include <avr/pgmspace.h>
+#include "system_mgmt.h"
+#define PRINTD(FORMAT,args...) {sleep_acquire_lock(); printf_P(PSTR(FORMAT),##args); sleep_release_lock();}
+#else
+#define PRINTD(...)
+#endif
+
+#if WITH_RTDEBUG == 1
+#include "rtdebug.h"
+#define RTDEBUG_PUSH(x) rtdebug_push(x)
+#else
+#warning "I2C Driver compiling without RTDEBUG!"
+#define RTDEBUG_PUSH(x)
+#endif
+
+#ifndef TIMEOUT_TIMER
+#warning "I2C Driver compiling without TIMEOUT!"
+#endif
+
+
+static int8_t wait_job();
+static int8_t wait_stop();
+
+static int8_t i2c_ioctl(const i2c_driver* const me, uint8_t cmd, uint8_t arg);
+static int8_t i2c_read(const i2c_driver* const me, uint8_t cmd_flags, uint8_t* buffer, uint8_t len);
+static int8_t i2c_write(const i2c_driver* const me, uint8_t cmd_flags, const uint8_t* data, uint8_t len);
+
+
+// static linkage of member functions
+i2c_driver i2c_drv = {i2c_ioctl, i2c_read, i2c_write};
+// lock spi if driver opened to prevent further opening access
+static volatile bool i2c_lock = false;
+
+
+///////////////////////////////////////////////////////////////
+// global functions
+///////////////////////////////////////////////////////////////
+
+i2c_driver* i2c_open(void)
+{
+	if(i2c_lock == true)
+	{
+		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_OPEN__DEVICE_BUSY);
+		return NULL;
+	}	
+	 
+	i2c_lock = true;
+	power_twi_enable();
+	I2C_INIT();	
+
+	TWBR = I2C_FREQ_STANDARD;
+	TWSR &= ~((1<<TWPS1) | (1<<TWPS0));
+	TWSR |= (1<<TWPS0);
+	TWCR = (1<<TWEN);
+	
+	return &i2c_drv;
+}
+
+void i2c_close(i2c_driver* const me)
+{
+	if(me == NULL || i2c_lock == false)
+	{
+		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_CLOSE__NO_DEVICE);
+		return;
+	}
+	
+	i2c_reset();
+	
+	return;
+}
+
+void i2c_reset(void)
+{
+	TWCR &= ~(1<<TWEN);
+	I2C_DEINIT();
+	power_twi_disable();
+	i2c_lock = false;
+	
+	return;
+}
+
+
+///////////////////////////////////////////////////////////////
+// local helper functions
+///////////////////////////////////////////////////////////////
+
+#ifdef TIMEOUT_TIMER
+	static int8_t wait_job()
+	{
+		int8_t status = I2C_OK;	
+		uint16_t timeout = TIMEOUT_TIMER_NOW_ADD(I2C_TIMEOUT);
+	
+
+		while (!(TWCR & (1<<TWINT)))
+		{
+			if(!(TIMEOUT_TIMER_LT(TIMEOUT_TIMER_NOW(), timeout)))
+			{
+				status = I2C_ERROR_TIMEOUT;
+				break;
+			}	
+		}
+	
+		return status;
+	}
+	
+	static int8_t wait_stop()
+	{
+		int8_t status = I2C_OK;	
+		uint16_t timeout = TIMEOUT_TIMER_NOW_ADD(I2C_TIMEOUT);
+	
+
+		while (TWCR & (1<<TWSTO))
+		{
+			if(!(TIMEOUT_TIMER_LT(TIMEOUT_TIMER_NOW(), timeout)))
+			{
+				status = I2C_ERROR_TIMEOUT;
+				break;
+			}	
+		}
+	
+		return status;
+	}
+#else
+	static int8_t wait_job()
+	{
+		while (!(TWCR & (1<<TWINT)));
+		return I2C_OK;
+	}
+	
+	static int8_t wait_stop()
+	{
+		while (TWCR & (1<<TWSTO));
+		return I2C_OK;
+	}
+#endif
+
+
+///////////////////////////////////////////////////////////////
+// member functions
+///////////////////////////////////////////////////////////////
+
+static int8_t i2c_ioctl(const i2c_driver* const me, uint8_t cmd, uint8_t arg)
+{
+	if(me == NULL || i2c_lock == false)
+	{
+		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_IOCTL__DEVICE_CLOSED);
+		return I2C_ERROR_DRIVER;
+	}
+		
+	if(cmd == I2C_IOCTL_CMD_SET_FREQ)
+	{
+		switch(arg)
+		{
+			case I2C_FREQ_400KHZ:	TWBR = I2C_FREQ_400KHZ; break;
+			case I2C_FREQ_250KHZ:	TWBR = I2C_FREQ_250KHZ; break;
+			case I2C_FREQ_100KHZ:	TWBR = I2C_FREQ_100KHZ; break;
+			case I2C_FREQ_50KHZ:	TWBR = I2C_FREQ_50KHZ; break;
+			case I2C_FREQ_10KHZ:	TWBR = I2C_FREQ_10KHZ; break;
+			default:
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_IOCTL__ARG_INVALID);
+				return I2C_ERROR_DRIVER;
+			}			
+		}
+	}
+	else
+	{
+		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_IOCTL__CMD_INVALID);
+		return I2C_ERROR_DRIVER;
+	}
+	
+	return I2C_OK;
+}
+
+static int8_t i2c_read(const i2c_driver* const me, uint8_t cmd_flags, uint8_t* buffer, uint8_t len)
+{
+	uint8_t i = 0;
+	int8_t status = I2C_OK;
+	
+	
+	if(me == NULL || i2c_lock == false)
+	{
+		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__DEVICE_CLOSED);
+		return I2C_ERROR_DRIVER;
+	}	
+	
+	if((len > 0) && (buffer == NULL))
+	{
+		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__ERROR_NULLPOINTER);
+		return I2C_ERROR_DRIVER;
+	}
+	
+	do 
+	{
+		if(cmd_flags & I2C_CMD_FLAG_START)
+		{
+			I2C_START();
+			if(wait_job() != I2C_OK)
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__START_TIMEOUT);
+				status = I2C_ERROR_TIMEOUT;
+				break;
+			}
+			if((I2C_STATUS() != I2C_STATUS_START) && (I2C_STATUS() != I2C_STATUS_START_REP))
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__START_ERROR);
+				status = I2C_ERROR_START;
+				break;
+			}
+			PRINTD("I2C-RD-START\n");
+		}
+		
+		if(len == 0) break;
+		
+		for(i=0; i<(len-1); i++)
+		{
+			I2C_READ_BYTE_ACK();
+			if(wait_job() != I2C_OK)
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__READ_BYTE_ACK_TIMEOUT);
+				status = I2C_ERROR_TIMEOUT;
+				break;
+			}
+			if(I2C_STATUS() != I2C_STATUS_DATAR_ACK)
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__READ_BYTE_ACK_ERROR);
+				status = I2C_ERROR_READ;
+				break;
+			}
+			buffer[i] = I2C_RX_REG;
+			PRINTD("I2C-RD-RACK: 0x%02X\n", buffer[i]);
+		}
+		
+		I2C_READ_BYTE_NACK();
+		if(wait_job() != I2C_OK)
+		{
+			RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__READ_BYTE_NACK_TIMEOUT);
+			status = I2C_ERROR_TIMEOUT;
+			break;
+		}
+		if(I2C_STATUS() != I2C_STATUS_DATAR_NACK)
+		{
+			RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__READ_BYTE_NACK_ERROR);
+			status = I2C_ERROR_READ;
+			break;
+		}
+		buffer[i] = I2C_RX_REG;
+		PRINTD("I2C-RD-RNACK: 0x%02X\n", buffer[i]);
+		
+	} while (0);
+	
+	if(cmd_flags & I2C_CMD_FLAG_STOP)
+	{
+		I2C_STOP();
+		if(wait_stop() != I2C_OK)
+		{
+			RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__STOP_TIMEOUT);
+			status = I2C_ERROR_TIMEOUT;
+		}
+		PRINTD("I2C-RD_STOP\n");
+	}
+	
+	return status;
+}
+
+static int8_t i2c_write(const i2c_driver* const me, uint8_t cmd_flags, const uint8_t* data, uint8_t len)
+{
+	uint8_t i = 0;
+	int8_t status = I2C_OK;
+	
+	
+	if(me == NULL || i2c_lock == false)
+	{
+		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__DEVICE_CLOSED);
+		return I2C_ERROR_DRIVER;
+	}
+	
+	if((len > 0) && (data == NULL))
+	{
+		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__ERROR_NULLPOINTER);
+		return I2C_ERROR_DRIVER;
+	}
+	
+	do 
+	{		
+		if(cmd_flags & I2C_CMD_FLAG_START)
+		{
+			I2C_START();
+			if(wait_job() != I2C_OK)
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__START_TIMEOUT);
+				status = I2C_ERROR_TIMEOUT;
+				break;
+			}
+			if((I2C_STATUS() != I2C_STATUS_START) && (I2C_STATUS() != I2C_STATUS_START_REP))
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__START_ERROR);
+				status = I2C_ERROR_START;
+				break;
+			}
+			PRINTD("I2C-WR-START\n");
+		}
+		
+		
+	
+		for(i=0; i<len; i++)
+		{
+			I2C_TX_REG = data[i];
+			I2C_WRITE_BYTE();
+			if(wait_job() != I2C_OK)
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__WRITE_BYTE_TIMEOUT);
+				status = I2C_ERROR_TIMEOUT;
+				break;
+			}
+			if((I2C_STATUS() != I2C_STATUS_DATAW_ACK) && (I2C_STATUS() != I2C_STATUS_SLAW_ACK) && (I2C_STATUS() != I2C_STATUS_SLAR_ACK))
+			{
+				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__WRITE_BYTE_ERROR);
+				status = I2C_ERROR_WRITE;
+				break;
+			}
+			PRINTD("I2C-WR-BYTE: 0x%02X\n", data[i]);
+		}
+
+	} while (0);
+	
+	if(cmd_flags & I2C_CMD_FLAG_STOP)
+	{
+		I2C_STOP();
+		if(wait_stop() != I2C_OK)
+		{
+			RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__STOP_TIMEOUT);
+			status = I2C_ERROR_TIMEOUT;
+		}
+		PRINTD("I2C-WR-STOP\n");
+	}
+	
+	return status;
+}
diff --git a/platform/guhRF/dev/i2c.h b/platform/guhRF/dev/i2c.h
new file mode 100644
index 000000000..bed70fc0a
--- /dev/null
+++ b/platform/guhRF/dev/i2c.h
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2014, Ingo Gulyas Intembsys
+ * 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
+ *         I2C driver for ATMEGA128rfa1
+ *
+ * \author
+ *         Ingo Gulyas Intembsys
+ *         office@intembsys.at
+ *         www.intembsys.at
+ */
+ 
+
+#ifndef I2C_H_
+#define I2C_H_
+
+
+#include <stdint.h>
+
+////////////////////////////////////////////////////////////////////////////////////////////
+// CONFIGURATION SECTION:
+
+#define I2C_TD          0			// compiler switch: i2c testdriver code
+
+#define I2C_PORT            PORTD
+#define I2C_DDR             DDRD
+#define I2C_SCL_PIN         0
+#define I2C_SDA_PIN         1
+
+// END OF CONFIGURATION SECTION
+////////////////////////////////////////////////////////////////////////////////////////////
+
+#define I2C_INIT()          ({I2C_DDR &= ~((1<<I2C_SCL_PIN) | (1<<I2C_SDA_PIN)); I2C_PORT |= ((1<<I2C_SCL_PIN) | (1<<I2C_SDA_PIN));})
+#define I2C_DEINIT()        ({I2C_DDR &= ~((1<<I2C_SCL_PIN) | (1<<I2C_SDA_PIN)); I2C_PORT |= ((1<<I2C_SCL_PIN) | (1<<I2C_SDA_PIN));})
+
+#define I2C_FREQ_STANDARD I2C_FREQ_50KHZ
+
+#if F_CPU == 16000000UL
+	#define	I2C_FREQ_400KHZ  0x03
+	#define	I2C_FREQ_250KHZ  0x06
+	#define	I2C_FREQ_100KHZ  0x12
+	#define	I2C_FREQ_50KHZ   0x26
+	#define I2C_FREQ_10KHZ   0xC6
+#else
+	#error "NO I2C FREQUENCY DEFINED -> CHECK F_CPU SETTINGS!"
+#endif
+
+
+#define I2C_STATUS_REG        TWSR
+#define I2C_TX_REG            TWDR
+#define I2C_RX_REG            TWDR
+
+#define I2C_START()           (TWCR = (1<<TWINT) |(1<<TWSTA) | (1<<TWEN))
+#define I2C_STOP()            (TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO))
+#define I2C_WRITE_BYTE()      (TWCR = (1<<TWINT) | (1<<TWEN))
+#define I2C_READ_BYTE_ACK()   (TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWEA))
+#define I2C_READ_BYTE_NACK()  (TWCR = (1<<TWINT) | (1<<TWEN))
+#define I2C_STATUS()          (I2C_STATUS_REG & I2C_STATUS_MASK)
+
+#define I2C_STATUS_MASK       0xF8
+#define I2C_STATUS_START      0x08
+#define I2C_STATUS_START_REP  0x10
+#define I2C_STATUS_SLAW_ACK   0x18
+#define I2C_STATUS_DATAW_ACK  0x28
+#define I2C_STATUS_SLAR_ACK   0x40
+#define I2C_STATUS_DATAR_ACK  0x50
+#define I2C_STATUS_DATAR_NACK 0x58
+
+#define I2C_ADR_WR(adr)       ((adr<<1) & ~(1<<0))
+#define I2C_ADR_RD(adr)       ((adr<<1) | (1<<0))
+
+#define I2C_CMD_FLAG_NONE     0x00
+#define I2C_CMD_FLAG_START    (1<<0)
+#define I2C_CMD_FLAG_STOP     (1<<1)
+
+
+#define I2C_OK                0
+#define I2C_ERROR_DRIVER      -1
+#define I2C_ERROR_TIMEOUT     -2
+#define I2C_ERROR_START       -3
+#define I2C_ERROR_WRITE       -4
+#define I2C_ERROR_READ        -5
+
+
+#define I2C_IOCTL_CMD_SET_FREQ 0x01
+
+
+typedef struct i2c_driver i2c_driver;
+struct i2c_driver
+{
+	int8_t (*ioctl)(const i2c_driver* const me, uint8_t cmd, uint8_t arg);
+	int8_t (*read)(const i2c_driver* const me, uint8_t cmd_flags, uint8_t* buffer, uint8_t len);
+	int8_t (*write)(const i2c_driver* const me, uint8_t cmd_flags, const uint8_t* data, uint8_t len);
+};
+
+i2c_driver* i2c_open(void);
+void i2c_close(i2c_driver* const me);
+void i2c_reset(void);
+
+
+#endif /* I2C_H_ */
diff --git a/platform/guhRF/dev/key.c b/platform/guhRF/dev/key.c
new file mode 100644
index 000000000..20d852c18
--- /dev/null
+++ b/platform/guhRF/dev/key.c
@@ -0,0 +1,73 @@
+/*
+ *  Copyright (c) 2010  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 KEY support.
+ *
+ * \author
+ *      Harald Pichler harald@the-develop.net
+ *
+ */
+
+#include "key.h"
+
+/*---------------------------------------------------------------------------*/
+
+/**
+ *   \brief This will intialize the KEY for button readings.
+*/
+void
+key_init(void)
+{
+    /* Enter is input w/pullup */
+    DDRF &= ~(1<<PINF1);
+}
+
+/*---------------------------------------------------------------------------*/
+
+/**
+ *   \brief This will poll run key_task() to determine if a button has been pressed.
+ *
+ *   \retval True if button is pressed
+ *   \retval False if button is not pressed
+*/
+uint8_t
+is_button(void)
+{
+    /* Return true if button has been pressed. */
+    if ( PINF & (1<<PINF1) ) {
+        return 0;
+    }
+    else{
+        return 1;
+    }
+}
diff --git a/platform/guhRF/dev/key.h b/platform/guhRF/dev/key.h
new file mode 100644
index 000000000..8d64b8423
--- /dev/null
+++ b/platform/guhRF/dev/key.h
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2010  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 Key support.
+ *
+ * \author
+ *      Harald Pixhlwe harald@the-develop.net
+ *
+ */
+
+#ifndef __KEY_H__
+#define __KEY_H__
+
+#include <stdint.h>
+#include <avr/io.h>
+
+void	key_init(void);
+uint8_t	is_button(void);
+
+#endif /* __KEY_H__ */
diff --git a/platform/guhRF/dev/led.c b/platform/guhRF/dev/led.c
new file mode 100644
index 000000000..b447a2749
--- /dev/null
+++ b/platform/guhRF/dev/led.c
@@ -0,0 +1,72 @@
+/*
+ *  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 guhRF LED support.
+ *
+ * \author
+ *      Harald Pichler harald@the-develop.net
+ *      Bernhard Trinnes bernhard.trinnes@guh.guru
+ *
+ */
+
+#include "led.h"
+
+/**
+ * \addtogroup relay
+ * \{
+*/
+/*---------------------------------------------------------------------------*/
+
+/**
+ * \brief Turns the LED1 on.
+*/
+void
+led1_off(void)
+{
+    PORTE &= ~(1<<PINE5);
+    DDRE  |=  (1<<PINE5);
+}
+
+/*---------------------------------------------------------------------------*/
+
+/**
+ *  \brief Turns the LED1 off.
+*/
+void
+led1_on(void)
+{
+    PORTE |= (1<<PINE5);
+    DDRE  |= (1<<PINE5);
+}
+/*---------------------------------------------------------------------------*/
+
diff --git a/platform/guhRF/dev/led.h b/platform/guhRF/dev/led.h
new file mode 100644
index 000000000..68ed89ab4
--- /dev/null
+++ b/platform/guhRF/dev/led.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 __LED_H__
+#define __LED_H__
+
+#include <avr/io.h>
+
+/** @name LED Functions */
+/** @{ */
+void led1_on(void);
+void led1_off(void);
+/** @} */
+
+#endif /* __LED_H__ */
diff --git a/platform/guhRF/dev/leds-arch.c b/platform/guhRF/dev/leds-arch.c
new file mode 100644
index 000000000..966387ce9
--- /dev/null
+++ b/platform/guhRF/dev/leds-arch.c
@@ -0,0 +1,71 @@
+/*
+* Copyright (c) 2005, 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.
+*
+* This file is part of the Contiki operating system.
+*
+* $Id: leds-arch.c,v 1.1 2006/06/17 22:41:31 adamdunkels Exp $
+*/
+
+/**
+* \file
+* Leds arch. for STK600-Atmega128rfa1.
+* \author
+* Paulo Louro <paulolouro@binarylabs.dk>
+*/
+
+
+ // WARNING : Blink function is disabled on the core leds.c file
+ 
+#include "contiki.h"
+#include "dev/leds.h"
+#include "leds-arch.h"
+
+/*---------------------------------------------------------------------------*/
+void
+leds_arch_init(void)
+{
+DDRE  |=  (1<<DDRE5);	// Set pins as output since leds are mounted on the VDD bus
+LEDS_OFF();
+}
+/*---------------------------------------------------------------------------*/
+unsigned char
+leds_arch_get(void)
+{
+  return ((LED_OUT & BIT_GREEN) ? 1 : 0);
+}
+/*---------------------------------------------------------------------------*/
+void
+leds_arch_set(unsigned char leds)
+{
+  if(leds & LEDS_GREEN) {
+    LED_GREEN_ON();
+  } else {
+    LED_GREEN_OFF();
+  }
+}
+/*---------------------------------------------------------------------------*/
diff --git a/platform/guhRF/dev/leds-arch.h b/platform/guhRF/dev/leds-arch.h
new file mode 100644
index 000000000..92532dafa
--- /dev/null
+++ b/platform/guhRF/dev/leds-arch.h
@@ -0,0 +1,26 @@
+/*
+	guhRF Platform has just one green LED on PIN E5
+
+*/
+
+#ifndef __LEDS_ARCH_H__
+#define __LEDS_ARCH_H__
+
+#define LED_OUT PORTE
+
+#define BIT_GREEN _BV(PE5)
+
+#define LED_GREEN_OFF() LED_OUT &= ~BIT_GREEN
+#define LED_GREEN_ON()  LED_OUT |=  BIT_GREEN
+
+#define LED_GREEN_TOGGLE() LED_OUT ^= BIT_GREEN
+
+#define LEDS_OFF() LED_OUT &= ~BIT_GREEN
+#define LEDS_ON() LED_OUT |=   BIT_GREEN
+
+
+void leds_arch_init(void);
+unsigned char leds_arch_get(void);
+void leds_arch_set(unsigned char leds);
+
+#endif /* __LEDS_ARCH_H__ */
diff --git a/platform/guhRF/dev/optriac-sensor.c b/platform/guhRF/dev/optriac-sensor.c
new file mode 100644
index 000000000..2f0566bc4
--- /dev/null
+++ b/platform/guhRF/dev/optriac-sensor.c
@@ -0,0 +1,102 @@
+/*
+* Copyright (c) , 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:
+* 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.
+*
+* @(#)$Id: servo-sensor.c,v 1.0 2013/02/20 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* optriac sensor header file for Atmega128rfa1.
+* \author
+* Harald Pichler <harald@the-develop.net>
+*/
+
+#include "contiki.h"
+#include "Arduino.h"
+#include "dev/optriac-sensor.h"
+
+#define PRINTF(...) printf(__VA_ARGS__)
+
+const struct sensors_sensor optriac_sensor;
+static int status(int type);
+static int enabled = 0;
+static int optriac[2]={0,0};
+static int optriacpin[8]={OPTRIAC_PIN_1,OPTRIAC_PIN_2};
+
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  return optriac[type];
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int c)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+    if(c) {
+      if(!status(SENSORS_ACTIVE)) {
+		pinMode(optriacpin[OPTRIAC_SENSOR_1], OUTPUT);
+		digitalWrite(optriacpin[OPTRIAC_SENSOR_1], LOW);
+		pinMode(optriacpin[OPTRIAC_SENSOR_2], OUTPUT);
+		digitalWrite(optriacpin[OPTRIAC_SENSOR_2], LOW);
+
+        enabled = 1;
+      }
+    } else {
+      enabled = 1;
+    }
+    break;
+  case OPTRIAC_SENSOR_1:
+  case OPTRIAC_SENSOR_2:
+
+    if(c==0){
+	digitalWrite(optriacpin[type], LOW);
+	optriac[type]=0;
+    }else{
+	digitalWrite(optriacpin[type], HIGH);
+	optriac[type]=1;
+    };
+    break;
+  }
+  return 0;	
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+  case SENSORS_READY:
+    return enabled;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(optriac_sensor, OPTRIAC_SENSOR, value, configure, status); 
diff --git a/platform/guhRF/dev/optriac-sensor.h b/platform/guhRF/dev/optriac-sensor.h
new file mode 100644
index 000000000..8cec46c14
--- /dev/null
+++ b/platform/guhRF/dev/optriac-sensor.h
@@ -0,0 +1,54 @@
+/*
+* Copyright (c), 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:
+* 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.
+*
+* @(#)$Id: servo-sensor.h,v 1.0 2013/02/20 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* Servo sensor header file for Atmega128rfa1.
+* \author
+* Harald Pichler <harald@the-develop.net>
+*/
+
+#ifndef __OPTRIAC_SENSOR_H__
+#define __OPTRIAC_SENSOR_H__
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor optriac_sensor;
+
+#define OPTRIAC_SENSOR "TRIAC"
+#define OPTRIAC_SENSOR_1          0
+#define OPTRIAC_SENSOR_2          1
+
+/* default pins Arduino-Merkurboard */
+#define OPTRIAC_PIN_1          2
+#define OPTRIAC_PIN_2          3
+
+#endif /* __OPTRIAC_SENSOR_H__ */ 
diff --git a/platform/guhRF/dev/pins_arduino.h b/platform/guhRF/dev/pins_arduino.h
new file mode 100644
index 000000000..d3b439299
--- /dev/null
+++ b/platform/guhRF/dev/pins_arduino.h
@@ -0,0 +1,218 @@
+/*
+  pins_arduino.h - Pin definition functions for Arduino
+  Part of Arduino - http://www.arduino.cc/
+
+  Copyright (c) 2014 Harald Pichler
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General
+  Public License along with this library; if not, write to the
+  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+
+  $Id: wiring.h 249 2014-04-18 17:35:12Z pichler $
+*/
+
+/*
+	This version of pins_arduino.h is for the Merkur Dev Board r1
+	Harald Pichler 2014 Apr 18
+*/
+
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <avr/pgmspace.h>
+
+#define NUM_DIGITAL_PINS            15
+#define NUM_ANALOG_INPUTS           6
+#define analogInputToDigitalPin(p)  ((p < NUM_ANALOG_INPUTS) ? (p) + NUM_DIGITAL_PINS  : -1)
+#define digitalPinHasPWM(p)         ((p) == 2 ||(p) == 3 ||(p) == 4 ||(p) == 14 )
+
+// Dev board specific defines: RF RX and TX LEDs:
+#define RXLED_DDR  DDRB
+#define RXLED_PORT PORTB
+#define RXLED_POS  PB6
+
+#define TXLED_DDR  DDRB
+#define TXLED_PORT PORTB
+#define TXLED_POS  PB7  
+
+const static uint8_t SS   = 10;
+const static uint8_t MOSI = 11;
+const static uint8_t MISO = 13;
+const static uint8_t SCK  = 12;
+
+const static uint8_t SDA = 9;
+const static uint8_t SCL = 8;
+const static uint8_t LED = 4;
+const static uint8_t LED1 = 4;
+const static uint8_t LED2 = 5;
+
+const static uint8_t A0 = 7;
+const static uint8_t A1 = 6;
+const static uint8_t A2 = 5;
+const static uint8_t A3 = 4;
+const static uint8_t A4 = 0;
+const static uint8_t A5 = 1;
+
+// A majority of the pins are NOT PCINTs, SO BE WARNED (i.e. you cannot use them as receive pins)
+// Only pins available for RECEIVE (TRANSMIT can be on any pin):
+// Pins: 10, 11, 12, 13, 14
+
+#define digitalPinToPCICR(p)    ( (((p) >= 10) && ((p) <= 14)) || ? (&PCICR) : ((uint8_t *)0) )
+
+#define digitalPinToPCICRbit(p) ( 0 ) 
+
+#define digitalPinToPCMSK(p)    ( (((p) >= 10) && ((p) <= 14))  ? (&PCMSK0) : ((uint8_t *)0) )
+
+#define digitalPinToPCMSKbit(p) ( ((p) == 10) ? 6 : \
+                                ( ((p) == 11) ? 5 : \
+                                ( ((p) == 12) ? 1 : \
+                                ( ((p) == 13) ? 3 : \
+                                ( ((p) == 14) ? 7 : \
+                                0 ) ) ) ) )
+
+#ifdef ARDUINO_MAIN
+
+const uint16_t PROGMEM port_to_mode_PGM[] = {
+	NOT_A_PORT,
+	NOT_A_PORT,
+	(uint16_t)&DDRB,
+	NOT_A_PORT,
+	(uint16_t)&DDRD,
+	(uint16_t)&DDRE,
+	(uint16_t)&DDRF,
+	(uint16_t)&DDRG,
+	NOT_A_PORT,
+	NOT_A_PORT,
+	NOT_A_PORT,
+	NOT_A_PORT,
+	NOT_A_PORT,
+};
+
+const uint16_t PROGMEM port_to_output_PGM[] = {
+	NOT_A_PORT,
+	NOT_A_PORT,
+	(uint16_t)&PORTB,
+	NOT_A_PORT,
+	(uint16_t)&PORTD,
+	(uint16_t)&PORTE,
+	(uint16_t)&PORTF,
+	(uint16_t)&PORTG,
+	NOT_A_PORT,
+	NOT_A_PORT,
+	NOT_A_PORT,
+	NOT_A_PORT,
+	NOT_A_PORT,
+};
+
+const uint16_t PROGMEM port_to_input_PGM[] = {
+	NOT_A_PIN,
+	NOT_A_PIN,
+	NOT_A_PIN,
+	(uint16_t)&PINC,
+	(uint16_t)&PIND,
+	(uint16_t)&PINE,
+	(uint16_t)&PINF,
+	(uint16_t)&PING,
+	NOT_A_PIN,
+	NOT_A_PIN,
+	NOT_A_PIN,
+	NOT_A_PIN,
+	NOT_A_PIN,
+};
+
+const uint8_t PROGMEM digital_pin_to_port_PGM[] = {
+	// PORTLIST		
+	// -------------------------------------------		
+	PE	, // PE 1 ** 0 ** D0 / USART0_TX	
+	PE	, // PE 0 ** 1 ** D1 / USART0_RX	
+	PE	, // PE 3 ** 2 ** D2 / PWM
+	PE	, // PE 4 ** 3 ** D3 / PWM
+	PE	, // PE 5 ** 4 ** D4 / PWM / LED1 / LED 
+	PE	, // PE 6 ** 5 ** D5 / LED2
+	PD	, // PD 3 ** 6 ** D6 / USART1_TX
+	PD	, // PD 2 ** 7 ** D7 / USART1_RX
+	PD	, // PD 0 ** 8 ** D8 / I2C_SCL
+	PD	, // PD 1 ** 9 ** D9 / I2C_SDA
+	PB	, // PB 0 ** 10 ** D10 / SPI_SSN
+	PB	, // PB 2 ** 11 ** D11 / SPI_MOSI
+	PB	, // PB 1 ** 12 ** D12 / SPI_SCK
+	PB	, // PB 3 ** 13 ** D13 / SPI_MISO
+	PB	, // PB 4 ** 14 ** D14 / PWM 
+	PF	, // PF 7 ** 15 ** A0 / D15
+	PF	, // PF 6 ** 16 ** A1 / D16	
+	PF	, // PF 5 ** 17 ** A2 / D17	
+	PF	, // PF 4 ** 18 ** A3 / D18	
+	PF	, // PF 0 ** 19 ** A4 / D19
+	PF	, // PF 1 ** 20 ** A5 / D20
+//	PB	, // PB 6 ** 34 ** D34 / LED1 / LED / PWM
+//	PB	, // PB 7 ** 35 ** D35 / LED2 / PWM
+//	PE	, // PE 2 ** 2 ** D2
+//	PE	, // PE 7 ** 7 ** D7
+//	PB	, // PB 5 ** 8 ** D8 / PWM
+//	PG	, // PG 0 ** 16 ** D16
+//	PG	, // PG 1 ** 17 ** D17
+//	PG	, // PG 2 ** 18 ** D18
+//	PG	, // PG 5 ** 19 ** D19 / PWM
+//	PD	, // PD 4 ** 22 ** D22
+//	PD	, // PD 5 ** 23 ** D23
+//	PD	, // PD 6 ** 24 ** D24
+//	PD	, // PD 7 ** 25 ** D25
+//	PF	, // PF 2 ** 28 ** A2 / D28
+//	PF	, // PF 3 ** 29 ** A3 / D29
+};
+
+const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = {
+	// PIN IN PORT		
+	// -------------------------------------------		
+	_BV( 1 )	, // PE 1 ** 0 ** USART0_TX	
+	_BV( 0 )	, // PE 0 ** 1 ** USART0_RX	
+	_BV( 3 )	, // PE 3 ** 2 ** D3 / PWM
+	_BV( 4 )	, // PE 4 ** 3 ** D4 / PWM
+	_BV( 5 )	, // PE 5 ** 4 ** D5 / PWM
+	_BV( 6 )	, // PE 6 ** 5 ** D6
+	_BV( 3 )	, // PD 3 ** 6 ** D21 / USART1_TX
+	_BV( 2 )	, // PD 2 ** 7 ** D20 / USART1_RX
+	_BV( 0 )	, // PD 0 ** 8 ** D15 / I2C_SCL
+	_BV( 1 )	, // PD 1 ** 9 ** D14 / I2C_SDA
+	_BV( 0 )	, // PB 0 ** 10 ** D10 / SPI_SSN
+	_BV( 2 )	, // PB 2 ** 11 ** D11 / SPI_MOSI
+	_BV( 1 )	, // PB 1 ** 12 ** D13 / SPI_SCK
+	_BV( 3 )	, // PB 3 ** 13 ** D12 / SPI_MISO
+	_BV( 4 )	, // PB 4 ** 14 ** D9 / PWM
+	_BV( 7 )	, // PF 7 ** 15 ** A0 / D33
+	_BV( 6 )	, // PF 6 ** 16 ** A1 / D32
+	_BV( 5 )	, // PF 5 ** 17 ** A2 / D31
+	_BV( 4 )	, // PF 4 ** 18 ** A3 / D30			
+	_BV( 0 )	, // PF 0 ** 19 ** A4 / D26
+	_BV( 1 )	, // PF 1 ** 20 ** A5 / D27
+//	_BV( 2 )	, // PE 2 ** 2 ** D2
+//	_BV( 7 )	, // PE 7 ** 7 ** D7
+//	_BV( 5 )	, // PB 5 ** 8 ** D8 / PWM
+//	_BV( 0 )	, // PG 0 ** 16 ** D16
+//	_BV( 1 )	, // PG 1 ** 17 ** D17	
+//	_BV( 2 )	, // PG 2 ** 18 ** D18	
+//	_BV( 5 )	, // PG 5 ** 19 ** D19 / PWM
+//	_BV( 4 )	, // PD 4 ** 22 ** D22
+//	_BV( 5 )  	, // PD 5 ** 23 ** D23
+//	_BV( 6 )  	, // PD 6 ** 24 ** D24
+//	_BV( 7 )	, // PD 7 ** 25 ** D25
+//	_BV( 2 )	, // PF 2 ** 28 ** A2 / D28
+//	_BV( 3 )	, // PF 3 ** 29 ** A3 / D29
+//	_BV( 6 )	, // PB 6 ** 34 ** D34 / LED1 / LED / PWM
+//	_BV( 7 )	, // PB 7 ** 35 ** D35 / LED2 / PWM
+};
+
+#endif
+
+#endif
diff --git a/platform/guhRF/dev/pir-sensor.c b/platform/guhRF/dev/pir-sensor.c
new file mode 100644
index 000000000..37a97c025
--- /dev/null
+++ b/platform/guhRF/dev/pir-sensor.c
@@ -0,0 +1,85 @@
+/* Sensor routine */
+#include "contiki.h"
+#include "lib/sensors.h"
+#include "dev/pir-sensor.h"
+
+#include <avr/interrupt.h>
+#include "led.h" // debug
+
+const struct sensors_sensor pir_sensor;
+
+static struct timer debouncetimer;
+static int status(int type);
+static int enabled = 0;
+struct sensors_sensor *sensors[1];
+unsigned char sensors_flags[1];
+
+#define PIR_BIT INTF6
+#define PIR_CHECK_IRQ() (EIFR & PIR_BIT) ? 0 : 1
+
+#define PRINTF(...) printf(__VA_ARGS__)
+/*---------------------------------------------------------------------------*/
+ISR(INT6_vect)
+{
+
+//  leds_toggle(LEDS_YELLOW);
+  
+  if(PIR_CHECK_IRQ()) {
+    if(timer_expired(&debouncetimer)) {
+ //   led1_on();
+      timer_set(&debouncetimer, CLOCK_SECOND / 4);
+      sensors_changed(&pir_sensor);
+ //   led1_off();
+    }
+  }
+
+}
+/*---------------------------------------------------------------------------*/
+
+static int
+value(int type)
+{
+ return (PORTE & _BV(PE6) ? 0 : 1) || !timer_expired(&debouncetimer);
+ //return 0;
+}
+
+static int
+configure(int type, int c)
+{
+	switch (type) {
+	case SENSORS_ACTIVE:
+		if (c) {
+			if(!status(SENSORS_ACTIVE)) {
+  //  led1_on();
+				timer_set(&debouncetimer, 0);
+				DDRE |= (0<<DDRE6); // Set pin as input
+				PORTE |= (1<<PORTE6); // Set port PORTE bint 6 with pullup resistor
+				EICRB |= (3<<ISC60); // For rising edge
+				EIMSK |= (1<<INT6); // Set int
+				enabled = 1;
+				sei();
+  //  led1_off();
+			}
+		} else {
+				enabled = 0;
+				EIMSK &= ~(1<<INT6); // clear int
+		}
+		return 1;
+	}
+	return 0;
+}
+
+static int
+status(int type)
+{
+	switch (type) {
+	case SENSORS_ACTIVE:
+	case SENSORS_READY:
+		return enabled;//(EIMSK & (1<<INT6) ? 0 : 1);//PIR_IRQ_ENABLED();
+	}
+	return 0;
+}
+
+SENSORS_SENSOR(pir_sensor, PIR_SENSOR,
+	       value, configure, status);
+
diff --git a/platform/guhRF/dev/pir-sensor.h b/platform/guhRF/dev/pir-sensor.h
new file mode 100644
index 000000000..ac59e0f9f
--- /dev/null
+++ b/platform/guhRF/dev/pir-sensor.h
@@ -0,0 +1,48 @@
+/*
+* Copyright (c) 2012, BinaryLabs.
+* 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.
+*
+* @(#)$Id: battery-sensor.h,v 1.1 2012/08/25 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* PIR sensor header file for Atmega128rfa1.
+* \author
+* Harald Pichler <harald@the-develop.net>
+*/
+
+#ifndef __PIR_SENSOR_H__
+#define __PIR_SENSOR_H__
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor pir_sensor;
+
+#define PIR_SENSOR "PIR"
+
+#endif /* __PIR_SENSOR_H__ */
\ No newline at end of file
diff --git a/platform/guhRF/dev/relay-sensor.c b/platform/guhRF/dev/relay-sensor.c
new file mode 100644
index 000000000..6415926c9
--- /dev/null
+++ b/platform/guhRF/dev/relay-sensor.c
@@ -0,0 +1,109 @@
+/*
+* Copyright (c) , 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:
+* 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.
+*
+* @(#)$Id: relay-sensor.c,v 1.0 2013/11/22 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* relay sensor header file for Atmega128rfa1.
+* \author
+* Harald Pichler <harald@the-develop.net>
+*/
+
+#include "contiki.h"
+#include "dev/relay.h"
+#include "dev/relay-sensor.h"
+
+#define PRINTF(...) printf(__VA_ARGS__)
+
+const struct sensors_sensor relay_sensor;
+static int status(int type);
+static int enabled = 0;
+static int relay[8]={0,0,0,0,0,0,0,0};
+static int relaypin[8]={RELAY_PIN_1,RELAY_PIN_2,RELAY_PIN_3,RELAY_PIN_4,RELAY_PIN_5,RELAY_PIN_6,RELAY_PIN_7,RELAY_PIN_8};
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+    return relay[type];
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int c)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+    if(c) {
+      if(!status(SENSORS_ACTIVE)) {
+		relay_init(relaypin[RELAY_SENSOR_1]);
+		relay_init(relaypin[RELAY_SENSOR_2]);
+		relay_init(relaypin[RELAY_SENSOR_3]);
+		relay_init(relaypin[RELAY_SENSOR_4]);
+		relay_init(relaypin[RELAY_SENSOR_5]);
+		relay_init(relaypin[RELAY_SENSOR_6]);
+		relay_init(relaypin[RELAY_SENSOR_7]);
+		relay_init(relaypin[RELAY_SENSOR_8]);
+        enabled = 1;
+      }
+    } else {
+      enabled = 1;
+    }
+    break;
+  case RELAY_SENSOR_1:
+  case RELAY_SENSOR_2:
+  case RELAY_SENSOR_3:
+  case RELAY_SENSOR_4:
+  case RELAY_SENSOR_5:
+  case RELAY_SENSOR_6:
+  case RELAY_SENSOR_7:
+  case RELAY_SENSOR_8:
+    if(c==0){
+	relay_off(relaypin[type]);
+	relay[type]=0;
+    }else{
+	relay_on(relaypin[type]);
+	relay[type]=1;
+    };
+    break;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+  case SENSORS_READY:
+    return enabled;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(relay_sensor, RELAY_SENSOR, value, configure, status); 
diff --git a/platform/guhRF/dev/relay-sensor.h b/platform/guhRF/dev/relay-sensor.h
new file mode 100644
index 000000000..88b9dd0f5
--- /dev/null
+++ b/platform/guhRF/dev/relay-sensor.h
@@ -0,0 +1,66 @@
+/*
+* Copyright (c), 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:
+* 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.
+*
+* @(#)$Id: relay-sensor.h,v 1.0 2013/11/22 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* Relay sensor header file for Atmega128rfa1.
+* \author
+* Harald Pichler <harald@the-develop.net>
+*/
+
+#ifndef __RELAY_SENSOR_H__
+#define __RELAY_SENSOR_H__
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor relay_sensor;
+
+#define RELAY_SENSOR "RELAY"
+#define RELAY_SENSOR_1          0
+#define RELAY_SENSOR_2          1
+#define RELAY_SENSOR_3          2
+#define RELAY_SENSOR_4          3
+#define RELAY_SENSOR_5          4
+#define RELAY_SENSOR_6          5
+#define RELAY_SENSOR_7          6
+#define RELAY_SENSOR_8          7
+
+/* default pins Arduino-Merkurboard */
+#define RELAY_PIN_1          10
+#define RELAY_PIN_2          11
+#define RELAY_PIN_3          12
+#define RELAY_PIN_4          13
+#define RELAY_PIN_5          15
+#define RELAY_PIN_6          16
+#define RELAY_PIN_7          17
+#define RELAY_PIN_8          18
+
+#endif /* __RELAY_SENSOR_H__ */ 
diff --git a/platform/guhRF/dev/relay.c b/platform/guhRF/dev/relay.c
new file mode 100644
index 000000000..67d9c7f5b
--- /dev/null
+++ b/platform/guhRF/dev/relay.c
@@ -0,0 +1,76 @@
+/*
+ *  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 "Arduino.h"
+#include "relay.h"
+
+/**
+ * \addtogroup relay
+ * \{
+*/
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief  init RELAY PINS.
+*/
+void
+relay_init(uint8_t pin)
+{
+   pinMode(pin, OUTPUT);
+   digitalWrite(pin, LOW);
+}
+/**
+ * \brief Turns the RELAY on.
+*/
+
+void
+relay_on(uint8_t pin)
+{
+   digitalWrite(pin, HIGH);
+}
+
+/*---------------------------------------------------------------------------*/
+
+/**
+ *  \brief Turns the RELAY off
+*/
+void
+relay_off(uint8_t pin)
+{
+   digitalWrite(pin, LOW);
+}
diff --git a/platform/guhRF/dev/relay.h b/platform/guhRF/dev/relay.h
new file mode 100644
index 000000000..3b9b48759
--- /dev/null
+++ b/platform/guhRF/dev/relay.h
@@ -0,0 +1,54 @@
+/*
+ *  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 relay_init(uint8_t pin);
+void relay_on(uint8_t pin);
+void relay_off(uint8_t pin);
+
+/** @} */
+
+#endif /* __RELAY_H__ */
diff --git a/platform/guhRF/dev/servo-sensor.c b/platform/guhRF/dev/servo-sensor.c
new file mode 100644
index 000000000..9da3caf80
--- /dev/null
+++ b/platform/guhRF/dev/servo-sensor.c
@@ -0,0 +1,100 @@
+/*
+* Copyright (c) , 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:
+* 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.
+*
+* @(#)$Id: servo-sensor.c,v 1.0 2013/02/20 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* Servo sensor header file for Atmega128rfa1.
+* \author
+* Harald Pichler <harald@the-develop.net>
+*/
+
+#include "contiki.h"
+#include "dev/servo.h"
+#include "dev/servo-sensor.h"
+
+#define PRINTF(...) printf(__VA_ARGS__)
+
+const struct sensors_sensor servo_sensor;
+static int status(int type);
+static int enabled = 0;
+
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  switch(type) {
+  case SERVO_SENSOR_A:
+    return servo_get(0);;
+
+    /* Total Solar Radiation. */
+  case SERVO_SENSOR_B:
+    return servo_get(1);
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int c)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+    if(c) {
+      if(!status(SENSORS_ACTIVE)) {
+	servo_init();
+        enabled = 1;
+      }
+    } else {
+      servo_off();
+      enabled = 1;
+    }
+    break;
+  case SERVO_SENSOR_A:
+    servo_set(0,c);
+    break;
+  case SERVO_SENSOR_B:
+    servo_set(1,c);
+    break;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+  case SENSORS_READY:
+    return enabled;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(servo_sensor, SERVO_SENSOR, value, configure, status); 
diff --git a/platform/guhRF/dev/servo-sensor.h b/platform/guhRF/dev/servo-sensor.h
new file mode 100644
index 000000000..44e50c0f8
--- /dev/null
+++ b/platform/guhRF/dev/servo-sensor.h
@@ -0,0 +1,50 @@
+/*
+* Copyright (c), 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:
+* 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.
+*
+* @(#)$Id: servo-sensor.h,v 1.0 2013/02/20 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* Servo sensor header file for Atmega128rfa1.
+* \author
+* Harald Pichler <harald@the-develop.net>
+*/
+
+#ifndef __SERVO_SENSOR_H__
+#define __SERVO_SENSOR_H__
+
+#include "lib/sensors.h"
+
+extern const struct sensors_sensor servo_sensor;
+
+#define SERVO_SENSOR "Servo"
+#define SERVO_SENSOR_A          0
+#define SERVO_SENSOR_B          1
+
+#endif /* __SERVO_SENSOR_H__ */ 
diff --git a/platform/guhRF/dev/servo.c b/platform/guhRF/dev/servo.c
new file mode 100644
index 000000000..874e98b89
--- /dev/null
+++ b/platform/guhRF/dev/servo.c
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2007, 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.
+ *
+ */
+
+/*
+ * Device driver for the Sensirion SHT1x/SHT7x family of humidity and
+ * temperature sensors.
+ */
+
+#include "contiki.h"
+#include <stdio.h>
+#include <dev/servo.h>
+
+#define DEBUG 0
+
+#if DEBUG
+#include <stdio.h>
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+/*
+ * servo device
+ */
+
+unsigned int servoa=SERVO_INIT;
+unsigned int servob=SERVO_INIT;
+
+void
+servo_init(void)
+{
+  // Port E initialization
+  // Set Pin 3 and 4 to output mode for OCR1A and OCR2A
+  DDRE |= 1<<3 | 1<<4;
+
+  // Timer/Counter 3 initialization
+  // Clock source: System Clock
+  // Clock value: 2000.000 kHz
+  // Mode: Ph. & fr. cor. PWM top=ICR1
+  // OC3A output: Connected
+  // OC3B output: Connected
+  // OC3C output: Connected
+  // Noise Canceler: Off
+  // Input Capture on Falling Edge
+  // Timer3 Overflow Interrupt: Off
+  // Input Capture Interrupt: Off
+  // Compare A Match Interrupt: Off
+  // Compare B Match Interrupt: Off
+  // Compare C Match Interrupt: Off
+
+  /* TCCR3A = [COM3A1|COM3A0|COM3B1|COM3B0||FOC3A|FOC3B|WGM31|WGM30] */
+  /*                1      0      1      0      1     0     0     0  */
+  TCCR3A=0xA8;
+  /* TCCR3B = [ ICNC3| ICES3|     -| WGM33||WGM32| CS32| CS31| CS30] */
+  /*                0      0      0      1      0     0     1     0  */
+  TCCR3B=0x12;
+  TCNT3H=0x00;
+  TCNT3L=0x00;
+  // ICR3 has a computed value of 20,000 - see the chip manual for how this
+  // value was derived.
+  // 20000 == 0x4e20 so that's what goes into the high and low byte of the ICR3 register
+  // alternatively, Codevision would let you just do ICR3 = 20000;
+  ICR3H=0x4E;
+  ICR3L=0x20;
+
+  // OCR3A will govern the steering servo, OCR3B will govern throttle
+  OCR3A = servoa;  // set it to an initial position somewhere in the middle of the 1 to 2ms range
+
+  // OCR3A will govern the steering servo, OCR3B will govern throttle
+  OCR3B = servob;  // set it to an initial position somewhere in the middle of the 1 to 2ms range
+  // start with motor off - no duty cycle at all
+  OCR3CH=0x00;
+  OCR3CL=0x00;
+}
+/*---------------------------------------------------------------------------*/
+/*
+ * Power of device.
+ */
+void
+servo_off(void)
+{
+
+}
+/*---------------------------------------------------------------------------*/
+/*
+ * get servo position
+ */
+unsigned int
+servo_get(unsigned int i)
+{
+  if(i==0)
+    return servoa;
+  if(i==1)
+    return servob;
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+/*
+ * Set servo position
+ */
+unsigned int
+servo_set(unsigned i,unsigned int j)
+{
+  if(j > SERVO_MAX)
+    j=SERVO_MAX;
+  if(j < SERVO_MIN)
+    j=SERVO_MIN;
+
+  if(i==0)
+  {
+    servoa=j;
+    OCR3A = servoa;
+    return 1;
+  }
+  if(i==1)
+  {
+    servob=j;
+    OCR3B = servob;
+    return 1;
+  }
+
+  return 0;
+}
diff --git a/platform/guhRF/dev/servo.h b/platform/guhRF/dev/servo.h
new file mode 100644
index 000000000..c6ae4ab57
--- /dev/null
+++ b/platform/guhRF/dev/servo.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2007, 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 SERVO_H
+#define SERVO_H
+
+#define SERVO_MIN   575
+#define SERVO_MAX  2425
+#define SERVO_INIT 1500
+
+void servo_init(void);
+void servo_off(void);
+
+unsigned int servo_get(unsigned int i);
+unsigned int servo_set(unsigned i,unsigned int j);
+
+#endif /* SHT11_H */
diff --git a/platform/guhRF/dev/sg-ready.c b/platform/guhRF/dev/sg-ready.c
new file mode 100644
index 000000000..c992462f0
--- /dev/null
+++ b/platform/guhRF/dev/sg-ready.c
@@ -0,0 +1,240 @@
+/*
+ *  Copyright (c) 2015 Bernhard Trinnes
+ *  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
+ *      Smart Grid Ready Module - guhRF
+ *
+ * \author
+ *      Bernhard Trinnes bernhard.trinnes@guh.guru
+	guh Gmbh
+ *
+ */
+
+#include "sg-ready.h"
+#include <util/delay.h>
+
+
+#if DEBUG
+#include <stdio.h>
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+
+
+
+/**
+ * \addtogroup relay
+ * \{
+*/
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief  init RELAY PINS - direction & pull-ups
+*/
+void
+sg_relay_init(uint8_t state)
+{
+   /*2 latching dual coal relay
+   RELAY 1 Coil 1   PB4 - ON
+           Coil 2   PB5 - OFF
+           Feedback PD5
+   RELAY 2 Coil 1   PB6 - ON
+           Coil 2   PB7 - OFF
+           Feedback PD7
+
+   */
+
+   PRINTF("SET DDRB\n");
+   DDRB |= (RELAY1_ON | RELAY1_OFF | RELAY2_ON | RELAY2_OFF);
+   PRINTF("SET PORTB\n");
+   PORTB &= ~(RELAY1_ON | RELAY1_OFF | RELAY2_ON | RELAY2_OFF);
+
+   PRINTF("SET DDRD\n");
+   DDRD &= ~(RELAY1_FB | RELAY2_FB);
+   PRINTF("SET PORTD\n");
+   PORTD |= (RELAY1_FB | RELAY2_FB);
+
+   PRINTF("SET STATE\n");
+   sg_set_state(state); // set default state - heat pump normal operation
+}
+
+/**
+ * \brief 
+*/
+
+void
+sg_set_state(uint8_t state)
+{
+   /* State 1 - Relays 1:0
+      State 2 - Relays 0:0  
+      State 3 - Relays 0:1
+      State 4 - Relays 1:1
+   */
+   uint8_t i = 0;
+   uint8_t current_state;
+
+   PRINTF("GET STATE\n");
+   current_state = sg_get_state();
+
+   PRINTF("SET DIFFERENCE: %u %u\n", current_state, state);
+   sg_switch_difference(current_state, state);
+
+   
+
+/*   while ( i<=3 || (current_state != state)){
+      i++;
+      sg_switch_difference(current_state, state);
+      current_state = sg_get_state();  
+  }
+*/ 
+}
+/**
+ * \brief 
+*/
+
+
+uint8_t
+sg_get_state()
+{
+   uint8_t state;
+   /* Pull up -> Pin high = Relay Open */
+   if ((~PIND & RELAY1_FB) && (~PIND & RELAY2_FB)){ 
+      state = 4;
+   }else if  (~PIND & RELAY1_FB){ 
+      state = 1; 
+   } else if (~PIND & RELAY2_FB){
+      state = 3;
+   } else {
+      state = 2;
+   }
+   return state;
+}
+/**
+ * \brief 
+*/
+
+void 
+sg_switch_difference(uint8_t old_state, uint8_t new_state)
+{
+   switch(old_state) {
+      case 1: 
+          switch(new_state) {
+              case 2: 
+                 PORTB |=   RELAY1_OFF;
+                 PORTB &= ~(RELAY1_ON | RELAY2_ON | RELAY2_OFF);
+                 _delay_us(LATCH_TIME);
+                 PORTB &= ~(RELAY1_OFF); 
+              break;
+              case 3: 
+                 PORTB |=  (RELAY1_OFF | RELAY2_ON );
+                 PORTB &= ~(RELAY1_ON  | RELAY2_OFF);
+                 _delay_us(LATCH_TIME);
+                 PORTB &= ~(RELAY1_OFF | RELAY2_ON);   
+              break;
+              case 4: 
+                 PORTB |=   RELAY2_ON;
+                 PORTB &= ~(RELAY1_ON | RELAY1_OFF | RELAY2_OFF);
+                 _delay_us(LATCH_TIME);
+                 PORTB &= ~(RELAY2_ON); 
+              break;
+          }
+      break;
+      case 2: 
+          switch(new_state) {
+              case 1: 
+                 PORTB |=   RELAY1_ON;
+                 PORTB &= ~(RELAY1_OFF | RELAY2_ON | RELAY2_OFF);
+                 _delay_us(LATCH_TIME);
+                 PORTB &= ~(RELAY1_ON); 
+              break;
+              case 3: 
+                 PORTB |=  (RELAY2_ON);
+                 PORTB &= ~(RELAY1_ON | RELAY1_OFF | RELAY2_OFF);
+                 _delay_us(LATCH_TIME);
+                 PORTB &= ~(RELAY2_ON); 
+              break;
+              case 4: 
+                 PORTB |=  (RELAY1_ON  | RELAY2_ON);
+                 PORTB &= ~(RELAY1_OFF | RELAY2_OFF);
+                 _delay_us(LATCH_TIME);
+                 PORTB &= ~(RELAY1_ON  | RELAY2_ON); 
+              break;
+          }
+  
+      break;
+      case 3:
+          switch(new_state) {
+              case 1: 
+                 PORTB |=  (RELAY1_ON  | RELAY2_OFF);
+                 PORTB &= ~(RELAY1_OFF | RELAY2_ON);
+                 _delay_us(LATCH_TIME);
+                 PORTB &= ~(RELAY1_ON  | RELAY2_OFF); 
+              break;
+              case 2: 
+                 PORTB |=   RELAY2_OFF;
+                 PORTB &= ~(RELAY1_ON  | RELAY1_OFF | RELAY2_ON);
+                 _delay_us(LATCH_TIME);
+                 PORTB &= ~(RELAY2_OFF);   
+              break;
+              case 4: 
+                 PORTB |=   RELAY1_ON;
+                 PORTB &= ~(RELAY1_OFF | RELAY2_ON | RELAY2_OFF);
+                 _delay_us(LATCH_TIME);
+                 PORTB &= ~(RELAY1_ON); 
+              break;
+          }
+      break;
+      case 4: 
+          switch(new_state) {
+              case 1: 
+                 PORTB |=   RELAY2_OFF;
+                 PORTB &= ~(RELAY1_ON | RELAY1_OFF | RELAY2_ON);
+                 _delay_us(LATCH_TIME);
+                 PORTB &= ~(RELAY2_OFF); 
+              break;
+              case 2: 
+                 PORTB |=  (RELAY1_OFF | RELAY2_OFF);
+                 PORTB &= ~(RELAY1_ON  | RELAY2_ON );
+                 _delay_us(LATCH_TIME);
+                 PORTB &= ~(RELAY1_OFF | RELAY2_OFF);  
+              break;
+              case 3: 
+                 PORTB |=   RELAY1_OFF;
+                 PORTB &= ~(RELAY1_ON | RELAY2_ON | RELAY2_OFF);
+                 _delay_us(LATCH_TIME);
+                 PORTB &= ~(RELAY1_OFF); 
+              break;
+          }
+      break;
+   }
+}
+
diff --git a/platform/guhRF/dev/sg-ready.h b/platform/guhRF/dev/sg-ready.h
new file mode 100644
index 000000000..0e92ba557
--- /dev/null
+++ b/platform/guhRF/dev/sg-ready.h
@@ -0,0 +1,65 @@
+/*
+ *  Copyright (c) 2015 Bernhard Trinnes
+ *  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
+ *     
+ *
+ * \author
+ *      Bernhard Trinnes bernhard.trinnes@guh.guru
+ *
+ */
+
+#ifndef __SGREADY_H__
+#define __SGREADY_H__
+
+#include <avr/io.h>
+
+#define LATCH_TIME 3000 // time in micro seconds
+
+#define RELAY1_ON     (1<<DDRB4)
+#define RELAY1_OFF    (1<<DDRB5)
+#define RELAY2_ON     (1<<DDRB6)
+#define RELAY2_OFF    (1<<DDRB7)
+#define RELAY1_FB     (1<<DDRD5)
+#define RELAY2_FB     (1<<DDRD7)
+
+
+/** @name Smart Grid Ready Functions */
+/** @{ */
+void sg_relay_init(uint8_t state);
+void sg_set_state(uint8_t pin);
+uint8_t sg_get_state();
+void sg_switch_difference(uint8_t old_state, uint8_t new_state); 
+
+/** @} */
+
+#endif /* __SGREADY_H__ */
diff --git a/platform/guhRF/dev/t4-servo-sensor.c b/platform/guhRF/dev/t4-servo-sensor.c
new file mode 100644
index 000000000..a35b2de02
--- /dev/null
+++ b/platform/guhRF/dev/t4-servo-sensor.c
@@ -0,0 +1,101 @@
+/*
+** Copyright (C) 2013-2014 Marcus Priesch, All rights reserved
+** In Prandnern 31, A--2122 Riedenthal, Austria. office@priesch.co.at
+**
+** 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.
+**
+**++
+** Name
+**    t4-servo-sensor
+**
+** Purpose
+**    Implements a sensor around t4servo.c
+**
+**
+** Revision Dates
+**    31-Mar-2013 (MPR) Creation
+**    12-Mar-2014 (MPR) Factored to support configurable amount of pwm's
+**    ««revision-date»»···
+**--
+*/
+
+#include "contiki.h"
+#include "dev/t4-servo.h"
+#include "dev/t4-servo-sensor.h"
+
+const struct sensors_sensor t4_servo_sensor;
+
+static int status(int type);
+static int enabled = 0;
+
+static int value (int channel)
+  {
+    if (channel >= SERVO_COUNT)
+      return -1;
+    else if (channel < 0)
+      return -2;
+    else
+      return t4_servo_get (channel);
+  }
+
+static int configure (int type, int c) // type, c: SENSORS_ACTIVE, 1 -> act.
+                                       // type, c: SENSORS_ACTIVE, 0 -> deact.
+  {
+    switch (type)
+      {
+        case SENSORS_ACTIVE :
+          if (c == 0)
+            {
+              t4_servo_off ();
+            }
+          else if (c == 1)
+            {
+              t4_servo_init ();
+            }
+          break;
+
+        default :
+          if (type >= SERVO_COUNT)
+            return -1;
+          else
+            t4_servo_set (type, c);
+          break;
+
+      }
+    return 0;
+  }
+
+static int status(int type)
+  {
+    switch (type)
+      {
+        case SENSORS_ACTIVE:
+        case SENSORS_READY:
+          return enabled;
+      }
+    return 0;
+  }
+
+SENSORS_SENSOR(t4_servo_sensor, T4_SENSOR_NAME, value, configure, status);
diff --git a/platform/guhRF/dev/t4-servo-sensor.h b/platform/guhRF/dev/t4-servo-sensor.h
new file mode 100644
index 000000000..099bb4c66
--- /dev/null
+++ b/platform/guhRF/dev/t4-servo-sensor.h
@@ -0,0 +1,52 @@
+/*
+** Copyright (C) 2013-2014 Marcus Priesch, All rights reserved
+** In Prandnern 31, A--2122 Riedenthal, Austria. office@priesch.co.at
+**
+** 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.
+**
+**++
+** Name
+**    t4-servo-sensor
+**
+** Purpose
+**    Implements a sensor around t4servo.c
+**
+**
+** Revision Dates
+**    31-Mar-2013 (MPR) Creation
+**    12-Mar-2014 (MPR) Factored to support configurable amount of pwm's
+      ««revision-date»»···
+**--
+*/
+
+#ifndef __T4_SERVO_SENSOR_H__
+#define __T4_SERVO_SENSOR_H__
+
+#include "lib/sensors.h"
+#include "t4-servo-config.h"
+
+extern const struct sensors_sensor t4_servo_sensor;
+
+#endif /* __T4_SERVO_SENSOR_H__ */
diff --git a/platform/guhRF/dev/t4-servo.c b/platform/guhRF/dev/t4-servo.c
new file mode 100644
index 000000000..45f74ad9b
--- /dev/null
+++ b/platform/guhRF/dev/t4-servo.c
@@ -0,0 +1,139 @@
+/*
+** Copyright (C) 2013-2014 Marcus Priesch, All rights reserved
+** In Prandnern 31, A--2122 Riedenthal, Austria. office@priesch.co.at
+**
+** 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.
+**
+**++
+** Name
+**    t4-servo
+**
+** Purpose
+**    Implements software pwm on any portpins via timer 4
+**
+**
+** Revision Dates
+**    31-Mar-2013 (MPR) Creation
+**    12-Mar-2014 (MPR) Factored to support configurable amount of pwm's
+**    ««revision-date»»···
+**--
+*/
+
+#include "t4-servo.h"
+#include "t4-servo-config.h"
+#include "t4-servo-hardware.h"
+#include <avr/io.h>
+#include <avr/interrupt.h>
+
+// static servo_channel_type servo_channels [SERVO_COUNT];
+
+// timer 4: CTC OCR4A
+#define WGM4 0x4
+
+void t4_servo_init (void)
+{
+  unsigned char channel;
+
+  for (channel = 0; channel < SERVO_COUNT;  channel ++)
+    {
+      _SFR_IO8 (servo_channels [channel].ddr ) |=   servo_channels [channel].pin;
+      _SFR_IO8 (servo_channels [channel].port) &= ~(servo_channels [channel].pin);
+    }
+
+  cli ();
+  TCCR4A               = 0x00;
+  TCCR4A_struct.wgm4   =  WGM4 & 0x3;
+  TCCR4B_struct.wgm4   = (WGM4 & 0xc) >> 2;
+  TCCR4B_struct.cs4    = 0x1; // No prescaler
+  TCCR4C               = 0x00;
+  OCR4A                = (T4_VALUE);
+  TIMSK4_struct.ocie4a = 1;
+  TIMSK4_struct.toie4  = 1;
+  sei();
+}
+
+void t4_servo_off (void)
+  {
+    TIMSK4_struct.toie4  = 0;
+    TIMSK4_struct.ocie4a = 0;
+  }
+
+int t4_servo_get (unsigned int channel)
+  {
+    if (channel >= SERVO_COUNT)
+      return -1;
+    //printf ("t4_servo_get: %d, %d\n", channel, servo_channels [channel].duty);
+    return servo_channels [channel].duty;
+  }
+
+int t4_servo_set (unsigned int channel, unsigned char duty)
+  {
+    //printf ("t4_servo_set: %d, %d\n", channel, duty);
+
+    if (channel >= SERVO_COUNT)
+      return -1;
+
+    if (duty > SERVO_MAX)
+      return -2;
+
+    if (duty < SERVO_MIN)
+      return -3;
+
+    servo_channels [channel].duty = duty;
+    return 0;
+  }
+
+ISR (TIMER4_COMPA_vect, ISR_NOBLOCK)
+  {
+    unsigned char channel;
+    static unsigned int tick_count = 0;
+
+  cli ();
+    for (channel = 0; channel < SERVO_COUNT;  channel ++)
+      {
+        if (tick_count < servo_channels [channel].duty)
+          {
+            // turn on
+//            _SFR_IO8 (servo_channels [channel].ddr ) |= servo_channels [channel].pin;
+            _SFR_IO8 (servo_channels [channel].port) |= servo_channels [channel].pin;
+          }
+        else
+          {
+            // turn off
+            _SFR_IO8 (servo_channels [channel].port) &= ~(servo_channels [channel].pin);
+//            _SFR_IO8 (servo_channels [channel].ddr ) |=   servo_channels [channel].pin;
+          }
+      }
+
+    tick_count ++;
+
+    if (tick_count >= (SERVO_MAX + SERVO_OFFSET))
+      {
+        tick_count = 0;
+      }
+  sei();
+
+  }
+
diff --git a/platform/guhRF/dev/t4-servo.h b/platform/guhRF/dev/t4-servo.h
new file mode 100644
index 000000000..5acdc4013
--- /dev/null
+++ b/platform/guhRF/dev/t4-servo.h
@@ -0,0 +1,61 @@
+/*
+** Copyright (C) 2013-2014 Marcus Priesch, All rights reserved
+** In Prandnern 31, A--2122 Riedenthal, Austria. office@priesch.co.at
+**
+** 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.
+**
+**++
+** Name
+**    t4-servo
+**
+** Purpose
+**    Implements software pwm on any portpins via timer 4
+**
+**
+** Revision Dates
+**    31-Mar-2013 (MPR) Creation
+**    12-Mar-2014 (MPR) Factored to support configurable amount of pwm's
+      ««revision-date»»···
+**--
+*/
+
+#ifndef __T4_SERVO_H__
+#define __T4_SERVO_H__
+
+typedef struct struct_servo_channel
+{
+  unsigned char port;
+  unsigned char ddr;
+  unsigned char pin;
+  unsigned char duty;
+} servo_channel_type;
+
+void t4_servo_init(void);
+void t4_servo_off(void);
+
+int t4_servo_get(unsigned int channel);
+int t4_servo_set(unsigned int channel, unsigned char duty);
+
+#endif /* __T4_SERVO_H__ */
diff --git a/platform/guhRF/dev/temperature-sensor.c b/platform/guhRF/dev/temperature-sensor.c
new file mode 100644
index 000000000..c85896178
--- /dev/null
+++ b/platform/guhRF/dev/temperature-sensor.c
@@ -0,0 +1,66 @@
+/*
+* Copyright (c) 2012, BinaryLabs.
+* 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.
+*
+* @(#)$Id: temperature-sensor.c,v 1.1 2010/08/25 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* Temperature sensor header file for Atmega128rfa1.
+* \author
+* Paulo Louro <paulolouro@binarylabs.dk>
+*/
+
+#include "contiki.h"
+#include "dev/temperature-sensor.h"
+
+#define PRINTF(...) printf(__VA_ARGS__)
+
+
+const struct sensors_sensor temperature_sensor;
+
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  return readInternalTemp();
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int c)
+{
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(temperature_sensor, TEMPERATURE_SENSOR, value, configure, status);
\ No newline at end of file
diff --git a/platform/guhRF/dev/temperature-sensor.h b/platform/guhRF/dev/temperature-sensor.h
new file mode 100644
index 000000000..6cf5dbf26
--- /dev/null
+++ b/platform/guhRF/dev/temperature-sensor.h
@@ -0,0 +1,49 @@
+/*
+* Copyright (c) 2012, BinaryLabs.
+* 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.
+*
+* @(#)$Id: temperature-sensor.h,v 1.1 2012/08/25 19:34:06 nifi Exp $
+*/
+
+/**
+* \file
+* Temperature sensor header file for Atmega128rfa1.
+* \author
+* Paulo Louro <paulolouro@binarylabs.dk>
+*/
+
+#ifndef __TEMPERATURE_SENSOR_H__
+#define __TEMPERATURE_SENSOR_H__
+
+#include "lib/sensors.h"
+#include "dev/adc.h"
+
+extern const struct sensors_sensor temperature_sensor;
+
+#define TEMPERATURE_SENSOR "Temperature"
+
+#endif /* __TEMPERATURE_SENSOR_H__ */
\ No newline at end of file
diff --git a/platform/guhRF/dev/wiring_digital.c b/platform/guhRF/dev/wiring_digital.c
new file mode 100644
index 000000000..75b6745d6
--- /dev/null
+++ b/platform/guhRF/dev/wiring_digital.c
@@ -0,0 +1,104 @@
+/*
+  wiring_digital.c - digital input and output functions
+  Part of Arduino - http://www.arduino.cc/
+
+  Copyright (c) 2005-2006 David A. Mellis
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General
+  Public License along with this library; if not, write to the
+  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+
+  Modified 28 September 2010 by Mark Sproul
+
+  $Id: wiring.c 248 2007-02-03 15:36:30Z mellis $
+*/
+
+#define ARDUINO_MAIN
+#include "wiring_private.h"
+#include "pins_arduino.h"
+
+void pinMode(uint8_t pin, uint8_t mode)
+{
+	uint8_t bit = digitalPinToBitMask(pin);
+	uint8_t port = digitalPinToPort(pin);
+	volatile uint8_t *reg, *out;
+
+	if (port == NOT_A_PIN) return;
+
+	// JWS: can I let the optimizer do this?
+	reg = portModeRegister(port);
+	out = portOutputRegister(port);
+
+	if (mode == INPUT) { 
+		uint8_t oldSREG = SREG;
+                cli();
+		*reg &= ~bit;
+		*out &= ~bit;
+		SREG = oldSREG;
+	} else if (mode == INPUT_PULLUP) {
+		uint8_t oldSREG = SREG;
+                cli();
+		*reg &= ~bit;
+		*out |= bit;
+		SREG = oldSREG;
+	} else {
+		uint8_t oldSREG = SREG;
+                cli();
+		*reg |= bit;
+		SREG = oldSREG;
+	}
+}
+
+void digitalWrite(uint8_t pin, uint8_t val)
+{
+	uint8_t timer = digitalPinToTimer(pin);
+	uint8_t bit = digitalPinToBitMask(pin);
+	uint8_t port = digitalPinToPort(pin);
+	volatile uint8_t *out;
+
+	if (port == NOT_A_PIN) return;
+
+	// If the pin that support PWM output, we need to turn it off
+	// before doing a digital write.
+	if (timer != NOT_ON_TIMER) turnOffPWM(timer);
+
+	out = portOutputRegister(port);
+
+	uint8_t oldSREG = SREG;
+	cli();
+
+	if (val == LOW) {
+		*out &= ~bit;
+	} else {
+		*out |= bit;
+	}
+
+	SREG = oldSREG;
+}
+
+int digitalRead(uint8_t pin)
+{
+	uint8_t timer = digitalPinToTimer(pin);
+	uint8_t bit = digitalPinToBitMask(pin);
+	uint8_t port = digitalPinToPort(pin);
+
+	if (port == NOT_A_PIN) return LOW;
+
+	// If the pin that support PWM output, we need to turn it off
+	// before getting a digital reading.
+	if (timer != NOT_ON_TIMER) turnOffPWM(timer);
+
+	if (*portInputRegister(port) & bit) return HIGH;
+	return LOW;
+}
diff --git a/platform/guhRF/dev/wiring_private.h b/platform/guhRF/dev/wiring_private.h
new file mode 100644
index 000000000..37c263352
--- /dev/null
+++ b/platform/guhRF/dev/wiring_private.h
@@ -0,0 +1,69 @@
+/*
+  wiring_private.h - Internal header file.
+  Part of Arduino - http://www.arduino.cc/
+
+  Copyright (c) 2005-2006 David A. Mellis
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General
+  Public License along with this library; if not, write to the
+  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+
+  $Id: wiring.h 239 2007-01-12 17:58:39Z mellis $
+*/
+
+#ifndef WiringPrivate_h
+#define WiringPrivate_h
+
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Arduino.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#ifndef cbi
+#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
+#endif
+#ifndef sbi
+#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
+#endif
+
+#define EXTERNAL_INT_0 0
+#define EXTERNAL_INT_1 1
+#define EXTERNAL_INT_2 2
+#define EXTERNAL_INT_3 3
+#define EXTERNAL_INT_4 4
+#define EXTERNAL_INT_5 5
+#define EXTERNAL_INT_6 6
+#define EXTERNAL_INT_7 7
+
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+#define EXTERNAL_NUM_INTERRUPTS 8
+#elif defined(__AVR_ATmega128RFA1__) || (__AVR_ATmega256RFR2__)
+#define EXTERNAL_NUM_INTERRUPTS 8
+#else
+#define EXTERNAL_NUM_INTERRUPTS 2
+#endif
+
+typedef void (*voidFuncPtr)(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif
diff --git a/platform/guhRF/node-id.c b/platform/guhRF/node-id.c
new file mode 100644
index 000000000..8698b1855
--- /dev/null
+++ b/platform/guhRF/node-id.c
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2006, 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.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ * $Id: node-id.c,v 1.1 2007/03/23 09:59:08 nifi Exp $
+ */
+
+/**
+ * \file
+ *         Utility to store a node id in the external flash
+ * \author
+ *         Adam Dunkels <adam@sics.se>
+ */
+
+#include "node-id.h"
+#include "contiki-conf.h"
+#include "dev/xmem.h"
+
+unsigned short node_id = 0;
+
+/*---------------------------------------------------------------------------*/
+void
+node_id_restore(void)
+{
+/* todo */
+/*
+  unsigned char buf[4];
+  xmem_pread(buf, 4, NODE_ID_XMEM_OFFSET);
+  if(buf[0] == 0xad &&
+     buf[1] == 0xde) {
+    node_id = (buf[2] << 8) | buf[3];
+  } else {
+    node_id = 0;
+  }
+*/
+ node_id = 0;
+}
+/*---------------------------------------------------------------------------*/
+void
+node_id_burn(unsigned short id)
+{
+/* todo */
+/*
+  unsigned char buf[4];
+  buf[0] = 0xad;
+  buf[1] = 0xde;
+  buf[2] = id >> 8;
+  buf[3] = id & 0xff;
+  xmem_erase(XMEM_ERASE_UNIT_SIZE, NODE_ID_XMEM_OFFSET);
+  xmem_pwrite(buf, 4, NODE_ID_XMEM_OFFSET);
+*/
+}
+/*---------------------------------------------------------------------------*/
diff --git a/platform/guhRF/node-id.h b/platform/guhRF/node-id.h
new file mode 100644
index 000000000..592379fc9
--- /dev/null
+++ b/platform/guhRF/node-id.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2006, 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.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ * $Id: node-id.h,v 1.1 2007/03/23 09:59:08 nifi Exp $
+ */
+
+#ifndef __NODE_ID_H__
+#define __NODE_ID_H__
+
+void node_id_restore(void);
+void node_id_burn(unsigned short node_id);
+
+extern unsigned short node_id;
+
+#endif /* __NODE_ID_H__ */
diff --git a/platform/guhRF/params.c b/platform/guhRF/params.c
new file mode 100644
index 000000000..4b0252387
--- /dev/null
+++ b/platform/guhRF/params.c
@@ -0,0 +1,273 @@
+/*
+ * Copyright (c) 2011, 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.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ */
+#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
+
+#define DEBUG 1
+#if DEBUG
+#define PRINTD(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
+#else
+#define PRINTD(...)
+#endif
+
+#include "contiki.h"
+#include <avr/pgmspace.h>
+#include <avr/eeprom.h>
+#include <stdio.h>
+#include <string.h>
+
+#if AVR_WEBSERVER
+//#include "httpd-fs.h"
+//#include "httpd-cgi.h"
+#endif
+
+#include "contiki-net.h"
+#include "params.h"
+
+#if WITH_NODE_ID
+uint16_t node_id;
+#endif
+
+#if CONTIKI_CONF_RANDOM_MAC
+extern uint8_t rng_get_uint8(void);
+static void
+generate_new_eui64(uint8_t eui64[8]) {
+  eui64[0] = 0x02;
+  eui64[1] = rng_get_uint8();
+  eui64[2] = rng_get_uint8();
+  eui64[3] = 0xFF;
+  eui64[4] = 0xFE;
+  eui64[5] = rng_get_uint8();
+  eui64[6] = rng_get_uint8();
+  eui64[7] = rng_get_uint8();
+}
+#endif
+
+#if AVR_WEBSERVER
+/* Webserver builds can set these in httpd-fsdata.c via makefsdata.h */
+extern uint8_t default_mac_address[8];
+extern uint8_t default_server_name[16];
+extern uint8_t default_domain_name[30];
+#else
+const uint8_t default_mac_address[8] PROGMEM = PARAMS_EUI64ADDR;
+const uint8_t default_server_name[] PROGMEM = PARAMS_SERVERNAME;
+const uint8_t default_domain_name[] PROGMEM = PARAMS_DOMAINNAME;
+#endif
+
+#if PARAMETER_STORAGE==0
+/* 0 Hard coded, minmal program and eeprom usage. */
+
+extern uint8_t bootloader_get_mac(uint8_t);
+
+uint8_t
+params_get_eui64(uint8_t *eui64) {
+#if CONTIKI_CONF_RANDOM_MAC
+    PRINTD("Generating random EUI64 MAC\n");
+    generate_new_eui64(eui64);
+    return 1;
+#else
+    uint8_t i;
+#if BOOTLOADER_GET_MAC
+    for (i=0;i<sizeof(default_mac_address);i++){
+      eui64[i] =  bootloader_get_mac(i);
+    }
+#else
+    for (i=0;i<sizeof(default_mac_address);i++) eui64[i] = pgm_read_byte_near(default_mac_address+i);
+#endif
+    return 0;
+#endif
+}
+#elif PARAMETER_STORAGE==1
+/* 1 Stored in fixed eeprom locations, rewritten from flash if corrupt.
+ * They can be manually changed and kept over program reflash.
+ * The channel and bit complement are used to check EEMEM integrity,
+ * If corrupt all values will be rewritten with the default flash values.
+ * To make this work, get the channel before anything else.
+ */
+#if !AVR_WEBSERVER
+uint8_t eemem_mac_address[] EEMEM = PARAMS_EUI64ADDR;
+uint8_t eemem_server_name[] EEMEM = PARAMS_SERVERNAME;
+uint8_t eemem_domain_name[] EEMEM = PARAMS_DOMAINNAME;
+#endif /*AVR_WEBSERVER */
+
+uint16_t eemem_nodeid EEMEM = PARAMS_NODEID;
+uint8_t eemem_channel[2] EEMEM = {CHANNEL_802_15_4, ~CHANNEL_802_15_4};
+uint16_t eemem_panid EEMEM = IEEE802154_CONF_PANID;
+uint16_t eemem_panaddr EEMEM = PARAMS_PANADDR;
+uint8_t eemem_txpower EEMEM = PARAMS_TXPOWER;
+
+#if CONTIKI_CONF_RANDOM_MAC
+static uint8_t randomeui64;
+#endif
+
+uint8_t
+params_get_channel(void) {
+  uint8_t x[2];
+  *(uint16_t *)x = eeprom_read_word ((uint16_t *)&eemem_channel);
+/* Don't return an invalid channel number */
+  if( (x[0]<11) || (x[0] > 26)) x[1]=x[0];
+/* Do exclusive or test on the two values read */
+  if((uint8_t)x[0]!=(uint8_t)~x[1]) {//~x[1] can promote comparison to 16 bit
+/* Verification fails, rewrite everything */
+    uint8_t i,buffer[32];
+    PRINTD("EEPROM is corrupt, rewriting with defaults.\n");
+#if CONTIKI_CONF_RANDOM_MAC
+    PRINTD("Generating random EUI64 MAC\n");
+    generate_new_eui64(&buffer);
+    randomeui64=1;
+#else
+    for (i=0;i<sizeof(default_mac_address);i++) buffer[i] = pgm_read_byte_near(default_mac_address+i);
+#endif
+/* eeprom_write_block should not be interrupted */
+    cli();
+    eeprom_write_block(&buffer,  &eemem_mac_address, sizeof(eemem_mac_address));
+    for (i=0;i<sizeof(default_server_name);i++) buffer[i] = pgm_read_byte_near(default_server_name+i);
+    eeprom_write_block(&buffer,  &eemem_server_name, sizeof(eemem_server_name));
+    for (i=0;i<sizeof(default_domain_name);i++) buffer[i] = pgm_read_byte_near(default_domain_name+i);
+    eeprom_write_block(&buffer,  &eemem_domain_name, sizeof(eemem_domain_name));
+    eeprom_write_word(&eemem_panid  , IEEE802154_CONF_PANID);
+    eeprom_write_word(&eemem_panaddr, PARAMS_PANADDR);
+    eeprom_write_byte(&eemem_txpower, PARAMS_TXPOWER);
+    eeprom_write_word(&eemem_nodeid, PARAMS_NODEID);
+    x[0] = CHANNEL_802_15_4;
+    x[1]= ~x[0];
+    eeprom_write_word((uint16_t *)&eemem_channel, *(uint16_t *)x);
+    sei();
+  }
+/* Always returns a valid channel */
+  return x[0];
+}
+uint8_t
+params_get_eui64(uint8_t *eui64) {
+  cli();
+  eeprom_read_block ((void *)eui64, &eemem_mac_address, sizeof(linkaddr_t));
+  sei();
+#if CONTIKI_CONF_RANDOM_MAC
+  return randomeui64;
+#else
+  return 0;
+#endif
+}
+uint16_t
+params_get_panid(void) {
+  return eeprom_read_word(&eemem_panid);
+}
+uint16_t
+params_get_panaddr(void) {
+  return eeprom_read_word (&eemem_panaddr);
+}
+uint8_t
+params_get_txpower(void)
+{
+  return eeprom_read_byte(&eemem_txpower);
+}
+
+#else /* CONTIKI_CONF_SETTINGS_MANAGER */
+
+uint8_t
+params_get_channel() {
+  uint8_t x;
+  size_t  size = 1;
+  if (settings_get(SETTINGS_KEY_CHANNEL, 0,(unsigned char*)&x, &size) == SETTINGS_STATUS_OK) {
+    PRINTD("<-Get RF channel %u\n",x);
+  } else {
+    x = CHANNEL_802_15_4;
+    if (settings_add_uint8(SETTINGS_KEY_CHANNEL,x ) == SETTINGS_STATUS_OK) {
+      PRINTD("->Set EEPROM RF channel to %d\n",x);
+    }
+  }
+  return x;
+}
+uint8_t
+params_get_eui64(uint8_t *eui64) {
+  size_t size = sizeof(linkaddr_t); 
+  if(settings_get(SETTINGS_KEY_EUI64, 0, (unsigned char*)eui64, &size) == SETTINGS_STATUS_OK) {
+    PRINTD("<-Get EUI64 MAC\n");
+    return 0;		
+  }
+#if CONTIKI_CONF_RANDOM_MAC
+  PRINTD("Generating random EUI64 MAC\n");
+  generate_new_eui64(eui64);
+#else
+  {uint8_t i;for (i=0;i<8;i++) eui64[i] = pgm_read_byte_near(default_mac_address+i);} //test this
+#endif
+  if (settings_add(SETTINGS_KEY_EUI64,(unsigned char*)eui64,8) == SETTINGS_STATUS_OK) {
+    PRINTD("->Set EEPROM MAC address\n");
+  }
+#if CONTIKI_CONF_RANDOM_MAC
+  return 1;
+#else
+  return 0;
+#endif
+}
+uint16_t
+params_get_panid(void) {
+  uint16_t x;
+  size_t  size = 2;
+  if (settings_get(SETTINGS_KEY_PAN_ID, 0,(unsigned char*)&x, &size) == SETTINGS_STATUS_OK) {
+    PRINTD("<-Get PAN ID of %04x\n",x);
+  } else {
+    x=IEEE802154_PANID;
+    if (settings_add_uint16(SETTINGS_KEY_PAN_ID,x)==SETTINGS_STATUS_OK) {
+      PRINTD("->Set EEPROM PAN ID to %04x\n",x);
+    }
+  }
+  return x;
+}
+uint16_t
+params_get_panaddr(void) {
+  uint16_t x;
+  size_t  size = 2;
+  if (settings_get(SETTINGS_KEY_PAN_ADDR, 0,(unsigned char*)&x, &size) == SETTINGS_STATUS_OK) {
+    PRINTD("<-Get PAN address of %04x\n",x);
+  } else {
+    x=PARAMS_PANADDR;
+    if (settings_add_uint16(SETTINGS_KEY_PAN_ADDR,x)==SETTINGS_STATUS_OK) {
+      PRINTD("->Set EEPROM PAN address to %04x\n",x);
+    }
+  }        
+  return x;
+}
+uint8_t
+params_get_txpower(void) {
+  uint8_t x;
+  size_t  size = 1;
+  if (settings_get(SETTINGS_KEY_TXPOWER, 0,(unsigned char*)&x, &size) == SETTINGS_STATUS_OK) {
+    PRINTD("<-Get tx power of %d (0=max)\n",x);
+  } else {
+    x=PARAMS_TXPOWER;
+    if (settings_add_uint8(SETTINGS_KEY_TXPOWER,x)==SETTINGS_STATUS_OK) {
+      PRINTD("->Set EEPROM tx power of %d (0=max)\n",x);
+    }
+  }
+  return x;
+}
+#endif /* CONTIKI_CONF_SETTINGS_MANAGER */
diff --git a/platform/guhRF/params.h b/platform/guhRF/params.h
new file mode 100644
index 000000000..f6648888d
--- /dev/null
+++ b/platform/guhRF/params.h
@@ -0,0 +1,105 @@
+#ifndef PARAMS_H_
+#define PARAMS_H_
+/* PARAMETER_STORAGE =
+ * 0 Hard coded, minmal program and eeprom usage.
+ * 1 Stored in fixed eeprom locations, rewritten from flash if corrupt.
+ *   This allows parameter changes using a hardware programmer or custom application code.
+ *   Corruption test is based on channel verify so get the channel before anything else!
+ * 2 Obtained from eeprom using the general settings manager and read from program flash if not present.
+ *   Useful for for testing builds without wearing out flash memory.
+ * 3 Obtained from eeprom using the settings manager and rewritten from flash if not present.
+ *   This ensures all parameters are present in upper eeprom flash.
+ *
+ * Note the parameters in this file can be changed without forcing a complete rebuild.
+ */
+// default settings
+#define CHANNEL_802_15_4          26     // default frequency (11-26) 
+
+// end default settings
+
+#define CONTIKI_CONF_RANDOM_MAC       0  //adds 78 bytes
+#define CONTIKI_CONF_SETTINGS_MANAGER 0  //adds 1696 bytes
+#define BOOTLOADER_GET_MAC            0  // get mac from booloader, need bootloader bonsai, PARAMETER_STORAGE 0
+
+#if CONTIKI_CONF_SETTINGS_MANAGER
+//#define PARAMETER_STORAGE 2
+#define PARAMETER_STORAGE 2
+#else
+//#define PARAMETER_STORAGE 1
+#define PARAMETER_STORAGE 1           // get mac from booloader, need bootloader bonsai, PARAMETER_STORAGE 0
+#endif
+
+/* Include settings.h, then dummy out the write routines */
+#include "settings.h"
+#if PARAMETER_STORAGE==2
+#define settings_add(...) 0
+#define settings_add_uint8(...) 0
+#define settings_add_uint16(...) 0
+#endif
+
+#if AVR_WEBSERVER
+/* Webserver builds can set some defaults in httpd-fsdata.c via makefsdata.h */
+extern uint8_t eemem_mac_address[8];
+extern uint8_t eemem_server_name[16];
+extern uint8_t eemem_domain_name[30];
+#endif
+#ifdef SERVER_NAME
+#define PARAMS_SERVERNAME SERVER_NAME
+#else
+#define PARAMS_SERVERNAME "ATMEGA256rfr2"
+#endif
+#ifdef DOMAIN_NAME
+#define PARAMS_DOMAINNAME DOMAIN_NAME
+#else
+#define PARAMS_DOMAINNAME "localhost"
+#endif
+#ifdef NODE_ID
+#define PARAMS_NODEID NODE_ID
+#else
+#define PARAMS_NODEID 0
+#endif
+#ifdef IEEE802154_PANADDR
+#define PARAMS_PANADDR IEEE802154_PANADDR
+#else
+#define PARAMS_PANADDR 0
+#endif
+#ifdef RF230_MAX_TX_POWER
+#define PARAMS_TXPOWER RF230_MAX_TX_POWER
+#else
+#define PARAMS_TXPOWER 0
+#endif
+#ifdef EUI64_ADDRESS
+#define PARAMS_EUI64ADDR EUI64_ADDRESS
+#else
+/* This form of of EUI64 mac allows full 6LoWPAN header compression from mac address */
+#if UIP_CONF_LL_802154
+//#define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN}
+//#define PARAMS_EUI64ADDR {0x00, 0x21, 0x2e, 0xff, 0xff, 0x00, 0x1E, 0xFB}
+#define PARAMS_EUI64ADDR {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x11}
+#else
+//#define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xff, 0xfe, 0xNN, 0xNN, 0xNN}
+#define PARAMS_EUI64ADDR {0x00, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x03}
+#endif
+/* This form of of EUI64 mac allows 16 bit 6LoWPAN header compression on multihops */
+//#define PARAMS_EUI64ADDR {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0xNN, 0xNN}
+#endif
+
+uint8_t params_get_eui64(uint8_t *eui64);
+#if PARAMETER_STORAGE==0
+/* Hard coded program flash parameters */
+#define params_get_servername(...) 
+#define params_get_nodeid(...)  PARAMS_NODEID
+#define params_get_channel(...) CHANNEL_802_15_4
+#define params_get_panid(...)   IEEE802154_PANID
+#define params_get_panaddr(...) PARAMS_PANADDR
+#define params_get_txpower(...) PARAMS_TXPOWER
+#else
+/* Parameters stored in eeprom */
+uint16_t params_get_nodeid(void);
+uint8_t params_get_channel(void);
+uint16_t params_get_panid(void);
+uint16_t params_get_panaddr(void);
+uint8_t params_get_txpower(void);
+#endif
+
+#endif /* PARAMS_H_ */
diff --git a/platform/guhRF/slip_uart0.c b/platform/guhRF/slip_uart0.c
new file mode 100644
index 000000000..edff55385
--- /dev/null
+++ b/platform/guhRF/slip_uart0.c
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2010, University of Colombo School of Computing
+ * 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
+ *         Machine dependent AVR SLIP routines for UART0.
+ * \author
+ *         Kasun Hewage <kasun.ch@gmail.com>
+ */
+
+#include <stdio.h>
+#include "contiki.h"
+#include "dev/rs232.h"
+#include "slip.h"
+
+/*---------------------------------------------------------------------------*/
+static int
+slip_putchar(char c, FILE *stream)
+{
+#define SLIP_END 0300
+  static char debug_frame = 0;
+
+  if (!debug_frame) {        /* Start of debug output */
+    slip_arch_writeb(SLIP_END);
+    slip_arch_writeb('\r'); /* Type debug line == '\r' */
+    debug_frame = 1;
+  }
+
+  slip_arch_writeb((unsigned char)c);
+          
+  /*
+   * Line buffered output, a newline marks the end of debug output and
+   * implicitly flushes debug output.         
+   */
+  if (c == '\n') {
+    slip_arch_writeb(SLIP_END);
+    debug_frame = 0;
+  }
+
+  return c;
+}
+/*---------------------------------------------------------------------------*/
+static FILE slip_stdout = FDEV_SETUP_STREAM(slip_putchar, NULL,
+                                            _FDEV_SETUP_WRITE);
+/*---------------------------------------------------------------------------*/
+void
+slip_arch_init(unsigned long ubr)
+{
+  rs232_set_input(SLIP_PORT, slip_input_byte);
+  stdout = &slip_stdout;
+}
+/*---------------------------------------------------------------------------*/
+/*
+ XXX:
+      Currently, the following function is in cpu/avr/dev/rs232.c file. this
+      should be moved to here from there hence this is a platform specific slip 
+      related function. 
+void
+slip_arch_writeb(unsigned char c)
+{
+  rs232_send(RS232_PORT_0, c);
+}
+*/

From fb5f0f66dd035463a54968b82711a9974abcb81f Mon Sep 17 00:00:00 2001
From: Nicolas Tsiftes <nvt@sics.se>
Date: Thu, 21 Apr 2016 13:24:16 +0200
Subject: [PATCH 186/393] Removed Deluge and associated test files.

---
 apps/deluge/Makefile.deluge                   |   1 -
 apps/deluge/deluge.c                          | 698 ------------------
 apps/deluge/deluge.h                          | 159 ----
 examples/sky/test-deluge.c                    | 115 ---
 regression-tests/04-rime/04-sky-deluge.csc    | 155 ----
 ...5-sky-runicast.csc => 04-sky-runicast.csc} |   0
 ...{06-sky-trickle.csc => 05-sky-trickle.csc} |   0
 regression-tests/04-rime/06-sky-collect.csc   | 245 ++++++
 regression-tests/04-rime/07-sky-collect.csc   | 388 +++++++---
 ...cooja-trickle.csc => 08-cooja-trickle.csc} |   0
 regression-tests/04-rime/08-sky-collect.csc   | 447 -----------
 .../{10-cooja-mesh.csc => 09-cooja-mesh.csc}  |   0
 12 files changed, 540 insertions(+), 1668 deletions(-)
 delete mode 100644 apps/deluge/Makefile.deluge
 delete mode 100644 apps/deluge/deluge.c
 delete mode 100644 apps/deluge/deluge.h
 delete mode 100644 examples/sky/test-deluge.c
 delete mode 100644 regression-tests/04-rime/04-sky-deluge.csc
 rename regression-tests/04-rime/{05-sky-runicast.csc => 04-sky-runicast.csc} (100%)
 rename regression-tests/04-rime/{06-sky-trickle.csc => 05-sky-trickle.csc} (100%)
 create mode 100644 regression-tests/04-rime/06-sky-collect.csc
 rename regression-tests/04-rime/{09-cooja-trickle.csc => 08-cooja-trickle.csc} (100%)
 delete mode 100644 regression-tests/04-rime/08-sky-collect.csc
 rename regression-tests/04-rime/{10-cooja-mesh.csc => 09-cooja-mesh.csc} (100%)

diff --git a/apps/deluge/Makefile.deluge b/apps/deluge/Makefile.deluge
deleted file mode 100644
index abadf18d0..000000000
--- a/apps/deluge/Makefile.deluge
+++ /dev/null
@@ -1 +0,0 @@
-deluge_src = deluge.c
diff --git a/apps/deluge/deluge.c b/apps/deluge/deluge.c
deleted file mode 100644
index 9e3235b25..000000000
--- a/apps/deluge/deluge.c
+++ /dev/null
@@ -1,698 +0,0 @@
-/*
- * Copyright (c) 2007, 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.
- *
- * This file is part of the Contiki operating system.
- *
- */
-
-/**
- * \file
- *	An implementation of the Deluge protocol.
- *      (Hui and Culler: The dynamic behavior of a data 
- *      dissemination protocol for network programming at scale,
- *      ACM SenSys 2004)
- * \author
- * 	Nicolas Tsiftes <nvt@sics.se>
- */
-
-#include "contiki.h"
-#include "net/rime/rime.h"
-#include "cfs/cfs.h"
-#include "loader/elfloader.h"
-#include "lib/crc16.h"
-#include "lib/random.h"
-#include "sys/node-id.h"
-#include "deluge.h"
-
-#if NETSIM
-#include "ether.h"
-#include <stdio.h>
-#endif
-
-#include "dev/leds.h"
-#include <stdlib.h>
-#include <string.h>
-
-#define DEBUG	0
-#if DEBUG
-#include <stdio.h>
-#define PRINTF(...)	printf(__VA_ARGS__)
-#else
-#define PRINTF(...)
-#endif
-
-/* Implementation-specific variables. */
-static struct broadcast_conn deluge_broadcast;
-static struct unicast_conn deluge_uc;
-static struct deluge_object current_object;
-static process_event_t deluge_event;
-
-/* Deluge variables. */
-static int deluge_state;
-static int old_summary;
-static int neighbor_inconsistency;
-static unsigned r_interval;
-static unsigned recv_adv;
-static int broadcast_profile;
-
-/* Deluge timers. */
-static struct ctimer rx_timer;
-static struct ctimer tx_timer;
-static struct ctimer summary_timer;
-static struct ctimer profile_timer;
-
-/* Deluge objects will get an ID that defaults to the current value of
-   the next_object_id parameter. */
-static deluge_object_id_t next_object_id;
-
-/* Rime callbacks. */
-static void broadcast_recv(struct broadcast_conn *, const linkaddr_t *);
-static void unicast_recv(struct unicast_conn *, const linkaddr_t *);
-
-static const struct broadcast_callbacks broadcast_call = {broadcast_recv, NULL};
-static const struct unicast_callbacks unicast_call = {unicast_recv, NULL};
-
-/* The Deluge process manages the main Deluge timer. */
-PROCESS(deluge_process, "Deluge");
-
-static void
-transition(int state)
-{
-  if(state != deluge_state) {
-    switch(deluge_state) {
-    case DELUGE_STATE_MAINTAIN:
-      ctimer_stop(&summary_timer);
-      ctimer_stop(&profile_timer);
-      break;
-    case DELUGE_STATE_RX:
-      ctimer_stop(&rx_timer);
-      break;
-    case DELUGE_STATE_TX:
-      ctimer_stop(&tx_timer);
-      break;
-    }
-    deluge_state = state;
-  }
-}
-
-static int
-write_page(struct deluge_object *obj, unsigned pagenum, unsigned char *data)
-{
-  cfs_offset_t offset;
-
-  offset = pagenum * S_PAGE;
-
-  if(cfs_seek(obj->cfs_fd, offset, CFS_SEEK_SET) != offset) {
-    return -1;
-  }
-  return cfs_write(obj->cfs_fd, (char *)data, S_PAGE);
-}
-
-static int
-read_page(struct deluge_object *obj, unsigned pagenum, unsigned char *buf)
-{
-  cfs_offset_t offset;
-
-  offset = pagenum * S_PAGE;
-
-  if(cfs_seek(obj->cfs_fd, offset, CFS_SEEK_SET) != offset) {
-    return -1;
-  }
-  return cfs_read(obj->cfs_fd, (char *)buf, S_PAGE);
-}
-
-static void
-init_page(struct deluge_object *obj, int pagenum, int have)
-{
-  struct deluge_page *page;
-  unsigned char buf[S_PAGE];
-
-  page = &obj->pages[pagenum];
-
-  page->flags = 0;
-  page->last_request = 0;
-  page->last_data = 0;
-
-  if(have) {
-    page->version = obj->version;
-    page->packet_set = ALL_PACKETS;
-    page->flags |= PAGE_COMPLETE;
-    read_page(obj, pagenum, buf);
-    page->crc = crc16_data(buf, S_PAGE, 0);
-  } else {
-    page->version = 0;
-    page->packet_set = 0;
-  }
-}
-
-static cfs_offset_t
-file_size(const char *file)
-{
-  int fd;
-  cfs_offset_t size;
-
-  fd = cfs_open(file, CFS_READ);
-  if(fd < 0) {
-    return (cfs_offset_t)-1;
-  }
-
-  size = cfs_seek(fd, 0, CFS_SEEK_END);
-  cfs_close(fd);
-
-  return size;
-}
-
-static int
-init_object(struct deluge_object *obj, char *filename, unsigned version)
-{
-  static struct deluge_page *page;
-  int i;
-
-  obj->cfs_fd = cfs_open(filename, CFS_READ | CFS_WRITE);
-  if(obj->cfs_fd < 0) {
-    return -1;
-  }
-
-  obj->filename = filename;
-  obj->object_id = next_object_id++;
-  obj->size = file_size(filename);
-  obj->version = obj->update_version = version;
-  obj->current_rx_page = 0;
-  obj->nrequests = 0;
-  obj->tx_set = 0;
-
-  obj->pages = malloc(OBJECT_PAGE_COUNT(*obj) * sizeof(*obj->pages));
-  if(obj->pages == NULL) {
-    cfs_close(obj->cfs_fd);
-    return -1; 
-  }
-
-  for(i = 0; i < OBJECT_PAGE_COUNT(current_object); i++) {
-    page = &current_object.pages[i];
-    init_page(&current_object, i, 1);
-  }
-
-  memset(obj->current_page, 0, sizeof(obj->current_page));
-
-  return 0;
-}
-
-static int
-highest_available_page(struct deluge_object *obj)
-{
-  int i;
-
-  for(i = 0; i < OBJECT_PAGE_COUNT(*obj); i++) {
-    if(!(obj->pages[i].flags & PAGE_COMPLETE)) {
-      break;
-    }
-  }
-
-  return i;
-}
-
-static void
-send_request(void *arg)
-{
-  struct deluge_object *obj;
-  struct deluge_msg_request request;
-
-  obj = (struct deluge_object *)arg;
-
-  request.cmd = DELUGE_CMD_REQUEST;
-  request.pagenum = obj->current_rx_page;
-  request.version = obj->pages[request.pagenum].version;
-  request.request_set = ~obj->pages[obj->current_rx_page].packet_set;
-  request.object_id = obj->object_id;
-
-  PRINTF("Sending request for page %d, version %u, request_set %u\n", 
-	request.pagenum, request.version, request.request_set);
-  packetbuf_copyfrom(&request, sizeof(request));
-  unicast_send(&deluge_uc, &obj->summary_from);
-
-  /* Deluge R.2 */
-  if(++obj->nrequests == CONST_LAMBDA) {
-    /* XXX check rate here too. */
-    obj->nrequests = 0;
-    transition(DELUGE_STATE_MAINTAIN);
-  } else {
-    ctimer_reset(&rx_timer);
-  }
-}
-
-static void
-advertise_summary(struct deluge_object *obj)
-{
-  struct deluge_msg_summary summary;
-
-  if(recv_adv >= CONST_K) {
-    ctimer_stop(&summary_timer);
-    return;
-  }
-
-  summary.cmd = DELUGE_CMD_SUMMARY;
-  summary.version = obj->update_version;
-  summary.highest_available = highest_available_page(obj);
-  summary.object_id = obj->object_id;
-
-  PRINTF("Advertising summary for object id %u: version=%u, available=%u\n",
-	(unsigned)obj->object_id, summary.version, summary.highest_available);
-
-  packetbuf_copyfrom(&summary, sizeof(summary));
-  broadcast_send(&deluge_broadcast);
-}
-
-static void
-handle_summary(struct deluge_msg_summary *msg, const linkaddr_t *sender)
-{
-  int highest_available, i;
-  clock_time_t oldest_request, oldest_data, now;
-  struct deluge_page *page;
-
-  highest_available = highest_available_page(&current_object);
-
-  if(msg->version != current_object.version ||
-      msg->highest_available != highest_available) {
-    neighbor_inconsistency = 1;
-  } else {
-    recv_adv++;
-  }
-
-  if(msg->version < current_object.version) {
-    old_summary = 1;
-    broadcast_profile = 1;
-  }
-
-  /* Deluge M.5 */
-  if(msg->version == current_object.update_version &&
-     msg->highest_available > highest_available) {
-    if(msg->highest_available > OBJECT_PAGE_COUNT(current_object)) {
-      PRINTF("Error: highest available is above object page count!\n");
-      return;
-    }
-
-    oldest_request = oldest_data = now = clock_time();
-    for(i = 0; i < msg->highest_available; i++) {
-      page = &current_object.pages[i];
-      if(page->last_request < oldest_request) {
-	oldest_request = page->last_request;
-      }
-      if(page->last_request < oldest_data) {
-	oldest_data = page->last_data;
-      }
-    }
-
-    if(((now - oldest_request) / CLOCK_SECOND) <= 2 * r_interval ||
-	((now - oldest_data) / CLOCK_SECOND) <= r_interval) {
-      return;
-    }
-
-    linkaddr_copy(&current_object.summary_from, sender);
-    transition(DELUGE_STATE_RX);
-
-    if(ctimer_expired(&rx_timer)) {
-      ctimer_set(&rx_timer,
-	CONST_OMEGA * ESTIMATED_TX_TIME + ((unsigned)random_rand() % T_R),
-	send_request, &current_object);
-    }
-  }
-}
-
-static void
-send_page(struct deluge_object *obj, unsigned pagenum)
-{
-  unsigned char buf[S_PAGE];
-  struct deluge_msg_packet pkt;
-  unsigned char *cp;
-
-  pkt.cmd = DELUGE_CMD_PACKET;
-  pkt.pagenum = pagenum;
-  pkt.version = obj->pages[pagenum].version;
-  pkt.packetnum = 0;
-  pkt.object_id = obj->object_id;
-  pkt.crc = 0;
-
-  read_page(obj, pagenum, buf);
-
-  /* Divide the page into packets and send them one at a time. */
-  for(cp = buf; cp + S_PKT <= (unsigned char *)&buf[S_PAGE]; cp += S_PKT) {
-    if(obj->tx_set & (1 << pkt.packetnum)) {
-      pkt.crc = crc16_data(cp, S_PKT, 0);
-      memcpy(pkt.payload, cp, S_PKT);
-      packetbuf_copyfrom(&pkt, sizeof(pkt));
-      broadcast_send(&deluge_broadcast);
-    }
-    pkt.packetnum++;
-  }
-  obj->tx_set = 0;
-}
-
-static void
-tx_callback(void *arg)
-{
-  struct deluge_object *obj;
-
-  obj = (struct deluge_object *)arg;
-  if(obj->current_tx_page >= 0 && obj->tx_set) {
-    send_page(obj, obj->current_tx_page);
-    /* Deluge T.2. */
-    if(obj->tx_set) {
-      packetbuf_set_attr(PACKETBUF_ATTR_PACKET_TYPE,
-			 PACKETBUF_ATTR_PACKET_TYPE_STREAM);
-      ctimer_reset(&tx_timer);
-    } else {
-      packetbuf_set_attr(PACKETBUF_ATTR_PACKET_TYPE,
-			 PACKETBUF_ATTR_PACKET_TYPE_STREAM_END);
-      obj->current_tx_page = -1;
-      transition(DELUGE_STATE_MAINTAIN);
-    }
-  }
-}
-
-static void
-handle_request(struct deluge_msg_request *msg)
-{
-  int highest_available;
-
-  if(msg->pagenum >= OBJECT_PAGE_COUNT(current_object)) {
-    return;
-  }
-
-  if(msg->version != current_object.version) {
-    neighbor_inconsistency = 1;
-  }
-
-  highest_available = highest_available_page(&current_object);
-
-  /* Deluge M.6 */
-  if(msg->version == current_object.version &&
-      msg->pagenum <= highest_available) {
-    current_object.pages[msg->pagenum].last_request = clock_time();
-
-    /* Deluge T.1 */
-    if(msg->pagenum == current_object.current_tx_page) {
-      current_object.tx_set |= msg->request_set;
-    } else {
-      current_object.current_tx_page = msg->pagenum;
-      current_object.tx_set = msg->request_set;
-    }
-
-    transition(DELUGE_STATE_TX);
-    ctimer_set(&tx_timer, CLOCK_SECOND, tx_callback, &current_object);
-  }
-}
-
-static void
-handle_packet(struct deluge_msg_packet *msg)
-{
-  struct deluge_page *page;
-  uint16_t crc;
-  struct deluge_msg_packet packet;
-
-  memcpy(&packet, msg, sizeof(packet));
-
-  PRINTF("Incoming packet for object id %u, version %u, page %u, packet num %u!\n",
-	(unsigned)packet.object_id, (unsigned)packet.version,
-	(unsigned)packet.pagenum, (unsigned)packet.packetnum);
-
-  if(packet.pagenum != current_object.current_rx_page) {
-    return;
-  }
-
-  if(packet.version != current_object.version) {
-    neighbor_inconsistency = 1;
-  }
-
-  page = &current_object.pages[packet.pagenum];
-  if(packet.version == page->version && !(page->flags & PAGE_COMPLETE)) {
-    memcpy(&current_object.current_page[S_PKT * packet.packetnum],
-	packet.payload, S_PKT);
-
-    crc = crc16_data(packet.payload, S_PKT, 0);
-    if(packet.crc != crc) {
-      PRINTF("packet crc: %hu, calculated crc: %hu\n", packet.crc, crc);
-      return;
-    }
-
-    page->last_data = clock_time();
-    page->packet_set |= (1 << packet.packetnum);
-
-    if(page->packet_set == ALL_PACKETS) {
-      /* This is the last packet of the requested page; stop streaming. */
-      packetbuf_set_attr(PACKETBUF_ATTR_PACKET_TYPE,
-			 PACKETBUF_ATTR_PACKET_TYPE_STREAM_END);
-
-      write_page(&current_object, packet.pagenum, current_object.current_page);
-      page->version = packet.version;
-      page->flags = PAGE_COMPLETE;
-      PRINTF("Page %u completed\n", packet.pagenum);
-
-      current_object.current_rx_page++;
-
-      if(packet.pagenum == OBJECT_PAGE_COUNT(current_object) - 1) {
-	current_object.version = current_object.update_version;
-	leds_on(LEDS_RED);
-	PRINTF("Update completed for object %u, version %u\n", 
-	       (unsigned)current_object.object_id, packet.version);
-      } else if(current_object.current_rx_page < OBJECT_PAGE_COUNT(current_object)) {
-        if(ctimer_expired(&rx_timer)) {
-	  ctimer_set(&rx_timer,
-		CONST_OMEGA * ESTIMATED_TX_TIME + (random_rand() % T_R),
-		send_request, &current_object);
-	}
-      }
-      /* Deluge R.3 */
-      transition(DELUGE_STATE_MAINTAIN);
-    } else {
-      /* More packets to come. Put lower layers in streaming mode. */
-      packetbuf_set_attr(PACKETBUF_ATTR_PACKET_TYPE,
-			 PACKETBUF_ATTR_PACKET_TYPE_STREAM);
-    }
-  }
-}
-
-static void
-send_profile(struct deluge_object *obj)
-{
-  struct deluge_msg_profile *msg;
-  unsigned char buf[sizeof(*msg) + OBJECT_PAGE_COUNT(*obj)];
-  int i;
-
-  if(broadcast_profile && recv_adv < CONST_K) {
-    broadcast_profile = 0;
-
-    msg = (struct deluge_msg_profile *)buf;
-    msg->cmd = DELUGE_CMD_PROFILE;
-    msg->version = obj->version;
-    msg->npages = OBJECT_PAGE_COUNT(*obj);
-    msg->object_id = obj->object_id;
-    for(i = 0; i < msg->npages; i++) {
-      msg->version_vector[i] = obj->pages[i].version;
-    }
-
-    packetbuf_copyfrom(buf, sizeof(buf));
-    broadcast_send(&deluge_broadcast);
-  }
-}
-
-static void
-handle_profile(struct deluge_msg_profile *msg)
-{
-  int i;
-  int npages;
-  struct deluge_object *obj;
-  char *p;
-
-  obj = &current_object;
-  if(msg->version <= current_object.update_version) {
-    return;
-  }
-
-  PRINTF("Received profile of version %u with a vector of %u pages.\n",
-	msg->version, msg->npages);
-
-  leds_off(LEDS_RED);
-  current_object.tx_set = 0;
-
-  npages = OBJECT_PAGE_COUNT(*obj);
-  obj->size = msg->npages * S_PAGE;
-
-  p = malloc(OBJECT_PAGE_COUNT(*obj) * sizeof(*obj->pages));
-  if(p == NULL) {
-    PRINTF("Failed to reallocate memory for pages!\n");
-    return;
-  }
-
-  memcpy(p, obj->pages, npages * sizeof(*obj->pages));
-  free(obj->pages);
-  obj->pages = (struct deluge_page *)p;
-
-  if(msg->npages < npages) {
-    npages = msg->npages;
-  }
-
-  for(i = 0; i < npages; i++) {
-    if(msg->version_vector[i] > obj->pages[i].version) {
-      obj->pages[i].packet_set = 0;
-      obj->pages[i].flags &= ~PAGE_COMPLETE;
-      obj->pages[i].version = msg->version_vector[i];
-    }
-  }
-
-  for(; i < msg->npages; i++) {
-    init_page(obj, i, 0);
-  }
-
-  obj->current_rx_page = highest_available_page(obj);
-  obj->update_version = msg->version;
-
-  transition(DELUGE_STATE_RX);
-
-  ctimer_set(&rx_timer,
-	CONST_OMEGA * ESTIMATED_TX_TIME + ((unsigned)random_rand() % T_R),
-	send_request, obj);
-}
-
-static void
-command_dispatcher(const linkaddr_t *sender)
-{
-  char *msg;
-  int len;
-  struct deluge_msg_profile *profile;
-
-  msg = packetbuf_dataptr();  
-  len = packetbuf_datalen();
-  if(len < 1)
-    return;
-
-  switch(msg[0]) {
-  case DELUGE_CMD_SUMMARY:
-    if(len >= sizeof(struct deluge_msg_summary))
-      handle_summary((struct deluge_msg_summary *)msg, sender);
-    break;
-  case DELUGE_CMD_REQUEST:
-    if(len >= sizeof(struct deluge_msg_request))
-      handle_request((struct deluge_msg_request *)msg);
-    break;
-  case DELUGE_CMD_PACKET:
-    if(len >= sizeof(struct deluge_msg_packet))
-      handle_packet((struct deluge_msg_packet *)msg);
-    break;
-  case DELUGE_CMD_PROFILE:
-    profile = (struct deluge_msg_profile *)msg;
-    if(len >= sizeof(*profile) &&
-       len >= sizeof(*profile) + profile->npages * profile->version_vector[0])
-      handle_profile((struct deluge_msg_profile *)msg);
-    break;
-  default:
-    PRINTF("Incoming packet with unknown command: %d\n", msg[0]);
-  }
-}
-
-static void
-unicast_recv(struct unicast_conn *c, const linkaddr_t *sender)
-{
-  command_dispatcher(sender);
-}
-
-static void
-broadcast_recv(struct broadcast_conn *c, const linkaddr_t *sender)
-{
-  command_dispatcher(sender);
-}
-
-int
-deluge_disseminate(char *file, unsigned version)
-{
-  /* This implementation disseminates at most one object. */
-  if(next_object_id > 0 || init_object(&current_object, file, version) < 0) {
-    return -1;
-  }
-  process_start(&deluge_process, (void *)file);
-
-  return 0;
-}
-
-PROCESS_THREAD(deluge_process, ev, data)
-{
-  static struct etimer et;
-  static unsigned time_counter;
-  static unsigned r_rand;
-
-  PROCESS_EXITHANDLER(goto exit);
-
-  PROCESS_BEGIN();
-
-  deluge_event = process_alloc_event();
-
-  broadcast_open(&deluge_broadcast, DELUGE_BROADCAST_CHANNEL, &broadcast_call);
-  unicast_open(&deluge_uc, DELUGE_UNICAST_CHANNEL, &unicast_call);
-  r_interval = T_LOW;
-
-  PRINTF("Maintaining state for object %s of %d pages\n",
-	current_object.filename, OBJECT_PAGE_COUNT(current_object));
-
-  deluge_state = DELUGE_STATE_MAINTAIN;
-
-  for(r_interval = T_LOW;;) {
-    if(neighbor_inconsistency) {
-      /* Deluge M.2 */
-      r_interval = T_LOW;
-      neighbor_inconsistency = 0;
-    } else {
-      /* Deluge M.3 */
-      r_interval = (2 * r_interval >= T_HIGH) ? T_HIGH : 2 * r_interval;
-    }
-
-    r_rand = r_interval / 2 + ((unsigned)random_rand() % (r_interval / 2));
-    recv_adv = 0;
-    old_summary = 0;
-
-    /* Deluge M.1 */
-    ctimer_set(&summary_timer, r_rand * CLOCK_SECOND,
-	(void *)(void *)advertise_summary, &current_object);
-
-    /* Deluge M.4 */
-    ctimer_set(&profile_timer, r_rand * CLOCK_SECOND,
-	(void *)(void *)send_profile, &current_object);
-
-    LONG_TIMER(et, time_counter, r_interval);
-  }
-
-exit:
-  unicast_close(&deluge_uc);
-  broadcast_close(&deluge_broadcast);
-  if(current_object.cfs_fd >= 0) {
-    cfs_close(current_object.cfs_fd);
-  }
-  if(current_object.pages != NULL) {
-    free(current_object.pages);
-  }
-
-  PROCESS_END();
-}
diff --git a/apps/deluge/deluge.h b/apps/deluge/deluge.h
deleted file mode 100644
index 11bdd0a96..000000000
--- a/apps/deluge/deluge.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 2007, 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.
- *
- * This file is part of the Contiki operating system.
- *
- */
-
-/**
- * \file
- *	Header for Deluge.
- * \author
- * 	Nicolas Tsiftes <nvt@sics.se>
- */
-
-#ifndef DELUGE_H
-#define DELUGE_H
-
-#include "net/rime/rime.h"
-
-PROCESS_NAME(deluge_process);
-
-#define LONG_TIMER(et, counter, time)			\
-  do {							\
-    for (counter = 0; counter < time; counter++) {	\
-      etimer_set(&et, CLOCK_SECOND);			\
-      PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));	\
-    }							\
-  } while (0)
-
-#define DELUGE_UNICAST_CHANNEL		55
-#define DELUGE_BROADCAST_CHANNEL	56
-
-/* All the packets in a page have been received. */
-#define PAGE_COMPLETE	1
-/* All pages up to, and including, this page are complete. */
-#define PAGE_AVAILABLE	1
-
-#define S_PKT		64		/* Deluge packet size. */
-#define N_PKT		4		/* Packets per page. */
-#define S_PAGE		(S_PKT * N_PKT)	/* Fixed page size. */
-
-/* Bounds for the round time in seconds. */
-#define T_LOW		2
-#define T_HIGH		64
-
-/* Random interval for request transmissions in jiffies. */
-#define T_R		(CLOCK_SECOND * 2)
-
-/* Bound for the number of advertisements. */
-#define CONST_K		1
-
-/* The number of pages in this object. */
-#define OBJECT_PAGE_COUNT(obj)	(((obj).size + (S_PAGE - 1)) / S_PAGE)
-
-#define ALL_PACKETS		((1 << N_PKT) - 1)
-
-#define DELUGE_CMD_SUMMARY	1
-#define DELUGE_CMD_REQUEST	2
-#define DELUGE_CMD_PACKET	3
-#define DELUGE_CMD_PROFILE	4
-
-#define DELUGE_STATE_MAINTAIN	1
-#define DELUGE_STATE_RX		2
-#define DELUGE_STATE_TX		3
-
-#define CONST_LAMBDA		2
-#define CONST_ALPHA		0.5
-
-#define CONST_OMEGA		8
-#define ESTIMATED_TX_TIME	(CLOCK_SECOND)
-
-typedef uint8_t deluge_object_id_t;
-
-struct deluge_msg_summary {
-  uint8_t cmd;
-  uint8_t version;
-  uint8_t highest_available;
-  deluge_object_id_t object_id;
-};
-
-struct deluge_msg_request {
-  uint8_t cmd;
-  uint8_t version;
-  uint8_t pagenum;
-  uint8_t request_set;
-  deluge_object_id_t object_id;
-};
-
-struct deluge_msg_packet {
-  uint8_t cmd;
-  uint8_t version;
-  uint8_t pagenum;
-  uint8_t packetnum;
-  uint16_t crc;
-  deluge_object_id_t object_id;
-  unsigned char payload[S_PKT];
-};
-
-struct deluge_msg_profile {
-  uint8_t cmd;
-  uint8_t version;
-  uint8_t npages;
-  deluge_object_id_t object_id;
-  uint8_t version_vector[];
-};
-
-struct deluge_object {
-  char *filename;
-  uint16_t object_id;
-  uint16_t size;
-  uint8_t version;
-  uint8_t update_version;
-  struct deluge_page *pages;
-  uint8_t current_rx_page;
-  int8_t current_tx_page;
-  uint8_t nrequests;
-  uint8_t current_page[S_PAGE];
-  uint8_t tx_set;
-  int cfs_fd;
-  linkaddr_t summary_from;
-};
-
-struct deluge_page {
-  uint32_t packet_set;
-  uint16_t crc;
-  clock_time_t last_request;
-  clock_time_t last_data;
-  uint8_t flags;
-  uint8_t version;
-};
-
-int deluge_disseminate(char *file, unsigned version);
-
-#endif
diff --git a/examples/sky/test-deluge.c b/examples/sky/test-deluge.c
deleted file mode 100644
index 3bb9bb5e8..000000000
--- a/examples/sky/test-deluge.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2007, 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.
- *
- * This file is part of the Contiki operating system.
- *
- */
-
-/**
- * \file
- *         A test program for Deluge.
- * \author
- *         Nicolas Tsiftes <nvt@sics.se>
- */
-
-#include "contiki.h"
-#include "cfs/cfs.h"
-#include "deluge.h"
-#include "sys/node-id.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#ifndef SINK_ID
-#define SINK_ID	1
-#endif
-
-#ifndef FILE_SIZE
-#define FILE_SIZE 1000
-#endif
-
-PROCESS(deluge_test_process, "Deluge test process");
-AUTOSTART_PROCESSES(&deluge_test_process);
-/*---------------------------------------------------------------------------*/
-PROCESS_THREAD(deluge_test_process, ev, data)
-{
-  int fd, r;
-  char buf[32];
-  static struct etimer et;
-
-  PROCESS_BEGIN();
-
-  memset(buf, 0, sizeof(buf));
-  if(node_id == SINK_ID) {
-    strcpy(buf, "This is version 1 of the file");
-  } else {
-    strcpy(buf, "This is version 0 of the file");
-  }
-
-  cfs_remove("test");
-  fd = cfs_open("test", CFS_WRITE);
-  if(fd < 0) {
-    process_exit(NULL);
-  }
-  if(cfs_write(fd, buf, sizeof(buf)) != sizeof(buf)) {
-    cfs_close(fd);
-    process_exit(NULL);
-  }
-
-  if(cfs_seek(fd, FILE_SIZE, CFS_SEEK_SET) != FILE_SIZE) {
-    printf("failed to seek to the end\n");
-  }
-
-  deluge_disseminate("test", node_id == SINK_ID);
-  cfs_close(fd);
-
-  etimer_set(&et, CLOCK_SECOND * 5);
-  for(;;) {
-    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
-    if(node_id != SINK_ID) {
-      fd = cfs_open("test", CFS_READ);
-      if(fd < 0) {
-        printf("failed to open the test file\n");
-      } else {
-        r = cfs_read(fd, buf, sizeof(buf));
-	buf[sizeof(buf) - 1] = '\0';
-	if(r <= 0) {
-	  printf("failed to read data from the file\n");
-	} else {
-	  printf("File contents: %s\n", buf);
-	}
-	cfs_close(fd);
-      }
-    }
-    etimer_reset(&et);
-  }
-
-
-  PROCESS_END();
-}
-/*---------------------------------------------------------------------------*/
diff --git a/regression-tests/04-rime/04-sky-deluge.csc b/regression-tests/04-rime/04-sky-deluge.csc
deleted file mode 100644
index f62d87145..000000000
--- a/regression-tests/04-rime/04-sky-deluge.csc
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<simconf>
-  <project EXPORT="discard">[APPS_DIR]/mrm</project>
-  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
-  <project EXPORT="discard">[APPS_DIR]/avrora</project>
-  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
-  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
-  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
-  <simulation>
-    <title>Deluge</title>
-    <randomseed>generated</randomseed>
-    <motedelay_us>1000000</motedelay_us>
-    <radiomedium>
-      org.contikios.cooja.radiomediums.UDGM
-      <transmitting_range>50.0</transmitting_range>
-      <interference_range>100.0</interference_range>
-      <success_ratio_tx>1.0</success_ratio_tx>
-      <success_ratio_rx>1.0</success_ratio_rx>
-    </radiomedium>
-    <events>
-      <logoutput>40000</logoutput>
-    </events>
-    <motetype>
-      org.contikios.cooja.mspmote.SkyMoteType
-      <identifier>sky1</identifier>
-      <description>Sky Mote Type #1</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/sky/test-deluge.c</source>
-      <commands EXPORT="discard">make clean TARGET=sky
-make APPS=deluge test-deluge.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/sky/test-deluge.sky</firmware>
-      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
-      <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
-      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspClock</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspMoteID</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyButton</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyFlash</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspSerial</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyLED</moteinterface>
-    </motetype>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>22.464792491653174</x>
-        <y>11.3235347656354</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>1</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>16.167564578306468</x>
-        <y>29.89745599030348</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>3</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>63.42409596590043</x>
-        <y>12.470791515046386</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>5</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-  </simulation>
-  <plugin>
-    org.contikios.cooja.plugins.SimControl
-    <width>282</width>
-    <z>4</z>
-    <height>212</height>
-    <location_x>0</location_x>
-    <location_y>0</location_y>
-  </plugin>
-  <plugin>
-    org.contikios.cooja.plugins.Visualizer
-    <plugin_config>
-      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
-      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
-      <viewport>4.405003166995177 0.0 0.0 4.405003166995177 -40.3007583818182 -45.78929741329485</viewport>
-    </plugin_config>
-    <width>283</width>
-    <z>2</z>
-    <height>144</height>
-    <location_x>-1</location_x>
-    <location_y>212</location_y>
-  </plugin>
-  <plugin>
-    org.contikios.cooja.plugins.ScriptRunner
-    <plugin_config>
-      <script>TIMEOUT(100000, log.log("last msg: " + msg + "\n")); /* print last msg at timeout */
-
-WAIT_UNTIL(id == 3 &amp;&amp; msg.contains("version 1"));
-log.log("Node 3 got version 1\n");
-
-WAIT_UNTIL(id == 5 &amp;&amp; msg.contains("version 1"));
-log.log("Node 5 got version 1\n");
-
-log.testOK(); /* Report test success and quit */</script>
-      <active>true</active>
-    </plugin_config>
-    <width>600</width>
-    <z>1</z>
-    <height>357</height>
-    <location_x>281</location_x>
-    <location_y>1</location_y>
-  </plugin>
-  <plugin>
-    org.contikios.cooja.plugins.TimeLine
-    <plugin_config>
-      <mote>0</mote>
-      <mote>1</mote>
-      <mote>2</mote>
-      <showRadioRXTX />
-      <zoomfactor>500.0</zoomfactor>
-    </plugin_config>
-    <width>882</width>
-    <z>3</z>
-    <height>149</height>
-    <location_x>-1</location_x>
-    <location_y>357</location_y>
-  </plugin>
-  <plugin>
-    org.contikios.cooja.plugins.LogListener
-    <plugin_config>
-      <filter />
-      <formatted_time />
-      <coloring />
-    </plugin_config>
-    <width>882</width>
-    <z>0</z>
-    <height>195</height>
-    <location_x>-1</location_x>
-    <location_y>504</location_y>
-  </plugin>
-</simconf>
-
diff --git a/regression-tests/04-rime/05-sky-runicast.csc b/regression-tests/04-rime/04-sky-runicast.csc
similarity index 100%
rename from regression-tests/04-rime/05-sky-runicast.csc
rename to regression-tests/04-rime/04-sky-runicast.csc
diff --git a/regression-tests/04-rime/06-sky-trickle.csc b/regression-tests/04-rime/05-sky-trickle.csc
similarity index 100%
rename from regression-tests/04-rime/06-sky-trickle.csc
rename to regression-tests/04-rime/05-sky-trickle.csc
diff --git a/regression-tests/04-rime/06-sky-collect.csc b/regression-tests/04-rime/06-sky-collect.csc
new file mode 100644
index 000000000..3fe71e180
--- /dev/null
+++ b/regression-tests/04-rime/06-sky-collect.csc
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>generated</randomseed>
+    <motedelay_us>10000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>30.0</transmitting_range>
+      <interference_range>40.0</interference_range>
+      <success_ratio_tx>0.9</success_ratio_tx>
+      <success_ratio_rx>0.9</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.mspmote.SkyMoteType
+      <identifier>sky1</identifier>
+      <description>Sky Mote Type #1</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/sky/sky-collect.c</source>
+      <commands EXPORT="discard">make clean TARGET=sky
+make sky-collect.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/sky/sky-collect.sky</firmware>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspSerial</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyLED</moteinterface>
+    </motetype>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>9.333811152651393</x>
+        <y>89.28114548870677</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>1</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>33.040227185226826</x>
+        <y>54.184283361563054</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>2</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-2.2559922410521516</x>
+        <y>50.71648775308175</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>3</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>12.959353575718179</x>
+        <y>43.874396471224806</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>4</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>15.917348901177405</x>
+        <y>66.93526904376517</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>5</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>26.735174243053933</x>
+        <y>35.939375910459084</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>6</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>41.5254792748469</x>
+        <y>28.370611308140152</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>7</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>265</width>
+    <z>3</z>
+    <height>200</height>
+    <location_x>0</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <viewport>1.9551775516837413 0.0 0.0 1.9551775516837413 87.61059024269439 -50.01503690267507</viewport>
+    </plugin_config>
+    <width>264</width>
+    <z>1</z>
+    <height>185</height>
+    <location_x>0</location_x>
+    <location_y>200</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>TIMEOUT(300000, log.log("received/node: " + count[1] + " " + count[2] + " " + count[3] + " " + count[4] + " " + count[5] + " " + count[6] + " " + count[7] + "\n"));
+
+/* Conf. */
+booted = new Array();
+count = new Array();
+nrNodes = 7;
+nodes_starting = true;
+for (i = 1; i &lt;= nrNodes; i++) {
+  booted[i] = false;
+  count[i] = 0;
+}
+
+/* Wait until all nodes have started */
+while (nodes_starting) {
+  YIELD_THEN_WAIT_UNTIL(msg.startsWith('Starting'));
+  
+  log.log("Node " + id + " booted\n");
+  booted[id] = true;
+
+  for (i = 1; i &lt;= nrNodes; i++) {
+    if (!booted[i]) break;
+    if (i == nrNodes) nodes_starting = false;
+  }
+}
+
+/* Create sink */
+log.log("All nodes booted, creating sink at node " + id + "\n");
+mote.getInterfaces().getButton().clickButton()
+
+while (true) {
+  YIELD();
+
+  /* Count sensor data packets */
+  source = msg.split(" ")[0];
+  count[source]++;
+  log.log("Got data from node " + source + ": tot=" + count[source] + "\n");
+
+  /* Fail if any node has transmitted more than 20 packets */
+  for (i = 1; i &lt;= nrNodes; i++) {
+    if (count[i] &gt; 20) {
+      log.log("received/node: " + count[1] + " " + count[2] + " " + count[3] + " " + count[4] + " " + count[5] + " " + count[6] + " " + count[7] + "\n");
+      log.testFailed(); /* We are done! */
+    }
+  }
+
+  /* Wait until we have received data from all nodes */
+  for (i = 1; i &lt;= nrNodes; i++) {
+    if (count[i] &lt; 5) break;
+    if (i == nrNodes) log.testOK();
+  }
+
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>600</width>
+    <z>2</z>
+    <height>385</height>
+    <location_x>266</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.TimeLine
+    <plugin_config>
+      <mote>0</mote>
+      <mote>1</mote>
+      <mote>2</mote>
+      <mote>3</mote>
+      <mote>4</mote>
+      <mote>5</mote>
+      <mote>6</mote>
+      <showRadioRXTX />
+      <zoomfactor>500.0</zoomfactor>
+    </plugin_config>
+    <width>866</width>
+    <z>0</z>
+    <height>152</height>
+    <location_x>0</location_x>
+    <location_y>384</location_y>
+  </plugin>
+</simconf>
+
diff --git a/regression-tests/04-rime/07-sky-collect.csc b/regression-tests/04-rime/07-sky-collect.csc
index 3fe71e180..5184bf959 100644
--- a/regression-tests/04-rime/07-sky-collect.csc
+++ b/regression-tests/04-rime/07-sky-collect.csc
@@ -9,25 +9,25 @@
   <simulation>
     <title>My simulation</title>
     <randomseed>generated</randomseed>
-    <motedelay_us>10000000</motedelay_us>
+    <motedelay_us>1000000</motedelay_us>
     <radiomedium>
       org.contikios.cooja.radiomediums.UDGM
-      <transmitting_range>30.0</transmitting_range>
-      <interference_range>40.0</interference_range>
-      <success_ratio_tx>0.9</success_ratio_tx>
-      <success_ratio_rx>0.9</success_ratio_rx>
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
     </radiomedium>
     <events>
-      <logoutput>40000</logoutput>
+      <logoutput>400000</logoutput>
     </events>
     <motetype>
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/sky/sky-collect.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/rime/example-collect.c</source>
       <commands EXPORT="discard">make clean TARGET=sky
-make sky-collect.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/sky/sky-collect.sky</firmware>
+make example-collect.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/rime/example-collect.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
@@ -38,13 +38,18 @@ make sky-collect.sky TARGET=sky</commands>
       <moteinterface>org.contikios.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
       <moteinterface>org.contikios.cooja.mspmote.interfaces.MspSerial</moteinterface>
       <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyLED</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyTemperature</moteinterface>
     </motetype>
     <mote>
       <breakpoints />
       <interface_config>
         org.contikios.cooja.interfaces.Position
-        <x>9.333811152651393</x>
-        <y>89.28114548870677</y>
+        <x>87.29845932913939</x>
+        <y>60.286214311723164</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
@@ -57,8 +62,8 @@ make sky-collect.sky TARGET=sky</commands>
       <breakpoints />
       <interface_config>
         org.contikios.cooja.interfaces.Position
-        <x>33.040227185226826</x>
-        <y>54.184283361563054</y>
+        <x>94.30809966340686</x>
+        <y>22.50388779326399</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
@@ -71,8 +76,8 @@ make sky-collect.sky TARGET=sky</commands>
       <breakpoints />
       <interface_config>
         org.contikios.cooja.interfaces.Position
-        <x>-2.2559922410521516</x>
-        <y>50.71648775308175</y>
+        <x>82.40423567500785</x>
+        <y>39.56979106929553</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
@@ -85,8 +90,8 @@ make sky-collect.sky TARGET=sky</commands>
       <breakpoints />
       <interface_config>
         org.contikios.cooja.interfaces.Position
-        <x>12.959353575718179</x>
-        <y>43.874396471224806</y>
+        <x>26.185019854469438</x>
+        <y>4.800834369523899</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
@@ -99,8 +104,8 @@ make sky-collect.sky TARGET=sky</commands>
       <breakpoints />
       <interface_config>
         org.contikios.cooja.interfaces.Position
-        <x>15.917348901177405</x>
-        <y>66.93526904376517</y>
+        <x>1.9530156130507015</x>
+        <y>78.3175061800706</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
@@ -113,8 +118,8 @@ make sky-collect.sky TARGET=sky</commands>
       <breakpoints />
       <interface_config>
         org.contikios.cooja.interfaces.Position
-        <x>26.735174243053933</x>
-        <y>35.939375910459084</y>
+        <x>48.35216700543414</x>
+        <y>80.36988713780997</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
@@ -127,8 +132,8 @@ make sky-collect.sky TARGET=sky</commands>
       <breakpoints />
       <interface_config>
         org.contikios.cooja.interfaces.Position
-        <x>41.5254792748469</x>
-        <y>28.370611308140152</y>
+        <x>24.825985087266833</x>
+        <y>74.27809432062487</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
@@ -137,12 +142,194 @@ make sky-collect.sky TARGET=sky</commands>
       </interface_config>
       <motetype_identifier>sky1</motetype_identifier>
     </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>8.356165164293616</x>
+        <y>94.33967355724187</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>8</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>45.11740613004886</x>
+        <y>31.7059041432301</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>9</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>68.9908548386292</x>
+        <y>55.01991960639596</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>10</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>13.181122543889046</x>
+        <y>55.9636533130127</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>11</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>2.1749985906538427</x>
+        <y>78.39666095789707</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>12</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>37.79795217518357</x>
+        <y>7.164284163506062</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>13</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>64.4595177394984</x>
+        <y>72.115414337433</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>14</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>81.85663737096085</x>
+        <y>89.31412706434035</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>15</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>44.74952276297882</x>
+        <y>18.78566116347574</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>16</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>96.11333426285873</x>
+        <y>90.64560410751824</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>17</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>21.651464136783527</x>
+        <y>7.1381043251259495</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>18</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>83.6006916200628</x>
+        <y>26.97170140682981</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>19</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>1.3446070721664705</x>
+        <y>7.340373220385176</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.mspmote.interfaces.MspMoteID
+        <id>20</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
   </simulation>
   <plugin>
     org.contikios.cooja.plugins.SimControl
-    <width>265</width>
-    <z>3</z>
-    <height>200</height>
+    <width>247</width>
+    <z>0</z>
+    <height>227</height>
     <location_x>0</location_x>
     <location_y>0</location_y>
   </plugin>
@@ -151,95 +338,110 @@ make sky-collect.sky TARGET=sky</commands>
     <plugin_config>
       <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
       <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
-      <viewport>1.9551775516837413 0.0 0.0 1.9551775516837413 87.61059024269439 -50.01503690267507</viewport>
+      <viewport>1.685403700540615 0.0 0.0 1.685403700540615 23.872012513439184 -0.545889466623605</viewport>
     </plugin_config>
-    <width>264</width>
+    <width>224</width>
+    <z>3</z>
+    <height>225</height>
+    <location_x>247</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>469</width>
     <z>1</z>
-    <height>185</height>
+    <height>473</height>
     <location_x>0</location_x>
-    <location_y>200</location_y>
+    <location_y>226</location_y>
   </plugin>
   <plugin>
     org.contikios.cooja.plugins.ScriptRunner
     <plugin_config>
-      <script>TIMEOUT(300000, log.log("received/node: " + count[1] + " " + count[2] + " " + count[3] + " " + count[4] + " " + count[5] + " " + count[6] + " " + count[7] + "\n"));
+      <script>TIMEOUT(600000);
 
-/* Conf. */
-booted = new Array();
-count = new Array();
-nrNodes = 7;
-nodes_starting = true;
-for (i = 1; i &lt;= nrNodes; i++) {
-  booted[i] = false;
-  count[i] = 0;
-}
+num_nodes = mote.getSimulation().getMotesCount();
 
-/* Wait until all nodes have started */
-while (nodes_starting) {
-  YIELD_THEN_WAIT_UNTIL(msg.startsWith('Starting'));
-  
-  log.log("Node " + id + " booted\n");
-  booted[id] = true;
-
-  for (i = 1; i &lt;= nrNodes; i++) {
-    if (!booted[i]) break;
-    if (i == nrNodes) nodes_starting = false;
+function print_stats() {
+  log.log("Received:\n");
+  for(i = 1; i &lt;= num_nodes; i++) {
+      log.log("Node " + i + " ");
+      if(i == sink) {
+          log.log("sink\n");
+      } else {
+          log.log("received: " + received[i] + " hops: " + hops[i] + "\n");
+      }
   }
 }
 
-/* Create sink */
-log.log("All nodes booted, creating sink at node " + id + "\n");
-mote.getInterfaces().getButton().clickButton()
+/* Init */
+sink = 0;
+hops = new Array();
+dups = new Array();
+received = new Array();
 
-while (true) {
-  YIELD();
+doubleFormat = new java.text.DecimalFormat("0.00");
+integerFormat = new java.text.DecimalFormat("00");
+for(i = 1; i &lt;= num_nodes; i++) {
+    received[i] = "__________";
+    hops[i] = received[i];
+}
 
-  /* Count sensor data packets */
-  source = msg.split(" ")[0];
-  count[source]++;
-  log.log("Got data from node " + source + ": tot=" + count[source] + "\n");
+log.log("Simulation has " + num_nodes + " nodes\n");
 
-  /* Fail if any node has transmitted more than 20 packets */
-  for (i = 1; i &lt;= nrNodes; i++) {
-    if (count[i] &gt; 20) {
-      log.log("received/node: " + count[1] + " " + count[2] + " " + count[3] + " " + count[4] + " " + count[5] + " " + count[6] + " " + count[7] + "\n");
-      log.testFailed(); /* We are done! */
+while(true) {
+    YIELD();
+    log.log(time + " " + id + " "+ msg + "\n");
+    /* Count sensor data packets */
+    if(msg.startsWith("Sink got message")) {
+        node_text = msg.split(" ")[4];
+        seqno_text = msg.split(" ")[6];
+        hops_text = msg.split(" ")[8];
+        if(node_text) {
+            source = parseInt(node_text);
+            seqno = parseInt(seqno_text);
+            hop = parseInt(hops_text);
+            dups = received[source].substr(seqno, 1);
+            if(dups == "_") {
+                dups = 1;
+            } else if(dups &lt; 9) {
+                dups++;
+            }
+            received[source] = received[source].substr(0, seqno) + dups +
+                received[source].substr(seqno + 1, 10 - seqno);
+
+            if(hop &gt; 9) {
+                hop = "+";
+            }
+            hops[source] = hops[source].substr(0, seqno) + hop +
+                hops[source].substr(seqno + 1, 10 - seqno);
+            print_stats();
+        }
+    }
+    /* Signal OK if all nodes have reported 10 messages. */
+    num_reported = 0;
+    for(i = 1; i &lt;= num_nodes; i++) {
+        if(!isNaN(received[i])) {
+            num_reported++;
+        }
     }
-  }
 
-  /* Wait until we have received data from all nodes */
-  for (i = 1; i &lt;= nrNodes; i++) {
-    if (count[i] &lt; 5) break;
-    if (i == nrNodes) log.testOK();
-  }
-
-}</script>
+    if(num_reported == num_nodes) {
+        print_stats();
+        log.testOK();
+    }
+  }</script>
       <active>true</active>
     </plugin_config>
     <width>600</width>
     <z>2</z>
-    <height>385</height>
-    <location_x>266</location_x>
+    <height>700</height>
+    <location_x>469</location_x>
     <location_y>0</location_y>
   </plugin>
-  <plugin>
-    org.contikios.cooja.plugins.TimeLine
-    <plugin_config>
-      <mote>0</mote>
-      <mote>1</mote>
-      <mote>2</mote>
-      <mote>3</mote>
-      <mote>4</mote>
-      <mote>5</mote>
-      <mote>6</mote>
-      <showRadioRXTX />
-      <zoomfactor>500.0</zoomfactor>
-    </plugin_config>
-    <width>866</width>
-    <z>0</z>
-    <height>152</height>
-    <location_x>0</location_x>
-    <location_y>384</location_y>
-  </plugin>
 </simconf>
 
diff --git a/regression-tests/04-rime/09-cooja-trickle.csc b/regression-tests/04-rime/08-cooja-trickle.csc
similarity index 100%
rename from regression-tests/04-rime/09-cooja-trickle.csc
rename to regression-tests/04-rime/08-cooja-trickle.csc
diff --git a/regression-tests/04-rime/08-sky-collect.csc b/regression-tests/04-rime/08-sky-collect.csc
deleted file mode 100644
index 5184bf959..000000000
--- a/regression-tests/04-rime/08-sky-collect.csc
+++ /dev/null
@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<simconf>
-  <project EXPORT="discard">[APPS_DIR]/mrm</project>
-  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
-  <project EXPORT="discard">[APPS_DIR]/avrora</project>
-  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
-  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
-  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
-  <simulation>
-    <title>My simulation</title>
-    <randomseed>generated</randomseed>
-    <motedelay_us>1000000</motedelay_us>
-    <radiomedium>
-      org.contikios.cooja.radiomediums.UDGM
-      <transmitting_range>50.0</transmitting_range>
-      <interference_range>50.0</interference_range>
-      <success_ratio_tx>1.0</success_ratio_tx>
-      <success_ratio_rx>1.0</success_ratio_rx>
-    </radiomedium>
-    <events>
-      <logoutput>400000</logoutput>
-    </events>
-    <motetype>
-      org.contikios.cooja.mspmote.SkyMoteType
-      <identifier>sky1</identifier>
-      <description>Sky Mote Type #1</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/rime/example-collect.c</source>
-      <commands EXPORT="discard">make clean TARGET=sky
-make example-collect.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/rime/example-collect.sky</firmware>
-      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
-      <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
-      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspClock</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspMoteID</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyButton</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyFlash</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspSerial</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyLED</moteinterface>
-      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
-      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyTemperature</moteinterface>
-    </motetype>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>87.29845932913939</x>
-        <y>60.286214311723164</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>1</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>94.30809966340686</x>
-        <y>22.50388779326399</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>2</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>82.40423567500785</x>
-        <y>39.56979106929553</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>3</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>26.185019854469438</x>
-        <y>4.800834369523899</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>4</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>1.9530156130507015</x>
-        <y>78.3175061800706</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>5</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>48.35216700543414</x>
-        <y>80.36988713780997</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>6</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>24.825985087266833</x>
-        <y>74.27809432062487</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>7</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>8.356165164293616</x>
-        <y>94.33967355724187</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>8</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>45.11740613004886</x>
-        <y>31.7059041432301</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>9</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>68.9908548386292</x>
-        <y>55.01991960639596</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>10</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>13.181122543889046</x>
-        <y>55.9636533130127</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>11</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>2.1749985906538427</x>
-        <y>78.39666095789707</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>12</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>37.79795217518357</x>
-        <y>7.164284163506062</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>13</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>64.4595177394984</x>
-        <y>72.115414337433</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>14</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>81.85663737096085</x>
-        <y>89.31412706434035</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>15</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>44.74952276297882</x>
-        <y>18.78566116347574</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>16</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>96.11333426285873</x>
-        <y>90.64560410751824</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>17</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>21.651464136783527</x>
-        <y>7.1381043251259495</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>18</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>83.6006916200628</x>
-        <y>26.97170140682981</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>19</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      <breakpoints />
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>1.3446070721664705</x>
-        <y>7.340373220385176</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.mspmote.interfaces.MspMoteID
-        <id>20</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-  </simulation>
-  <plugin>
-    org.contikios.cooja.plugins.SimControl
-    <width>247</width>
-    <z>0</z>
-    <height>227</height>
-    <location_x>0</location_x>
-    <location_y>0</location_y>
-  </plugin>
-  <plugin>
-    org.contikios.cooja.plugins.Visualizer
-    <plugin_config>
-      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
-      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
-      <viewport>1.685403700540615 0.0 0.0 1.685403700540615 23.872012513439184 -0.545889466623605</viewport>
-    </plugin_config>
-    <width>224</width>
-    <z>3</z>
-    <height>225</height>
-    <location_x>247</location_x>
-    <location_y>1</location_y>
-  </plugin>
-  <plugin>
-    org.contikios.cooja.plugins.LogListener
-    <plugin_config>
-      <filter />
-      <formatted_time />
-      <coloring />
-    </plugin_config>
-    <width>469</width>
-    <z>1</z>
-    <height>473</height>
-    <location_x>0</location_x>
-    <location_y>226</location_y>
-  </plugin>
-  <plugin>
-    org.contikios.cooja.plugins.ScriptRunner
-    <plugin_config>
-      <script>TIMEOUT(600000);
-
-num_nodes = mote.getSimulation().getMotesCount();
-
-function print_stats() {
-  log.log("Received:\n");
-  for(i = 1; i &lt;= num_nodes; i++) {
-      log.log("Node " + i + " ");
-      if(i == sink) {
-          log.log("sink\n");
-      } else {
-          log.log("received: " + received[i] + " hops: " + hops[i] + "\n");
-      }
-  }
-}
-
-/* Init */
-sink = 0;
-hops = new Array();
-dups = new Array();
-received = new Array();
-
-doubleFormat = new java.text.DecimalFormat("0.00");
-integerFormat = new java.text.DecimalFormat("00");
-for(i = 1; i &lt;= num_nodes; i++) {
-    received[i] = "__________";
-    hops[i] = received[i];
-}
-
-log.log("Simulation has " + num_nodes + " nodes\n");
-
-while(true) {
-    YIELD();
-    log.log(time + " " + id + " "+ msg + "\n");
-    /* Count sensor data packets */
-    if(msg.startsWith("Sink got message")) {
-        node_text = msg.split(" ")[4];
-        seqno_text = msg.split(" ")[6];
-        hops_text = msg.split(" ")[8];
-        if(node_text) {
-            source = parseInt(node_text);
-            seqno = parseInt(seqno_text);
-            hop = parseInt(hops_text);
-            dups = received[source].substr(seqno, 1);
-            if(dups == "_") {
-                dups = 1;
-            } else if(dups &lt; 9) {
-                dups++;
-            }
-            received[source] = received[source].substr(0, seqno) + dups +
-                received[source].substr(seqno + 1, 10 - seqno);
-
-            if(hop &gt; 9) {
-                hop = "+";
-            }
-            hops[source] = hops[source].substr(0, seqno) + hop +
-                hops[source].substr(seqno + 1, 10 - seqno);
-            print_stats();
-        }
-    }
-    /* Signal OK if all nodes have reported 10 messages. */
-    num_reported = 0;
-    for(i = 1; i &lt;= num_nodes; i++) {
-        if(!isNaN(received[i])) {
-            num_reported++;
-        }
-    }
-
-    if(num_reported == num_nodes) {
-        print_stats();
-        log.testOK();
-    }
-  }</script>
-      <active>true</active>
-    </plugin_config>
-    <width>600</width>
-    <z>2</z>
-    <height>700</height>
-    <location_x>469</location_x>
-    <location_y>0</location_y>
-  </plugin>
-</simconf>
-
diff --git a/regression-tests/04-rime/10-cooja-mesh.csc b/regression-tests/04-rime/09-cooja-mesh.csc
similarity index 100%
rename from regression-tests/04-rime/10-cooja-mesh.csc
rename to regression-tests/04-rime/09-cooja-mesh.csc

From 068f27d1c2f3dc93ec56680cbd665dab2995f7be Mon Sep 17 00:00:00 2001
From: Ralf Schlatterbeck <rsc@runtux.com>
Date: Fri, 22 Apr 2016 12:31:21 +0200
Subject: [PATCH 187/393] Fix integer overflow in RPL timeout expression

---
 core/net/rpl/rpl-conf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h
index 5511b8289..f0fc9ec7c 100644
--- a/core/net/rpl/rpl-conf.h
+++ b/core/net/rpl/rpl-conf.h
@@ -260,7 +260,7 @@
 #ifdef RPL_CONF_PROBING_EXPIRATION_TIME
 #define RPL_PROBING_EXPIRATION_TIME RPL_CONF_PROBING_EXPIRATION_TIME
 #else
-#define RPL_PROBING_EXPIRATION_TIME (10 * 60 * CLOCK_SECOND)
+#define RPL_PROBING_EXPIRATION_TIME (10L * 60 * CLOCK_SECOND)
 #endif
 
 /*

From 53dd2e5d161571ca69e4a9341cb8d108991de820 Mon Sep 17 00:00:00 2001
From: Ralf Schlatterbeck <rsc@runtux.com>
Date: Fri, 22 Apr 2016 12:34:16 +0200
Subject: [PATCH 188/393] Fix unused variable warning

---
 core/net/mac/contikimac/contikimac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/mac/contikimac/contikimac.c b/core/net/mac/contikimac/contikimac.c
index 30a532511..47e2b5733 100644
--- a/core/net/mac/contikimac/contikimac.c
+++ b/core/net/mac/contikimac/contikimac.c
@@ -540,11 +540,11 @@ send_packet(mac_callback_t mac_callback, void *mac_callback_ptr,
   rtimer_clock_t t0;
 #if WITH_PHASE_OPTIMIZATION
   rtimer_clock_t encounter_time = 0;
+  uint8_t is_known_receiver = 0;
 #endif
   int strobes;
   uint8_t got_strobe_ack = 0;
   uint8_t is_broadcast = 0;
-  uint8_t is_known_receiver = 0;
   uint8_t collisions;
   int transmit_len;
   int ret;

From 186138f6af940877dea8e6824f9e24d2247ef8f4 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Fri, 4 Mar 2016 14:20:23 +0100
Subject: [PATCH 189/393] added error check for extraction of aligned llao

---
 core/net/ipv6/uip-nd6.c | 36 +++++++++++++-----------------------
 core/net/nbr-table.c    |  3 +--
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/core/net/ipv6/uip-nd6.c b/core/net/ipv6/uip-nd6.c
index d160392ed..218507228 100644
--- a/core/net/ipv6/uip-nd6.c
+++ b/core/net/ipv6/uip-nd6.c
@@ -135,11 +135,13 @@ static uip_ds6_prefix_t *prefix; /**  Pointer to a prefix list entry */
 #if UIP_ND6_SEND_NA || UIP_ND6_SEND_RA || !UIP_CONF_ROUTER
 /*------------------------------------------------------------------*/
 /* Copy link-layer address from LLAO option to a word-aligned uip_lladdr_t */
-static void
+static int
 extract_lladdr_from_llao_aligned(uip_lladdr_t *dest) {
   if(dest != NULL && nd6_opt_llao != NULL) {
     memcpy(dest, &nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET], UIP_LLADDR_LEN);
+    return 1;
   }
+  return 0;
 }
 #endif /* UIP_ND6_SEND_NA || UIP_ND6_SEND_RA || !UIP_CONF_ROUTER */
 /*------------------------------------------------------------------*/
@@ -203,14 +205,8 @@ ns_input(void)
         extract_lladdr_from_llao_aligned(&lladdr_aligned);
         nbr = uip_ds6_nbr_lookup(&UIP_IP_BUF->srcipaddr);
         if(nbr == NULL) {
-<<<<<<< 2e852f758b3fbc18ad30ec75d8c62b5d5238e70a
-          uip_lladdr_t lladdr_aligned;
-          extract_lladdr_aligned(&lladdr_aligned);
           uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned,
 			  0, NBR_STALE, NBR_TABLE_REASON_IPV6_ND, NULL);
-=======
-          uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned, 0, NBR_STALE);
->>>>>>> replaced add/remove ds6-nbr with an nbr-module controlled update of lladdress to avoid loss of other state information
         } else {
           const uip_lladdr_t *lladdr = uip_ds6_nbr_get_ll(nbr);
           if(lladdr == NULL) {
@@ -440,6 +436,7 @@ na_input(void)
   uint8_t is_router;
   uint8_t is_solicited;
   uint8_t is_override;
+  uip_lladdr_t lladdr_aligned;
 
   PRINTF("Received NA from ");
   PRINT6ADDR(&UIP_IP_BUF->srcipaddr);
@@ -517,12 +514,9 @@ na_input(void)
                UIP_LLADDR_LEN);
     }
     if(nbr->state == NBR_INCOMPLETE) {
-      uip_lladdr_t lladdr_aligned;
-      if(nd6_opt_llao == NULL) {
+      if(nd6_opt_llao == NULL || !extract_lladdr_from_llao_aligned(&lladdr_aligned)) {
         goto discard;
       }
-
-      extract_lladdr_from_llao_aligned(&lladdr_aligned);
       if(nbr_table_update_lladdr((const linkaddr_t *)lladdr, (const linkaddr_t *)&lladdr_aligned, 1) == 0) {
         /* failed to update the lladdr */
         goto discard;
@@ -552,9 +546,8 @@ na_input(void)
          */
         if(is_override || !is_llchange || nd6_opt_llao == NULL) {
           if(nd6_opt_llao != NULL && is_llchange) {
-            uip_lladdr_t lladdr_aligned;
-            extract_lladdr_from_llao_aligned(&lladdr_aligned);
-            if(nbr_table_update_lladdr((const linkaddr_t *) lladdr, (const linkaddr_t *) &lladdr_aligned, 1) == 0) {
+            if(!extract_lladdr_from_llao_aligned(&lladdr_aligned) ||
+               nbr_table_update_lladdr((const linkaddr_t *) lladdr, (const linkaddr_t *) &lladdr_aligned, 1) == 0) {
               /* failed to update the lladdr */
               goto discard;
             }
@@ -854,6 +847,8 @@ uip_nd6_rs_output(void)
 void
 ra_input(void)
 {
+  uip_lladdr_t lladdr_aligned;
+
   PRINTF("Received RA from ");
   PRINT6ADDR(&UIP_IP_BUF->srcipaddr);
   PRINTF(" to ");
@@ -898,19 +893,14 @@ ra_input(void)
       PRINTF("Processing SLLAO option in RA\n");
       nd6_opt_llao = (uint8_t *) UIP_ND6_OPT_HDR_BUF;
       nbr = uip_ds6_nbr_lookup(&UIP_IP_BUF->srcipaddr);
+      if(!extract_lladdr_from_llao_aligned(&lladdr_aligned)) {
+        /* failed to extract llao - discard packet */
+        goto discard;
+      }
       if(nbr == NULL) {
-        uip_lladdr_t lladdr_aligned;
-<<<<<<< 2e852f758b3fbc18ad30ec75d8c62b5d5238e70a
-        extract_lladdr_aligned(&lladdr_aligned);
         nbr = uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned,
                               1, NBR_STALE, NBR_TABLE_REASON_IPV6_ND, NULL);
-=======
-        extract_lladdr_from_llao_aligned(&lladdr_aligned);
-        nbr = uip_ds6_nbr_add(&UIP_IP_BUF->srcipaddr, &lladdr_aligned, 1, NBR_STALE);
->>>>>>> replaced add/remove ds6-nbr with an nbr-module controlled update of lladdress to avoid loss of other state information
       } else {
-        uip_lladdr_t lladdr_aligned;
-        extract_lladdr_from_llao_aligned(&lladdr_aligned);
         const uip_lladdr_t *lladdr = uip_ds6_nbr_get_ll(nbr);
         if(lladdr == NULL) {
           goto discard;
diff --git a/core/net/nbr-table.c b/core/net/nbr-table.c
index 4a3518475..4893a99ca 100644
--- a/core/net/nbr-table.c
+++ b/core/net/nbr-table.c
@@ -195,9 +195,8 @@ remove_key(nbr_table_key_t *least_used_key)
   used_map[index_from_key(least_used_key)] = 0;
   /* Remove neighbor from list */
   list_remove(nbr_table_keys, least_used_key);
-  /* Return associated key */
 }
-
+/*---------------------------------------------------------------------------*/
 static nbr_table_key_t *
 nbr_table_allocate(nbr_table_reason_t reason, void *data)
 {

From 4cdb7ba9b606c4308b9ae5d5206f4c0b0e0ffd82 Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Fri, 7 Aug 2015 15:43:10 -0700
Subject: [PATCH 190/393] x86: Add TSS-based protection domain support

This patch extends the protection domain framework with an additional
plugin to use Task-State Segment (TSS) structures to offload much of
the work of switching protection domains to the CPU.  This can save
space compared to paging, since paging requires two 4KiB page tables
and one 32-byte page table plus one whole-system TSS and an additional
32-byte data structure for each protection domain, whereas the
approach implemented by this patch just requires a 128-byte data
structure for each protection domain.  Only a small number of
protection domains will typically be used, so
n * 128 < 8328 + (n * 32).

For additional information, please refer to cpu/x86/mm/README.md.

GCC 6 is introducing named address spaces for the FS and GS segments
[1].  LLVM Clang also provides address spaces for the FS and GS
segments [2].  This patch also adds support to the multi-segment X86
memory management subsystem for using these features instead of inline
assembly blocks, which enables type checking to detect some address
space mismatches.

[1] https://gcc.gnu.org/onlinedocs/gcc/Named-Address-Spaces.html
[2] http://llvm.org/releases/3.3/tools/clang/docs/LanguageExtensions.html#target-specific-extensions
---
 cpu/x86/Makefile.x86_quarkX1000               |  19 +
 cpu/x86/bootstrap_quarkX1000.S                |  12 +
 cpu/x86/dma.h                                 |   2 +-
 cpu/x86/drivers/legacy_pc/pci.c               |  10 +-
 cpu/x86/drivers/legacy_pc/pci.h               |  12 +-
 cpu/x86/drivers/legacy_pc/uart-16x50.c        |  45 ++-
 cpu/x86/drivers/legacy_pc/uart-16x50.h        |   2 +-
 cpu/x86/drivers/quarkX1000/eth.c              | 116 ++++--
 cpu/x86/drivers/quarkX1000/gpio.c             |   8 +
 cpu/x86/drivers/quarkX1000/i2c.c              |   8 +
 cpu/x86/drivers/quarkX1000/uart.c             |   8 +-
 cpu/x86/init/common/cpu.c                     |  10 +-
 cpu/x86/init/common/gdt.c                     |  26 +-
 cpu/x86/init/common/gdt.h                     |  24 +-
 cpu/x86/init/common/idt.c                     |  50 ++-
 cpu/x86/init/common/idt.h                     |   2 +-
 cpu/x86/mm/README.md                          | 363 ++++++++++++++++--
 cpu/x86/mm/gdt-layout.h                       |  28 ++
 cpu/x86/mm/ldt-layout.h                       |  59 +++
 cpu/x86/mm/multi-segment.c                    | 239 ++++++++++++
 cpu/x86/mm/multi-segment.h                    | 195 ++++++++++
 cpu/x86/mm/prot-domains.c                     |   6 +-
 cpu/x86/mm/prot-domains.h                     | 113 +++++-
 cpu/x86/mm/segmentation.h                     |  19 +-
 cpu/x86/mm/stacks.h                           |  11 +
 cpu/x86/mm/syscalls.h                         |  47 ++-
 cpu/x86/mm/tss-prot-domains-asm.S             |  88 +++++
 cpu/x86/mm/tss-prot-domains.c                 | 161 ++++++++
 cpu/x86/mm/tss-prot-domains.h                 | 130 +++++++
 cpu/x86/quarkX1000.ld                         |   2 +
 cpu/x86/quarkX1000_dma.ld                     |  28 +-
 cpu/x86/quarkX1000_multi_seg.ld               | 190 +++++++++
 cpu/x86/quarkX1000_paging.ld                  |   4 +-
 platform/galileo/Makefile.customrules-galileo |  12 +-
 34 files changed, 1883 insertions(+), 166 deletions(-)
 create mode 100644 cpu/x86/mm/ldt-layout.h
 create mode 100644 cpu/x86/mm/multi-segment.c
 create mode 100644 cpu/x86/mm/multi-segment.h
 create mode 100644 cpu/x86/mm/tss-prot-domains-asm.S
 create mode 100644 cpu/x86/mm/tss-prot-domains.c
 create mode 100644 cpu/x86/mm/tss-prot-domains.h
 create mode 100644 cpu/x86/quarkX1000_multi_seg.ld

diff --git a/cpu/x86/Makefile.x86_quarkX1000 b/cpu/x86/Makefile.x86_quarkX1000
index 4a7668cc6..13a9c686f 100644
--- a/cpu/x86/Makefile.x86_quarkX1000
+++ b/cpu/x86/Makefile.x86_quarkX1000
@@ -20,6 +20,11 @@ CFLAGS += -DX86_CONF_USE_INVLPG
 endif
 # This matches the definition of X86_CONF_PROT_DOMAINS__PAGING in prot-domains.h:
 CFLAGS += -DX86_CONF_PROT_DOMAINS=1
+else ifeq ($(X86_CONF_PROT_DOMAINS),tss)
+# This matches the definition of X86_CONF_PROT_DOMAINS__TSS in prot-domains.h:
+CFLAGS += -DX86_CONF_PROT_DOMAINS=2
+X86_CONF_MULTI_SEG = 1
+CONTIKI_SOURCEFILES += tss-prot-domains-asm.S
 else
 $(error Unrecognized setting for X86_CONF_PROT_DOMAINS: \
         $(X86_CONF_PROT_DOMAINS).  See cpu/x86/mm/README.md for \
@@ -30,6 +35,20 @@ ifeq ($(X86_CONF_SYSCALLS_INT),1)
 CONTIKI_SOURCEFILES += syscalls-int-asm.S tss.c
 endif
 
+ifeq ($(X86_CONF_MULTI_SEG),1)
+LINKERSCRIPT_SFX = _multi_seg
+CONTIKI_SOURCEFILES += multi-segment.c
+# Due to the way the multi-segment implementation of protection domains define
+# tightly-bounded stack segments, the base pointer register cannot be used as
+# a general-purpose register in all circumstances.  The stack segment is used
+# by default for a data access that uses the base pointer as the base register
+# to compute the address.  If the data referenced by the base pointer is not
+# on the stack, then the access will fail.  Thus, it is necessary to disable
+# the omit-frame-pointer optimization.  See mm/README.md for more details of
+# how multi-segment protection domains are implemented.
+CFLAGS += -fno-omit-frame-pointer
+endif
+
 endif
 
 CFLAGS += -m32 -march=i586 -mtune=i586
diff --git a/cpu/x86/bootstrap_quarkX1000.S b/cpu/x86/bootstrap_quarkX1000.S
index 4211e51a3..622c9dab8 100644
--- a/cpu/x86/bootstrap_quarkX1000.S
+++ b/cpu/x86/bootstrap_quarkX1000.S
@@ -45,5 +45,17 @@
 .global start
 start:
         cli
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__TSS
+        /* TSS-based protection domains use a multi-segment model that defines
+         * tight bounds around stacks.  That means that the bottom of the stack
+         * has an offset of 0, which is the address of the stacks_main symbol.
+         * The following code computes the physical load address of the top of
+         * the stack, which is what should be initially used as the stack
+         * pointer while the flat memory model is in use.
+         */
+        lea _sdata_addr, %eax
+        lea (stacks_main + STACKS_SIZE_MAIN)(%eax), %esp
+#else
         mov $(stacks_main + STACKS_SIZE_MAIN), %esp
+#endif
         call cpu_boot_stage0
diff --git a/cpu/x86/dma.h b/cpu/x86/dma.h
index b0122fcdb..7a8d991b1 100644
--- a/cpu/x86/dma.h
+++ b/cpu/x86/dma.h
@@ -43,6 +43,6 @@
 #endif
 #endif
 
-extern int _sbss_dma_addr, _ebss_dma_addr;
+extern int _ebss_pre_dma_addr, _sbss_dma_addr, _ebss_dma_addr;
 
 #endif /* CPU_X86_DMA_H_ */
diff --git a/cpu/x86/drivers/legacy_pc/pci.c b/cpu/x86/drivers/legacy_pc/pci.c
index e94c9ecbe..4584d454c 100644
--- a/cpu/x86/drivers/legacy_pc/pci.c
+++ b/cpu/x86/drivers/legacy_pc/pci.c
@@ -138,7 +138,9 @@ SYSCALLS_DEFINE_SINGLETON(pci_irq_agent_set_pirq,
     offset = 0x3146;
   }
 
-  value = *(uint16_t*)(rcba_addr + offset);
+  prot_domains_enable_mmio();
+
+  MMIO_READW(value, *(uint16_t ATTR_MMIO_ADDR_SPACE *)(rcba_addr + offset));
 
   /* clear interrupt pin route and set corresponding pirq. */
   switch(pin) {
@@ -159,7 +161,9 @@ SYSCALLS_DEFINE_SINGLETON(pci_irq_agent_set_pirq,
     value |= (pirq << 12);
   }
 
-  *(uint16_t*)(rcba_addr + offset) = value;
+  MMIO_WRITEW(*(uint16_t ATTR_MMIO_ADDR_SPACE *)(rcba_addr + offset), value);
+
+  prot_domains_disable_mmio();
 }
 /*---------------------------------------------------------------------------*/
 /**
@@ -231,7 +235,7 @@ pci_pirq_set_irq(PIRQ pirq, uint8_t irq, uint8_t route_to_legacy)
  * \param meta_sz  Size of optional driver-defined metadata.
  */
 void
-pci_init(pci_driver_t *c_this,
+pci_init(pci_driver_t ATTR_KERN_ADDR_SPACE *c_this,
          pci_config_addr_t pci_addr,
          size_t mmio_sz,
          uintptr_t meta,
diff --git a/cpu/x86/drivers/legacy_pc/pci.h b/cpu/x86/drivers/legacy_pc/pci.h
index fff53a048..666b3c29e 100644
--- a/cpu/x86/drivers/legacy_pc/pci.h
+++ b/cpu/x86/drivers/legacy_pc/pci.h
@@ -102,7 +102,7 @@ void pci_command_enable(pci_config_addr_t addr, uint32_t flags);
 
 typedef dom_client_data_t pci_driver_t;
 
-void pci_init(pci_driver_t *c_this,
+void pci_init(pci_driver_t ATTR_KERN_ADDR_SPACE *c_this,
               pci_config_addr_t pci_addr,
               size_t mmio_sz,
               uintptr_t meta,
@@ -113,10 +113,12 @@ void pci_root_complex_init(void);
 void pci_root_complex_lock(void);
 
 #define PCI_MMIO_READL(c_this, dest, reg_addr)                                \
-  dest = *((volatile uint32_t *)                                              \
-    (((uintptr_t)PROT_DOMAINS_MMIO(c_this)) + (reg_addr)))
+  MMIO_READL(dest,                                                            \
+             *((volatile uint32_t ATTR_MMIO_ADDR_SPACE *)                     \
+               (((uintptr_t)PROT_DOMAINS_MMIO(c_this)) + (reg_addr))))
 #define PCI_MMIO_WRITEL(c_this, reg_addr, src)                                \
-  *((volatile uint32_t *)                                                     \
-    (((uintptr_t)PROT_DOMAINS_MMIO(c_this)) + (reg_addr))) = (src)
+  MMIO_WRITEL(*((volatile uint32_t ATTR_MMIO_ADDR_SPACE *)                    \
+                (((uintptr_t)PROT_DOMAINS_MMIO(c_this)) + (reg_addr))),       \
+              src)
 
 #endif /* CPU_X86_DRIVERS_LEGACY_PC_PCI_H_ */
diff --git a/cpu/x86/drivers/legacy_pc/uart-16x50.c b/cpu/x86/drivers/legacy_pc/uart-16x50.c
index d1f2c498d..d17e61498 100644
--- a/cpu/x86/drivers/legacy_pc/uart-16x50.c
+++ b/cpu/x86/drivers/legacy_pc/uart-16x50.c
@@ -74,6 +74,11 @@ typedef struct uart_16x50_regs {
  */
 #define UART_MMIO_SZ MIN_PAGE_SIZE
 #else
+/* Multi-segment protection domain implementations can control memory with
+ * byte granularity.  Thus, only the registers defined in the uart_16x50_regs
+ * structure are included in the MMIO region allocated for this protection
+ * domain:
+ */
 #define UART_MMIO_SZ sizeof(uart_16x50_regs_t)
 #endif
 
@@ -82,24 +87,30 @@ void uart_16x50_setup(uart_16x50_driver_t c_this, uint16_t dl);
 /*---------------------------------------------------------------------------*/
 SYSCALLS_DEFINE(uart_16x50_setup, uart_16x50_driver_t c_this, uint16_t dl)
 {
-  uart_16x50_regs_t *regs = (uart_16x50_regs_t *)PROT_DOMAINS_MMIO(c_this);
+  uart_16x50_regs_t ATTR_MMIO_ADDR_SPACE *regs =
+    (uart_16x50_regs_t ATTR_MMIO_ADDR_SPACE *)PROT_DOMAINS_MMIO(c_this);
+
+  prot_domains_enable_mmio();
 
   /* Set the DLAB bit to enable access to divisor settings. */
-  regs->lcr = UART_LCR_7_DLAB;
+  MMIO_WRITEL(regs->lcr, UART_LCR_7_DLAB);
 
   /* The divisor settings configure the baud rate, and may need to be defined
    * on a per-device basis.
    */
-  regs->rbr_thr_dll = dl & UINT8_MAX;
-  regs->ier_dlh = dl >> 8;
+  MMIO_WRITEL(regs->rbr_thr_dll, dl & UINT8_MAX);
+  MMIO_WRITEL(regs->ier_dlh, dl >> 8);
 
   /* Clear the DLAB bit to enable access to other settings and configure other
    * UART parameters.
    */
-  regs->lcr = UART_LCR_8BITS;
+  MMIO_WRITEL(regs->lcr, UART_LCR_8BITS);
 
   /* Enable the FIFOs. */
-  regs->iir_fcr = UART_FCR_0_FIFOE | UART_FCR_1_RFIFOR | UART_FCR_2_XFIFOR;
+  MMIO_WRITEL(regs->iir_fcr,
+              UART_FCR_0_FIFOE | UART_FCR_1_RFIFOR | UART_FCR_2_XFIFOR);
+
+  prot_domains_disable_mmio();
 }
 /*---------------------------------------------------------------------------*/
 /**
@@ -112,13 +123,21 @@ SYSCALLS_DEFINE(uart_16x50_setup, uart_16x50_driver_t c_this, uint16_t dl)
  */
 SYSCALLS_DEFINE(uart_16x50_tx, uart_16x50_driver_t c_this, uint8_t c)
 {
-  uart_16x50_regs_t *regs = (uart_16x50_regs_t *)PROT_DOMAINS_MMIO(c_this);
+  uint32_t ready;
+  uart_16x50_regs_t ATTR_MMIO_ADDR_SPACE *regs =
+    (uart_16x50_regs_t ATTR_MMIO_ADDR_SPACE *)PROT_DOMAINS_MMIO(c_this);
+
+  prot_domains_enable_mmio();
 
   /* Wait for space in TX FIFO. */
-  while((regs->lsr & UART_LSR_5_THRE) == 0);
+  do {
+    MMIO_READL(ready, regs->lsr);
+  } while((ready & UART_LSR_5_THRE) == 0);
 
   /* Add character to TX FIFO. */
-  regs->rbr_thr_dll = c;
+  MMIO_WRITEL(regs->rbr_thr_dll, c);
+
+  prot_domains_disable_mmio();
 }
 /*---------------------------------------------------------------------------*/
 /**
@@ -128,10 +147,12 @@ SYSCALLS_DEFINE(uart_16x50_tx, uart_16x50_driver_t c_this, uint8_t c)
  * \param dl       Divisor setting to configure the baud rate.
  */
 void
-uart_16x50_init(uart_16x50_driver_t *c_this,
+uart_16x50_init(uart_16x50_driver_t ATTR_KERN_ADDR_SPACE *c_this,
                 pci_config_addr_t pci_addr,
                 uint16_t dl)
 {
+  uart_16x50_driver_t loc_c_this;
+
   /* This assumes that the UART had an MMIO range assigned to it by the
    * firmware during boot.
    */
@@ -141,6 +162,8 @@ uart_16x50_init(uart_16x50_driver_t *c_this,
   SYSCALLS_INIT(uart_16x50_tx);
   SYSCALLS_AUTHZ(uart_16x50_tx, *c_this);
 
-  uart_16x50_setup(*c_this, dl);
+  prot_domains_copy_dcd(&loc_c_this, c_this);
+
+  uart_16x50_setup(loc_c_this, dl);
 }
 /*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/drivers/legacy_pc/uart-16x50.h b/cpu/x86/drivers/legacy_pc/uart-16x50.h
index 615806518..4a038b948 100644
--- a/cpu/x86/drivers/legacy_pc/uart-16x50.h
+++ b/cpu/x86/drivers/legacy_pc/uart-16x50.h
@@ -35,7 +35,7 @@
 
 typedef pci_driver_t uart_16x50_driver_t;
 
-void uart_16x50_init(uart_16x50_driver_t *c_this,
+void uart_16x50_init(uart_16x50_driver_t ATTR_KERN_ADDR_SPACE *c_this,
                      pci_config_addr_t pci_addr,
                      uint16_t dl);
 
diff --git a/cpu/x86/drivers/quarkX1000/eth.c b/cpu/x86/drivers/quarkX1000/eth.c
index 5c16b10a5..88782ebc2 100644
--- a/cpu/x86/drivers/quarkX1000/eth.c
+++ b/cpu/x86/drivers/quarkX1000/eth.c
@@ -216,13 +216,19 @@ SYSCALLS_DEFINE_SINGLETON(quarkX1000_eth_setup, drv, uintptr_t meta_phys_base)
 {
   uip_eth_addr mac_addr;
   uint32_t mac_tmp1, mac_tmp2;
-  quarkX1000_eth_meta_t *loc_meta =
-    (quarkX1000_eth_meta_t *)PROT_DOMAINS_META(drv);
+  quarkX1000_eth_rx_desc_t rx_desc;
+  quarkX1000_eth_tx_desc_t tx_desc;
+  quarkX1000_eth_meta_t ATTR_META_ADDR_SPACE *loc_meta =
+    (quarkX1000_eth_meta_t ATTR_META_ADDR_SPACE *)PROT_DOMAINS_META(drv);
+
+  prot_domains_enable_mmio();
 
   /* Read the MAC address from the device. */
   PCI_MMIO_READL(drv, mac_tmp1, REG_ADDR_MACADDR_HI);
   PCI_MMIO_READL(drv, mac_tmp2, REG_ADDR_MACADDR_LO);
 
+  prot_domains_disable_mmio();
+
   /* Convert the data read from the device into the format expected by
    * Contiki.
    */
@@ -245,29 +251,39 @@ SYSCALLS_DEFINE_SINGLETON(quarkX1000_eth_setup, drv, uintptr_t meta_phys_base)
   uip_setethaddr(mac_addr);
 
   /* Initialize transmit descriptor. */
-  loc_meta->tx_desc.tdes0 = 0;
-  loc_meta->tx_desc.tdes1 = 0;
+  tx_desc.tdes0 = 0;
+  tx_desc.tdes1 = 0;
 
-  loc_meta->tx_desc.buf1_ptr =
-    (uint8_t *)PROT_DOMAINS_META_OFF_TO_PHYS(
-      (uintptr_t)&loc_meta->tx_buf, meta_phys_base);
-  loc_meta->tx_desc.tx_end_of_ring = 1;
-  loc_meta->tx_desc.first_seg_in_frm = 1;
-  loc_meta->tx_desc.last_seg_in_frm = 1;
-  loc_meta->tx_desc.tx_end_of_ring = 1;
+  tx_desc.tx_end_of_ring = 1;
+  tx_desc.first_seg_in_frm = 1;
+  tx_desc.last_seg_in_frm = 1;
+  tx_desc.tx_end_of_ring = 1;
+
+  META_WRITEL(loc_meta->tx_desc.tdes0, tx_desc.tdes0);
+  META_WRITEL(loc_meta->tx_desc.tdes1, tx_desc.tdes1);
+  META_WRITEL(loc_meta->tx_desc.buf1_ptr,
+              (uint8_t *)PROT_DOMAINS_META_OFF_TO_PHYS(
+                (uintptr_t)&loc_meta->tx_buf, meta_phys_base));
+  META_WRITEL(loc_meta->tx_desc.buf2_ptr, 0);
 
   /* Initialize receive descriptor. */
-  loc_meta->rx_desc.rdes0 = 0;
-  loc_meta->rx_desc.rdes1 = 0;
+  rx_desc.rdes0 = 0;
+  rx_desc.rdes1 = 0;
 
-  loc_meta->rx_desc.buf1_ptr =
-    (uint8_t *)PROT_DOMAINS_META_OFF_TO_PHYS(
-      (uintptr_t)&loc_meta->rx_buf, meta_phys_base);
-  loc_meta->rx_desc.own = 1;
-  loc_meta->rx_desc.first_desc = 1;
-  loc_meta->rx_desc.last_desc = 1;
-  loc_meta->rx_desc.rx_buf1_sz = UIP_BUFSIZE;
-  loc_meta->rx_desc.rx_end_of_ring = 1;
+  rx_desc.own = 1;
+  rx_desc.first_desc = 1;
+  rx_desc.last_desc = 1;
+  rx_desc.rx_buf1_sz = UIP_BUFSIZE;
+  rx_desc.rx_end_of_ring = 1;
+
+  META_WRITEL(loc_meta->rx_desc.rdes0, rx_desc.rdes0);
+  META_WRITEL(loc_meta->rx_desc.rdes1, rx_desc.rdes1);
+  META_WRITEL(loc_meta->rx_desc.buf1_ptr,
+              (uint8_t *)PROT_DOMAINS_META_OFF_TO_PHYS(
+                (uintptr_t)&loc_meta->rx_buf, meta_phys_base));
+  META_WRITEL(loc_meta->rx_desc.buf2_ptr, 0);
+
+  prot_domains_enable_mmio();
 
   /* Install transmit and receive descriptors. */
   PCI_MMIO_WRITEL(drv, REG_ADDR_RX_DESC_LIST,
@@ -298,8 +314,11 @@ SYSCALLS_DEFINE_SINGLETON(quarkX1000_eth_setup, drv, uintptr_t meta_phys_base)
                   /* Place the receiver state machine in the Running state. */
                   OP_MODE_1_START_RX);
 
+  prot_domains_disable_mmio();
+
   printf(LOG_PFX "Enabled 100M full-duplex mode.\n");
 }
+
 /*---------------------------------------------------------------------------*/
 /**
  * \brief           Poll for a received Ethernet frame.
@@ -313,33 +332,43 @@ SYSCALLS_DEFINE_SINGLETON(quarkX1000_eth_poll, drv, uint16_t * frame_len)
 {
   uint16_t *loc_frame_len;
   uint16_t frm_len = 0;
-  quarkX1000_eth_meta_t *loc_meta =
-    (quarkX1000_eth_meta_t *)PROT_DOMAINS_META(drv);
+  quarkX1000_eth_rx_desc_t tmp_desc;
+  quarkX1000_eth_meta_t ATTR_META_ADDR_SPACE *loc_meta =
+    (quarkX1000_eth_meta_t ATTR_META_ADDR_SPACE *)PROT_DOMAINS_META(drv);
 
   PROT_DOMAINS_VALIDATE_PTR(loc_frame_len, frame_len, sizeof(*frame_len));
 
+  META_READL(tmp_desc.rdes0, loc_meta->rx_desc.rdes0);
+
   /* Check whether the RX descriptor is still owned by the device.  If not,
    * process the received frame or an error that may have occurred.
    */
-  if(loc_meta->rx_desc.own == 0) {
-    if(loc_meta->rx_desc.err_summary) {
+  if(tmp_desc.own == 0) {
+    META_READL(tmp_desc.rdes1, loc_meta->rx_desc.rdes1);
+    if(tmp_desc.err_summary) {
       fprintf(stderr,
               LOG_PFX "Error receiving frame: RDES0 = %08x, RDES1 = %08x.\n",
-              loc_meta->rx_desc.rdes0, loc_meta->rx_desc.rdes1);
+              tmp_desc.rdes0, tmp_desc.rdes1);
       assert(0);
     }
 
-    frm_len = loc_meta->rx_desc.frm_len;
+    frm_len = tmp_desc.frm_len;
     assert(frm_len <= UIP_BUFSIZE);
-    memcpy(uip_buf, (void *)loc_meta->rx_buf, frm_len);
+    MEMCPY_FROM_META(uip_buf, loc_meta->rx_buf, frm_len);
 
     /* Return ownership of the RX descriptor to the device. */
-    loc_meta->rx_desc.own = 1;
+    tmp_desc.own = 1;
+
+    META_WRITEL(loc_meta->rx_desc.rdes0, tmp_desc.rdes0);
+
+    prot_domains_enable_mmio();
 
     /* Request that the device check for an available RX descriptor, since
      * ownership of the descriptor was just transferred to the device.
      */
     PCI_MMIO_WRITEL(drv, REG_ADDR_RX_POLL_DEMAND, 1);
+
+    prot_domains_disable_mmio();
   }
 
   *loc_frame_len = frm_len;
@@ -356,32 +385,45 @@ SYSCALLS_DEFINE_SINGLETON(quarkX1000_eth_poll, drv, uint16_t * frame_len)
  */
 SYSCALLS_DEFINE_SINGLETON(quarkX1000_eth_send, drv)
 {
-  quarkX1000_eth_meta_t *loc_meta =
-    (quarkX1000_eth_meta_t *)PROT_DOMAINS_META(drv);
+  quarkX1000_eth_tx_desc_t tmp_desc;
+  quarkX1000_eth_meta_t ATTR_META_ADDR_SPACE *loc_meta =
+    (quarkX1000_eth_meta_t ATTR_META_ADDR_SPACE *)PROT_DOMAINS_META(drv);
 
   /* Wait until the TX descriptor is no longer owned by the device. */
-  while(loc_meta->tx_desc.own == 1);
+  do {
+    META_READL(tmp_desc.tdes0, loc_meta->tx_desc.tdes0);
+  } while(tmp_desc.own == 1);
+
+  META_READL(tmp_desc.tdes1, loc_meta->tx_desc.tdes1);
 
   /* Check whether an error occurred transmitting the previous frame. */
-  if(loc_meta->tx_desc.err_summary) {
+  if(tmp_desc.err_summary) {
     fprintf(stderr,
             LOG_PFX "Error transmitting frame: TDES0 = %08x, TDES1 = %08x.\n",
-            loc_meta->tx_desc.tdes0, loc_meta->tx_desc.tdes1);
+            tmp_desc.tdes0, tmp_desc.tdes1);
     assert(0);
   }
 
   /* Transmit the next frame. */
   assert(uip_len <= UIP_BUFSIZE);
-  memcpy((void *)loc_meta->tx_buf, uip_buf, uip_len);
+  MEMCPY_TO_META(loc_meta->tx_buf, uip_buf, uip_len);
 
-  loc_meta->tx_desc.tx_buf1_sz = uip_len;
+  tmp_desc.tx_buf1_sz = uip_len;
 
-  loc_meta->tx_desc.own = 1;
+  META_WRITEL(loc_meta->tx_desc.tdes1, tmp_desc.tdes1);
+
+  tmp_desc.own = 1;
+
+  META_WRITEL(loc_meta->tx_desc.tdes0, tmp_desc.tdes0);
+
+  prot_domains_enable_mmio();
 
   /* Request that the device check for an available TX descriptor, since
    * ownership of the descriptor was just transferred to the device.
    */
   PCI_MMIO_WRITEL(drv, REG_ADDR_TX_POLL_DEMAND, 1);
+
+  prot_domains_disable_mmio();
 }
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/cpu/x86/drivers/quarkX1000/gpio.c b/cpu/x86/drivers/quarkX1000/gpio.c
index 642cad310..ba825c090 100644
--- a/cpu/x86/drivers/quarkX1000/gpio.c
+++ b/cpu/x86/drivers/quarkX1000/gpio.c
@@ -56,7 +56,11 @@
 
 #define HIGHEST_REG   LS_SYNC
 
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__PAGING
 #define MMIO_SZ       MIN_PAGE_SIZE
+#else
+#define MMIO_SZ       (HIGHEST_REG + 4)
+#endif
 
 PROT_DOMAINS_ALLOC(pci_driver_t, drv);
 
@@ -77,7 +81,9 @@ SYSCALLS_DEFINE_SINGLETON(quarkX1000_gpio_mmin, drv,
     halt();
   }
 
+  prot_domains_enable_mmio();
   PCI_MMIO_READL(drv, *loc_res, offset);
+  prot_domains_disable_mmio();
 }
 
 static inline uint32_t
@@ -96,7 +102,9 @@ SYSCALLS_DEFINE_SINGLETON(quarkX1000_gpio_mmout, drv,
     halt();
   }
 
+  prot_domains_enable_mmio();
   PCI_MMIO_WRITEL(drv, offset, val);
+  prot_domains_disable_mmio();
 }
 
 static inline void
diff --git a/cpu/x86/drivers/quarkX1000/i2c.c b/cpu/x86/drivers/quarkX1000/i2c.c
index 746e52b96..9e233e89c 100644
--- a/cpu/x86/drivers/quarkX1000/i2c.c
+++ b/cpu/x86/drivers/quarkX1000/i2c.c
@@ -51,7 +51,11 @@
 
 #define I2C_IRQ 9
 
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__PAGING
 #define MMIO_SZ MIN_PAGE_SIZE
+#else
+#define MMIO_SZ (QUARKX1000_IC_HIGHEST + 4)
+#endif
 
 typedef enum {
   I2C_DIRECTION_READ,
@@ -99,7 +103,9 @@ SYSCALLS_DEFINE_SINGLETON(quarkX1000_i2c_mmin, drv,
     halt();
   }
 
+  prot_domains_enable_mmio();
   PCI_MMIO_READL(drv, *loc_res, offset);
+  prot_domains_disable_mmio();
 }
 
 static inline uint32_t
@@ -119,7 +125,9 @@ SYSCALLS_DEFINE_SINGLETON(quarkX1000_i2c_mmout, drv,
     halt();
   }
 
+  prot_domains_enable_mmio();
   PCI_MMIO_WRITEL(drv, offset, val);
+  prot_domains_disable_mmio();
 }
 
 static inline void
diff --git a/cpu/x86/drivers/quarkX1000/uart.c b/cpu/x86/drivers/quarkX1000/uart.c
index dcd0af8f2..341e31cf7 100644
--- a/cpu/x86/drivers/quarkX1000/uart.c
+++ b/cpu/x86/drivers/quarkX1000/uart.c
@@ -49,7 +49,7 @@ void
 quarkX1000_uart_init(quarkX1000_uart_dev_t dev)
 {
   pci_config_addr_t pci_addr;
-  uart_16x50_driver_t *drv;
+  uart_16x50_driver_t ATTR_KERN_ADDR_SPACE *drv;
 
   assert((dev == QUARK_X1000_UART_0) || (dev == QUARK_X1000_UART_1));
 
@@ -78,7 +78,11 @@ quarkX1000_uart_init(quarkX1000_uart_dev_t dev)
 void
 quarkX1000_uart_tx(quarkX1000_uart_dev_t dev, uint8_t c)
 {
+  uart_16x50_driver_t drv;
   assert((dev == QUARK_X1000_UART_0) || (dev == QUARK_X1000_UART_1));
-  uart_16x50_tx((dev == QUARK_X1000_UART_0) ? quarkX1000_uart0 : quarkX1000_uart1, c);
+  prot_domains_copy_dcd(&drv,
+                        (dev == QUARK_X1000_UART_0) ?
+                          &quarkX1000_uart0 : &quarkX1000_uart1);
+  uart_16x50_tx(drv, c);
 }
 /*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/init/common/cpu.c b/cpu/x86/init/common/cpu.c
index 94ec2ddab..dd58b96d5 100644
--- a/cpu/x86/init/common/cpu.c
+++ b/cpu/x86/init/common/cpu.c
@@ -42,8 +42,11 @@ double_fault_handler(struct interrupt_context context)
   halt();
 }
 /*---------------------------------------------------------------------------*/
-/* The OS has switched to its own segment descriptors.  However, the protection
- * domain support, if enabled, has not yet been fully activated.
+/* The OS has switched to its own segment descriptors.  When multi-segment
+ * protection domain support is enabled, this routine runs with the
+ * necessary address translations configured to invoke other routines that
+ * require those translations to be in place.  However, the protection domain
+ * support, if enabled, has not yet been fully activated.
  */
 static void
 boot_stage1(void)
@@ -75,7 +78,8 @@ cpu_boot_stage0(void)
   uintptr_t top_of_stack = STACKS_INIT_TOP;
 
 #if X86_CONF_PROT_DOMAINS != X86_CONF_PROT_DOMAINS__NONE
-  uintptr_t *top_of_stack_ptr = (uintptr_t *)top_of_stack;
+  uintptr_t *top_of_stack_ptr =
+    (uintptr_t *)DATA_OFF_TO_PHYS_ADDR(top_of_stack);
 
   top_of_stack_ptr[0] = (uintptr_t)prot_domains_launch_kernel;
   top_of_stack_ptr[1] = (uintptr_t)prot_domains_launch_app;
diff --git a/cpu/x86/init/common/gdt.c b/cpu/x86/init/common/gdt.c
index f7fa10342..f63767850 100644
--- a/cpu/x86/init/common/gdt.c
+++ b/cpu/x86/init/common/gdt.c
@@ -72,7 +72,7 @@ set_descriptor(unsigned int index,
   segment_desc_init(&descriptor, base, len, flag);
 
   /* Save descriptor into gdt */
-  gdt[index] = descriptor;
+  gdt_insert_boot(index, descriptor);
 }
 /*---------------------------------------------------------------------------*/
 void
@@ -86,15 +86,17 @@ gdt_copy_desc_change_dpl(unsigned int dest_idx,
     halt();
   }
 
-  desc = gdt[src_idx];
+  gdt_lookup(src_idx, &desc);
   SEG_SET_FLAG(desc, DPL, dpl);
-  gdt[dest_idx] = desc;
+  gdt_insert(dest_idx, desc);
 }
 /*---------------------------------------------------------------------------*/
 /* This function initializes the Global Descriptor Table. For simplicity, the
- * memory is organized following the flat model. Thus, memory appears to
- * Contiki as a single continuous address space. Code, data, and stack
+ * memory is initially organized following the flat model. Thus, memory appears
+ * to Contiki as a single continuous address space. Code, data, and stack
  * are all contained in this address space (so called linear address space).
+ * Certain protection domain implementations switch to a multi-segment memory
+ * model later during boot.
  */
 void
 gdt_init(void)
@@ -103,7 +105,7 @@ gdt_init(void)
 
   /* Initialize gdtr structure */
   gdtr.limit = sizeof(segment_desc_t) * GDT_LEN - 1;
-  gdtr.base = (uint32_t) &gdt;
+  gdtr.base = KERN_DATA_OFF_TO_PHYS_ADDR(gdt);
 
   /* Initialize descriptors */
   set_descriptor(GDT_IDX_NULL, 0, 0, 0);
@@ -115,13 +117,20 @@ gdt_init(void)
 }
 /*---------------------------------------------------------------------------*/
 void
+gdt_insert_boot(unsigned int idx, segment_desc_t desc)
+{
+  ((segment_desc_t *)KERN_DATA_OFF_TO_PHYS_ADDR(gdt))[idx] = desc;
+}
+/*---------------------------------------------------------------------------*/
+void
 gdt_insert(unsigned int idx, segment_desc_t desc)
 {
   if(GDT_LEN <= idx) {
     halt();
   }
 
-  gdt[idx] = desc;
+  KERN_WRITEL(gdt[idx].raw_lo, desc.raw_lo);
+  KERN_WRITEL(gdt[idx].raw_hi, desc.raw_hi);
 }
 /*---------------------------------------------------------------------------*/
 void
@@ -131,6 +140,7 @@ gdt_lookup(unsigned int idx, segment_desc_t *desc)
     halt();
   }
 
-  *desc = gdt[idx];
+  KERN_READL(desc->raw_lo, gdt[idx].raw_lo);
+  KERN_READL(desc->raw_hi, gdt[idx].raw_hi);
 }
 /*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/init/common/gdt.h b/cpu/x86/init/common/gdt.h
index 37f1f4dbe..305e32716 100644
--- a/cpu/x86/init/common/gdt.h
+++ b/cpu/x86/init/common/gdt.h
@@ -35,13 +35,21 @@
 #include "prot-domains.h"
 #include "segmentation.h"
 
-extern segment_desc_t gdt[];
-extern int _ebss_gdt_addr;
+extern segment_desc_t ATTR_KERN_ADDR_SPACE gdt[];
+extern int ATTR_KERN_ADDR_SPACE _ebss_gdt_addr;
 
 #define GDT_IDX_OF_DESC(ptr)                      \
        ((((uintptr_t)(ptr)) - ((uintptr_t)&gdt))/ \
         sizeof(segment_desc_t))
 
+typedef struct far_pointer {
+  /** Far pointer offset. */
+  uint32_t offset;
+  /** Far pointer segment/gate selector. */
+  uint16_t sel;
+  uint16_t pad;
+} __attribute__((packed)) far_pointer_t;
+
 /**
  * \brief     Compute the selector for a GDT entry allocated somewhere besides gdt.c.
  * \param ptr Pointer to GDT descriptor.
@@ -49,14 +57,22 @@ extern int _ebss_gdt_addr;
  */
 #define GDT_SEL_OF_DESC(ptr, rpl) GDT_SEL(GDT_IDX_OF_DESC(ptr), rpl)
 
-#define ATTR_BSS_GDT       __attribute__((section(".gdt_bss")))
-#define ATTR_BSS_GDT_START __attribute__((section(".gdt_bss_start")))
+/* Section for fixed GDT entries */
+#define ATTR_BSS_GDT \
+  __attribute__((section(".gdt_bss"))) ATTR_KERN_ADDR_SPACE
+/* Section for TSS and LDT descriptors for protection domains */
+#define ATTR_BSS_GDT_MID \
+  __attribute__((used, section(".gdt_bss_mid"))) ATTR_KERN_ADDR_SPACE
+/* Section for other GDT entries */
+#define ATTR_BSS_GDT_START \
+  __attribute__((section(".gdt_bss_start"))) ATTR_KERN_ADDR_SPACE
 
 void gdt_copy_desc_change_dpl(unsigned int dest_idx,
                               unsigned int src_idx,
                               unsigned dpl);
 void gdt_init(void) ATTR_CODE_BOOT;
 void gdt_insert(unsigned int idx, segment_desc_t desc);
+void gdt_insert_boot(unsigned int idx, segment_desc_t desc) ATTR_CODE_BOOT;
 void gdt_lookup(unsigned int idx, segment_desc_t *desc);
 
 #endif /* GDT_H */
diff --git a/cpu/x86/init/common/idt.c b/cpu/x86/init/common/idt.c
index 441668a75..c5de5ed25 100644
--- a/cpu/x86/init/common/idt.c
+++ b/cpu/x86/init/common/idt.c
@@ -43,17 +43,23 @@ typedef struct idtr {
   uint32_t base;
 } __attribute__((packed)) idtr_t;
 
-typedef struct intr_gate_desc {
-  uint16_t    offset_low;
-  uint16_t    selector;   /* Segment Selector for destination code segment */
-  uint16_t    fixed:11;
-  uint16_t    d:1;        /* Size of gate: 1 = 32 bits; 0 = 16 bits */
-  uint16_t    pad:1;
-  uint16_t    dpl:2;      /* Descriptor Privilege Level */
-  uint16_t    p:1;        /* Segment Present flag */
-  uint16_t    offset_high;
-
-} __attribute__((packed)) intr_gate_desc_t;
+typedef union intr_gate_desc {
+  struct __attribute__((packed)) {
+    uint16_t    offset_low;
+    uint16_t    selector;   /* Segment Selector for destination code segment */
+    uint16_t    fixed:11;
+    uint16_t    d:1;        /* Size of gate: 1 = 32 bits; 0 = 16 bits */
+    uint16_t    pad:1;
+    uint16_t    dpl:2;      /* Descriptor Privilege Level */
+    uint16_t    p:1;        /* Segment Present flag */
+    uint16_t    offset_high;
+  };
+  uint64_t raw;
+  struct {
+    uint32_t raw_lo;
+    uint32_t raw_hi;
+  };
+} intr_gate_desc_t;
 
 /* According to Intel Combined Manual, Vol. 3, Section 6.10, the base addresses
  * of the IDT should be aligned on an 8-byte boundary to maximize performance
@@ -73,15 +79,19 @@ idt_set_intr_gate_desc(int intr_num,
                        uint16_t cs,
                        uint16_t dpl)
 {
-  intr_gate_desc_t *desc = &idt[intr_num];
+  intr_gate_desc_t desc;
 
-  desc->offset_low = offset & 0xFFFF;
-  desc->selector = cs;
-  desc->fixed = BIT(9) | BIT(10);
-  desc->d = 1;
-  desc->dpl = dpl;
-  desc->p = 1;
-  desc->offset_high = (offset >> 16) & 0xFFFF;
+  desc.offset_low = offset & 0xFFFF;
+  desc.selector = cs;
+  desc.fixed = BIT(9) | BIT(10);
+  desc.pad = 0;
+  desc.d = 1;
+  desc.dpl = dpl;
+  desc.p = 1;
+  desc.offset_high = (offset >> 16) & 0xFFFF;
+
+  KERN_WRITEL(idt[intr_num].raw_hi, desc.raw_hi);
+  KERN_WRITEL(idt[intr_num].raw_lo, desc.raw_lo);
 }
 /*---------------------------------------------------------------------------*/
 /* Initialize Interrupt Descriptor Table. The IDT is initialized with
@@ -95,7 +105,7 @@ idt_init(void)
 
   /* Initialize idtr structure */
   idtr.limit = (sizeof(intr_gate_desc_t) * NUM_DESC) - 1;
-  idtr.base = (uint32_t)&idt;
+  idtr.base = KERN_DATA_OFF_TO_PHYS_ADDR((uint32_t)idt);
 
   /* Load IDTR register */
   __asm__("lidt %0\n\t" :: "m" (idtr));
diff --git a/cpu/x86/init/common/idt.h b/cpu/x86/init/common/idt.h
index 18f168ad8..059e81705 100644
--- a/cpu/x86/init/common/idt.h
+++ b/cpu/x86/init/common/idt.h
@@ -34,7 +34,7 @@
 #include <stdint.h>
 #include "prot-domains.h"
 
-void idt_init(void) ATTR_CODE_BOOT;
+void idt_init(void);
 void idt_set_intr_gate_desc(int intr_num,
                             uint32_t offset,
                             uint16_t cs,
diff --git a/cpu/x86/mm/README.md b/cpu/x86/mm/README.md
index 8990beec9..dcd6370b4 100644
--- a/cpu/x86/mm/README.md
+++ b/cpu/x86/mm/README.md
@@ -5,13 +5,15 @@ Introduction
 ------------
 
 The X86 port of Contiki implements a simple, lightweight form of
-protection domains using a pluggable framework.  Currently, the
-following plugin is available:
+protection domains using a pluggable framework.  Currently, there are
+two plugins available:
 
  - Flat memory model with paging.
+ - Multi-segment memory model with hardware-switched segments based on
+   Task-State Segment (TSS) structures.
 
-For an introduction to paging and possible ways in which it can be
-used, refer to the following resources:
+For an introduction to paging and TSS and possible ways in which they
+can be used, refer to the following resources:
 
  - Intel Combined Manual (Intel 64 and IA-32 Architectures Software
    Developer's Manual), Vol. 3, Chapter 4
@@ -28,7 +30,7 @@ idealized principle is balanced against the practical objectives of
 limiting the number of relatively time-consuming context switches and
 minimizing changes to existing code.  In fact, no changes were made to
 code outside of the CPU- and platform-specific code directories for
-the initial plugin.
+the initial plugins.
 
 Each protection domain can optionally be associated with a metadata
 and/or MMIO region.  The hardware can support additional regions per
@@ -139,7 +141,11 @@ the one that was interrupted.  However, interrupts are only actually
 enabled in the application protection domain.
 
 Similarly, register contents may be accessed and modified across
-protection domain boundaries.
+protection domain boundaries in some protection domain
+implementations.  The TSS task switching mechanism automatically saves
+and restores many registers to and from TSS data structures when
+switching tasks, but the paging-based protection domain implementation
+does not perform analogous operations.
 
 For the reasons described above, each protection domain should only
 invoke other protection domains that it trusts to properly handle data
@@ -186,7 +192,9 @@ disabled.  Flat segments each map the whole 4GiB physical memory
 space.  This is the state of the system when the OS enters boot stage
 0.  This stage is responsible for setting up a new GDT and loading the
 segment registers with the appropriate descriptors from the new GDT to
-enable boot stage 1 to run.
+enable boot stage 1 to run.  Code in stage 1 for multi-segment
+protection domain implementations require that the appropriate
+segment-based address translations be configured.
 
 #### Boot Stage 1
 
@@ -258,17 +266,18 @@ Ring level 1 is unused.
 ### IO and Interrupt Privileges
 
 The kernel protection domain cooperative scheduling context needs
-access to IO ports, for device initialization.  Other protection
-domains may also require such access.  The IO Privilege Level (IOPL)
-that is assigned to a protection domain using the relevant bits in the
+access to IO ports, for device initialization.  Some other protection
+domains also require such access.  The IO Privilege Level (IOPL) that
+is assigned to a protection domain using the relevant bits in the
 EFLAGS field could be set according to whether IO port access is
-required in that protection domain.  However, this would introduce
-additional complexity and overhead in the critical system call and
-return dispatchers.  Instead, the IOPL is always set to block IO
-access from the cooperative scheduling context.  Port IO instructions
-in that context will then generate general protection faults, and the
-exception handler decodes and emulates authorized port IO
-instructions.
+required in that protection domain.  This is straightforward for TSS,
+which includes separate flags settings for each protection domain.
+However, this would introduce additional complexity and overhead in
+the critical system call and return dispatchers for other plugins.
+Instead, the IOPL is always set to block IO access from the
+cooperative scheduling context.  Port IO instructions in that context
+will then generate general protection faults, and the exception
+handler decodes and emulates authorized port IO instructions.
 
 Interrupts are handled at ring level 2, since they do not use any
 privileged instructions.  They do cause the interrupt flag to be
@@ -307,11 +316,15 @@ pivoting to the main stack and executing the handler.
 ### Protection Domain Control Structures (PDCSes)
 
 Each protection domain is managed by the kernel and privileged
-functions using a PDCS.  The PDCS structure is entirely
-software-defined.  The initial protection domain plugin does not
-support re-entrant protection domains to simplify the implementation
-of the plugin by enabling domain-specific information (e.g. system
-call return address) to be trivially stored in each PDCS.
+functions using a PDCS.  The structure of the PDCS is partially
+hardware-imposed in the cases of the two segment-based plugins, since
+the PDCS contains the Local Descriptor Table (LDT) and the TSS, if
+applicable.  In the paging plugin, the PDCS structure is entirely
+software-defined.  None of the initial protection domain plugins
+support re-entrant protection domains due to hardware-imposed
+limitations of TSS and to simplify the implementation of the other
+plugins by enabling domain-specific information (e.g. system call
+return address) to be trivially stored in each PDCS.
 
 ### Paging-Based Protection Domains
 
@@ -547,6 +560,293 @@ be possible to improve the robustness of the system by marking that
 data as read-only.  Doing so would introduce additional complexity
 into the system.
 
+### Hardware-Switched Segment-Based Protection Domains
+
+Primary implementation sources:
+
+ - cpu/x86/mm/tss-prot-domains.c
+ - cpu/x86/mm/tss-prot-domains-asm.S
+
+#### Introduction
+
+One TSS is allocated for each protection domain.  Each one is
+associated with its own dedicated LDT.  The memory resources assigned
+to each protection domain are represented as segment descriptors in
+the LDT for the protection domain.  Additional shared memory resources
+are represented as segment descriptors in the GDT.
+
+#### System Call and Return Dispatching
+
+The system call dispatcher runs in the context of the server
+protection domain.  It is a common piece of code that is shared among
+all protection domains.  Thus, each TSS, except the application TSS,
+has its EIP field initialized to the entrypoint for the system call
+dispatcher so that will be the first code to run when the first switch
+to that task is performed.
+
+The overall process of handling a system call can be illustrated at a
+high level as follows.  Some minor steps are omitted from this
+illustration in the interest of clarity and brevity.
+
+```
+ == BEGIN Client protection domain ==========================================
+ -- BEGIN Caller ------------------------------------------------------------
+  1.  Call system call stub.
+ --
+  13. Continue execution...
+ -- END Caller --------------------------------------------------------------
+ -- BEGIN System call stub --------------------------------------------------
+  2.  Already in desired (server) protection domain?
+    - No: Request task switch to server protection domain.
+    - Yes: Jump to system call body.
+ --
+  12. Return to caller.
+ -- END System call stub ----------------------------------------------------
+ == END Client protection domain ============================================
+ == BEGIN Server protection domain ==========================================
+ -- BEGIN System call dispatcher---------------------------------------------
+  3.  Check that the requested system call is allowed.  Get entrypoint.
+  4.  Switch to the main stack.
+  5.  Pop the client return address off the stack to a callee-saved register.
+  6.  Push the address of the system call return dispatcher onto the stack.
+  7.  Jump to system call body.
+ --
+  10. Restore the client return address to the stack.
+  11. Request task switch to client protection domain.
+ -- END System call dispatcher ----------------------------------------------
+ -- BEGIN System call body --------------------------------------------------
+  8.  Execute the work for the requested system call.
+  9.  Return (to system call return stub, unless invoked from server
+      protection domain, in which case return is to caller).
+ -- END System call body ----------------------------------------------------
+ == END Server protection domain ============================================
+```
+
+An additional exception handler is needed, for the "Device Not
+Available" exception.  The handler comprises just a CLTS and an IRET
+instruction.  The CLTS instruction is privileged, which is why it must
+be run at ring level 0.  This exception handler is invoked when a
+floating point instruction is used following a task switch, and its
+sole purpose is to enable the floating point instruction to execute
+after the exception handler returns.  See the TSS resources listed
+above for more details regarding interactions between task switching
+and floating point instructions.
+
+Each segment register may represent a different data region within
+each protection domain, although the FS register is used for two
+separate purposes at different times.  The segments are defined as
+follows:
+
+ - CS (code segment) maps all non-startup code with execute-only
+   permissions in all protection domains.  Limiting the code that is
+   executable within each protection domain to just the code that is
+   actually needed within that protection domain could improve the
+   robustness of the system, but it is challenging to determine all
+   code that may be needed in a given protection domain (e.g. all
+   needed library routines).  Furthermore, that code may not all be
+   contiguous, and each segment descriptor can only map a contiguous
+   memory region.  Finally, segment-based memory addressing is
+   relative to an offset of zero from the beginning of each segment,
+   introducing additional complexity if such fine-grained memory
+   management were to be used.
+ - DS (default data segment) typically maps the main stack and all
+   non-stack data memory that is accessible from all protection
+   domains.  Limiting the data that is accessible via DS within each
+   protection domain to just the subset of the data that is actually
+   needed within that protection domain could improve the robustness
+   of the system, but it is challenging for similar reasons to those
+   that apply to CS.  Access to the main stack via DS is supported so
+   that code that copies the stack pointer to a register and attempts
+   to access stack entries via DS works correctly.  Disallowing access
+   to the main stack via DS could improve the robustness of the
+   system, but that may require modifying code that expects to be able
+   to access the stack via DS.
+ - ES is loaded with the same segment descriptor as DS so that string
+   operations (e.g. the MOVS instruction) work correctly.
+ - FS usually maps the kernel-owned data region.  That region can only
+   be written via FS in the kernel protection domain.  FS contains a
+   descriptor specifying a read-only mapping in all other protection
+   domains except the application protection domain, in which FS is
+   nullified.  Requiring that code specifically request access to the
+   kernel-owned data region by using the FS segment may improve the
+   robustness of the system by blocking undesired accesses to the
+   kernel-owned data region via memory access instructions within the
+   kernel protection domain that implicitly access DS.  The reason for
+   granting read-only access to the kernel-owned data region from most
+   protection domains is that the system call dispatcher runs in the
+   context of the server protection domain to minimize overhead, and
+   it requires access to the kernel-owned data region.  It may improve
+   the robustness of the system to avoid this by running the system
+   call dispatcher in a more-privileged ring level (e.g. ring 1)
+   within the protection domain and just granting access to the
+   kernel-owned data region from that ring.  However, that would
+   necessitate a ring level transition to ring 3 when dispatching the
+   system call, which would increase overhead.  The application
+   protection domain does not export any system calls, so it does not
+   require access to the kernel-owned data region.
+ - FS is temporarily loaded with a segment descriptor that maps just
+   an MMIO region used by a driver protection domain when such a
+   driver needs to perform MMIO accesses.
+ - GS maps an optional region of readable and writable metadata that
+   can be associated with a protection domain.  In protection domains
+   that are not associated with metadata, GS is nullified.
+ - SS usually maps just the main stack.  This may improve the
+   robustness of the system by enabling immediate detection of stack
+   underflows and overflows rather than allowing such a condition to
+   result in silent data corruption.  Interrupt handlers use a stack
+   segment that covers the main stack and also includes a region above
+   the main stack that is specifically for use by interrupt handlers.
+   In like manner, exception handlers use a stack segment that covers
+   both of the other stacks and includes an additional region.  This
+   is to support the interrupt dispatchers that copy parameters from
+   the interrupt-specific stack region to the main stack prior to
+   pivoting to the main stack to execute an interrupt handler body.
+
+The approximate memory layout of the system is depicted below,
+starting with the highest physical addresses and proceeding to lower
+physical addresses.  The memory ranges that are mapped at various
+times by each of the segment registers are also depicted.  Read the
+descriptions of each segment above for more information about what
+memory range may be mapped by each segment register at various times
+with various protection domain configurations.  Parenthetical notes
+indicate the protection domains that can use each mapping.  The suffix
+[L] indicates that the descriptor is loaded from LDT.  Optional
+mappings are denoted by a '?' after the protection domain label.  The
+'other' protection domain label refers to protection domains other
+than the application and kernel domains.
+
+```
+ ...
+ +------------------------------------------+ \
+ | Domain X MMIO                            | +- FS[L]
+ +------------------------------------------+ /  (other?)
+ ...
+ +------------------------------------------+ \
+ | Domain X DMA-accessible metadata         | +- GS[L] (other?)
+ | (section .dma_bss)                       | |
+ +------------------------------------------+ /
+ +------------------------------------------+ \
+ | Domain X metadata (section .meta_bss)    | +- GS[L] (other?)
+ +------------------------------------------+ /
+ ...
+ +------------------------------------------+ \
+ | Kernel-private data                      | |
+ | (sections .prot_dom_bss, .gdt_bss, etc.) | +- FS[L] (kern)
+ +------------------------------------------+ |
+ +------------------------------------------+ \
+ | System call data (section .syscall_bss)  | |
+ +------------------------------------------+ +- FS[L] (all)
+ +------------------------------------------+ |
+ | Kernel-owned data (section .kern_bss)    | |
+ +------------------------------------------+ /
+ +------------------------------------------+             \
+ | Common data                              |             |
+ | (sections .data, .rodata*, .bss, etc.)   |             |
+ +------------------------------------------+             +- DS, ES
+ +------------------------------------------+ \           |  (all)
+ | Exception stack (section .exc_stack)     | |           |
+ |+----------------------------------------+| \           |
+ || Interrupt stack (section .int_stack)   || |           |
+ ||+--------------------------------------+|| \           |
+ ||| Main stack (section .main_stack)     ||| +- SS (all) |
+ +++--------------------------------------+++ /           /
+ +------------------------------------------+ \
+ | Main code (.text)                        | +- CS (all)
+ +------------------------------------------+ /
+ +------------------------------------------+
+ | Bootstrap code (section .boot_text)      |
+ +------------------------------------------+
+ +------------------------------------------+
+ | Multiboot header                         |
+ +------------------------------------------+
+ ...
+```
+
+This memory layout is more efficient than the layout that is possible
+with paging-based protection domains, since segments have byte
+granularity, whereas the minimum unit of control supported by paging
+is a 4KiB page.  For example, this means that metadata may need to be
+padded to be a multiple of the page size.  This may also permit
+potentially-undesirable accesses to padded areas of code and data
+regions that do not entirely fill the pages that they occupy.
+
+Kernel data structure access, including to the descriptor tables
+themselves, is normally restricted to the code running at ring level
+0, specifically the exception handlers and the system call and return
+dispatchers.  It is also accessible from the cooperative scheduling
+context in the kernel protection domain. Interrupt delivery is
+disabled in the kernel protection domain, so the preemptive scheduling
+context is not used.
+
+SS, DS, and ES all have the same base address, since the compiler may
+assume that a flat memory model is in use.  Memory accesses that use a
+base register of SP/ESP or BP/EBP or that are generated by certain
+other instructions (e.g. PUSH, RET, etc.) are directed to SS by
+default, whereas other accesses are directed to DS or ES by default.
+The compiler may use an instruction that directs an access to DS or ES
+even if the data being accessed is on the stack, which is why these
+three segments must use the same base address.  However, it is
+possible to use a lower limit for SS than for DS and ES for the
+following reasons.  Compilers commonly provide an option for
+preventing the frame pointer, EBP, from being omitted and possibly
+used to point to non-stack data.  In our tests, compilers never used
+ESP to point to non-stack data.
+
+Each task switch ends up saving and restoring more state than is
+actually useful to us, but the implementation attempts to minimize
+overhead by configuring the register values in each TSS to reduce the
+number of register loads that are needed in the system call
+dispatcher.  Specifically, two callee-saved registers are populated
+with base addresses used when computing addresses in the entrypoint
+information table as well as a mask corresponding to the ID of the
+server protection domain that is used to check whether the requested
+system call is exported by the server protection domain.  Callee-saved
+registers are used, since the task return will update the saved
+register values.
+
+Note that this implies that the intervening code run between the task
+call and return can modify critical data used by the system call
+dispatcher.  However, this is analogous to the considerations
+associated with sharing a single stack amongst all protection domains
+and should be addressed similarly, by only invoking protection domains
+that are trusted by the caller to not modify the saved critical
+values.  This consideration is specific to the TSS-based dispatcher
+and is not shared by the ring 0 dispatcher used in the other
+plugins.
+
+Data in the .rodata sections is marked read/write, even though it may
+be possible to improve the robustness of the system by marking that
+data as read-only.  Doing so would introduce even more complexity into
+the system than would be the case with paging-based protection
+domains, since it would require allocating different segment
+descriptors for the read-only vs. the read/write data.
+
+#### Supporting Null-Pointer Checks
+
+A lot of code considers a pointer value of 0 to be invalid.  However,
+segment offsets always start at 0.  To accommodate the common software
+behavior, at least the first byte of each segment is marked as
+unusable.  An exception to this is that the first byte of the stack
+segments is usable.
+
+#### Interrupt and Exception Dispatching
+
+A distinctive challenge that occurs during interrupt and exception
+dispatching is that the state of the segment registers when an
+interrupt or exception occurs is somewhat unpredictable.  For example,
+an exception may occur while MMIO is being performed, meaning that FS
+is loaded with the MMIO descriptor instead of the kernel descriptor.
+Leaving the segment registers configured in that way could cause
+incorrect interrupt or exception handler behavior.  Thus, the
+interrupt or exception dispatcher must save the current segment
+configuration, switch to a configuration that is suitable for the
+handler body, and then restore the saved segment configuration after
+the handler body returns.  Another motivation for this is that the
+interrupted code may have corrupted the segment register configuration
+in an unexpected manner, since segment register load instructions are
+unprivileged.  Similar segment register updates must be performed for
+similar reasons when dispatching system calls.
+
 ### Pointer Validation
 
 Primary implementation sources:
@@ -563,10 +863,14 @@ an unintended manner.  For example, if an incoming pointer referenced
 the return address, it could potentially redirect execution with the
 privileges of the callee protection domain.
 
-It is also necessary to check that the pointer is either within the
-stack region or the shared data region (or a guard band region, since
-that will generate a fault) to prevent redirection of data accesses to
-MMIO or metadata regions.
+When the paging-based plugin is in use, it is also necessary to check
+that the pointer is either within the stack region or the shared data
+region (or a guard band region, since that will generate a fault) to
+prevent redirection of data accesses to MMIO or metadata regions.  The
+other plugins already configure segments to restrict accesses to DS to
+just those regions.  Pointers provided as inputs to system calls as
+defined above should never be dereferenced in any segment other than
+DS.
 
 The pointer is both validated and copied to a new storage location,
 which must be within the callee's local stack region (excluding the
@@ -648,8 +952,11 @@ The following steps are required:
 Usage
 -----
 
-To enable protection domain support, add
-"X86_CONF_PROT_DOMAINS=paging" to the command line.
+To enable protection domain support, add "X86_CONF_PROT_DOMAINS=" to
+the command line and specify one of the following options:
+
+ - paging
+ - tss
 
 The paging option accepts a sub-option to determine whether the TLB is
 fully- or selectively-invalidated during protection domain switches.
diff --git a/cpu/x86/mm/gdt-layout.h b/cpu/x86/mm/gdt-layout.h
index 8a5af6cbf..5dddd3a4d 100644
--- a/cpu/x86/mm/gdt-layout.h
+++ b/cpu/x86/mm/gdt-layout.h
@@ -39,6 +39,8 @@
  * outside of gdt.c.
  */
 #define GDT_NUM_FIXED_DESC    7
+#elif X86_CONF_PROT_DOMAINS_MULTI_SEG
+#define GDT_NUM_FIXED_DESC    11
 #else
 #define GDT_NUM_FIXED_DESC    3
 #endif
@@ -66,12 +68,34 @@
 /** Stack segment for interrupt handlers */
 #define GDT_IDX_STK_INT       5
 
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__PAGING
 #define GDT_IDX_CODE_EXC      GDT_IDX_CODE_FLAT
 /** Default data segment used by code at all privilege levels */
 #define GDT_IDX_DATA          6
 #define GDT_IDX_STK           GDT_IDX_DATA
 #define GDT_IDX_STK_EXC       GDT_IDX_DATA_FLAT
 #else
+/**
+ * Same bounds and permissions as default code segment, but at the exception
+ * handler privilege level
+ */
+#define GDT_IDX_CODE_EXC      6
+/** R/W kernel data descriptor used during boot stage 1 */
+#define GDT_IDX_DATA_KERN_EXC 7
+/** Default data segment used by code at all privilege levels */
+#define GDT_IDX_DATA          8
+/**
+ * Default stack segment, which overlaps with the beginning of the default data
+ * segment
+ */
+#define GDT_IDX_STK           9
+/** Stack segment for exception handlers */
+#define GDT_IDX_STK_EXC       10
+
+#define GDT_IDX_TSS(dom_id)   (GDT_NUM_FIXED_DESC + (2 * (dom_id)))
+#define GDT_IDX_LDT(dom_id)   (GDT_NUM_FIXED_DESC + (2 * (dom_id)) + 1)
+#endif
+#else
 #define GDT_IDX_CODE          GDT_IDX_CODE_FLAT
 #define GDT_IDX_CODE_INT      GDT_IDX_CODE_FLAT
 #define GDT_IDX_CODE_EXC      GDT_IDX_CODE_FLAT
@@ -96,10 +120,14 @@
 #define GDT_SEL_CODE_EXC      GDT_SEL(GDT_IDX_CODE_EXC, PRIV_LVL_EXC)
 
 #define GDT_SEL_DATA          GDT_SEL(GDT_IDX_DATA, PRIV_LVL_EXC)
+#define GDT_SEL_DATA_KERN_EXC GDT_SEL(GDT_IDX_DATA_KERN_EXC, PRIV_LVL_EXC)
 
 #define GDT_SEL_STK           GDT_SEL(GDT_IDX_STK, PRIV_LVL_USER)
 #define GDT_SEL_STK_INT       GDT_SEL(GDT_IDX_STK_INT, PRIV_LVL_INT)
 #define GDT_SEL_STK_EXC       GDT_SEL(GDT_IDX_STK_EXC, PRIV_LVL_EXC)
 
+#define GDT_SEL_TSS(dom_id)   GDT_SEL(GDT_IDX_TSS(dom_id), PRIV_LVL_USER)
+#define GDT_SEL_LDT(dom_id)   GDT_SEL(GDT_IDX_LDT(dom_id), PRIV_LVL_USER)
+
 #endif /* CPU_X86_MM_GDT_LAYOUT_H_ */
 
diff --git a/cpu/x86/mm/ldt-layout.h b/cpu/x86/mm/ldt-layout.h
new file mode 100644
index 000000000..7c61054a5
--- /dev/null
+++ b/cpu/x86/mm/ldt-layout.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_MM_LDT_LAYOUT_H_
+#define CPU_X86_MM_LDT_LAYOUT_H_
+
+#include "gdt-layout.h"
+
+/* Each LDT can contain up to this many descriptors, but some protection
+ * domains may not use all of the slots.
+ */
+#define LDT_NUM_DESC 3
+
+/**
+ * Provides access to kernel data.  Most protection domains are granted at most
+ * read-only access, but the kernel protection domain is granted read/write
+ * access.
+ */
+#define LDT_IDX_KERN 0
+/** Maps a device MMIO range */
+#define LDT_IDX_MMIO 1
+/** Maps domain-defined metadata */
+#define LDT_IDX_META 2
+
+#define LDT_SEL(idx, rpl) (GDT_SEL(idx, rpl) | (1 << 2))
+
+#define LDT_SEL_KERN      LDT_SEL(LDT_IDX_KERN, PRIV_LVL_USER)
+#define LDT_SEL_MMIO      LDT_SEL(LDT_IDX_MMIO, PRIV_LVL_USER)
+#define LDT_SEL_META      LDT_SEL(LDT_IDX_META, PRIV_LVL_USER)
+#define LDT_SEL_STK       LDT_SEL(LDT_IDX_STK, PRIV_LVL_USER)
+
+#endif /* CPU_X86_MM_LDT_LAYOUT_H_ */
diff --git a/cpu/x86/mm/multi-segment.c b/cpu/x86/mm/multi-segment.c
new file mode 100644
index 000000000..f60a2c8bb
--- /dev/null
+++ b/cpu/x86/mm/multi-segment.c
@@ -0,0 +1,239 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+#include "gdt.h"
+#include "helpers.h"
+#include "prot-domains.h"
+#include "segmentation.h"
+#include "stacks.h"
+
+/*---------------------------------------------------------------------------*/
+static uint32_t
+segment_desc_compute_base(segment_desc_t desc)
+{
+  return (desc.base_hi << 24) | (desc.base_mid << 16) | desc.base_lo;
+}
+/*---------------------------------------------------------------------------*/
+void
+prot_domains_reg_multi_seg(volatile struct dom_kern_data ATTR_KERN_ADDR_SPACE *dkd,
+                           uintptr_t mmio, size_t mmio_sz,
+                           uintptr_t meta, size_t meta_sz)
+{
+  segment_desc_t desc;
+  dom_id_t dom_id = PROT_DOMAINS_GET_DOM_ID(dkd);
+  uint32_t kern_data_len;
+  uint32_t tmp;
+
+  if((dkd < prot_domains_kern_data) ||
+     (prot_domains_kern_data_end <= dkd) ||
+     (((((uintptr_t)dkd) - (uintptr_t)prot_domains_kern_data) %
+         sizeof(dom_kern_data_t)) != 0)) {
+    halt();
+  }
+
+  KERN_READL(tmp, dkd->ldt[DT_SEL_GET_IDX(LDT_SEL_KERN)].raw_hi);
+  if(tmp != 0) {
+    /* This PDCS was previously initialized, which is disallowed. */
+    halt();
+  }
+
+  /* Initialize descriptors */
+
+  if(dom_id == DOM_ID_kern) {
+    kern_data_len = (uint32_t)&_ebss_kern_addr;
+  } else {
+    /* Non-kernel protection domains do not need to access the protection
+     * domain control structures, and they may contain saved register values
+     * that are private to each domain.
+     */
+    kern_data_len = (uint32_t)&_ebss_syscall_addr;
+  }
+  kern_data_len -= (uint32_t)&_sbss_kern_addr;
+
+  segment_desc_init(&desc, (uint32_t)&_sbss_kern_addr, kern_data_len,
+    /* Every protection domain requires at least read-only access to kernel
+       data to read dom_client_data structures and to support the system call
+       dispatcher, if applicable.  Only the kernel protection domain is granted
+       read/write access to the kernel data. */
+                    ((dom_id == DOM_ID_kern) ?
+                        SEG_TYPE_DATA_RDWR :
+                        SEG_TYPE_DATA_RDONLY) |
+                    SEG_FLAG(DPL, PRIV_LVL_USER) |
+                    SEG_GRAN_BYTE | SEG_DESCTYPE_NSYS);
+
+  KERN_WRITEL(dkd->ldt[LDT_IDX_KERN].raw_lo, desc.raw_lo);
+  KERN_WRITEL(dkd->ldt[LDT_IDX_KERN].raw_hi, desc.raw_hi);
+
+  if(mmio_sz != 0) {
+    if(SEG_MAX_BYTE_GRAN_LEN < mmio_sz) {
+      halt();
+    }
+
+    segment_desc_init(&desc, mmio, mmio_sz,
+                      SEG_FLAG(DPL, PRIV_LVL_USER) | SEG_GRAN_BYTE |
+                      SEG_DESCTYPE_NSYS | SEG_TYPE_DATA_RDWR);
+  } else {
+    desc.raw = SEG_DESC_NOT_PRESENT;
+  }
+
+  KERN_WRITEL(dkd->ldt[LDT_IDX_MMIO].raw_lo, desc.raw_lo);
+  KERN_WRITEL(dkd->ldt[LDT_IDX_MMIO].raw_hi, desc.raw_hi);
+
+  if(meta_sz != 0) {
+    if(SEG_MAX_BYTE_GRAN_LEN < meta_sz) {
+      halt();
+    }
+
+    segment_desc_init(&desc, meta, meta_sz,
+                      SEG_FLAG(DPL, PRIV_LVL_USER) | SEG_GRAN_BYTE |
+                      SEG_DESCTYPE_NSYS | SEG_TYPE_DATA_RDWR);
+  } else {
+    desc.raw = SEG_DESC_NOT_PRESENT;
+  }
+
+  KERN_WRITEL(dkd->ldt[LDT_IDX_META].raw_lo, desc.raw_lo);
+  KERN_WRITEL(dkd->ldt[LDT_IDX_META].raw_hi, desc.raw_hi);
+
+  segment_desc_init(&desc,
+                    KERN_DATA_OFF_TO_PHYS_ADDR(dkd->ldt),
+                    sizeof(dkd->ldt),
+                    SEG_FLAG(DPL, PRIV_LVL_USER) | SEG_GRAN_BYTE |
+                    SEG_DESCTYPE_SYS | SEG_TYPE_LDT);
+  gdt_insert(GDT_IDX_LDT(dom_id), desc);
+}
+/*---------------------------------------------------------------------------*/
+void
+prot_domains_gdt_init()
+{
+  int i;
+  segment_desc_t desc;
+
+  segment_desc_init(&desc,
+                    (uint32_t)&_stext_addr,
+                    ((uint32_t)&_etext_addr) - (uint32_t)&_stext_addr,
+                    SEG_FLAG(DPL, PRIV_LVL_EXC) | SEG_GRAN_BYTE |
+                    SEG_DESCTYPE_NSYS | SEG_TYPE_CODE_EX);
+  gdt_insert_boot(GDT_IDX_CODE_EXC, desc);
+
+  segment_desc_init(&desc,
+                    (uint32_t)&_sdata_addr,
+                    ((uint32_t)&_edata_addr) - (uint32_t)&_sdata_addr,
+                    SEG_FLAG(DPL, PRIV_LVL_USER) | SEG_GRAN_BYTE |
+                    SEG_DESCTYPE_NSYS | SEG_TYPE_DATA_RDWR);
+  gdt_insert_boot(GDT_IDX_DATA, desc);
+
+  segment_desc_init(&desc,
+                    (uint32_t)&_sbss_kern_addr,
+                    ((uint32_t)&_ebss_kern_addr) -
+                    (uint32_t)&_sbss_kern_addr,
+                    SEG_FLAG(DPL, PRIV_LVL_EXC) | SEG_GRAN_BYTE |
+                    SEG_DESCTYPE_NSYS | SEG_TYPE_DATA_RDWR);
+  gdt_insert_boot(GDT_IDX_DATA_KERN_EXC, desc);
+
+  segment_desc_init(&desc,
+                    (uint32_t)DATA_OFF_TO_PHYS_ADDR(stacks_main),
+                    STACKS_SIZE_MAIN,
+                    SEG_FLAG(DPL, PRIV_LVL_USER) | SEG_GRAN_BYTE |
+                    SEG_DESCTYPE_NSYS | SEG_TYPE_DATA_RDWR);
+  gdt_insert_boot(GDT_IDX_STK, desc);
+
+  segment_desc_set_limit(&desc, STACKS_SIZE_MAIN + STACKS_SIZE_INT);
+  SEG_SET_FLAG(desc, DPL, PRIV_LVL_INT);
+  gdt_insert_boot(GDT_IDX_STK_INT, desc);
+
+  segment_desc_set_limit(&desc,
+                         STACKS_SIZE_MAIN +
+                         STACKS_SIZE_INT +
+                         STACKS_SIZE_EXC);
+  SEG_SET_FLAG(desc, DPL, PRIV_LVL_EXC);
+  gdt_insert_boot(GDT_IDX_STK_EXC, desc);
+
+  /* Not all domains will necessarily be initialized, so this initially marks
+   * all per-domain descriptors not-present.
+   */
+  desc.raw = SEG_DESC_NOT_PRESENT;
+  for(i = 0; i < PROT_DOMAINS_ACTUAL_CNT; i++) {
+    gdt_insert_boot(GDT_IDX_TSS(i), desc);
+    gdt_insert_boot(GDT_IDX_LDT(i), desc);
+  }
+
+  __asm__ __volatile__ (
+      "mov %[_default_data_], %%ds\n\t"
+      "mov %[_default_data_], %%es\n\t"
+      "mov %[_kern_data_], %%" SEG_KERN "s\n\t"
+      :
+      : [_default_data_] "r"(GDT_SEL_DATA),
+        [_kern_data_] "r"(GDT_SEL_DATA_KERN_EXC));
+}
+/*---------------------------------------------------------------------------*/
+void
+multi_segment_launch_kernel(void)
+{
+  /* Update segment registers. */
+  __asm__ __volatile__ (
+    "mov %[_data_seg_], %%ds\n\t"
+    "mov %[_data_seg_], %%es\n\t"
+    "mov %[_kern_seg_], %%" SEG_KERN "s\n\t"
+    "mov %[_data_seg_], %%" SEG_META "s\n\t"
+    :
+    : [_data_seg_] "r" (GDT_SEL_DATA),
+      [_kern_seg_] "r" (LDT_SEL_KERN)
+    );
+}
+/*---------------------------------------------------------------------------*/
+void
+prot_domains_enable_mmio(void)
+{
+  __asm__ __volatile__ ("mov %0, %%" SEG_MMIO "s" :: "r" (LDT_SEL_MMIO));
+}
+/*---------------------------------------------------------------------------*/
+void
+prot_domains_disable_mmio(void)
+{
+  __asm__ __volatile__ ("mov %0, %%" SEG_KERN "s" :: "r" (LDT_SEL_KERN));
+}
+/*---------------------------------------------------------------------------*/
+uintptr_t
+prot_domains_lookup_meta_phys_base(dom_client_data_t ATTR_KERN_ADDR_SPACE *drv)
+{
+  dom_id_t dom_id;
+  segment_desc_t desc;
+  volatile dom_kern_data_t ATTR_KERN_ADDR_SPACE *dkd;
+
+  KERN_READL(dom_id, drv->dom_id);
+
+  dkd = prot_domains_kern_data + dom_id;
+
+  KERN_READL(desc.raw_lo, dkd->ldt[DT_SEL_GET_IDX(LDT_SEL_META)].raw_lo);
+  KERN_READL(desc.raw_hi, dkd->ldt[DT_SEL_GET_IDX(LDT_SEL_META)].raw_hi);
+
+  return segment_desc_compute_base(desc);
+}
+/*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/mm/multi-segment.h b/cpu/x86/mm/multi-segment.h
new file mode 100644
index 000000000..baa28002b
--- /dev/null
+++ b/cpu/x86/mm/multi-segment.h
@@ -0,0 +1,195 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_MM_MULTI_SEGMENT_H_
+#define CPU_X86_MM_MULTI_SEGMENT_H_
+
+#include <stdint.h>
+#include <stdlib.h>
+#include "helpers.h"
+#include "ldt-layout.h"
+
+#ifdef __clang__
+#define __SEG_FS
+#define __seg_fs __attribute__((address_space(257)))
+#define __SEG_GS
+#define __seg_gs __attribute__((address_space(256)))
+#endif
+
+#ifdef __SEG_FS
+#define ATTR_MMIO_ADDR_SPACE __seg_fs
+#define ATTR_KERN_ADDR_SPACE __seg_fs
+#else
+#define ATTR_KERN_ADDR_SPACE
+#endif
+#ifdef __SEG_GS
+#define ATTR_META_ADDR_SPACE __seg_gs
+#endif
+
+void prot_domains_reg_multi_seg(volatile struct dom_kern_data ATTR_KERN_ADDR_SPACE *dkd,
+                                uintptr_t mmio, size_t mmio_sz,
+                                uintptr_t meta, size_t meta_sz);
+void multi_segment_launch_kernel(void);
+
+#define MULTI_SEGMENT_ENTER_ISR(exc)                                          \
+  "mov $" EXP_STRINGIFY(GDT_SEL_DATA) ", %%eax\n\t"                           \
+  /* Refresh DS and ES in case the userspace code corrupted them.         */  \
+  "mov %%eax, %%ds\n\t"                                                       \
+  "mov %%eax, %%es\n\t"                                                       \
+  /* Refresh SEG_KERN.                                                    */  \
+  "mov $" EXP_STRINGIFY(LDT_SEL_KERN) ", %%eax\n\t"                           \
+  "mov %%eax, %%" SEG_KERN "s\n\t"                                            \
+  ".if " #exc "\n\t"                                                          \
+  /* It is possible that a routine performing MMIO is being interrupted.  */  \
+  /* Thus, it is necessary to save and restore the MMIO segment register  */  \
+  /* (in a callee-saved register).                                        */  \
+  "mov %%" SEG_MMIO "s, %%ebp\n\t"                                            \
+  "mov $" EXP_STRINGIFY(GDT_SEL_DATA_KERN_EXC) ", %%eax\n\t"                  \
+  "mov %%eax, %%" SEG_KERN "s\n\t"                                            \
+  ".endif\n\t"
+#define MULTI_SEGMENT_LEAVE_ISR(exc)                                          \
+  ".if " #exc "\n\t"                                                          \
+  "mov %%ebp, %%" SEG_MMIO "s\n\t"                                            \
+  ".endif\n\t"
+
+/**
+ * The MMIO region is tightly bounded within a segment, so its base offset is
+ * always 0.
+ */
+#define PROT_DOMAINS_MMIO(dcd) 0
+/**
+ * The metadata region is tightly bounded within a segment, so its base offset
+ * is always 0.
+ */
+#define PROT_DOMAINS_META(dcd) 0
+
+#define SEG_MMIO "f" /**< For MMIO accesses, when enabled. */
+#define SEG_KERN "f" /**< For kernel data accesses */
+#define SEG_META "g" /**< For metadata accesses */
+
+#define _SEG_READL(seg, dst, src)                                             \
+  __asm__ __volatile__ (                                                      \
+    "movl %%" seg "s:%[src_], %[dst_]" : [dst_]"=r"(dst) : [src_]"m"(src))
+
+#define _SEG_READW(seg, dst, src)                                             \
+  __asm__ __volatile__ (                                                      \
+    "movw %%" seg "s:%[src_], %[dst_]" : [dst_]"=r"(dst) : [src_]"m"(src))
+
+#define _SEG_READB(seg, dst, src)                                             \
+  __asm__ __volatile__ (                                                      \
+    "movb %%" seg "s:%[src_], %[dst_]" : [dst_]"=q"(dst) : [src_]"m"(src))
+
+#define _SEG_WRITEL(seg, dst, src)                                            \
+  __asm__ __volatile__ (                                                      \
+    "movl %[src_], %%" seg "s:%[dst_]"                                        \
+    : [dst_]"=m"(dst) : [src_]"r"((uint32_t)(src)))
+
+#define _SEG_WRITEW(seg, dst, src)                                            \
+  __asm__ __volatile__ (                                                      \
+    "movw %[src_], %%" seg "s:%[dst_]"                                        \
+    : [dst_]"=m"(dst) : [src_]"r"((uint16_t)(src)))
+
+#define _SEG_WRITEB(seg, dst, src)                                            \
+  __asm__ __volatile__ (                                                      \
+    "movb %[src_], %%" seg "s:%[dst_]"                                        \
+    : [dst_]"=m"(dst) : [src_]"q"((uint8_t)(src)))
+
+#ifndef __SEG_FS
+#define MMIO_READL(dst, src)  _SEG_READL(SEG_MMIO, dst, src)
+#define MMIO_READW(dst, src)  _SEG_READW(SEG_MMIO, dst, src)
+#define MMIO_READB(dst, src)  _SEG_READB(SEG_MMIO, dst, src)
+#define MMIO_WRITEL(dst, src) _SEG_WRITEL(SEG_MMIO, dst, src)
+#define MMIO_WRITEW(dst, src) _SEG_WRITEW(SEG_MMIO, dst, src)
+#define MMIO_WRITEB(dst, src) _SEG_WRITEB(SEG_MMIO, dst, src)
+
+#define KERN_READL(dst, src)  _SEG_READL(SEG_KERN, dst, src)
+#define KERN_READW(dst, src)  _SEG_READW(SEG_KERN, dst, src)
+#define KERN_READB(dst, src)  _SEG_READB(SEG_KERN, dst, src)
+#define KERN_WRITEL(dst, src) _SEG_WRITEL(SEG_KERN, dst, src)
+#define KERN_WRITEW(dst, src) _SEG_WRITEW(SEG_KERN, dst, src)
+#define KERN_WRITEB(dst, src) _SEG_WRITEB(SEG_KERN, dst, src)
+#endif
+
+#ifndef __SEG_GS
+#define META_READL(dst, src)  _SEG_READL(SEG_META, dst, src)
+#define META_READW(dst, src)  _SEG_READW(SEG_META, dst, src)
+#define META_READB(dst, src)  _SEG_READB(SEG_META, dst, src)
+#define META_WRITEL(dst, src) _SEG_WRITEL(SEG_META, dst, src)
+#define META_WRITEW(dst, src) _SEG_WRITEW(SEG_META, dst, src)
+#define META_WRITEB(dst, src) _SEG_WRITEB(SEG_META, dst, src)
+#endif
+
+#define MEMCPY_FROM_META(dst, src, sz)                                        \
+  {                                                                           \
+    uintptr_t __dst = (uintptr_t)(dst);                                       \
+    uintptr_t __src = (uintptr_t)(src);                                       \
+    size_t __sz = (size_t)(sz);                                               \
+    __asm__ __volatile__ (                                                    \
+      "rep movsb %%" SEG_META "s:(%%esi), %%es:(%%edi)\n\t"                   \
+      : "+D"(__dst), "+S"(__src), "+c"(__sz));                                \
+  }
+
+#define MEMCPY_TO_META(dst, src, sz)                                          \
+  {                                                                           \
+    uintptr_t __dst = (uintptr_t)(dst);                                       \
+    uintptr_t __src = (uintptr_t)(src);                                       \
+    size_t __sz = (size_t)(sz);                                               \
+    __asm__ __volatile__ (                                                    \
+      "push %%es\n\t"                                                         \
+      "push %%" SEG_META "s\n\t"                                              \
+      "pop %%es\n\t"                                                          \
+      "rep movsb\n\t"                                                         \
+      "pop %%es\n\t"                                                          \
+      : "+D"(__dst), "+S"(__src), "+c"(__sz));                                \
+  }
+
+/** Compute physical address from offset into kernel data space */
+#define KERN_DATA_OFF_TO_PHYS_ADDR(x)                                         \
+  (((uintptr_t)&_sbss_kern_addr) + (uintptr_t)(x))
+/** Compute physical address from offset into default data space */
+#define DATA_OFF_TO_PHYS_ADDR(x)                                              \
+  (((uintptr_t)&_sdata_addr) + (uintptr_t)(x))
+/** Compute kernel data offset from physical address in kernel data space */
+#define PHYS_ADDR_TO_KERN_DATA_OFF(x)                                         \
+  (((uintptr_t)(x)) - (uintptr_t)&_sbss_kern_addr)
+
+/**
+ * In multi-segment protection domain implementations, it is sufficient to just
+ * compare incoming pointers against the frame pointer.  All incoming pointers
+ * are dereferenced in the main data segment, which only maps the stacks and
+ * the shared data section.  Since the shared data section is at a higher
+ * address range than the stacks, the frame pointer check is sufficient.
+ */
+#define PROT_DOMAINS_CHECK_INCOMING_PTR PROT_DOMAINS_CHECK_INCOMING_PTR_EBP
+
+void prot_domains_enable_mmio(void);
+void prot_domains_disable_mmio(void);
+
+#endif /* CPU_X86_MM_MULTI_SEGMENT_H_ */
diff --git a/cpu/x86/mm/prot-domains.c b/cpu/x86/mm/prot-domains.c
index 593da98e2..8bbeb4d83 100644
--- a/cpu/x86/mm/prot-domains.c
+++ b/cpu/x86/mm/prot-domains.c
@@ -39,10 +39,12 @@
 #include "stacks.h"
 
 static dom_kern_data_t __attribute__((section(".kern_prot_dom_bss")))
-  PROT_DOMAINS_PDCS_NM(kern_dcd);
+  ATTR_KERN_ADDR_SPACE PROT_DOMAINS_PDCS_NM(kern_dcd);
+PROT_DOMAINS_ALLOC_IMPL(kern_dcd);
 static dom_client_data_t ATTR_BSS_KERN kern_dcd;
 static dom_kern_data_t __attribute__((section(".app_prot_dom_bss")))
-  PROT_DOMAINS_PDCS_NM(app_dcd);
+  ATTR_KERN_ADDR_SPACE PROT_DOMAINS_PDCS_NM(app_dcd);
+PROT_DOMAINS_ALLOC_IMPL(app_dcd);
 static dom_client_data_t ATTR_BSS_KERN app_dcd;
 
 /*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/mm/prot-domains.h b/cpu/x86/mm/prot-domains.h
index f7dc84e3c..a1fbca130 100644
--- a/cpu/x86/mm/prot-domains.h
+++ b/cpu/x86/mm/prot-domains.h
@@ -40,6 +40,10 @@
 
 #define X86_CONF_PROT_DOMAINS__NONE   0
 #define X86_CONF_PROT_DOMAINS__PAGING 1
+#define X86_CONF_PROT_DOMAINS__TSS    2
+
+#define X86_CONF_PROT_DOMAINS_MULTI_SEG                                       \
+  (X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__TSS)
 
 /** Privilege level (ring) for exception handlers and other supervisory code */
 #define PRIV_LVL_EXC  0
@@ -68,6 +72,49 @@ typedef uint32_t dom_id_t;
 
 #if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__PAGING
 #include "paging-prot-domains.h"
+#elif X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__TSS
+#include "tss-prot-domains.h"
+#endif
+
+#ifndef ATTR_META_ADDR_SPACE
+#define ATTR_META_ADDR_SPACE
+#endif
+#ifndef ATTR_MMIO_ADDR_SPACE
+#define ATTR_MMIO_ADDR_SPACE
+#endif
+#ifndef ATTR_KERN_ADDR_SPACE
+#define ATTR_KERN_ADDR_SPACE
+#endif
+
+#ifndef MMIO_READL
+#define MMIO_READL(dst, src) dst = (src)
+#define MMIO_READW(dst, src) dst = (src)
+#define MMIO_READB(dst, src) dst = (src)
+#define MMIO_WRITEL(dst, src) MMIO_READL(dst, src)
+#define MMIO_WRITEW(dst, src) MMIO_READW(dst, src)
+#define MMIO_WRITEB(dst, src) MMIO_READB(dst, src)
+#endif
+#ifndef KERN_READL
+#define KERN_READL(dst, src) dst = (src)
+#define KERN_READW(dst, src) dst = (src)
+#define KERN_READB(dst, src) dst = (src)
+#define KERN_WRITEL(dst, src) KERN_READL(dst, src)
+#define KERN_WRITEW(dst, src) KERN_READW(dst, src)
+#define KERN_WRITEB(dst, src) KERN_READB(dst, src)
+#endif
+#ifndef META_READL
+#define META_READL(dst, src) dst = (src)
+#define META_READW(dst, src) dst = (src)
+#define META_READB(dst, src) dst = (src)
+#define META_WRITEL(dst, src) META_READL(dst, src)
+#define META_WRITEW(dst, src) META_READw(dst, src)
+#define META_WRITEB(dst, src) META_READB(dst, src)
+#endif
+
+#ifndef MEMCPY_FROM_META
+#define MEMCPY_FROM_META(dst, src, sz) \
+  memcpy((void *)(dst), (const void *)(src), (sz))
+#define MEMCPY_TO_META(dst, src, sz) MEMCPY_FROM_META(dst, src, sz)
 #endif
 
 /* The following symbols are defined in the linker script */
@@ -77,9 +124,9 @@ extern uint32_t _stext_addr, _etext_addr;
 #if X86_CONF_PROT_DOMAINS != X86_CONF_PROT_DOMAINS__NONE
 
 /** Metadata that should not be DMA-accessible */
-#define ATTR_BSS_META __attribute__((section(".meta_bss")))
+#define ATTR_BSS_META __attribute__((section(".meta_bss"))) ATTR_META_ADDR_SPACE
 /** Kernel-owned data */
-#define ATTR_BSS_KERN __attribute__((section(".kern_bss")))
+#define ATTR_BSS_KERN __attribute__((section(".kern_bss"))) ATTR_KERN_ADDR_SPACE
 /** Code that should only be executable during bootup */
 #define ATTR_CODE_BOOT __attribute__((section(".boot_text")))
 
@@ -97,6 +144,10 @@ extern uint32_t _ebss_syscall_addr;
 /** Bounds for other data sections */
 extern uint32_t _sdata_addr, _edata_addr;
 
+#ifndef SEG_KERN
+#define SEG_KERN "d"
+#endif
+
 /**
  * If set, this protection domain is already in the call stack and is not
  * available for nested invocations.
@@ -114,8 +165,8 @@ extern uint32_t _sdata_addr, _edata_addr;
  */
 typedef struct dom_kern_data dom_kern_data_t;
 
-extern volatile dom_kern_data_t prot_domains_kern_data[];
-extern volatile dom_kern_data_t prot_domains_kern_data_end[];
+extern volatile dom_kern_data_t ATTR_KERN_ADDR_SPACE prot_domains_kern_data[];
+extern volatile dom_kern_data_t ATTR_KERN_ADDR_SPACE prot_domains_kern_data_end[];
 
 #define PROT_DOMAINS_ACTUAL_CNT                                               \
   (prot_domains_kern_data_end - prot_domains_kern_data)
@@ -125,6 +176,7 @@ extern volatile dom_kern_data_t prot_domains_kern_data_end[];
 
 void prot_domains_syscall_dispatcher(void);
 
+#if X86_CONF_PROT_DOMAINS != X86_CONF_PROT_DOMAINS__TSS
 /**
  * Data associated with each protection domain that is owned by clients of that
  * domain and used to identify the domain.
@@ -132,15 +184,21 @@ void prot_domains_syscall_dispatcher(void);
 struct dom_client_data {
   dom_id_t dom_id;
 } __attribute__((packed));
+#endif
+
+#ifndef PROT_DOMAINS_ALLOC_IMPL
+#define PROT_DOMAINS_ALLOC_IMPL(nm)
+#endif
 
 /** Allocate the client-owned protection domain data structure. */
 #define PROT_DOMAINS_PDCS_NM(nm) _pdcs_##nm
 #define PROT_DOMAINS_ALLOC(typ, nm)                                           \
   static dom_kern_data_t __attribute__((section(".prot_dom_bss")))            \
-    PROT_DOMAINS_PDCS_NM(nm);                                                 \
+    ATTR_KERN_ADDR_SPACE PROT_DOMAINS_PDCS_NM(nm);                            \
+  PROT_DOMAINS_ALLOC_IMPL(nm);                                                \
   static typ ATTR_BSS_KERN nm
 #define PROT_DOMAINS_INIT_ID(nm)                                              \
-  (nm).dom_id = PROT_DOMAINS_GET_DOM_ID(&PROT_DOMAINS_PDCS_NM(nm))
+  KERN_WRITEL((nm).dom_id, PROT_DOMAINS_GET_DOM_ID(&PROT_DOMAINS_PDCS_NM(nm)))
 
 /**
  * Perform early initialization during boot stage 0 to prepare for boot stage 1
@@ -169,8 +227,12 @@ void prot_domains_launch_kernel(void);
  */
 #define PROT_DOMAINS_INIT_RET_ADDR_CNT 2
 
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__TSS
+void prot_domains_launch_app(void);
+#else
 void app_main(void);
 #define prot_domains_launch_app app_main
+#endif
 
 #else
 
@@ -229,7 +291,7 @@ typedef struct dom_client_data dom_client_data_t;
  * \param meta_sz Size of metadata
  * \param pio     Set to true if protection domain requires port IO access
  */
-void prot_domains_reg(dom_client_data_t *dcd,
+void prot_domains_reg(dom_client_data_t ATTR_KERN_ADDR_SPACE *dcd,
                       uintptr_t mmio,
                       size_t mmio_sz,
                       uintptr_t meta,
@@ -237,11 +299,41 @@ void prot_domains_reg(dom_client_data_t *dcd,
                       bool pio);
 #endif
 
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__NONE
+#define prot_domains_copy_dcd(dst, src) *(dst) = *(src)
+#else
+static inline void
+/**
+ * It is necessary to make a local copy of a dom_client_data structure when a
+ * multi-segment protection domain implementation is in use, segment attributes
+ * are not supported by the compiler, and a dom_client_data structure needs to
+ * be passed by value into some function. Otherwise, the compiler will not know
+ * to access the non-default segment in which *src is stored and will attempt
+ * to copy it out of the default data segment.
+ */
+prot_domains_copy_dcd(struct dom_client_data *dst,
+                      struct dom_client_data ATTR_KERN_ADDR_SPACE *src)
+{
+  KERN_READL(dst->dom_id, src->dom_id);
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__TSS
+  KERN_READL(dst->tss_sel, src->tss_sel);
+#endif
+}
+#endif
+
+#if !X86_CONF_PROT_DOMAINS_MULTI_SEG
+#define prot_domains_enable_mmio()
+#define prot_domains_disable_mmio()
+
+#define KERN_DATA_OFF_TO_PHYS_ADDR(x) ((uintptr_t)(x))
+#define DATA_OFF_TO_PHYS_ADDR(x) ((uintptr_t)(x))
+#endif
+
 #if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__NONE
 #define prot_domains_lookup_meta_phys_base(drv) 0
 #else
 /** Lookup base physical address of metadata region for specified domain */
-uintptr_t prot_domains_lookup_meta_phys_base(dom_client_data_t *drv);
+uintptr_t prot_domains_lookup_meta_phys_base(dom_client_data_t ATTR_KERN_ADDR_SPACE *drv);
 #endif
 
 #if X86_CONF_PROT_DOMAINS != X86_CONF_PROT_DOMAINS__PAGING
@@ -270,6 +362,11 @@ uintptr_t prot_domains_lookup_meta_phys_base(dom_client_data_t *drv);
   ".endif\n\t"
 #endif
 
+#ifdef X86_CONF_PROT_DOMAINS_MULTI_SEG
+/* include GDT section definitions used when allocating protection domains: */
+#include "gdt.h"
+#endif
+
 #endif /* !__ASSEMBLER__ */
 
 #endif /* CPU_X86_MM_PROT_DOMAINS_H_ */
diff --git a/cpu/x86/mm/segmentation.h b/cpu/x86/mm/segmentation.h
index 57b1b8aea..71cd6beb6 100644
--- a/cpu/x86/mm/segmentation.h
+++ b/cpu/x86/mm/segmentation.h
@@ -59,8 +59,11 @@
 #define SEG_WIDTH_GRAN       1
 #define SEG_SHAMT_GRAN       15
 
+#define SEG_TYPE_DATA_RDONLY SEG_FLAG(TYPE, 0x00) /* Read only */
 #define SEG_TYPE_DATA_RDWR   SEG_FLAG(TYPE, 0x02) /* Read/Write */
 #define SEG_TYPE_CODE_EXRD   SEG_FLAG(TYPE, 0x0A) /* Execute/Read */
+#define SEG_TYPE_CODE_EX     SEG_FLAG(TYPE, 0x08) /* Execute only */
+#define SEG_TYPE_LDT         SEG_FLAG(TYPE, 0x02)
 #define SEG_TYPE_TSS32_AVAIL SEG_FLAG(TYPE, 0x09)
 
 #define SEG_DESCTYPE_SYS     SEG_FLAG(DESCTYPE, 0)
@@ -73,6 +76,12 @@
 #define SEG_GRAN_BYTE        SEG_FLAG(GRAN, 0)
 #define SEG_GRAN_PAGE        SEG_FLAG(GRAN, 1)
 
+/**
+ * Maximum length of segment that can be regulated with a byte-granularity
+ * segment limit.
+ */
+#define SEG_MAX_BYTE_GRAN_LEN (1 << 20)
+
 /**
  * Segment descriptor.  See Intel Combined Manual,
  * Vol. 3, Section 3.4.5 for more details.
@@ -91,7 +100,13 @@ typedef union segment_desc {
   uint64_t raw;
 } segment_desc_t;
 
-static inline void
+#define SEG_DESC_NOT_PRESENT 0
+
+/* The next two functions are invoked by boot code, so they must always be
+ * inlined to avoid being placed in a different address space than the initial,
+ * flat address space.
+ */
+static inline void __attribute__((always_inline))
 segment_desc_set_limit(segment_desc_t *c_this, uint32_t len)
 {
   uint32_t limit = len - 1;
@@ -108,7 +123,7 @@ segment_desc_set_limit(segment_desc_t *c_this, uint32_t len)
  * \param flags  Flags to be added to the default flags: present, default
  *               operand size of 32 bits, and high limit bits.
  */
-static inline void
+static inline void __attribute__((always_inline))
 segment_desc_init(segment_desc_t *c_this,
                   uint32_t base, uint32_t len, uint16_t flags)
 {
diff --git a/cpu/x86/mm/stacks.h b/cpu/x86/mm/stacks.h
index a1005d8e0..96be72cf9 100644
--- a/cpu/x86/mm/stacks.h
+++ b/cpu/x86/mm/stacks.h
@@ -61,6 +61,17 @@
 #else
 #define STACKS_SIZE_EXC 256
 #endif
+#elif X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__TSS
+/**
+ * This should be large enough to execute the exception handler with the
+ * largest stack requirement: double_fault_handler:
+ *  - 1 word for the return address from calling double_fault_handler
+ *  - 1 word for the saved frame pointer in double_fault_handler
+ *  - 2 words that GCC has been observed to skip on the stack to align it
+ *    to a preferred boundary
+ *  - 1 word for the return address for calling halt
+ */
+#define STACKS_SIZE_EXC (STACKS_SIZE_INT + (6 * 4))
 #else
 #define STACKS_SIZE_EXC STACKS_SIZE_INT
 #endif
diff --git a/cpu/x86/mm/syscalls.h b/cpu/x86/mm/syscalls.h
index 83be7a47e..cae8ff2f5 100644
--- a/cpu/x86/mm/syscalls.h
+++ b/cpu/x86/mm/syscalls.h
@@ -33,6 +33,7 @@
 
 #include "helpers.h"
 #include "prot-domains.h"
+#include <stdbool.h>
 
 typedef uint32_t dom_id_bitmap_t;
 
@@ -40,8 +41,8 @@ typedef struct syscalls_entrypoint {
   uintptr_t entrypoint;
   dom_id_bitmap_t doms;
 } syscalls_entrypoint_t;
-extern syscalls_entrypoint_t syscalls_entrypoints[];
-extern syscalls_entrypoint_t syscalls_entrypoints_end[];
+extern syscalls_entrypoint_t ATTR_KERN_ADDR_SPACE syscalls_entrypoints[];
+extern syscalls_entrypoint_t ATTR_KERN_ADDR_SPACE syscalls_entrypoints_end[];
 
 #define SYSCALLS_ACTUAL_CNT (syscalls_entrypoints_end - syscalls_entrypoints)
 
@@ -49,11 +50,11 @@ extern syscalls_entrypoint_t syscalls_entrypoints_end[];
 
 #define SYSCALLS_ALLOC_ENTRYPOINT(nm)                                         \
   syscalls_entrypoint_t __attribute__((section(".syscall_bss")))              \
-    _syscall_ent_##nm
+    ATTR_KERN_ADDR_SPACE _syscall_ent_##nm
 
 #define SYSCALLS_INIT(nm)                                                     \
-  _syscall_ent_##nm.entrypoint = (uintptr_t)_syscall_##nm;                    \
-  _syscall_ent_##nm.doms = 0
+  KERN_WRITEL(_syscall_ent_##nm.entrypoint, (uintptr_t)_syscall_##nm);        \
+  KERN_WRITEL(_syscall_ent_##nm.doms, 0)
 
 #define SYSCALLS_DEFINE(nm, ...)                                              \
   void _syscall_##nm(__VA_ARGS__);                                            \
@@ -65,8 +66,19 @@ extern syscalls_entrypoint_t syscalls_entrypoints_end[];
   SYSCALLS_STUB_SINGLETON(nm, dcd);                                           \
   void _syscall_##nm(__VA_ARGS__)
 
-#define SYSCALLS_AUTHZ(nm, drv) _syscall_ent_##nm.doms |= BIT((drv).dom_id)
-#define SYSCALLS_DEAUTHZ(nm, drv) _syscall_ent_##nm.doms &= ~BIT((drv).dom_id)
+#define SYSCALLS_AUTHZ_UPD(nm, drv, set)                                      \
+  {                                                                           \
+    dom_id_t _sc_tmp_id;                                                      \
+    dom_id_bitmap_t _sc_tmp_bm;                                               \
+    KERN_READL(_sc_tmp_id, (drv).dom_id);                                     \
+    KERN_READL(_sc_tmp_bm, _syscall_ent_##nm.doms);                           \
+    if(set) {                                                                 \
+      _sc_tmp_bm |= BIT(_sc_tmp_id);                                          \
+    } else {                                                                  \
+      _sc_tmp_bm &= ~BIT(_sc_tmp_id);                                         \
+    }                                                                         \
+    KERN_WRITEL(_syscall_ent_##nm.doms, _sc_tmp_bm);                          \
+  }
 
 /**
  * Check that any untrusted pointer that could have been influenced by a caller
@@ -78,7 +90,11 @@ extern syscalls_entrypoint_t syscalls_entrypoints_end[];
  *
  * This also checks that the pointer is either within the stack region or the
  * shared data region, which is important for preventing redirection of data
- * accesses to MMIO or metadata regions.
+ * accesses to MMIO or metadata regions.  This check is omitted for multi-
+ * segment protection domain implementations, since the segment settings
+ * already enforce this property for pointers dereferenced in DS.  Pointers
+ * that can be influenced by a caller should not be dereferenced in any other
+ * segment.
  *
  * The pointer is both validated and copied to a new storage location, which
  * must be within the callee's local stack region (excluding the parameter
@@ -92,6 +108,14 @@ extern syscalls_entrypoint_t syscalls_entrypoints_end[];
  * references the return address, it could potentially redirect execution with
  * the privileges of the callee protection domain.
  */
+#if X86_CONF_PROT_DOMAINS_MULTI_SEG
+#define PROT_DOMAINS_VALIDATE_PTR(validated, untrusted, sz)                   \
+  validated = untrusted;                                                      \
+  if(((uintptr_t)(validated)) <                                               \
+      ((2 * sizeof(uintptr_t)) + (uintptr_t)__builtin_frame_address(0))) {    \
+    halt();                                                                   \
+  }
+#else
 #define PROT_DOMAINS_VALIDATE_PTR(validated, untrusted, sz)                   \
   validated = untrusted;                                                      \
   if((((uintptr_t)(validated)) <                                              \
@@ -99,6 +123,7 @@ extern syscalls_entrypoint_t syscalls_entrypoints_end[];
      (((uintptr_t)&_edata_addr) <= (((uintptr_t)(validated)) + (sz)))) {      \
     halt();                                                                   \
   }
+#endif
 
 #else
 
@@ -106,10 +131,12 @@ extern syscalls_entrypoint_t syscalls_entrypoints_end[];
 #define SYSCALLS_INIT(nm)
 #define SYSCALLS_DEFINE(nm, ...) void nm(__VA_ARGS__)
 #define SYSCALLS_DEFINE_SINGLETON(nm, dcd, ...) void nm(__VA_ARGS__)
-#define SYSCALLS_AUTHZ(nm, drv)
-#define SYSCALLS_DEAUTHZ(nm, drv)
+#define SYSCALLS_AUTHZ_UPD(nm, drv, set)
 #define PROT_DOMAINS_VALIDATE_PTR(validated, untrusted, sz) validated = untrusted
 
 #endif
 
+#define SYSCALLS_AUTHZ(nm, drv) SYSCALLS_AUTHZ_UPD(nm, drv, true)
+#define SYSCALLS_DEAUTHZ(nm, drv) SYSCALLS_AUTHZ_UPD(nm, drv, false)
+
 #endif /* CPU_X86_MM_SYSCALLS_H_ */
diff --git a/cpu/x86/mm/tss-prot-domains-asm.S b/cpu/x86/mm/tss-prot-domains-asm.S
new file mode 100644
index 000000000..45832a62c
--- /dev/null
+++ b/cpu/x86/mm/tss-prot-domains-asm.S
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+.text
+
+/* Initialize the TSS fields in prot_domains_reg accordingly:
+ * Note: Each of these must be a callee-saved register, so that they are
+ * restored to their original values prior to the task returning.  This will
+ * result in the same values being loaded when the task is next invoked.
+ */
+#define CUR_DOM_ID_BITMAP                esi
+
+/* Must match SEG_KERN (plus the trailing 's') in multi-segment.h */
+#define SEG_KERN fs
+
+.global prot_domains_syscall_dispatcher
+prot_domains_syscall_dispatcher:
+#define PROT_DOMAINS_SYSCALL eax
+  mov prot_domains_syscall, %PROT_DOMAINS_SYSCALL
+  cmp $syscalls_entrypoints, %PROT_DOMAINS_SYSCALL
+  jl halt
+  cmp $syscalls_entrypoints_end, %PROT_DOMAINS_SYSCALL
+  jnl halt
+#define SYSCALLS_ENTRYPOINTS_ALIGN_MASK  ebp
+  mov $3, %SYSCALLS_ENTRYPOINTS_ALIGN_MASK
+  and %PROT_DOMAINS_SYSCALL, %SYSCALLS_ENTRYPOINTS_ALIGN_MASK
+  jnz halt
+
+  /* Compare allowed domains bitmask against current domain ID bitmap.  If
+   * the check fails, then the current domain ID bitmap value will be zeroed
+   * out, which could cause incorrect behavior in the future.  However, the
+   * response to a failed check is to halt the system, so destroying the
+   * current domain ID bitmap value will have no effect.
+   */
+  and %SEG_KERN:4(%PROT_DOMAINS_SYSCALL), %CUR_DOM_ID_BITMAP
+  jz halt
+
+  mov prot_domains_main_esp, %esp
+
+  /* Must be a callee-saved register: */
+#define ORIG_RET_ADDR edi
+  /* Update the caller's stack to return back to here */
+  pop %ORIG_RET_ADDR
+  push $sysret_dispatcher
+  /* Jump to the system call body */
+  jmp *%SEG_KERN:(%PROT_DOMAINS_SYSCALL)
+
+sysret_dispatcher:
+  push %ORIG_RET_ADDR
+
+  iret
+
+  /* The task will resume here for the next system call, so it is necessary
+   * to jump back to the top.
+   */
+  jmp prot_domains_syscall_dispatcher
+
+.global dev_not_avail_isr
+dev_not_avail_isr:
+  clts
+  iret
diff --git a/cpu/x86/mm/tss-prot-domains.c b/cpu/x86/mm/tss-prot-domains.c
new file mode 100644
index 000000000..40041a6d1
--- /dev/null
+++ b/cpu/x86/mm/tss-prot-domains.c
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2015-2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+#include <stdint.h>
+#include <string.h>
+#include "gdt.h"
+#include "helpers.h"
+#include "idt.h"
+#include "prot-domains.h"
+#include "stacks.h"
+#include "syscalls.h"
+#include "tss.h"
+
+uint32_t prot_domains_main_esp;
+syscalls_entrypoint_t ATTR_KERN_ADDR_SPACE *prot_domains_syscall;
+
+/*---------------------------------------------------------------------------*/
+void app_main(void);
+void
+prot_domains_reg(dom_client_data_t ATTR_KERN_ADDR_SPACE *dcd,
+                 uintptr_t mmio, size_t mmio_sz,
+                 uintptr_t meta, size_t meta_sz,
+                 bool pio)
+{
+  segment_desc_t desc;
+  uint32_t eflags;
+  dom_id_t dom_id;
+  volatile struct dom_kern_data ATTR_KERN_ADDR_SPACE *dkd;
+
+  KERN_READL(dom_id, dcd->dom_id);
+
+  dkd = prot_domains_kern_data + dom_id;
+
+  prot_domains_reg_multi_seg(dkd, mmio, mmio_sz, meta, meta_sz);
+
+  /* Only the kernel protection domain requires port I/O access outside of the
+   * interrupt handlers.
+   */
+  eflags = EFLAGS_IOPL(pio ? PRIV_LVL_USER : PRIV_LVL_INT);
+  if(dom_id == DOM_ID_app) {
+    eflags |= EFLAGS_IF;
+  }
+
+  /* Keep this initialization in sync with the register definitions in
+   * tss-prot-domains-asm.S.
+   */
+  KERN_WRITEL(dkd->tss.ebp, 0);
+  KERN_WRITEL(dkd->tss.ebx, 0);
+  KERN_WRITEL(dkd->tss.esi, BIT(dom_id));
+  KERN_WRITEL(dkd->tss.eip,
+             (dom_id == DOM_ID_app) ?
+             (uint32_t)app_main :
+             (uint32_t)prot_domains_syscall_dispatcher);
+  KERN_WRITEL(dkd->tss.cs, GDT_SEL_CODE);
+  KERN_WRITEL(dkd->tss.ds, GDT_SEL_DATA);
+  KERN_WRITEL(dkd->tss.es, GDT_SEL_DATA);
+  KERN_WRITEL(dkd->tss.fs, LDT_SEL_KERN);
+  KERN_WRITEL(dkd->tss.gs,
+             (meta_sz == 0) ? GDT_SEL_NULL : LDT_SEL_META);
+  KERN_WRITEL(dkd->tss.ss, GDT_SEL_STK);
+  /* This stack pointer is only actually used in application protection domain.
+   * Other domains enter at system call dispatcher, which switches to main
+   * stack.
+   */
+  KERN_WRITEL(dkd->tss.esp,
+             /* Two return addresses have been consumed: */
+             STACKS_INIT_TOP + (2 * sizeof(uintptr_t)));
+  KERN_WRITEL(dkd->tss.eflags, eflags);
+  KERN_WRITEL(dkd->tss.ldt, GDT_SEL_LDT(dom_id));
+  KERN_WRITEL(dkd->tss.esp2, STACKS_SIZE_MAIN + STACKS_SIZE_INT);
+  KERN_WRITEL(dkd->tss.ss2, GDT_SEL_STK_INT);
+  KERN_WRITEL(dkd->tss.esp0,
+             STACKS_SIZE_MAIN + STACKS_SIZE_INT + STACKS_SIZE_EXC);
+  KERN_WRITEL(dkd->tss.ss0, GDT_SEL_STK_EXC);
+  KERN_WRITEW(dkd->tss.t, 0);
+  KERN_WRITEW(dkd->tss.iomap_base, sizeof(tss_t));
+  KERN_WRITEL(dkd->tss.cr3, 0);
+
+  segment_desc_init(&desc,
+                    KERN_DATA_OFF_TO_PHYS_ADDR((uint32_t)&(dkd->tss)),
+                    sizeof(dkd->tss),
+                    /* It should be possible for code at any privilege level to invoke the task's
+                     * system call dispatcher.
+                     */
+                    SEG_FLAG(DPL, PRIV_LVL_USER) | SEG_TYPE_TSS32_AVAIL);
+
+  gdt_insert(GDT_IDX_TSS(dom_id), desc);
+
+  KERN_WRITEW(dcd->tss_sel, GDT_SEL(GDT_IDX_TSS(dom_id), PRIV_LVL_USER));
+}
+/*---------------------------------------------------------------------------*/
+void dev_not_avail_isr(void);
+void
+prot_domains_impl_init(void)
+{
+  __asm__ __volatile__ ("ltr %0" :: "r" ((uint16_t)GDT_SEL_TSS(DOM_ID_kern)));
+  __asm__ __volatile__ ("lldt %0" :: "r" ((uint16_t)GDT_SEL_LDT(DOM_ID_kern)));
+
+  idt_set_intr_gate_desc(7,
+                         (uint32_t)dev_not_avail_isr,
+                         GDT_SEL_CODE_EXC, PRIV_LVL_EXC);
+}
+/*---------------------------------------------------------------------------*/
+int main();
+void
+prot_domains_launch_kernel(void)
+{
+  multi_segment_launch_kernel();
+
+  /* Activate kernel protection domain, entering the kernel at main. */
+  __asm__ __volatile__ (
+    "pushl %[_ss_]\n\t"
+    "pushl %[_top_of_stk_]\n\t"
+    "pushl %[_eflags_]\n\t"
+    "pushl %[_cs_]\n\t"
+    "pushl %[_kern_start_]\n\t"
+    "iretl\n\t"
+    :
+    : [_ss_] "g" (GDT_SEL_STK),
+      [_eflags_] "g" (EFLAGS_IOPL(PRIV_LVL_USER)),
+      [_cs_] "g" (GDT_SEL_CODE),
+      [_kern_start_] "g" (main),
+      /* one address has already been consumed */
+      [_top_of_stk_] "g" (STACKS_INIT_TOP + sizeof(uint32_t))
+    );
+}
+/*---------------------------------------------------------------------------*/
+void
+prot_domains_launch_app()
+{
+  far_pointer_t app_ptr = { 0, GDT_SEL_TSS(DOM_ID_app) };
+  __asm__ __volatile__ ("ljmp *%0" :: "m" (app_ptr));
+}
+/*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/mm/tss-prot-domains.h b/cpu/x86/mm/tss-prot-domains.h
new file mode 100644
index 000000000..d61d97504
--- /dev/null
+++ b/cpu/x86/mm/tss-prot-domains.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2015-2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_MM_TSS_PROT_DOMAINS_H_
+#define CPU_X86_MM_TSS_PROT_DOMAINS_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include "ldt-layout.h"
+#include "segmentation.h"
+#include "tss.h"
+
+struct dom_kern_data {
+  /** Task State Segment */
+  tss_t tss;
+  /** Local Descriptor Table with per-domain descriptors */
+  segment_desc_t ldt[LDT_NUM_DESC];
+} __attribute__((packed));
+
+/* relies on dom_kern_data: */
+#include "multi-segment.h"
+
+/* relies on ATTR_KERN_ADDR_SPACE: */
+#include "syscalls.h"
+
+/**
+ * Data associated with each protection domain that is owned by clients of that
+ * domain and used to identify the domain.
+ */
+struct dom_client_data {
+  dom_id_t dom_id;
+  /** The selector is only 16 bits, but it is padded to 32 bits. */
+  uint32_t tss_sel;
+};
+
+extern uint32_t prot_domains_main_esp;
+
+#define SYSCALLS_STUB_MIDDLE(nm)                                              \
+  /* If already in the callee protection domain, skip the protection */       \
+  /* domain switch and directly invoke the system call body */                \
+  "  je _syscall_" #nm "\n\t"                                                 \
+  "  movl $" EXP_STRINGIFY(_syscall_ent_##nm) ", prot_domains_syscall\n\t"    \
+  "  mov %esp, prot_domains_main_esp\n\t"
+
+#define SYSCALLS_STUB(nm)                                                     \
+  SYSCALLS_ALLOC_ENTRYPOINT(nm);                                              \
+  asm (                                                                       \
+    ".text\n\t"                                                               \
+    ".global " #nm "\n\t"                                                     \
+    #nm ":\n\t"                                                               \
+    "  str %ax\n\t"                                                           \
+    /* Compare current Task Register selector to selector for callee */       \
+    /* protection domain, in tss_sel field of dom_client_data */              \
+    "  cmpw %ax, 8(%esp)\n\t"                                                 \
+    SYSCALLS_STUB_MIDDLE(nm)                                                  \
+    /* This will treat the dom_id field as the offset for the call, but */    \
+    /* that is ignored when performing a far call to a task */                \
+    "  lcall *4(%esp)\n\t"                                                    \
+    "  ret\n\t")
+
+#define SYSCALLS_STUB_SINGLETON(nm, dcd)                                      \
+  SYSCALLS_ALLOC_ENTRYPOINT(nm);                                              \
+  asm (                                                                       \
+    ".text\n\t"                                                               \
+    ".global " #nm "\n\t"                                                     \
+    #nm ":\n\t"                                                               \
+    "  str %ax\n\t"                                                           \
+    /* Compare current Task Register selector to selector for callee */       \
+    /* protection domain, in tss_sel field of dom_client_data */              \
+    "  cmpw %ax, %" SEG_KERN "s:(4 + " #dcd ")\n\t"                           \
+    SYSCALLS_STUB_MIDDLE(nm)                                                  \
+    /* This will treat the dom_id field as the offset for the call, but */    \
+    /* that is ignored when performing a far call to a task */                \
+    "  lcall *%" SEG_KERN "s:" #dcd "\n\t"                                    \
+    "  ret\n\t")
+
+#define PROT_DOMAINS_ENTER_ISR(exc)                                           \
+  MULTI_SEGMENT_ENTER_ISR(exc)                                                \
+  /* It is possible that the system call dispatcher is being interrupted, */  \
+  /* and some interrupt handlers perform system calls.  Thus, it is       */  \
+  /* necessary to save and restore the system call dispatcher parameters  */  \
+  /* (in callee-saved registers).                                         */  \
+  "mov prot_domains_main_esp, %%esi\n\t"                                      \
+  "mov prot_domains_syscall, %%edi\n\t"                                       \
+  PROT_DOMAINS_ENTER_ISR_COMMON(exc)
+#define PROT_DOMAINS_LEAVE_ISR(exc)                                           \
+  PROT_DOMAINS_LEAVE_ISR_COMMON(exc)                                          \
+  "mov %%edi, prot_domains_syscall\n\t"                                       \
+  "mov %%esi, prot_domains_main_esp\n\t"                                      \
+  MULTI_SEGMENT_LEAVE_ISR(exc)
+
+/* Allocate two additional GDT entries for each protection domain.  Note that
+ * the particular storage allocated by this statement may actually be used for
+ * some other protection domain, depending on how the linker happens to arrange
+ * all of the GDT storage.  The GDT_IDX_TSS and GDT_IDX_LDT macros in
+ * gdt-layout.h determine which storage is used for each protection domain.
+ * Thus, this storage should not be referenced directly by its variable name.
+ */
+#define PROT_DOMAINS_ALLOC_IMPL(nm)                                           \
+  static segment_desc_t ATTR_BSS_GDT_MID _gdt_storage_##nm[2]
+
+#endif /* CPU_X86_MM_TSS_PROT_DOMAINS_H_ */
diff --git a/cpu/x86/quarkX1000.ld b/cpu/x86/quarkX1000.ld
index 2f90b7c70..be91a74c7 100644
--- a/cpu/x86/quarkX1000.ld
+++ b/cpu/x86/quarkX1000.ld
@@ -87,4 +87,6 @@ SECTIONS {
         */
         _ebss_gdt_addr = .;
     }
+
+    _ebss_pre_dma_addr = ALIGN(32);
 }
diff --git a/cpu/x86/quarkX1000_dma.ld b/cpu/x86/quarkX1000_dma.ld
index fe3b79861..4cecac839 100644
--- a/cpu/x86/quarkX1000_dma.ld
+++ b/cpu/x86/quarkX1000_dma.ld
@@ -30,26 +30,18 @@
 
 SECTIONS {
 
-    /*
-       It would be more natural to use a 1K alignment for this entire section.
-       However, the UEFI GenFw program ratchets up its alignment
-       granularity to the maximum granularity discovered in its input file.
-       Using 1K-alignment perturbs the symbols, hindering debugging.  Thus,
-       this section is simply padded out to the desired alignment and
-       declared to have a section alignment of only 32 bytes.
-
-       The alignment directives used here suffice even when paging is in use,
-       because this is the last section and directly follows one (.bss.meta)
-       that is 4K-aligned.
-    */
-    .bss.dma (NOLOAD) : ALIGN (32)
+    .bss.dma (NOLOAD) : AT(_ebss_pre_dma_addr) ALIGN (32)
     {
-        /* The IMR feature operates at 1K granularity. */
-        . = ALIGN(1K);
-        _sbss_dma_addr = .;
+        /* IMRs are used to restrict DMA, and they require 1K physical address alignment. */
+        . += ALIGN(_ebss_pre_dma_addr, 1K) - ALIGN(_ebss_pre_dma_addr, 32);
         *(.dma_bss)
-        . = ALIGN(1K);
-        _ebss_dma_addr = .;
     }
 
+    _sbss_dma_addr = LOADADDR(.bss.dma) + ALIGN(_ebss_pre_dma_addr, 1K) - ALIGN(_ebss_pre_dma_addr, 32);
+    /*
+       Effectively pointing beyond the end of .bss.dma is acceptable, since
+       .bss.dma is the last section in memory.
+    */
+    _ebss_dma_addr = ALIGN(LOADADDR(.bss.dma) + SIZEOF(.bss.dma), 1K);
+
 }
diff --git a/cpu/x86/quarkX1000_multi_seg.ld b/cpu/x86/quarkX1000_multi_seg.ld
new file mode 100644
index 000000000..945650399
--- /dev/null
+++ b/cpu/x86/quarkX1000_multi_seg.ld
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+OUTPUT_FORMAT("elf32-i386")
+
+ENTRY(start)
+
+/*
+   The TSS-based protection domain implementation does not explicitly reference
+   these symbols, so we list them here to prevent them from being garbage-
+   collected.
+*/
+EXTERN(stacks_int)
+EXTERN(stacks_exc)
+
+PHDRS {
+    boot_text PT_LOAD;
+    text PT_LOAD;
+    data PT_LOAD;
+}
+
+SECTIONS {
+    /*
+       OS-Dev Wiki says it is common for kernels to start at 1M. Addresses before that
+       are used by BIOS/EFI, the bootloader and memory-mapped I/O.
+
+       The UEFI GenFw program inserts a 0x220 byte offset between the image base and
+       the .text section.  We add that same offset here to align the symbols in the
+       UEFI DLL with those in the final UEFI binary to make debugging easier.
+    */
+    . = 1M + 0x220;
+
+    /*
+       The GenFw program in the EDK2 UEFI toolchain outputs UEFI images with a
+       section alignment of at least 32 bytes.  Thus, it is desirable to use at
+       least that alignment granularity to avoid symbols being shifted from the
+       intermediate DLL to the final UEFI image.  Such shifting may make
+       debugging more difficult by preventing the DLL from being a useful
+       source of symbol information.  The debugging symbols are not included in
+       the final UEFI image.
+    */
+    .text.boot : ALIGN (32)
+    {
+        *(.multiboot)
+        /*
+           The initial bootstrap code expects to operate in a flat address
+           space with an identity mapping between linear and physical
+           addresses.
+        */
+        *(.boot_text)
+    } :boot_text
+
+    /* The post-boot code segments define tight bounds around the code
+       section, so this directive resets the virtual address to 0. */
+    . = 0;
+
+    /* The virtual address differs from the load address. */
+    .text : AT(LOADADDR(.text.boot) + ALIGN(SIZEOF(.text.boot), 32)) ALIGN (32)
+    {
+        /*
+           These BYTE directives emit a UD2 instruction to cause execution to
+           halt if the control flow ever deviates to address 0.  This also
+           prevents other code from being placed at address 0.  Some code
+           considers a function pointer to address 0 to be a null function
+           pointer.
+        */
+        BYTE(0x0F);
+        BYTE(0x0B);
+        *(.text*)
+
+        /*
+           An alternative design to eliminate the need for ALIGN directives
+           within the AT directives in later sections could have padded
+           each section out to a 32-byte boundary.  However, that would have
+           enabled unneeded software accesses to the padding past the end of actual
+           code/data in each section, since segments are also configured based on
+           the values of the SIZEOF expressions.  As a general principle, accesses
+           should be as restricted as is feasible.
+        */
+    } :text
+
+    _stext_addr = LOADADDR(.text);
+    _etext_addr = LOADADDR(.text) + SIZEOF(.text);
+
+    . = 0;
+
+    .data : AT(ALIGN(_etext_addr, 32)) ALIGN (32)
+    {
+        *(.main_stack)
+        *(.int_stack)
+        *(.exc_stack)
+        *(.rodata*)
+        *(.data*)
+
+        /*
+           These could alternatively be treated as read-only data to prevent tampering
+           from the user privilege level.
+        */
+        _sdata_shared_isr = .;
+        KEEP(*(.shared_isr_data*))
+        _edata_shared_isr = .;
+    } :data
+
+    .bss : ALIGN (32)
+    {
+        *(COMMON)
+        *(.bss*)
+    }
+
+    _sdata_addr = LOADADDR(.data);
+    _edata_addr = LOADADDR(.bss) + SIZEOF(.bss);
+
+    . = 0;
+
+    .bss.kern (NOLOAD) : AT(ALIGN(_edata_addr, 32)) ALIGN (32)
+    {
+        /*
+           This directive prevents any data from being allocated at address
+           zero, since the address 0 is commonly used to represent null
+           pointers.
+        */
+        LONG(0);
+        *(.kern_bss)
+
+        syscalls_entrypoints = .;
+        *(.syscall_bss)
+        syscalls_entrypoints_end = .;
+    }
+
+    _ebss_syscall_addr = LOADADDR(.bss.kern) + SIZEOF(.bss.kern);
+
+    .bss.kern_priv (NOLOAD) : ALIGN (32)
+    {
+        prot_domains_kern_data = .;
+        /*
+            The kernel and app protection domain control structures must always
+            be placed in the first two slots in this order, so that they have
+            well-known protection domain IDs:
+         */
+        *(.kern_prot_dom_bss)
+        *(.app_prot_dom_bss)
+        *(.prot_dom_bss)
+        prot_domains_kern_data_end = .;
+
+        *(.gdt_bss_start)
+        KEEP(*(.gdt_bss_mid))
+        *(.gdt_bss)
+        _ebss_gdt_addr = .;
+    }
+
+    _sbss_kern_addr = LOADADDR(.bss.kern);
+    _ebss_kern_addr = LOADADDR(.bss.kern_priv) + SIZEOF(.bss.kern_priv);
+
+    . = _ebss_kern_addr;
+
+    .bss.meta (NOLOAD) : AT(ALIGN(_ebss_kern_addr, 32)) ALIGN (32)
+    {
+        *(.meta_bss)
+    }
+
+    /* .bss.meta may be empty, so this uses .bss.kern_priv as a base instead: */
+    _ebss_pre_dma_addr = ALIGN(ALIGN(_ebss_kern_addr, 32) + SIZEOF(.bss.meta), 32);
+}
diff --git a/cpu/x86/quarkX1000_paging.ld b/cpu/x86/quarkX1000_paging.ld
index 0352cbf64..19e50e1e0 100644
--- a/cpu/x86/quarkX1000_paging.ld
+++ b/cpu/x86/quarkX1000_paging.ld
@@ -129,7 +129,7 @@ SECTIONS {
         *(.data*)
 
         /*
-           These could also be treated as read-only data to prevent tampering
+           These could alternatively be treated as read-only data to prevent tampering
            from the user privilege level.
         */
         _sdata_shared_isr = .;
@@ -201,4 +201,6 @@ SECTIONS {
 
         . = ALIGN(4K);
     }
+
+    _ebss_pre_dma_addr = ALIGN(32);
 }
diff --git a/platform/galileo/Makefile.customrules-galileo b/platform/galileo/Makefile.customrules-galileo
index cb5bc26a9..b141ee211 100644
--- a/platform/galileo/Makefile.customrules-galileo
+++ b/platform/galileo/Makefile.customrules-galileo
@@ -9,7 +9,17 @@ MULTIBOOT = $(CONTIKI_PROJECT).$(MULTIBOOT_SFX)
 # UEFI binary
 UEFI_DLL_SFX = $(TARGET).dll
 UEFI_DLL = $(CONTIKI_PROJECT).$(UEFI_SFX)
-UEFI_LDFLAGS += -Xlinker --emit-relocs -Xlinker --entry=uefi_start
+# The GenFw program is unable to process absolute symbols like _stext_addr,
+# etc., that are defined in quarkX1000_dma.ld and quarkX1000_multi_seg.ld
+# and used to configure segments in multi-segment.c, etc.  Furthermore,
+# relocating the UEFI image during load would result in those symbols not
+# pointing to the expected image locations.  So, relocation data is omitted
+# from the intermediate UEFI DLL.  This will only result in a
+# correctly-functioning build if the UEFI firmware does not attempt to
+# relocate the UEFI image, so it may be desirable in the future to revisit
+# this design.  To emit relocation data, '-Xlinker --emit-relocs' should be
+# appended to the following line.
+UEFI_LDFLAGS = -Xlinker --entry=uefi_start
 UEFI_SFX = $(TARGET).efi
 UEFI = $(CONTIKI_PROJECT).$(UEFI_SFX)
 

From e0aefd11d94415c5ffc58344201e16c85a4e2e41 Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Fri, 7 Aug 2015 11:51:04 -0700
Subject: [PATCH 191/393] x86: Add support for SW-switched segment-based
 protection domains

This patch extends the protection domain framework with a third plugin
that is a hybrid of the previous two.  The hardware task switching
mechanism has a strictly-defined format for TSS data structures that
causes more space to be consumed than would otherwise be required.
This patch defines a smaller data structure that is allocated for each
protection domain, only requiring 32 bytes instead of 128 bytes.  It
uses the same multi-segment memory layout as the TSS-based plugin and
leaves paging disabled.  However, it uses a similar mechanism as the
paging plugin to perform system call dispatches and returns.

For additional information, please refer to cpu/x86/mm/README.md.
---
 cpu/x86/Makefile.x86_quarkX1000 |  5 ++
 cpu/x86/mm/README.md            | 31 ++++++++++--
 cpu/x86/mm/gdt-layout.h         |  5 ++
 cpu/x86/mm/multi-segment.c      | 11 ++++-
 cpu/x86/mm/prot-domains.c       |  7 +++
 cpu/x86/mm/prot-domains.h       |  6 ++-
 cpu/x86/mm/stacks.h             |  6 +++
 cpu/x86/mm/swseg-prot-domains.c | 83 +++++++++++++++++++++++++++++++
 cpu/x86/mm/swseg-prot-domains.h | 86 +++++++++++++++++++++++++++++++++
 cpu/x86/mm/syscalls-int-asm.S   | 48 +++++++++++++++++-
 cpu/x86/mm/syscalls-int.c       | 66 ++++++++++++++++---------
 cpu/x86/mm/syscalls-int.h       |  2 +-
 cpu/x86/mm/tss.c                | 17 ++++---
 13 files changed, 335 insertions(+), 38 deletions(-)
 create mode 100644 cpu/x86/mm/swseg-prot-domains.c
 create mode 100644 cpu/x86/mm/swseg-prot-domains.h

diff --git a/cpu/x86/Makefile.x86_quarkX1000 b/cpu/x86/Makefile.x86_quarkX1000
index 13a9c686f..1a8d3ac8e 100644
--- a/cpu/x86/Makefile.x86_quarkX1000
+++ b/cpu/x86/Makefile.x86_quarkX1000
@@ -25,6 +25,11 @@ else ifeq ($(X86_CONF_PROT_DOMAINS),tss)
 CFLAGS += -DX86_CONF_PROT_DOMAINS=2
 X86_CONF_MULTI_SEG = 1
 CONTIKI_SOURCEFILES += tss-prot-domains-asm.S
+else ifeq ($(X86_CONF_PROT_DOMAINS),swseg)
+# This matches the definition of X86_CONF_PROT_DOMAINS__SWSEG in prot-domains.h:
+CFLAGS += -DX86_CONF_PROT_DOMAINS=3
+X86_CONF_SYSCALLS_INT = 1
+X86_CONF_MULTI_SEG = 1
 else
 $(error Unrecognized setting for X86_CONF_PROT_DOMAINS: \
         $(X86_CONF_PROT_DOMAINS).  See cpu/x86/mm/README.md for \
diff --git a/cpu/x86/mm/README.md b/cpu/x86/mm/README.md
index dcd6370b4..42c4070a7 100644
--- a/cpu/x86/mm/README.md
+++ b/cpu/x86/mm/README.md
@@ -6,11 +6,12 @@ Introduction
 
 The X86 port of Contiki implements a simple, lightweight form of
 protection domains using a pluggable framework.  Currently, there are
-two plugins available:
+three plugins available:
 
  - Flat memory model with paging.
- - Multi-segment memory model with hardware-switched segments based on
-   Task-State Segment (TSS) structures.
+ - Multi-segment memory model with either hardware- or
+   software-switched segments.  The hardware-switched segments
+   approach is based on Task-State Segment (TSS) structures.
 
 For an introduction to paging and TSS and possible ways in which they
 can be used, refer to the following resources:
@@ -144,8 +145,8 @@ Similarly, register contents may be accessed and modified across
 protection domain boundaries in some protection domain
 implementations.  The TSS task switching mechanism automatically saves
 and restores many registers to and from TSS data structures when
-switching tasks, but the paging-based protection domain implementation
-does not perform analogous operations.
+switching tasks, but the other protection domain implementations do
+not perform analogous operations.
 
 For the reasons described above, each protection domain should only
 invoke other protection domains that it trusts to properly handle data
@@ -847,6 +848,25 @@ in an unexpected manner, since segment register load instructions are
 unprivileged.  Similar segment register updates must be performed for
 similar reasons when dispatching system calls.
 
+### Software-Switched Segment-Based Protection Domains
+
+Primary implementation sources:
+
+ - cpu/x86/mm/swseg-prot-domains.c
+
+The requirement to allocate a TSS for each protection domain in the
+hardware-switched segments plugin may consume a substantial amount of
+space, since the size of each TSS is fixed by hardware to be at least
+104 bytes.  The software-switched segments plugin saves space by
+defining a more compact PDCS.  However, the layout and definitions of
+the segments is identical to what was described above for the
+hardware-switched segments plugin.
+
+The system call and return procedure is mostly identical to that for
+paging-based protection domains.  However, instead of updating and
+invalidating page tables, the dispatchers update the LDT and some of
+the segment registers.
+
 ### Pointer Validation
 
 Primary implementation sources:
@@ -957,6 +977,7 @@ the command line and specify one of the following options:
 
  - paging
  - tss
+ - swseg
 
 The paging option accepts a sub-option to determine whether the TLB is
 fully- or selectively-invalidated during protection domain switches.
diff --git a/cpu/x86/mm/gdt-layout.h b/cpu/x86/mm/gdt-layout.h
index 5dddd3a4d..b79c2b9ca 100644
--- a/cpu/x86/mm/gdt-layout.h
+++ b/cpu/x86/mm/gdt-layout.h
@@ -92,8 +92,13 @@
 /** Stack segment for exception handlers */
 #define GDT_IDX_STK_EXC       10
 
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__TSS
 #define GDT_IDX_TSS(dom_id)   (GDT_NUM_FIXED_DESC + (2 * (dom_id)))
 #define GDT_IDX_LDT(dom_id)   (GDT_NUM_FIXED_DESC + (2 * (dom_id)) + 1)
+#else
+#define GDT_IDX_LDT(dom_id)   (GDT_NUM_FIXED_DESC + (dom_id))
+#endif
+
 #endif
 #else
 #define GDT_IDX_CODE          GDT_IDX_CODE_FLAT
diff --git a/cpu/x86/mm/multi-segment.c b/cpu/x86/mm/multi-segment.c
index f60a2c8bb..6d3fd57f1 100644
--- a/cpu/x86/mm/multi-segment.c
+++ b/cpu/x86/mm/multi-segment.c
@@ -139,7 +139,14 @@ prot_domains_gdt_init()
                     (uint32_t)&_stext_addr,
                     ((uint32_t)&_etext_addr) - (uint32_t)&_stext_addr,
                     SEG_FLAG(DPL, PRIV_LVL_EXC) | SEG_GRAN_BYTE |
-                    SEG_DESCTYPE_NSYS | SEG_TYPE_CODE_EX);
+                    SEG_DESCTYPE_NSYS |
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__SWSEG
+  /* The general protection fault handler requires read access to CS */
+                    SEG_TYPE_CODE_EXRD
+#else
+                    SEG_TYPE_CODE_EX
+#endif
+                    );
   gdt_insert_boot(GDT_IDX_CODE_EXC, desc);
 
   segment_desc_init(&desc,
@@ -180,7 +187,9 @@ prot_domains_gdt_init()
    */
   desc.raw = SEG_DESC_NOT_PRESENT;
   for(i = 0; i < PROT_DOMAINS_ACTUAL_CNT; i++) {
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__TSS
     gdt_insert_boot(GDT_IDX_TSS(i), desc);
+#endif
     gdt_insert_boot(GDT_IDX_LDT(i), desc);
   }
 
diff --git a/cpu/x86/mm/prot-domains.c b/cpu/x86/mm/prot-domains.c
index 8bbeb4d83..56461b381 100644
--- a/cpu/x86/mm/prot-domains.c
+++ b/cpu/x86/mm/prot-domains.c
@@ -54,6 +54,13 @@ prot_domains_init(void)
   segment_desc_t desc;
 
   gdt_lookup(GDT_IDX_CODE_EXC, &desc);
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__SWSEG
+  /* The exception code segment needs to be readable so that the general
+   * protection fault handler can decode instructions, but the interrupt and
+   * user level code segments should not be.
+   */
+  SEG_SET_FLAG(desc, TYPE, SEG_TYPE_CODE_EX);
+#endif
 
   SEG_SET_FLAG(desc, DPL, PRIV_LVL_INT);
   gdt_insert(GDT_IDX_CODE_INT, desc);
diff --git a/cpu/x86/mm/prot-domains.h b/cpu/x86/mm/prot-domains.h
index a1fbca130..13062612b 100644
--- a/cpu/x86/mm/prot-domains.h
+++ b/cpu/x86/mm/prot-domains.h
@@ -41,9 +41,11 @@
 #define X86_CONF_PROT_DOMAINS__NONE   0
 #define X86_CONF_PROT_DOMAINS__PAGING 1
 #define X86_CONF_PROT_DOMAINS__TSS    2
+#define X86_CONF_PROT_DOMAINS__SWSEG  3
 
 #define X86_CONF_PROT_DOMAINS_MULTI_SEG                                       \
-  (X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__TSS)
+  ((X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__TSS) ||                    \
+   (X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__SWSEG))
 
 /** Privilege level (ring) for exception handlers and other supervisory code */
 #define PRIV_LVL_EXC  0
@@ -74,6 +76,8 @@ typedef uint32_t dom_id_t;
 #include "paging-prot-domains.h"
 #elif X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__TSS
 #include "tss-prot-domains.h"
+#elif X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__SWSEG
+#include "swseg-prot-domains.h"
 #endif
 
 #ifndef ATTR_META_ADDR_SPACE
diff --git a/cpu/x86/mm/stacks.h b/cpu/x86/mm/stacks.h
index 96be72cf9..327e75600 100644
--- a/cpu/x86/mm/stacks.h
+++ b/cpu/x86/mm/stacks.h
@@ -61,6 +61,12 @@
 #else
 #define STACKS_SIZE_EXC 256
 #endif
+#elif X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__SWSEG
+#ifdef __clang__
+#define STACKS_SIZE_EXC 512
+#else
+#define STACKS_SIZE_EXC 256
+#endif
 #elif X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__TSS
 /**
  * This should be large enough to execute the exception handler with the
diff --git a/cpu/x86/mm/swseg-prot-domains.c b/cpu/x86/mm/swseg-prot-domains.c
new file mode 100644
index 000000000..78a29aaf6
--- /dev/null
+++ b/cpu/x86/mm/swseg-prot-domains.c
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+#include "gdt.h"
+#include "helpers.h"
+#include "multi-segment.h"
+#include "prot-domains.h"
+
+/*---------------------------------------------------------------------------*/
+void
+prot_domains_reg(dom_client_data_t ATTR_KERN_ADDR_SPACE *dcd,
+                 uintptr_t mmio, size_t mmio_sz,
+                 uintptr_t meta, size_t meta_sz,
+                 bool pio)
+{
+  volatile dom_kern_data_t ATTR_KERN_ADDR_SPACE *dkd;
+  dom_id_t dom_id;
+
+  KERN_READL(dom_id, dcd->dom_id);
+
+  if(PROT_DOMAINS_ACTUAL_CNT <= dom_id) {
+    halt();
+  }
+
+  dkd = prot_domains_kern_data + dom_id;
+
+  prot_domains_reg_multi_seg(dkd, mmio, mmio_sz, meta, meta_sz);
+
+  KERN_WRITEL(dkd->flags, pio ? PROT_DOMAINS_FLAG_PIO : 0);
+}
+/*---------------------------------------------------------------------------*/
+static inline void __attribute__((always_inline))
+prot_domains_switch(dom_id_t from_id, dom_id_t to_id,
+                    interrupt_stack_t *intr_stk)
+{
+  __asm__ __volatile__ (
+    "lldt %[_ldt_]\n\t"
+    "mov %[_meta_seg_], %%eax\n\t"
+    "lsl %%eax, %%ecx\n\t"
+    "jz 1f\n\t" /* ZF will only be set if the segment descriptor is valid. */
+    "xor %%eax, %%eax\n\t" /* Nullify metadata selector */
+    "1: mov %%eax, %%" SEG_META "s\n\t"
+    "mov %[_kern_seg_], %%eax\n\t"
+    "mov %%eax, %%" SEG_KERN "s\n\t"
+    :
+    : [_ldt_] "r" ((uint16_t)GDT_SEL_LDT(to_id)),
+      [_meta_seg_] "i" (LDT_SEL_META),
+      [_kern_seg_] "i" (LDT_SEL_KERN)
+    : "cc", "eax", "ecx"
+    );
+}
+/*---------------------------------------------------------------------------*/
+
+/* Enable inter-procedural optimization with procedures in the following file:
+ */
+#include "syscalls-int.c"
diff --git a/cpu/x86/mm/swseg-prot-domains.h b/cpu/x86/mm/swseg-prot-domains.h
new file mode 100644
index 000000000..a503bc6db
--- /dev/null
+++ b/cpu/x86/mm/swseg-prot-domains.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_MM_SWSEG_PROT_DOMAINS_H_
+#define CPU_X86_MM_SWSEG_PROT_DOMAINS_H_
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include "ldt-layout.h"
+#include "paging.h"
+#include "segmentation.h"
+#include "syscalls-int.h"
+
+struct dom_kern_data {
+  /** Local Descriptor Table with per-domain descriptors */
+  segment_desc_t ldt[LDT_NUM_DESC];
+  /** Flags are defined with the prefix PROT_DOMAINS_FLAG in prot-domains.h */
+  uint32_t flags;
+  /**
+   * Original return address from call stack when this protection domain
+   * invoked some other protection domain.  This serves to control the return
+   * entrypoint.  The callee is not permitted to modify this value (unless the
+   * callee is the kernel protection domain).
+   */
+  uintptr_t orig_ret_addr;
+
+  /* This structure is precisely 32 bytes in length, a power of 2.  If its size
+   * changes, add an alignment attribute to keep it aligned at a power of 2 so
+   * that dereferencing arrays of these structures uses shift instructions
+   * instead of multiplication.  Shifting is faster than multiplication.
+   */
+};
+
+/* relies on dom_kern_data: */
+#include "multi-segment.h"
+
+#define PROT_DOMAINS_ENTER_ISR(exc)                                           \
+  MULTI_SEGMENT_ENTER_ISR(exc)                                                \
+  PROT_DOMAINS_ENTER_ISR_COMMON(exc)
+#define PROT_DOMAINS_LEAVE_ISR(exc)                                           \
+  PROT_DOMAINS_LEAVE_ISR_COMMON(exc)                                          \
+  MULTI_SEGMENT_LEAVE_ISR(exc)
+
+#define prot_domains_impl_init syscalls_int_init
+
+#define prot_domains_set_wp(en)
+
+/* Allocate one additional GDT entry for each protection domain.  Note that
+ * the particular storage allocated by this statement may actually be used for
+ * some other protection domain, depending on how the linker happens to arrange
+ * all of the GDT storage.  The GDT_IDX_LDT macro in gdt-layout.h determine
+ * which storage is used for each protection domain.  Thus, this storage should
+ * not be referenced directly by its variable name.
+ */
+#define PROT_DOMAINS_ALLOC_IMPL(nm)                                           \
+  static segment_desc_t ATTR_BSS_GDT_MID _gdt_storage_##nm
+
+#endif /* CPU_X86_MM_SWSEG_PROT_DOMAINS_H_ */
diff --git a/cpu/x86/mm/syscalls-int-asm.S b/cpu/x86/mm/syscalls-int-asm.S
index 1fe80310f..5c88c890b 100644
--- a/cpu/x86/mm/syscalls-int-asm.S
+++ b/cpu/x86/mm/syscalls-int-asm.S
@@ -33,6 +33,10 @@
 #include "gdt-layout.h"
 #include "stacks.h"
 
+/* Must match definitions (plus the trailing 's') in multi-segment.h */
+#define SEG_MMIO fs
+#define SEG_KERN fs
+
 .text
 
 /* Invoke the system call return dispatcher from the default privilege
@@ -42,21 +46,57 @@
 prot_domains_sysret_stub:
   int $PROT_DOMAINS_SYSRET_DISPATCH_INT
 
+.macro save_segs
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__SWSEG
+  /* Save (and restore, in restore_segs) MMIO segment register into
+   * callee-saved register in case a system call was invoked from a region in
+   * which MMIO is enabled.
+   */
+  push %SEG_MMIO
+#endif
+.endm
+
+.macro restore_segs
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__SWSEG
+  pop %SEG_MMIO
+#endif
+.endm
+
+/* Refresh most of the segment registers in case they were corrupted by
+ * userspace code to prevent that from corrupting the operation of the
+ * privileged code.
+ */
+.macro load_kern_segs
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__SWSEG
+  mov $GDT_SEL_DATA, %eax
+  mov %eax, %ds
+  mov %eax, %es
+  mov $GDT_SEL_DATA_KERN_EXC, %eax
+  mov %eax, %SEG_KERN
+#endif
+.endm
+
 /* Invoke the system call dispatcher C routine */
 .global prot_domains_syscall_dispatcher
 prot_domains_syscall_dispatcher:
   mov %esp, %ecx /*< interrupt_stack_t *intr_stk */
   /* EDX already set to "dom_client_data_t to_dcd" by syscall stub */
-  push %eax /*< syscalls_id_t syscall_id */
+  save_segs
+  push %eax /*< syscalls_entrypoint_t *syscall */
+  load_kern_segs
   call prot_domains_syscall_dispatcher_impl
   /* fastcall convention, so callee pops arguments */
+  restore_segs
   iret
 
 /* Invoke the system call return dispatcher C routine */
 .global prot_domains_sysret_dispatcher
 prot_domains_sysret_dispatcher:
   mov %esp, %ecx /*< interrupt_stack_t *intr_stk */
+  save_segs
+  load_kern_segs
   call prot_domains_sysret_dispatcher_impl
+  restore_segs
   /* Zero caller-saved registers in case they contain secrets.  The system call
    * handlers and dispatchers need to preserve the callee-saved registers.
    */
@@ -67,11 +107,17 @@ prot_domains_sysret_dispatcher:
 
 .global prot_domains_launch_kernel
 prot_domains_launch_kernel:
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__PAGING
   mov $GDT_SEL_DATA, %eax
   mov %eax, %ds
   mov %eax, %es
   mov %eax, %fs
   mov %eax, %gs
+#else
+  mov $GDT_SEL_LDT(DOM_ID_kern), %eax
+  lldt %ax
+  call multi_segment_launch_kernel
+#endif
   /* init interrupt return stack: */
   pushl $GDT_SEL_STK
   lea stacks_main, %eax
diff --git a/cpu/x86/mm/syscalls-int.c b/cpu/x86/mm/syscalls-int.c
index 1d1c77efb..6820d3264 100644
--- a/cpu/x86/mm/syscalls-int.c
+++ b/cpu/x86/mm/syscalls-int.c
@@ -91,7 +91,10 @@ syscall_dispatcher_tail(interrupt_stack_t *intr_stk,
                         uint32_t syscall_eip)
 {
   dom_id_t from_id;
-  volatile dom_kern_data_t *from_dkd, *to_dkd;
+  uint32_t tmp;
+  volatile dom_kern_data_t ATTR_KERN_ADDR_SPACE *from_dkd, *to_dkd;
+
+  uint32_t loc_call_stk_ptr;
 
   to_dkd = prot_domains_kern_data + to_id;
 
@@ -101,36 +104,40 @@ syscall_dispatcher_tail(interrupt_stack_t *intr_stk,
    * kernel data associated with that protection domain.  That model does not
    * permit reentrancy.
    */
-  if((to_dkd->flags & PROT_DOMAINS_FLAG_BUSY) == PROT_DOMAINS_FLAG_BUSY) {
+  KERN_READL(tmp, to_dkd->flags);
+  if((tmp & PROT_DOMAINS_FLAG_BUSY) == PROT_DOMAINS_FLAG_BUSY) {
     halt();
   }
-  to_dkd->flags |= PROT_DOMAINS_FLAG_BUSY;
+  tmp |= PROT_DOMAINS_FLAG_BUSY;
+  KERN_WRITEL(to_dkd->flags, tmp);
 
   /* Update the interrupt stack so that the IRET instruction will return to the
    * system call entrypoint.
    */
   intr_stk->eip = syscall_eip;
 
+  KERN_READL(loc_call_stk_ptr, inter_dom_call_stk_ptr);
   /* Lookup the information for the caller */
-  from_id = inter_dom_call_stk[inter_dom_call_stk_ptr - 1];
+  KERN_READL(from_id, inter_dom_call_stk[loc_call_stk_ptr - 1]);
   from_dkd = prot_domains_kern_data + from_id;
 
   /* Save the current return address from the unprivileged stack to a protected
    * location in the kernel-owned data structure.  This enforces return
    * entrypoint control.
    */
-  from_dkd->orig_ret_addr = *(uintptr_t *)intr_stk->esp;
+  KERN_WRITEL(from_dkd->orig_ret_addr, *(uintptr_t *)intr_stk->esp);
   /* Update the unprivileged stack so that when the system call body is
    * complete, it will invoke the system call return stub.
    */
   *((uintptr_t *)intr_stk->esp) = (uintptr_t)prot_domains_sysret_stub;
 
-  if(MAX_INTER_DOM_CALL_STK_SZ <= inter_dom_call_stk_ptr) {
+  if(MAX_INTER_DOM_CALL_STK_SZ <= loc_call_stk_ptr) {
     halt();
   }
-  inter_dom_call_stk[inter_dom_call_stk_ptr] = to_id;
+  KERN_WRITEL(inter_dom_call_stk[loc_call_stk_ptr], to_id);
 
-  inter_dom_call_stk_ptr++;
+  loc_call_stk_ptr++;
+  KERN_WRITEL(inter_dom_call_stk_ptr, loc_call_stk_ptr);
 
   dispatcher_tail(from_id, to_id, intr_stk);
 }
@@ -140,6 +147,7 @@ prot_domains_syscall_dispatcher_impl(interrupt_stack_t *intr_stk,
                                      dom_id_t to_id,
                                      syscalls_entrypoint_t *syscall)
 {
+  uint32_t tmp;
   uint32_t syscall_eip;
 
   if(PROT_DOMAINS_ACTUAL_CNT <= to_id) {
@@ -156,11 +164,12 @@ prot_domains_syscall_dispatcher_impl(interrupt_stack_t *intr_stk,
     halt();
   }
 
-  if((BIT(to_id) & syscall->doms) == 0) {
+  KERN_READL(tmp, syscall->doms);
+  if((BIT(to_id) & tmp) == 0) {
     halt();
   }
 
-  syscall_eip = syscall->entrypoint;
+  KERN_READL(syscall_eip, syscall->entrypoint);
 
   prot_domains_set_wp(false);
 
@@ -171,9 +180,9 @@ int main(void);
 void __attribute__((fastcall))
 prot_domains_launch_kernel_impl(interrupt_stack_t *intr_stk)
 {
-  inter_dom_call_stk[0] = DOM_ID_app;
+  KERN_WRITEL(inter_dom_call_stk[0], DOM_ID_app);
 
-  inter_dom_call_stk_ptr = 1;
+  KERN_WRITEL(inter_dom_call_stk_ptr, 1);
 
   syscall_dispatcher_tail(intr_stk, DOM_ID_kern, (uint32_t)main);
 }
@@ -182,20 +191,27 @@ void __attribute__((fastcall))
 prot_domains_sysret_dispatcher_impl(interrupt_stack_t *intr_stk)
 {
   dom_id_t from_id, to_id;
-  if(inter_dom_call_stk_ptr <= 1) {
+  uint32_t loc_call_stk_ptr;
+  uint32_t flags;
+
+  KERN_READL(loc_call_stk_ptr, inter_dom_call_stk_ptr);
+  if(loc_call_stk_ptr <= 1) {
     halt();
   }
 
-  from_id = inter_dom_call_stk[inter_dom_call_stk_ptr - 1];
-  to_id = inter_dom_call_stk[inter_dom_call_stk_ptr - 2];
+  KERN_READL(from_id, inter_dom_call_stk[loc_call_stk_ptr - 1]);
+  KERN_READL(to_id, inter_dom_call_stk[loc_call_stk_ptr - 2]);
 
-  intr_stk->eip = prot_domains_kern_data[to_id].orig_ret_addr;
+  KERN_READL(intr_stk->eip,
+            prot_domains_kern_data[to_id].orig_ret_addr);
 
   prot_domains_set_wp(false);
 
-  prot_domains_kern_data[from_id].flags &= ~PROT_DOMAINS_FLAG_BUSY;
+  KERN_READL(flags, prot_domains_kern_data[from_id].flags);
+  flags &= ~PROT_DOMAINS_FLAG_BUSY;
+  KERN_WRITEL(prot_domains_kern_data[from_id].flags, flags);
 
-  inter_dom_call_stk_ptr--;
+  KERN_WRITEL(inter_dom_call_stk_ptr, loc_call_stk_ptr - 1);
 
   dispatcher_tail(from_id, to_id, intr_stk);
 }
@@ -204,11 +220,13 @@ prot_domains_sysret_dispatcher_impl(interrupt_stack_t *intr_stk)
  * \brief  Lookup the current protection domain.
  * \return Kernel data structure for the current protection domain.
  */
-static volatile dom_kern_data_t *
+static volatile dom_kern_data_t ATTR_KERN_ADDR_SPACE *
 get_current_domain(void)
 {
+  uint32_t loc_call_stk_ptr;
   dom_id_t id;
-  id = inter_dom_call_stk[inter_dom_call_stk_ptr - 1];
+  KERN_READL(loc_call_stk_ptr, inter_dom_call_stk_ptr);
+  KERN_READL(id, inter_dom_call_stk[loc_call_stk_ptr - 1]);
   return prot_domains_kern_data + id;
 }
 /*---------------------------------------------------------------------------*/
@@ -219,9 +237,11 @@ get_current_domain(void)
  * \return    Result of the check as a Boolean value
  */
 static bool
-needs_port_io(volatile dom_kern_data_t *dkd)
+needs_port_io(volatile dom_kern_data_t ATTR_KERN_ADDR_SPACE *dkd)
 {
-  return (dkd->flags & PROT_DOMAINS_FLAG_PIO) == PROT_DOMAINS_FLAG_PIO;
+  uint32_t dkd_flags;
+  KERN_READL(dkd_flags, dkd->flags);
+  return (dkd_flags & PROT_DOMAINS_FLAG_PIO) == PROT_DOMAINS_FLAG_PIO;
 }
 /*---------------------------------------------------------------------------*/
 /* Mark the context parameter as volatile so that writes to it will not get
@@ -236,7 +256,7 @@ gp_fault_handler(volatile struct interrupt_context context)
   uint32_t cs_lim;
   uint8_t opcode;
 
-  volatile dom_kern_data_t *dkd = get_current_domain();
+  volatile dom_kern_data_t ATTR_KERN_ADDR_SPACE *dkd = get_current_domain();
   if (needs_port_io(dkd)) {
     __asm__ __volatile__ (
       "mov %%cs, %0\n\t"
diff --git a/cpu/x86/mm/syscalls-int.h b/cpu/x86/mm/syscalls-int.h
index 7ee4bcb36..a5478d1c5 100644
--- a/cpu/x86/mm/syscalls-int.h
+++ b/cpu/x86/mm/syscalls-int.h
@@ -74,7 +74,7 @@ extern dom_id_t cur_dom;
     #nm ":\n\t"                                                               \
     /* First, load server protection domain ID into EDX, as required by */    \
     /* prot_domains_syscall_dispatcher: */                                    \
-    "  mov " #dcd ", %edx\n\t"                                                \
+    "  mov %" SEG_KERN "s:" #dcd ", %edx\n\t"                                 \
     SYSCALLS_STUB_EPILOGUE(nm))
 
 void syscalls_int_init(void);
diff --git a/cpu/x86/mm/tss.c b/cpu/x86/mm/tss.c
index c3628fa8a..b6e0f3deb 100644
--- a/cpu/x86/mm/tss.c
+++ b/cpu/x86/mm/tss.c
@@ -47,15 +47,20 @@ static segment_desc_t ATTR_BSS_GDT sys_tss_desc;
 void
 tss_init(void)
 {
-  sys_tss.iomap_base = sizeof(sys_tss);
-  sys_tss.esp2 = ((uint32_t)stacks_int) + STACKS_SIZE_INT;
-  sys_tss.ss2 = GDT_SEL_STK_INT;
-  sys_tss.esp0 = ((uint32_t)stacks_exc) + STACKS_SIZE_EXC;
-  sys_tss.ss0 = GDT_SEL_STK_EXC;
+  segment_desc_t seg_desc;
 
-  segment_desc_init(&sys_tss_desc, (uint32_t)&sys_tss, sizeof(sys_tss),
+  /* Initialize TSS */
+  KERN_WRITEW(sys_tss.iomap_base, sizeof(sys_tss));
+  KERN_WRITEL(sys_tss.esp2, ((uint32_t)stacks_int) + STACKS_SIZE_INT);
+  KERN_WRITEL(sys_tss.ss2, GDT_SEL_STK_INT);
+  KERN_WRITEL(sys_tss.esp0, ((uint32_t)stacks_exc) + STACKS_SIZE_EXC);
+  KERN_WRITEL(sys_tss.ss0, GDT_SEL_STK_EXC);
+
+  segment_desc_init(&seg_desc,
+                    KERN_DATA_OFF_TO_PHYS_ADDR(&sys_tss), sizeof(sys_tss),
                     SEG_FLAG(DPL, PRIV_LVL_EXC) |
                     SEG_DESCTYPE_SYS | SEG_TYPE_TSS32_AVAIL);
+  gdt_insert(GDT_IDX_OF_DESC(&sys_tss_desc), seg_desc);
 
   __asm__ __volatile__ (
     "ltr %0"

From 73774def6b7c52ce6d3be0e4a41852047e66f46b Mon Sep 17 00:00:00 2001
From: Michael LeMay <michael.lemay@intel.com>
Date: Sun, 9 Aug 2015 16:38:04 -0700
Subject: [PATCH 192/393] x86, galileo: Add sample non-driver protection domain

This patch adds a simple non-driver protection domain sample to serve
as an example for defining other non-driver protection domains.  It
simply performs a ping-pong test of protection domain switching
latency during boot, including optional accesses to a private metadata
region, and prints out the results.
---
 cpu/x86/quarkX1000.ld                         |   4 +
 cpu/x86/quarkX1000_multi_seg.ld               |   4 +
 cpu/x86/quarkX1000_paging.ld                  |   4 +
 cpu/x86/startup.h                             |  46 ++++++
 examples/galileo/Makefile                     |   8 +-
 examples/galileo/README.md                    |  11 ++
 examples/galileo/prot-domain-switch-latency.c | 156 ++++++++++++++++++
 platform/galileo/contiki-main.c               |  11 ++
 8 files changed, 243 insertions(+), 1 deletion(-)
 create mode 100644 cpu/x86/startup.h
 create mode 100644 examples/galileo/prot-domain-switch-latency.c

diff --git a/cpu/x86/quarkX1000.ld b/cpu/x86/quarkX1000.ld
index be91a74c7..d4ea66aa6 100644
--- a/cpu/x86/quarkX1000.ld
+++ b/cpu/x86/quarkX1000.ld
@@ -63,6 +63,10 @@ SECTIONS {
     {
         *(.rodata*)
 
+        _sdata_kern_startup_func = .;
+        KEEP(*(.kern_startup_func))
+        _edata_kern_startup_func = .;
+
         _sdata_shared_isr = .;
         KEEP(*(.shared_isr_data*))
         _edata_shared_isr = .;
diff --git a/cpu/x86/quarkX1000_multi_seg.ld b/cpu/x86/quarkX1000_multi_seg.ld
index 945650399..c4e6293cf 100644
--- a/cpu/x86/quarkX1000_multi_seg.ld
+++ b/cpu/x86/quarkX1000_multi_seg.ld
@@ -119,6 +119,10 @@ SECTIONS {
         *(.rodata*)
         *(.data*)
 
+        _sdata_kern_startup_func = .;
+        KEEP(*(.kern_startup_func))
+        _edata_kern_startup_func = .;
+
         /*
            These could alternatively be treated as read-only data to prevent tampering
            from the user privilege level.
diff --git a/cpu/x86/quarkX1000_paging.ld b/cpu/x86/quarkX1000_paging.ld
index 19e50e1e0..87c89ed8b 100644
--- a/cpu/x86/quarkX1000_paging.ld
+++ b/cpu/x86/quarkX1000_paging.ld
@@ -128,6 +128,10 @@ SECTIONS {
         *(.rodata*)
         *(.data*)
 
+        _sdata_kern_startup_func = .;
+        KEEP(*(.kern_startup_func))
+        _edata_kern_startup_func = .;
+
         /*
            These could alternatively be treated as read-only data to prevent tampering
            from the user privilege level.
diff --git a/cpu/x86/startup.h b/cpu/x86/startup.h
new file mode 100644
index 000000000..56ad3b482
--- /dev/null
+++ b/cpu/x86/startup.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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 CPU_X86_STARTUP_H_
+#define CPU_X86_STARTUP_H_
+
+/**
+ * \brief Declare a function that will be automatically invoked from the kernel
+ *        protection domain during boot, after all of the default device
+ *        initialization has been completed.
+ */
+#define KERN_STARTUP_FUNC(f)                                   \
+static void f(void);                                           \
+static uintptr_t                                               \
+  __attribute__((used, section(".kern_startup_func")))         \
+  __kern_startup_f = (uintptr_t)f;                             \
+static void f(void)
+
+#endif /* CPU_X86_STARTUP_H_ */
diff --git a/examples/galileo/Makefile b/examples/galileo/Makefile
index bc7b071ff..0852fe085 100644
--- a/examples/galileo/Makefile
+++ b/examples/galileo/Makefile
@@ -1,6 +1,6 @@
 TARGET=galileo
 
-KNOWN_EXAMPLES = gpio-input gpio-output gpio-interrupt i2c-LSM9DS0 i2c-callbacks print-imr
+KNOWN_EXAMPLES = gpio-input gpio-output gpio-interrupt i2c-LSM9DS0 i2c-callbacks print-imr prot-domain-switch-latency
 
 ifeq ($(filter $(EXAMPLE),$(KNOWN_EXAMPLES)),)
     $(info Set the variable EXAMPLE to one of the following Galileo-specific examples:)
@@ -12,6 +12,12 @@ ifeq ($(EXAMPLE),print-imr)
     CFLAGS += -DDBG_IMRS
 endif
 
+ifeq ($(EXAMPLE),prot-domain-switch-latency)
+ifeq ($(SAMPLE_METADATA),1)
+CFLAGS += -DSAMPLE_METADATA=1
+endif
+endif
+
 CONTIKI_PROJECT = $(EXAMPLE)
 
 all: $(CONTIKI_PROJECT)
diff --git a/examples/galileo/README.md b/examples/galileo/README.md
index 49777a16c..8f3217f05 100644
--- a/examples/galileo/README.md
+++ b/examples/galileo/README.md
@@ -93,6 +93,17 @@ Intel Quark X1000 SoC Isolated Memory Regions (IMRs), the Host System
 Management Mode Controls register, and the Host Memory I/O Boundary
 register.
 
+Protection Domains
+------------------
+
+### Protection Domain Switch Latency (EXAMPLE=prot-domain-switch-latency)
+
+This application measures and prints the average latency of repeatedly
+switching from one protection domain to another and back, in ping-pong
+fashion.  It can optionally perform memory accesses to metadata
+associated with the destination protection domain.  This feature can
+be enabled by specifying SAMPLE_METADATA=1 on the build command line.
+
 References
 ----------
 
diff --git a/examples/galileo/prot-domain-switch-latency.c b/examples/galileo/prot-domain-switch-latency.c
new file mode 100644
index 000000000..9b6908a2f
--- /dev/null
+++ b/examples/galileo/prot-domain-switch-latency.c
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2015-2016, Intel Corporation. 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 copyright holder 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 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 HOLDER 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.
+ */
+
+#include <assert.h>
+#include <stdio.h>
+#include <x86intrin.h>
+
+#include "contiki.h"
+#include "prot-domains.h"
+#include "startup.h"
+#include "syscalls.h"
+
+#define CPU_FREQ (400 * 1000 * 1000)
+/* Run the test for approximately eight seconds.
+ *
+ * Duration expressed as shift amount to avoid integer overflow.
+ */
+#define DURATION_SECONDS_SHAMT 3
+
+#ifdef SAMPLE_METADATA
+typedef struct sample_meta {
+  int cnt;
+
+#if X86_CONF_PROT_DOMAINS == X86_CONF_PROT_DOMAINS__PAGING
+  /**
+   * See the comment on the padding in the metadata for the Intel Quark X1000
+   * Ethernet driver for an explanation of why it is sized and structured like
+   * this.
+   */
+  uint8_t pad[MIN_PAGE_SIZE - sizeof(int)];
+#endif
+} __attribute__((packed)) sample_meta_t;
+
+static sample_meta_t ATTR_BSS_META meta = { .cnt = 0 };
+#endif
+
+PROT_DOMAINS_ALLOC(dom_client_data_t, ping_dcd);
+PROT_DOMAINS_ALLOC(dom_client_data_t, pong_dcd);
+
+PROCESS(prot_domain_latency_process, "Ping-Pong Process");
+AUTOSTART_PROCESSES(&prot_domain_latency_process);
+/*---------------------------------------------------------------------------*/
+void pong(uint64_t *mid, int *cnt);
+SYSCALLS_DEFINE_SINGLETON(pong, pong_dcd,
+                          uint64_t *mid, int *cnt)
+{
+#ifdef SAMPLE_METADATA
+  sample_meta_t *loc_meta = (sample_meta_t *)PROT_DOMAINS_META(pong_dcd);
+#endif
+
+  *mid = _rdtsc();
+
+#ifdef SAMPLE_METADATA
+  META_READL(*cnt, loc_meta->cnt);
+  META_WRITEL(loc_meta->cnt, *cnt + 1);
+#endif
+}
+/*---------------------------------------------------------------------------*/
+void ping(void);
+SYSCALLS_DEFINE_SINGLETON(ping, ping_dcd)
+{
+  uint64_t start, mid, end;
+  uint64_t diff1 = 0, diff2 = 0;
+  double diff1_d, diff2_d;
+  int i = 0;
+  int cnt;
+
+  while(((diff1 + diff2) >> DURATION_SECONDS_SHAMT) < CPU_FREQ) {
+    start = _rdtsc();
+    pong(&mid, &cnt);
+    end = _rdtsc();
+
+#ifdef SAMPLE_METADATA
+    assert(cnt == i);
+#endif
+
+    /* exclude the warm-up round */
+    if(i != 0) {
+      diff1 += mid - start;
+      diff2 += end - mid;
+    }
+
+    i++;
+  }
+
+  diff1_d = diff1;
+  diff2_d = diff2;
+
+  diff1_d /= i - 1;
+  diff2_d /= i - 1;
+
+  puts(  "Sample protection domain ping-pong switching latency measurements:");
+  printf(" %u iterations\n", i - 1);
+  printf("   Avg. # cycles ping -> pong: %.2f\n", diff1_d);
+  printf(" + Avg. # cycles pong -> ping: %.2f\n", diff2_d);
+  puts(  " ----------------------------------------");
+  printf("   Avg. # cycles round-trip:   %.2f\n", diff1_d + diff2_d);
+}
+/*---------------------------------------------------------------------------*/
+KERN_STARTUP_FUNC(sample_domain_init)
+{
+  PROT_DOMAINS_INIT_ID(ping_dcd);
+  prot_domains_reg(&ping_dcd, 0, 0, 0, 0, false);
+  SYSCALLS_INIT(ping);
+  SYSCALLS_AUTHZ(ping, ping_dcd);
+
+  PROT_DOMAINS_INIT_ID(pong_dcd);
+  prot_domains_reg(&pong_dcd, 0, 0,
+#ifdef SAMPLE_METADATA
+                   (uintptr_t)&meta, sizeof(meta), false);
+#else
+                   0, 0, false);
+#endif
+  SYSCALLS_INIT(pong);
+  SYSCALLS_AUTHZ(pong, pong_dcd);
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(prot_domain_latency_process, ev, data)
+{
+  PROCESS_BEGIN();
+
+  /* Run the latency test from the ping domain so that interrupts
+   * are disabled during the test.
+   */
+  ping();
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
diff --git a/platform/galileo/contiki-main.c b/platform/galileo/contiki-main.c
index 7b31a9961..ccc1f519f 100644
--- a/platform/galileo/contiki-main.c
+++ b/platform/galileo/contiki-main.c
@@ -54,6 +54,8 @@ PROCINIT(  &etimer_process
 #endif
          );
 
+extern int _sdata_kern_startup_func, _edata_kern_startup_func;
+
 /*---------------------------------------------------------------------------*/
 void
 app_main(void)
@@ -78,6 +80,8 @@ app_main(void)
 int
 main(void)
 {
+  uintptr_t *func_ptr;
+
 #ifdef X86_CONF_RESTRICT_DMA
   quarkX1000_imr_conf();
 #endif
@@ -104,6 +108,13 @@ main(void)
    */
   pci_root_complex_lock();
 
+  func_ptr = (uintptr_t *)&_sdata_kern_startup_func;
+  while(func_ptr != (uintptr_t *)&_edata_kern_startup_func) {
+    ((void (*)(void))*func_ptr)();
+
+    func_ptr++;
+  }
+
   prot_domains_leave_main();
 
   return 0;

From 04bbba6c1267e4a40b9b30c182039bd8e27d2a7f Mon Sep 17 00:00:00 2001
From: Ralf Schlatterbeck <rsc@runtux.com>
Date: Fri, 22 Apr 2016 17:51:59 +0200
Subject: [PATCH 193/393] Multi-platform support, osd-merkur-{128,256}

Rename guhRF platform to osd-merkur-256, previous osd-merkur platform is
now osd-merkur-128. Also check that everything is consistent.
Add both platforms to the regression tests.
Move redundant files in platform dev directory of both platforms to
cpu/avr/dev. Note that this probably needs some rework. Already
discovered some inconsistency in io definitions of both devices in the
avr/io.h includes. Added a workaround in the obvious cases.
The platform makefiles now set correct parameters for bootloader and for
reading mac-address from flash memory.
Factor the flash programming into cpu/avr and platform/osd-merkur* and
rework *all* osd example makefiles to use the new settings. Also update
all the flash.sh and run.sh to use the new settings.
The suli ledstrip modules (and osd example) have also been removed.
---
 .gitmodules                                   |   3 -
 cpu/avr/Makefile.avr                          |  29 +-
 {platform/guhRF => cpu/avr}/dev/adc.c         |   0
 {platform/guhRF => cpu/avr}/dev/adc.h         |   0
 .../dev => cpu/avr/dev/arduino}/Arduino.h     |   0
 .../avr}/dev/arduino/Print.cpp                |   0
 .../avr}/dev/arduino/Print.h                  |   0
 .../avr}/dev/arduino/Printable.h              |   0
 .../avr}/dev/arduino/Stream.cpp               |   0
 .../avr}/dev/arduino/Stream.h                 |   0
 .../avr}/dev/arduino/WMath.cpp                |   0
 .../avr}/dev/arduino/WString.cpp              |   0
 .../avr}/dev/arduino/WString.h                |   0
 .../avr}/dev/arduino/Wire.cpp                 |   0
 .../osd-merkur => cpu/avr}/dev/arduino/Wire.h |   0
 .../dev => cpu/avr/dev/arduino}/binary.h      |   0
 .../dev => cpu/avr/dev/arduino}/hw-arduino.h  |   0
 .../avr}/dev/arduino/new.cpp                  |   0
 .../osd-merkur => cpu/avr}/dev/arduino/new.h  |   0
 .../osd-merkur => cpu/avr}/dev/arduino/twi.c  |   0
 .../osd-merkur => cpu/avr}/dev/arduino/twi.h  |   0
 .../avr/dev/arduino}/wiring_digital.c         |   0
 .../avr}/dev/arduino/wiring_private.h         |   0
 {platform/guhRF => cpu/avr}/dev/batmon.c      |   0
 {platform/guhRF => cpu/avr}/dev/batmon.h      |   0
 .../guhRF => cpu/avr}/dev/battery-sensor.c    |   0
 .../guhRF => cpu/avr}/dev/battery-sensor.h    |   0
 .../avr}/dev/button-sensor.c                  |   0
 {platform/guhRF => cpu/avr}/dev/dht11.c       |   0
 {platform/guhRF => cpu/avr}/dev/dht11.h       |   0
 {platform/guhRF => cpu/avr}/dev/ds1820.c      |   0
 {platform/guhRF => cpu/avr}/dev/ds1820.h      |   0
 {platform/guhRF => cpu/avr}/dev/i2c.c         |   0
 {platform/guhRF => cpu/avr}/dev/i2c.h         |   0
 {platform/guhRF => cpu/avr}/dev/key.c         |   0
 {platform/guhRF => cpu/avr}/dev/key.h         |   0
 {platform/osd-merkur => cpu/avr}/dev/led.c    |   0
 {platform/osd-merkur => cpu/avr}/dev/led.h    |  13 +
 .../guhRF => cpu/avr}/dev/optriac-sensor.c    |   0
 .../guhRF => cpu/avr}/dev/optriac-sensor.h    |   0
 .../osd-merkur => cpu/avr}/dev/pir-sensor.c   |   0
 {platform/guhRF => cpu/avr}/dev/pir-sensor.h  |   0
 .../guhRF => cpu/avr}/dev/relay-sensor.c      |   0
 .../guhRF => cpu/avr}/dev/relay-sensor.h      |   0
 {platform/guhRF => cpu/avr}/dev/relay.c       |   0
 {platform/guhRF => cpu/avr}/dev/relay.h       |   0
 .../guhRF => cpu/avr}/dev/servo-sensor.c      |   0
 .../guhRF => cpu/avr}/dev/servo-sensor.h      |   0
 {platform/guhRF => cpu/avr}/dev/servo.c       |   0
 {platform/guhRF => cpu/avr}/dev/servo.h       |   0
 {platform/guhRF => cpu/avr}/dev/sg-ready.c    |   2 +-
 {platform/guhRF => cpu/avr}/dev/sg-ready.h    |  23 +
 .../guhRF => cpu/avr}/dev/t4-servo-sensor.c   |   0
 .../guhRF => cpu/avr}/dev/t4-servo-sensor.h   |   0
 {platform/guhRF => cpu/avr}/dev/t4-servo.c    |   0
 {platform/guhRF => cpu/avr}/dev/t4-servo.h    |   0
 .../avr}/dev/temperature-sensor.c             |   0
 .../avr}/dev/temperature-sensor.h             |   0
 examples/osd/.gitignore                       |   2 +
 examples/osd/arduino-climate3/Makefile        |  57 +-
 examples/osd/arduino-climate3/flash.sh        |   2 +-
 examples/osd/arduino-climate3/run.sh          |   4 +-
 examples/osd/arduino-dallastemp/Makefile      |  34 +-
 examples/osd/arduino-dallastemp/flash.sh      |   2 +-
 examples/osd/arduino-dallastemp/run.sh        |   4 +-
 examples/osd/arduino-distance/Makefile        |  34 +-
 examples/osd/arduino-distance/flash.sh        |   2 +-
 examples/osd/arduino-distance/run.sh          |   4 +-
 examples/osd/arduino-dooralert/Makefile       |  34 +-
 examples/osd/arduino-dooralert/flash.sh       |   2 +-
 examples/osd/arduino-dooralert/run.sh         |   4 +-
 examples/osd/arduino-htu21/Makefile           |  34 +-
 examples/osd/arduino-htu21/flash.sh           |   2 +-
 examples/osd/arduino-htu21/run.sh             |   4 +-
 examples/osd/arduino-ledstrip/Makefile        |  33 +-
 examples/osd/arduino-ledstrip/flash.sh        |   2 +-
 examples/osd/arduino-ledstrip/run.sh          |   4 +-
 examples/osd/arduino-merkurboard/Makefile     |  34 +-
 examples/osd/arduino-merkurboard/flash.sh     |   2 +-
 examples/osd/arduino-merkurboard/run.sh       |   4 +-
 examples/osd/arduino-plantobserving/Makefile  |  34 +-
 examples/osd/arduino-plantobserving/flash.sh  |   2 +-
 examples/osd/arduino-plantobserving/run.sh    |   4 +-
 examples/osd/arduino-roller/Makefile          |  34 +-
 examples/osd/arduino-roller/flash.sh          |   2 +-
 examples/osd/arduino-roller/run.sh            |   4 +-
 examples/osd/arduino-roomalert/Makefile       |  34 +-
 examples/osd/arduino-roomalert/flash.sh       |   2 +-
 examples/osd/arduino-roomalert/run.sh         |   4 +-
 examples/osd/arduino-sketch/Makefile          |  34 +-
 examples/osd/arduino-sketch/flash.sh          |   2 +-
 examples/osd/arduino-sketch/run.sh            |   4 +-
 examples/osd/arduino-wateralert/Makefile      |  34 +-
 examples/osd/arduino-wateralert/flash.sh      |   2 +-
 examples/osd/arduino-wateralert/run.sh        |   4 +-
 examples/osd/climate/Makefile                 |  27 +-
 examples/osd/climate/flash.sh                 |   2 +-
 examples/osd/climate/run.sh                   |   4 +-
 examples/osd/climate2/Makefile                |  25 +-
 examples/osd/climate2/flash.sh                |   2 +-
 examples/osd/climate2/run.sh                  |   4 +-
 examples/osd/dual-rgbw-actor/Makefile         |  12 +-
 examples/osd/dual-rgbw-actor/flash.sh         |   2 +-
 examples/osd/dual-rgbw-actor/run.sh           |   7 +-
 examples/osd/embedd-vm-merkurboard/Makefile   |  11 +-
 examples/osd/embedd-vm-merkurboard/flash.sh   |   2 +-
 examples/osd/embedd-vm-merkurboard/run.sh     |   7 +-
 .../osd/er-rest-example-merkurboard/Makefile  |  46 +-
 .../osd/er-rest-example-merkurboard/flash.sh  |   2 +-
 .../osd/er-rest-example-merkurboard/run.sh    |   4 +-
 examples/osd/led-strip/Makefile               |  94 ---
 examples/osd/led-strip/flash.sh               |   2 -
 examples/osd/led-strip/led-strip.c            | 160 -----
 examples/osd/led-strip/project-conf.h         | 102 ---
 examples/osd/led-strip/run.sh                 |   5 -
 examples/osd/light-actor/Makefile             |  34 +-
 examples/osd/light-actor/flash.sh             |   2 +-
 examples/osd/light-actor/pcintkey.c           |  25 +-
 examples/osd/light-actor/run.sh               |   7 +-
 examples/osd/light-shutter-control/Makefile   |  11 +-
 examples/osd/light-shutter-control/flash.sh   |   2 +-
 examples/osd/light-shutter-control/pcintkey.c |  25 +-
 examples/osd/light-shutter-control/run.sh     |   7 +-
 examples/osd/merkurboard/Makefile             |  48 +-
 examples/osd/merkurboard/flash.sh             |   2 +-
 examples/osd/merkurboard/run.sh               |   4 +-
 examples/osd/native-border-router/Makefile    |  12 +-
 examples/osd/pingtheplug/Makefile             |  34 +-
 examples/osd/pingtheplug/er-example-server.c  |   2 +-
 examples/osd/pingtheplug/flash.sh             |   2 +-
 examples/osd/pingtheplug/pcintkey.c           |  25 +-
 examples/osd/pingtheplug/run.sh               |   7 +-
 examples/osd/pir-sensor/Makefile              |  11 +-
 examples/osd/pir-sensor/flash.sh              |   2 +-
 examples/osd/pir-sensor/run.sh                |   7 +-
 examples/osd/poti/Makefile                    |  26 +-
 examples/osd/poti/flash.sh                    |   2 +-
 examples/osd/poti/run.sh                      |   4 +-
 examples/osd/powerbox/Makefile                |  13 +-
 examples/osd/powerbox/flash.sh                |   2 +-
 examples/osd/powerbox/run.sh                  |   7 +-
 examples/osd/pwm-example/Makefile             |  34 +-
 examples/osd/pwm-example/flash.sh             |   2 +-
 examples/osd/pwm-example/run.sh               |   4 +-
 examples/osd/rpl-border-router/Makefile       |  11 +-
 examples/osd/rpl-border-router/flash.sh       |   2 +-
 examples/osd/rpl-border-router/run.sh         |   8 +-
 examples/osd/servo-sensor/Makefile            |  15 +-
 examples/osd/servo-sensor/flash.sh            |   2 +-
 examples/osd/servo-sensor/run.sh              |   7 +-
 examples/osd/slip-radio/Makefile              |  11 +-
 examples/osd/slip-radio/flash.sh              |   2 +-
 examples/osd/slip-radio/run.sh                |   7 +-
 examples/osd/wallclock-time/Makefile          |  61 +-
 examples/osd/wallclock-time/flash.sh          |   2 +-
 examples/osd/wallclock-time/run.sh            |   4 +-
 .../{er-example-server.c => wallclock.c}      |   1 +
 examples/osd/wirelessplug/Makefile            |  22 +-
 examples/osd/wirelessplug/flash.sh            |   2 +-
 examples/osd/wirelessplug/run.sh              |   7 +-
 platform/guhRF/dev/button-sensor.c            |  78 ---
 platform/guhRF/dev/led.c                      |  72 --
 platform/guhRF/dev/led.h                      |  52 --
 platform/guhRF/dev/pir-sensor.c               |  85 ---
 platform/guhRF/dev/wiring_private.h           |  69 --
 .../Makefile.osd-merkur-128}                  |  36 +-
 .../contiki-conf.h                            |  76 +--
 .../contiki-main.c                            |  37 +-
 .../dev/leds-arch.c                           |  22 +-
 .../{guhRF => osd-merkur-128}/dev/leds-arch.h |   5 +-
 .../dev/pins_arduino.h                        |   0
 platform/{guhRF => osd-merkur-128}/node-id.c  |   0
 platform/{guhRF => osd-merkur-128}/node-id.h  |   0
 platform/{guhRF => osd-merkur-128}/params.c   |   0
 .../{osd-merkur => osd-merkur-128}/params.h   |   9 +-
 .../{guhRF => osd-merkur-128}/slip_uart0.c    |   0
 .../Makefile.osd-merkur-256}                  |  76 +--
 .../{guhRF => osd-merkur-256}/contiki-conf.h  |  47 +-
 .../{guhRF => osd-merkur-256}/contiki-main.c  |   6 +-
 .../{guhRF => osd-merkur-256}/dev/leds-arch.c |   0
 platform/osd-merkur-256/dev/leds-arch.h       |  25 +
 .../dev/pins_arduino.h                        |   0
 .../{osd-merkur => osd-merkur-256}/node-id.c  |   0
 .../{osd-merkur => osd-merkur-256}/node-id.h  |   0
 .../{osd-merkur => osd-merkur-256}/params.c   |   0
 platform/{guhRF => osd-merkur-256}/params.h   |   7 +-
 .../slip_uart0.c                              |   0
 platform/osd-merkur/dev/LED_Strip_Suli        |   1 -
 platform/osd-merkur/dev/Suli.h                | 106 ---
 platform/osd-merkur/dev/adc.c                 |  84 ---
 platform/osd-merkur/dev/adc.h                 |  65 --
 platform/osd-merkur/dev/arduino/Arduino.h     | 172 -----
 platform/osd-merkur/dev/arduino/hw-arduino.h  |  83 ---
 .../osd-merkur/dev/arduino/wiring_digital.c   | 104 ---
 platform/osd-merkur/dev/batmon.c              |  55 --
 platform/osd-merkur/dev/batmon.h              |   8 -
 platform/osd-merkur/dev/battery-sensor.c      |  90 ---
 platform/osd-merkur/dev/battery-sensor.h      |  48 --
 platform/osd-merkur/dev/binary.h              | 515 --------------
 platform/osd-merkur/dev/dht11.c               | 125 ----
 platform/osd-merkur/dev/dht11.h               |  67 --
 platform/osd-merkur/dev/ds1820.c              | 291 --------
 platform/osd-merkur/dev/ds1820.h              |  45 --
 platform/osd-merkur/dev/i2c.c                 | 391 -----------
 platform/osd-merkur/dev/i2c.h                 | 131 ----
 platform/osd-merkur/dev/key.c                 |  73 --
 platform/osd-merkur/dev/key.h                 |  50 --
 platform/osd-merkur/dev/leds-arch.h           |  31 -
 platform/osd-merkur/dev/old/Printable.h       |  40 --
 platform/osd-merkur/dev/old/Stream.cpp        | 270 --------
 platform/osd-merkur/dev/old/Stream.h          |  96 ---
 platform/osd-merkur/dev/old/WString.cpp       | 645 ------------------
 platform/osd-merkur/dev/old/WString.h         | 205 ------
 platform/osd-merkur/dev/old/Wire.cpp          | 298 --------
 platform/osd-merkur/dev/old/Wire.h            |  79 ---
 platform/osd-merkur/dev/old/new.cpp           |  28 -
 platform/osd-merkur/dev/old/new.h             |  24 -
 platform/osd-merkur/dev/old/twi.c             | 527 --------------
 platform/osd-merkur/dev/old/twi.h             |  53 --
 platform/osd-merkur/dev/optriac-sensor.c      | 102 ---
 platform/osd-merkur/dev/optriac-sensor.h      |  54 --
 platform/osd-merkur/dev/pir-sensor.h          |  48 --
 platform/osd-merkur/dev/relay-sensor.c        | 109 ---
 platform/osd-merkur/dev/relay-sensor.h        |  66 --
 platform/osd-merkur/dev/relay.c               |  76 ---
 platform/osd-merkur/dev/relay.h               |  54 --
 platform/osd-merkur/dev/servo-sensor.c        | 100 ---
 platform/osd-merkur/dev/servo-sensor.h        |  50 --
 platform/osd-merkur/dev/servo.c               | 152 -----
 platform/osd-merkur/dev/servo.h               |  44 --
 platform/osd-merkur/dev/t4-servo-sensor.c     | 101 ---
 platform/osd-merkur/dev/t4-servo-sensor.h     |  52 --
 platform/osd-merkur/dev/t4-servo.c            | 139 ----
 platform/osd-merkur/dev/t4-servo.h            |  61 --
 platform/osd-merkur/dev/temperature-sensor.c  |  66 --
 platform/osd-merkur/dev/temperature-sensor.h  |  49 --
 .../20-compile-osd-ports/Makefile             |  68 +-
 237 files changed, 679 insertions(+), 7835 deletions(-)
 rename {platform/guhRF => cpu/avr}/dev/adc.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/adc.h (100%)
 rename {platform/guhRF/dev => cpu/avr/dev/arduino}/Arduino.h (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/arduino/Print.cpp (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/arduino/Print.h (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/arduino/Printable.h (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/arduino/Stream.cpp (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/arduino/Stream.h (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/arduino/WMath.cpp (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/arduino/WString.cpp (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/arduino/WString.h (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/arduino/Wire.cpp (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/arduino/Wire.h (100%)
 rename {platform/guhRF/dev => cpu/avr/dev/arduino}/binary.h (100%)
 rename {platform/guhRF/dev => cpu/avr/dev/arduino}/hw-arduino.h (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/arduino/new.cpp (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/arduino/new.h (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/arduino/twi.c (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/arduino/twi.h (100%)
 rename {platform/guhRF/dev => cpu/avr/dev/arduino}/wiring_digital.c (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/arduino/wiring_private.h (100%)
 rename {platform/guhRF => cpu/avr}/dev/batmon.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/batmon.h (100%)
 rename {platform/guhRF => cpu/avr}/dev/battery-sensor.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/battery-sensor.h (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/button-sensor.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/dht11.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/dht11.h (100%)
 rename {platform/guhRF => cpu/avr}/dev/ds1820.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/ds1820.h (100%)
 rename {platform/guhRF => cpu/avr}/dev/i2c.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/i2c.h (100%)
 rename {platform/guhRF => cpu/avr}/dev/key.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/key.h (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/led.c (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/led.h (89%)
 rename {platform/guhRF => cpu/avr}/dev/optriac-sensor.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/optriac-sensor.h (100%)
 rename {platform/osd-merkur => cpu/avr}/dev/pir-sensor.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/pir-sensor.h (100%)
 rename {platform/guhRF => cpu/avr}/dev/relay-sensor.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/relay-sensor.h (100%)
 rename {platform/guhRF => cpu/avr}/dev/relay.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/relay.h (100%)
 rename {platform/guhRF => cpu/avr}/dev/servo-sensor.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/servo-sensor.h (100%)
 rename {platform/guhRF => cpu/avr}/dev/servo.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/servo.h (100%)
 rename {platform/guhRF => cpu/avr}/dev/sg-ready.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/sg-ready.h (84%)
 rename {platform/guhRF => cpu/avr}/dev/t4-servo-sensor.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/t4-servo-sensor.h (100%)
 rename {platform/guhRF => cpu/avr}/dev/t4-servo.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/t4-servo.h (100%)
 rename {platform/guhRF => cpu/avr}/dev/temperature-sensor.c (100%)
 rename {platform/guhRF => cpu/avr}/dev/temperature-sensor.h (100%)
 delete mode 100644 examples/osd/led-strip/Makefile
 delete mode 100755 examples/osd/led-strip/flash.sh
 delete mode 100644 examples/osd/led-strip/led-strip.c
 delete mode 100644 examples/osd/led-strip/project-conf.h
 delete mode 100755 examples/osd/led-strip/run.sh
 rename examples/osd/wallclock-time/{er-example-server.c => wallclock.c} (99%)
 delete mode 100644 platform/guhRF/dev/button-sensor.c
 delete mode 100644 platform/guhRF/dev/led.c
 delete mode 100644 platform/guhRF/dev/led.h
 delete mode 100644 platform/guhRF/dev/pir-sensor.c
 delete mode 100644 platform/guhRF/dev/wiring_private.h
 rename platform/{osd-merkur/Makefile.osd-merkur => osd-merkur-128/Makefile.osd-merkur-128} (70%)
 rename platform/{osd-merkur => osd-merkur-128}/contiki-conf.h (81%)
 rename platform/{osd-merkur => osd-merkur-128}/contiki-main.c (93%)
 rename platform/{osd-merkur => osd-merkur-128}/dev/leds-arch.c (83%)
 rename platform/{guhRF => osd-merkur-128}/dev/leds-arch.h (88%)
 rename platform/{guhRF => osd-merkur-128}/dev/pins_arduino.h (100%)
 rename platform/{guhRF => osd-merkur-128}/node-id.c (100%)
 rename platform/{guhRF => osd-merkur-128}/node-id.h (100%)
 rename platform/{guhRF => osd-merkur-128}/params.c (100%)
 rename platform/{osd-merkur => osd-merkur-128}/params.h (91%)
 rename platform/{guhRF => osd-merkur-128}/slip_uart0.c (100%)
 rename platform/{guhRF/Makefile.guhRF => osd-merkur-256/Makefile.osd-merkur-256} (50%)
 rename platform/{guhRF => osd-merkur-256}/contiki-conf.h (90%)
 rename platform/{guhRF => osd-merkur-256}/contiki-main.c (99%)
 rename platform/{guhRF => osd-merkur-256}/dev/leds-arch.c (100%)
 create mode 100644 platform/osd-merkur-256/dev/leds-arch.h
 rename platform/{osd-merkur => osd-merkur-256}/dev/pins_arduino.h (100%)
 rename platform/{osd-merkur => osd-merkur-256}/node-id.c (100%)
 rename platform/{osd-merkur => osd-merkur-256}/node-id.h (100%)
 rename platform/{osd-merkur => osd-merkur-256}/params.c (100%)
 rename platform/{guhRF => osd-merkur-256}/params.h (91%)
 rename platform/{osd-merkur => osd-merkur-256}/slip_uart0.c (100%)
 delete mode 160000 platform/osd-merkur/dev/LED_Strip_Suli
 delete mode 100644 platform/osd-merkur/dev/Suli.h
 delete mode 100644 platform/osd-merkur/dev/adc.c
 delete mode 100644 platform/osd-merkur/dev/adc.h
 delete mode 100644 platform/osd-merkur/dev/arduino/Arduino.h
 delete mode 100644 platform/osd-merkur/dev/arduino/hw-arduino.h
 delete mode 100644 platform/osd-merkur/dev/arduino/wiring_digital.c
 delete mode 100644 platform/osd-merkur/dev/batmon.c
 delete mode 100644 platform/osd-merkur/dev/batmon.h
 delete mode 100644 platform/osd-merkur/dev/battery-sensor.c
 delete mode 100644 platform/osd-merkur/dev/battery-sensor.h
 delete mode 100644 platform/osd-merkur/dev/binary.h
 delete mode 100644 platform/osd-merkur/dev/dht11.c
 delete mode 100644 platform/osd-merkur/dev/dht11.h
 delete mode 100644 platform/osd-merkur/dev/ds1820.c
 delete mode 100644 platform/osd-merkur/dev/ds1820.h
 delete mode 100644 platform/osd-merkur/dev/i2c.c
 delete mode 100644 platform/osd-merkur/dev/i2c.h
 delete mode 100644 platform/osd-merkur/dev/key.c
 delete mode 100644 platform/osd-merkur/dev/key.h
 delete mode 100644 platform/osd-merkur/dev/leds-arch.h
 delete mode 100644 platform/osd-merkur/dev/old/Printable.h
 delete mode 100644 platform/osd-merkur/dev/old/Stream.cpp
 delete mode 100644 platform/osd-merkur/dev/old/Stream.h
 delete mode 100644 platform/osd-merkur/dev/old/WString.cpp
 delete mode 100644 platform/osd-merkur/dev/old/WString.h
 delete mode 100644 platform/osd-merkur/dev/old/Wire.cpp
 delete mode 100644 platform/osd-merkur/dev/old/Wire.h
 delete mode 100644 platform/osd-merkur/dev/old/new.cpp
 delete mode 100644 platform/osd-merkur/dev/old/new.h
 delete mode 100644 platform/osd-merkur/dev/old/twi.c
 delete mode 100644 platform/osd-merkur/dev/old/twi.h
 delete mode 100644 platform/osd-merkur/dev/optriac-sensor.c
 delete mode 100644 platform/osd-merkur/dev/optriac-sensor.h
 delete mode 100644 platform/osd-merkur/dev/pir-sensor.h
 delete mode 100644 platform/osd-merkur/dev/relay-sensor.c
 delete mode 100644 platform/osd-merkur/dev/relay-sensor.h
 delete mode 100644 platform/osd-merkur/dev/relay.c
 delete mode 100644 platform/osd-merkur/dev/relay.h
 delete mode 100644 platform/osd-merkur/dev/servo-sensor.c
 delete mode 100644 platform/osd-merkur/dev/servo-sensor.h
 delete mode 100644 platform/osd-merkur/dev/servo.c
 delete mode 100644 platform/osd-merkur/dev/servo.h
 delete mode 100644 platform/osd-merkur/dev/t4-servo-sensor.c
 delete mode 100644 platform/osd-merkur/dev/t4-servo-sensor.h
 delete mode 100644 platform/osd-merkur/dev/t4-servo.c
 delete mode 100644 platform/osd-merkur/dev/t4-servo.h
 delete mode 100644 platform/osd-merkur/dev/temperature-sensor.c
 delete mode 100644 platform/osd-merkur/dev/temperature-sensor.h

diff --git a/.gitmodules b/.gitmodules
index 1fc8b720e..eecb69722 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "tools/cc2538-bsl"]
 	path = tools/cc2538-bsl
 	url = https://github.com/JelmerT/cc2538-bsl.git
-[submodule "platform/osd-merkur/dev/LED_Strip_Suli"]
-	path = platform/osd-merkur/dev/LED_Strip_Suli
-	url = https://github.com/osdomotics/LED_Strip_Suli.git
 [submodule "cpu/cc26xx-cc13xx/lib/cc26xxware"]
 	path = cpu/cc26xx-cc13xx/lib/cc26xxware
 	url = https://github.com/g-oikonomou/cc26xxware.git
diff --git a/cpu/avr/Makefile.avr b/cpu/avr/Makefile.avr
index 34537caa9..bc94010a2 100644
--- a/cpu/avr/Makefile.avr
+++ b/cpu/avr/Makefile.avr
@@ -12,7 +12,7 @@ CONTIKI_CPU=$(CONTIKI)/cpu/avr
 
 ### These directories will be searched for the specified source files
 ### TARGETLIBS are platform-specific routines in the contiki library path
-CONTIKI_CPU_DIRS            = . dev
+CONTIKI_CPU_DIRS            = . dev dev/arduino
 AVR        = clock.c mtarch.c eeprom.c flash.c rs232.c leds-arch.c \
              watchdog.c rtimer-arch.c bootloader.c
 ELFLOADER  = elfloader.c elfloader-avr.c symtab-avr.c
@@ -202,23 +202,30 @@ endif
 ### Upload image
 #Let avrdude use defaults if port or programmer not defined
 AVRDUDE ?= avrdude
-ifdef AVRDUDE_PORT
- AVRDUDE_PORT:=-P $(AVRDUDE_PORT)
-endif
-ifdef AVRDUDE_PROGRAMMER
- AVRDUDE_PROGRAMMER:=-c $(AVRDUDE_PROGRAMMER)
-endif
 ifdef AVRDUDE_MCU
- AVRDUDE_MCU:=-p $(AVRDUDE_MCU)
+ DUDE_MCU:=-p $(AVRDUDE_MCU)
 else
- AVRDUDE_MCU:=-p $(MCU)
+ DUDE_MCU:=-p $(MCU)
 endif
 %.u: %.hex
-	$(AVRDUDE) $(AVRDUDE_MCU) $(AVRDUDE_OPTIONS) $(AVRDUDE_PORT) $(AVRDUDE_PROGRAMMER) -U flash:w:$<
+	$(AVRDUDE) $(DUDE_MCU) $(AVRDUDE_OPTIONS) -P $(AVRDUDE_PORT) \
+        -c $(AVRDUDE_PROGRAMMER) -U flash:w:$<:i
 
 %.eu: %.eep
-	$(AVRDUDE) $(AVRDUDE_MCU) ${AVRDUDE_OPTIONS} ${AVRDUDE_PORT} ${AVRDUDE_PROGRAMMER} -U eeprom:w:$<
+	$(AVRDUDE) $(DUDE_MCU) ${AVRDUDE_OPTIONS} -P ${AVRDUDE_PORT} \
+        -c ${AVRDUDE_PROGRAMMER} -U eeprom:w:$<:i
 
 symbols.c:
 	cp ${CONTIKI}/tools/empty-symbols.c symbols.c
 	cp ${CONTIKI}/tools/empty-symbols.h symbols.h
+
+# Generic rules for .hex, .eep and .sz (size) file:
+%.$(TARGET).hex: %.$(TARGET)
+	$(OBJCOPY) -j .text -j .data -O ihex $< $@
+
+%.$(TARGET).eep: %.$(TARGET)
+	$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
+	--change-section-lma .eeprom=0 -O ihex $< $@
+
+%.$(TARGET).sz: %.$(TARGET)
+	$(ELF_SIZE) $<
diff --git a/platform/guhRF/dev/adc.c b/cpu/avr/dev/adc.c
similarity index 100%
rename from platform/guhRF/dev/adc.c
rename to cpu/avr/dev/adc.c
diff --git a/platform/guhRF/dev/adc.h b/cpu/avr/dev/adc.h
similarity index 100%
rename from platform/guhRF/dev/adc.h
rename to cpu/avr/dev/adc.h
diff --git a/platform/guhRF/dev/Arduino.h b/cpu/avr/dev/arduino/Arduino.h
similarity index 100%
rename from platform/guhRF/dev/Arduino.h
rename to cpu/avr/dev/arduino/Arduino.h
diff --git a/platform/osd-merkur/dev/arduino/Print.cpp b/cpu/avr/dev/arduino/Print.cpp
similarity index 100%
rename from platform/osd-merkur/dev/arduino/Print.cpp
rename to cpu/avr/dev/arduino/Print.cpp
diff --git a/platform/osd-merkur/dev/arduino/Print.h b/cpu/avr/dev/arduino/Print.h
similarity index 100%
rename from platform/osd-merkur/dev/arduino/Print.h
rename to cpu/avr/dev/arduino/Print.h
diff --git a/platform/osd-merkur/dev/arduino/Printable.h b/cpu/avr/dev/arduino/Printable.h
similarity index 100%
rename from platform/osd-merkur/dev/arduino/Printable.h
rename to cpu/avr/dev/arduino/Printable.h
diff --git a/platform/osd-merkur/dev/arduino/Stream.cpp b/cpu/avr/dev/arduino/Stream.cpp
similarity index 100%
rename from platform/osd-merkur/dev/arduino/Stream.cpp
rename to cpu/avr/dev/arduino/Stream.cpp
diff --git a/platform/osd-merkur/dev/arduino/Stream.h b/cpu/avr/dev/arduino/Stream.h
similarity index 100%
rename from platform/osd-merkur/dev/arduino/Stream.h
rename to cpu/avr/dev/arduino/Stream.h
diff --git a/platform/osd-merkur/dev/arduino/WMath.cpp b/cpu/avr/dev/arduino/WMath.cpp
similarity index 100%
rename from platform/osd-merkur/dev/arduino/WMath.cpp
rename to cpu/avr/dev/arduino/WMath.cpp
diff --git a/platform/osd-merkur/dev/arduino/WString.cpp b/cpu/avr/dev/arduino/WString.cpp
similarity index 100%
rename from platform/osd-merkur/dev/arduino/WString.cpp
rename to cpu/avr/dev/arduino/WString.cpp
diff --git a/platform/osd-merkur/dev/arduino/WString.h b/cpu/avr/dev/arduino/WString.h
similarity index 100%
rename from platform/osd-merkur/dev/arduino/WString.h
rename to cpu/avr/dev/arduino/WString.h
diff --git a/platform/osd-merkur/dev/arduino/Wire.cpp b/cpu/avr/dev/arduino/Wire.cpp
similarity index 100%
rename from platform/osd-merkur/dev/arduino/Wire.cpp
rename to cpu/avr/dev/arduino/Wire.cpp
diff --git a/platform/osd-merkur/dev/arduino/Wire.h b/cpu/avr/dev/arduino/Wire.h
similarity index 100%
rename from platform/osd-merkur/dev/arduino/Wire.h
rename to cpu/avr/dev/arduino/Wire.h
diff --git a/platform/guhRF/dev/binary.h b/cpu/avr/dev/arduino/binary.h
similarity index 100%
rename from platform/guhRF/dev/binary.h
rename to cpu/avr/dev/arduino/binary.h
diff --git a/platform/guhRF/dev/hw-arduino.h b/cpu/avr/dev/arduino/hw-arduino.h
similarity index 100%
rename from platform/guhRF/dev/hw-arduino.h
rename to cpu/avr/dev/arduino/hw-arduino.h
diff --git a/platform/osd-merkur/dev/arduino/new.cpp b/cpu/avr/dev/arduino/new.cpp
similarity index 100%
rename from platform/osd-merkur/dev/arduino/new.cpp
rename to cpu/avr/dev/arduino/new.cpp
diff --git a/platform/osd-merkur/dev/arduino/new.h b/cpu/avr/dev/arduino/new.h
similarity index 100%
rename from platform/osd-merkur/dev/arduino/new.h
rename to cpu/avr/dev/arduino/new.h
diff --git a/platform/osd-merkur/dev/arduino/twi.c b/cpu/avr/dev/arduino/twi.c
similarity index 100%
rename from platform/osd-merkur/dev/arduino/twi.c
rename to cpu/avr/dev/arduino/twi.c
diff --git a/platform/osd-merkur/dev/arduino/twi.h b/cpu/avr/dev/arduino/twi.h
similarity index 100%
rename from platform/osd-merkur/dev/arduino/twi.h
rename to cpu/avr/dev/arduino/twi.h
diff --git a/platform/guhRF/dev/wiring_digital.c b/cpu/avr/dev/arduino/wiring_digital.c
similarity index 100%
rename from platform/guhRF/dev/wiring_digital.c
rename to cpu/avr/dev/arduino/wiring_digital.c
diff --git a/platform/osd-merkur/dev/arduino/wiring_private.h b/cpu/avr/dev/arduino/wiring_private.h
similarity index 100%
rename from platform/osd-merkur/dev/arduino/wiring_private.h
rename to cpu/avr/dev/arduino/wiring_private.h
diff --git a/platform/guhRF/dev/batmon.c b/cpu/avr/dev/batmon.c
similarity index 100%
rename from platform/guhRF/dev/batmon.c
rename to cpu/avr/dev/batmon.c
diff --git a/platform/guhRF/dev/batmon.h b/cpu/avr/dev/batmon.h
similarity index 100%
rename from platform/guhRF/dev/batmon.h
rename to cpu/avr/dev/batmon.h
diff --git a/platform/guhRF/dev/battery-sensor.c b/cpu/avr/dev/battery-sensor.c
similarity index 100%
rename from platform/guhRF/dev/battery-sensor.c
rename to cpu/avr/dev/battery-sensor.c
diff --git a/platform/guhRF/dev/battery-sensor.h b/cpu/avr/dev/battery-sensor.h
similarity index 100%
rename from platform/guhRF/dev/battery-sensor.h
rename to cpu/avr/dev/battery-sensor.h
diff --git a/platform/osd-merkur/dev/button-sensor.c b/cpu/avr/dev/button-sensor.c
similarity index 100%
rename from platform/osd-merkur/dev/button-sensor.c
rename to cpu/avr/dev/button-sensor.c
diff --git a/platform/guhRF/dev/dht11.c b/cpu/avr/dev/dht11.c
similarity index 100%
rename from platform/guhRF/dev/dht11.c
rename to cpu/avr/dev/dht11.c
diff --git a/platform/guhRF/dev/dht11.h b/cpu/avr/dev/dht11.h
similarity index 100%
rename from platform/guhRF/dev/dht11.h
rename to cpu/avr/dev/dht11.h
diff --git a/platform/guhRF/dev/ds1820.c b/cpu/avr/dev/ds1820.c
similarity index 100%
rename from platform/guhRF/dev/ds1820.c
rename to cpu/avr/dev/ds1820.c
diff --git a/platform/guhRF/dev/ds1820.h b/cpu/avr/dev/ds1820.h
similarity index 100%
rename from platform/guhRF/dev/ds1820.h
rename to cpu/avr/dev/ds1820.h
diff --git a/platform/guhRF/dev/i2c.c b/cpu/avr/dev/i2c.c
similarity index 100%
rename from platform/guhRF/dev/i2c.c
rename to cpu/avr/dev/i2c.c
diff --git a/platform/guhRF/dev/i2c.h b/cpu/avr/dev/i2c.h
similarity index 100%
rename from platform/guhRF/dev/i2c.h
rename to cpu/avr/dev/i2c.h
diff --git a/platform/guhRF/dev/key.c b/cpu/avr/dev/key.c
similarity index 100%
rename from platform/guhRF/dev/key.c
rename to cpu/avr/dev/key.c
diff --git a/platform/guhRF/dev/key.h b/cpu/avr/dev/key.h
similarity index 100%
rename from platform/guhRF/dev/key.h
rename to cpu/avr/dev/key.h
diff --git a/platform/osd-merkur/dev/led.c b/cpu/avr/dev/led.c
similarity index 100%
rename from platform/osd-merkur/dev/led.c
rename to cpu/avr/dev/led.c
diff --git a/platform/osd-merkur/dev/led.h b/cpu/avr/dev/led.h
similarity index 89%
rename from platform/osd-merkur/dev/led.h
rename to cpu/avr/dev/led.h
index ffa753859..60ce30b01 100644
--- a/platform/osd-merkur/dev/led.h
+++ b/cpu/avr/dev/led.h
@@ -43,6 +43,19 @@
 
 #include <avr/io.h>
 
+/* Some io.h definitions of shift vary among processors */
+#ifndef DDE0
+#define DDE0 DDRE0
+#define DDE1 DDRE1
+#define DDE2 DDRE2
+#define DDE3 DDRE3
+#define DDE4 DDRE4
+#define DDE5 DDRE5
+#define DDE6 DDRE6
+#define DDE7 DDRE7
+#endif
+
+
 /** @name LED Functions */
 /** @{ */
 void led1_on(void);
diff --git a/platform/guhRF/dev/optriac-sensor.c b/cpu/avr/dev/optriac-sensor.c
similarity index 100%
rename from platform/guhRF/dev/optriac-sensor.c
rename to cpu/avr/dev/optriac-sensor.c
diff --git a/platform/guhRF/dev/optriac-sensor.h b/cpu/avr/dev/optriac-sensor.h
similarity index 100%
rename from platform/guhRF/dev/optriac-sensor.h
rename to cpu/avr/dev/optriac-sensor.h
diff --git a/platform/osd-merkur/dev/pir-sensor.c b/cpu/avr/dev/pir-sensor.c
similarity index 100%
rename from platform/osd-merkur/dev/pir-sensor.c
rename to cpu/avr/dev/pir-sensor.c
diff --git a/platform/guhRF/dev/pir-sensor.h b/cpu/avr/dev/pir-sensor.h
similarity index 100%
rename from platform/guhRF/dev/pir-sensor.h
rename to cpu/avr/dev/pir-sensor.h
diff --git a/platform/guhRF/dev/relay-sensor.c b/cpu/avr/dev/relay-sensor.c
similarity index 100%
rename from platform/guhRF/dev/relay-sensor.c
rename to cpu/avr/dev/relay-sensor.c
diff --git a/platform/guhRF/dev/relay-sensor.h b/cpu/avr/dev/relay-sensor.h
similarity index 100%
rename from platform/guhRF/dev/relay-sensor.h
rename to cpu/avr/dev/relay-sensor.h
diff --git a/platform/guhRF/dev/relay.c b/cpu/avr/dev/relay.c
similarity index 100%
rename from platform/guhRF/dev/relay.c
rename to cpu/avr/dev/relay.c
diff --git a/platform/guhRF/dev/relay.h b/cpu/avr/dev/relay.h
similarity index 100%
rename from platform/guhRF/dev/relay.h
rename to cpu/avr/dev/relay.h
diff --git a/platform/guhRF/dev/servo-sensor.c b/cpu/avr/dev/servo-sensor.c
similarity index 100%
rename from platform/guhRF/dev/servo-sensor.c
rename to cpu/avr/dev/servo-sensor.c
diff --git a/platform/guhRF/dev/servo-sensor.h b/cpu/avr/dev/servo-sensor.h
similarity index 100%
rename from platform/guhRF/dev/servo-sensor.h
rename to cpu/avr/dev/servo-sensor.h
diff --git a/platform/guhRF/dev/servo.c b/cpu/avr/dev/servo.c
similarity index 100%
rename from platform/guhRF/dev/servo.c
rename to cpu/avr/dev/servo.c
diff --git a/platform/guhRF/dev/servo.h b/cpu/avr/dev/servo.h
similarity index 100%
rename from platform/guhRF/dev/servo.h
rename to cpu/avr/dev/servo.h
diff --git a/platform/guhRF/dev/sg-ready.c b/cpu/avr/dev/sg-ready.c
similarity index 100%
rename from platform/guhRF/dev/sg-ready.c
rename to cpu/avr/dev/sg-ready.c
index c992462f0..93c1990bc 100644
--- a/platform/guhRF/dev/sg-ready.c
+++ b/cpu/avr/dev/sg-ready.c
@@ -98,8 +98,8 @@ sg_set_state(uint8_t state)
       State 2 - Relays 0:0  
       State 3 - Relays 0:1
       State 4 - Relays 1:1
-   */
    uint8_t i = 0;
+   */
    uint8_t current_state;
 
    PRINTF("GET STATE\n");
diff --git a/platform/guhRF/dev/sg-ready.h b/cpu/avr/dev/sg-ready.h
similarity index 84%
rename from platform/guhRF/dev/sg-ready.h
rename to cpu/avr/dev/sg-ready.h
index 0e92ba557..644df6109 100644
--- a/platform/guhRF/dev/sg-ready.h
+++ b/cpu/avr/dev/sg-ready.h
@@ -43,6 +43,29 @@
 
 #include <avr/io.h>
 
+/* Some other io settings of io include define DDRxx as DDxx */
+#ifndef DDRB0
+#define DDRB0 DDB0
+#define DDRB1 DDB1
+#define DDRB2 DDB2
+#define DDRB3 DDB3
+#define DDRB4 DDB4
+#define DDRB5 DDB5
+#define DDRB6 DDB6
+#define DDRB7 DDB7
+#endif
+
+#ifndef DDRD0
+#define DDRD0 DDD0
+#define DDRD1 DDD1
+#define DDRD2 DDD2
+#define DDRD3 DDD3
+#define DDRD4 DDD4
+#define DDRD5 DDD5
+#define DDRD6 DDD6
+#define DDRD7 DDD7
+#endif
+
 #define LATCH_TIME 3000 // time in micro seconds
 
 #define RELAY1_ON     (1<<DDRB4)
diff --git a/platform/guhRF/dev/t4-servo-sensor.c b/cpu/avr/dev/t4-servo-sensor.c
similarity index 100%
rename from platform/guhRF/dev/t4-servo-sensor.c
rename to cpu/avr/dev/t4-servo-sensor.c
diff --git a/platform/guhRF/dev/t4-servo-sensor.h b/cpu/avr/dev/t4-servo-sensor.h
similarity index 100%
rename from platform/guhRF/dev/t4-servo-sensor.h
rename to cpu/avr/dev/t4-servo-sensor.h
diff --git a/platform/guhRF/dev/t4-servo.c b/cpu/avr/dev/t4-servo.c
similarity index 100%
rename from platform/guhRF/dev/t4-servo.c
rename to cpu/avr/dev/t4-servo.c
diff --git a/platform/guhRF/dev/t4-servo.h b/cpu/avr/dev/t4-servo.h
similarity index 100%
rename from platform/guhRF/dev/t4-servo.h
rename to cpu/avr/dev/t4-servo.h
diff --git a/platform/guhRF/dev/temperature-sensor.c b/cpu/avr/dev/temperature-sensor.c
similarity index 100%
rename from platform/guhRF/dev/temperature-sensor.c
rename to cpu/avr/dev/temperature-sensor.c
diff --git a/platform/guhRF/dev/temperature-sensor.h b/cpu/avr/dev/temperature-sensor.h
similarity index 100%
rename from platform/guhRF/dev/temperature-sensor.h
rename to cpu/avr/dev/temperature-sensor.h
diff --git a/examples/osd/.gitignore b/examples/osd/.gitignore
index d21857f07..179e9fe4c 100644
--- a/examples/osd/.gitignore
+++ b/examples/osd/.gitignore
@@ -1,2 +1,4 @@
 *.osd-merkur
 *.eep
+*.osd-merkur-128
+*.osd-merkur-256
diff --git a/examples/osd/arduino-climate3/Makefile b/examples/osd/arduino-climate3/Makefile
index eb3d964f4..540913919 100644
--- a/examples/osd/arduino-climate3/Makefile
+++ b/examples/osd/arduino-climate3/Makefile
@@ -1,18 +1,11 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES) 
+all: $(EXE)
 
 CONTIKI=../../..
 
-# Contiki IPv6 configuration
-CONTIKI_WITH_IPV6 = 1
-
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 LFLAGS += -lm
 
@@ -29,59 +22,33 @@ REST_RESOURCES_FILES= $(notdir \
 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
 
+CONTIKI_WITH_IPV6 = 1
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
-$(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
+$(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
+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
diff --git a/examples/osd/arduino-climate3/flash.sh b/examples/osd/arduino-climate3/flash.sh
index e9cb40bfc..e82962073 100755
--- a/examples/osd/arduino-climate3/flash.sh
+++ b/examples/osd/arduino-climate3/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/arduino-climate3/run.sh b/examples/osd/arduino-climate3/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/arduino-climate3/run.sh
+++ b/examples/osd/arduino-climate3/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/arduino-dallastemp/Makefile b/examples/osd/arduino-dallastemp/Makefile
index 6d55a10a7..f1741488c 100644
--- a/examples/osd/arduino-dallastemp/Makefile
+++ b/examples/osd/arduino-dallastemp/Makefile
@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES) 
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -55,25 +51,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -85,3 +62,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/arduino-dallastemp/flash.sh b/examples/osd/arduino-dallastemp/flash.sh
index e9cb40bfc..e82962073 100755
--- a/examples/osd/arduino-dallastemp/flash.sh
+++ b/examples/osd/arduino-dallastemp/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/arduino-dallastemp/run.sh b/examples/osd/arduino-dallastemp/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/arduino-dallastemp/run.sh
+++ b/examples/osd/arduino-dallastemp/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/arduino-distance/Makefile b/examples/osd/arduino-distance/Makefile
index 70153c277..5a017eac0 100644
--- a/examples/osd/arduino-distance/Makefile
+++ b/examples/osd/arduino-distance/Makefile
@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -54,25 +50,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/tty.usbserial-AE01CZ7S -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -84,3 +61,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/arduino-distance/flash.sh b/examples/osd/arduino-distance/flash.sh
index e9cb40bfc..e82962073 100755
--- a/examples/osd/arduino-distance/flash.sh
+++ b/examples/osd/arduino-distance/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/arduino-distance/run.sh b/examples/osd/arduino-distance/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/arduino-distance/run.sh
+++ b/examples/osd/arduino-distance/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/arduino-dooralert/Makefile b/examples/osd/arduino-dooralert/Makefile
index 7dc5c26a1..5a017eac0 100644
--- a/examples/osd/arduino-dooralert/Makefile
+++ b/examples/osd/arduino-dooralert/Makefile
@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -54,25 +50,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -84,3 +61,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/arduino-dooralert/flash.sh b/examples/osd/arduino-dooralert/flash.sh
index e9cb40bfc..e82962073 100755
--- a/examples/osd/arduino-dooralert/flash.sh
+++ b/examples/osd/arduino-dooralert/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/arduino-dooralert/run.sh b/examples/osd/arduino-dooralert/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/arduino-dooralert/run.sh
+++ b/examples/osd/arduino-dooralert/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/arduino-htu21/Makefile b/examples/osd/arduino-htu21/Makefile
index cdf737098..b44ef11f1 100644
--- a/examples/osd/arduino-htu21/Makefile
+++ b/examples/osd/arduino-htu21/Makefile
@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES) 
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -55,25 +51,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -85,3 +62,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/arduino-htu21/flash.sh b/examples/osd/arduino-htu21/flash.sh
index e9cb40bfc..e82962073 100755
--- a/examples/osd/arduino-htu21/flash.sh
+++ b/examples/osd/arduino-htu21/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/arduino-htu21/run.sh b/examples/osd/arduino-htu21/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/arduino-htu21/run.sh
+++ b/examples/osd/arduino-htu21/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/arduino-ledstrip/Makefile b/examples/osd/arduino-ledstrip/Makefile
index 09e4a28a5..f03fdfc85 100644
--- a/examples/osd/arduino-ledstrip/Makefile
+++ b/examples/osd/arduino-ledstrip/Makefile
@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -55,25 +51,6 @@ APPS += json json-resource
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -86,3 +63,9 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 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
diff --git a/examples/osd/arduino-ledstrip/flash.sh b/examples/osd/arduino-ledstrip/flash.sh
index e9cb40bfc..e82962073 100755
--- a/examples/osd/arduino-ledstrip/flash.sh
+++ b/examples/osd/arduino-ledstrip/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/arduino-ledstrip/run.sh b/examples/osd/arduino-ledstrip/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/arduino-ledstrip/run.sh
+++ b/examples/osd/arduino-ledstrip/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/arduino-merkurboard/Makefile b/examples/osd/arduino-merkurboard/Makefile
index 7dc5c26a1..5a017eac0 100644
--- a/examples/osd/arduino-merkurboard/Makefile
+++ b/examples/osd/arduino-merkurboard/Makefile
@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -54,25 +50,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -84,3 +61,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/arduino-merkurboard/flash.sh b/examples/osd/arduino-merkurboard/flash.sh
index e9cb40bfc..e82962073 100755
--- a/examples/osd/arduino-merkurboard/flash.sh
+++ b/examples/osd/arduino-merkurboard/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/arduino-merkurboard/run.sh b/examples/osd/arduino-merkurboard/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/arduino-merkurboard/run.sh
+++ b/examples/osd/arduino-merkurboard/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/arduino-plantobserving/Makefile b/examples/osd/arduino-plantobserving/Makefile
index 7dc5c26a1..5a017eac0 100644
--- a/examples/osd/arduino-plantobserving/Makefile
+++ b/examples/osd/arduino-plantobserving/Makefile
@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -54,25 +50,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -84,3 +61,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/arduino-plantobserving/flash.sh b/examples/osd/arduino-plantobserving/flash.sh
index e9cb40bfc..e82962073 100755
--- a/examples/osd/arduino-plantobserving/flash.sh
+++ b/examples/osd/arduino-plantobserving/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/arduino-plantobserving/run.sh b/examples/osd/arduino-plantobserving/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/arduino-plantobserving/run.sh
+++ b/examples/osd/arduino-plantobserving/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/arduino-roller/Makefile b/examples/osd/arduino-roller/Makefile
index 254357fd9..5ffe58cad 100644
--- a/examples/osd/arduino-roller/Makefile
+++ b/examples/osd/arduino-roller/Makefile
@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -54,25 +50,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -84,3 +61,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/arduino-roller/flash.sh b/examples/osd/arduino-roller/flash.sh
index e9cb40bfc..e82962073 100755
--- a/examples/osd/arduino-roller/flash.sh
+++ b/examples/osd/arduino-roller/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/arduino-roller/run.sh b/examples/osd/arduino-roller/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/arduino-roller/run.sh
+++ b/examples/osd/arduino-roller/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/arduino-roomalert/Makefile b/examples/osd/arduino-roomalert/Makefile
index 650158d21..fad4a2b73 100644
--- a/examples/osd/arduino-roomalert/Makefile
+++ b/examples/osd/arduino-roomalert/Makefile
@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -55,25 +51,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -85,3 +62,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/arduino-roomalert/flash.sh b/examples/osd/arduino-roomalert/flash.sh
index e9cb40bfc..e82962073 100755
--- a/examples/osd/arduino-roomalert/flash.sh
+++ b/examples/osd/arduino-roomalert/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/arduino-roomalert/run.sh b/examples/osd/arduino-roomalert/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/arduino-roomalert/run.sh
+++ b/examples/osd/arduino-roomalert/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/arduino-sketch/Makefile b/examples/osd/arduino-sketch/Makefile
index 0f2c1dcc2..d54e087b2 100644
--- a/examples/osd/arduino-sketch/Makefile
+++ b/examples/osd/arduino-sketch/Makefile
@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -42,25 +38,6 @@ APPS += time json arduino json-resource
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -72,3 +49,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/arduino-sketch/flash.sh b/examples/osd/arduino-sketch/flash.sh
index e9cb40bfc..e82962073 100755
--- a/examples/osd/arduino-sketch/flash.sh
+++ b/examples/osd/arduino-sketch/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/arduino-sketch/run.sh b/examples/osd/arduino-sketch/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/arduino-sketch/run.sh
+++ b/examples/osd/arduino-sketch/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/arduino-wateralert/Makefile b/examples/osd/arduino-wateralert/Makefile
index 7dc5c26a1..5a017eac0 100644
--- a/examples/osd/arduino-wateralert/Makefile
+++ b/examples/osd/arduino-wateralert/Makefile
@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -54,25 +50,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -84,3 +61,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/arduino-wateralert/flash.sh b/examples/osd/arduino-wateralert/flash.sh
index e9cb40bfc..e82962073 100755
--- a/examples/osd/arduino-wateralert/flash.sh
+++ b/examples/osd/arduino-wateralert/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/arduino-wateralert/run.sh b/examples/osd/arduino-wateralert/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/arduino-wateralert/run.sh
+++ b/examples/osd/arduino-wateralert/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/climate/Makefile b/examples/osd/climate/Makefile
index 7bde50858..211ea0c1c 100644
--- a/examples/osd/climate/Makefile
+++ b/examples/osd/climate/Makefile
@@ -1,10 +1,5 @@
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size er-example-server.osd-merkur.hex \
-    er-example-server.osd-merkur.eep
-endif
-
-all: er-example-server $(PLATFORM_FILES)
-# use target "er-plugtest-server" explicitly when requried 
+EXE=er-example-server
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -74,21 +69,9 @@ connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-rout
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0 
 
-avr-size: er-example-server.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
+avr-size: $(EXE).$(TARGET).sz
 
-er-example-server.osd-merkur.hex: er-example-server.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur \
-	    er-example-server.osd-merkur.hex
-
-er-example-server.osd-merkur.eep: er-example-server.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    er-example-server.osd-merkur er-example-server.osd-merkur.eep
-
-flash: er-example-server.osd-merkur.hex er-example-server.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:er-example-server.osd-merkur.hex:a -U \
-	    eeprom:w:er-example-server.osd-merkur.eep:a
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
 
 .PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep
diff --git a/examples/osd/climate/flash.sh b/examples/osd/climate/flash.sh
index e92d472f6..e82962073 100755
--- a/examples/osd/climate/flash.sh
+++ b/examples/osd/climate/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-merkur.hex:a -U eeprom:w:er-example-server.osd-merkur.eep:a
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/climate/run.sh b/examples/osd/climate/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/climate/run.sh
+++ b/examples/osd/climate/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/climate2/Makefile b/examples/osd/climate2/Makefile
index 7bde50858..ee3981b6a 100644
--- a/examples/osd/climate2/Makefile
+++ b/examples/osd/climate2/Makefile
@@ -1,9 +1,6 @@
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size er-example-server.osd-merkur.hex \
-    er-example-server.osd-merkur.eep
-endif
+EXE=er-example-server
 
-all: er-example-server $(PLATFORM_FILES)
+all: $(EXE)
 # use target "er-plugtest-server" explicitly when requried 
 
 CONTIKI=../../..
@@ -74,21 +71,9 @@ connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-rout
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0 
 
-avr-size: er-example-server.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
+avr-size: $(EXE).$(TARGET).sz
 
-er-example-server.osd-merkur.hex: er-example-server.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur \
-	    er-example-server.osd-merkur.hex
-
-er-example-server.osd-merkur.eep: er-example-server.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    er-example-server.osd-merkur er-example-server.osd-merkur.eep
-
-flash: er-example-server.osd-merkur.hex er-example-server.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:er-example-server.osd-merkur.hex:a -U \
-	    eeprom:w:er-example-server.osd-merkur.eep:a
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
 
 .PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep
diff --git a/examples/osd/climate2/flash.sh b/examples/osd/climate2/flash.sh
index e92d472f6..e82962073 100755
--- a/examples/osd/climate2/flash.sh
+++ b/examples/osd/climate2/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-merkur.hex:a -U eeprom:w:er-example-server.osd-merkur.eep:a
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/climate2/run.sh b/examples/osd/climate2/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/climate2/run.sh
+++ b/examples/osd/climate2/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/dual-rgbw-actor/Makefile b/examples/osd/dual-rgbw-actor/Makefile
index 1305e71b9..d0e207dcf 100644
--- a/examples/osd/dual-rgbw-actor/Makefile
+++ b/examples/osd/dual-rgbw-actor/Makefile
@@ -1,5 +1,6 @@
-all: er-example-server
-# use this target explicitly if requried: er-plugtest-server
+EXE=er-example-server
+
+all: $(EXE)
 
 # variable for this Makefile
 # configure CoAP implementation (3|7|12|13) (er-coap-07 also supports CoAP draft 08)
@@ -91,3 +92,10 @@ connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/dual-rgbw-actor/flash.sh b/examples/osd/dual-rgbw-actor/flash.sh
index b91668634..e82962073 100755
--- a/examples/osd/dual-rgbw-actor/flash.sh
+++ b/examples/osd/dual-rgbw-actor/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-merkur.hex:a -U eeprom:w:er-example-server.osd-merkur.eep:a
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/dual-rgbw-actor/run.sh b/examples/osd/dual-rgbw-actor/run.sh
index 19451da3a..7b3a1dc9f 100755
--- a/examples/osd/dual-rgbw-actor/run.sh
+++ b/examples/osd/dual-rgbw-actor/run.sh
@@ -1,8 +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
-make -j TARGET=osd-merkur
-#avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
-avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
-avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
+make clean TARGET=osd-merkur-128
+make -j TARGET=osd-merkur-128
diff --git a/examples/osd/embedd-vm-merkurboard/Makefile b/examples/osd/embedd-vm-merkurboard/Makefile
index ee049c6f2..6e69fd76f 100644
--- a/examples/osd/embedd-vm-merkurboard/Makefile
+++ b/examples/osd/embedd-vm-merkurboard/Makefile
@@ -1,4 +1,6 @@
-all: embedd-vm-server
+EXE=embedd-vm-server
+
+all: $(EXE)
 # use this target explicitly if requried: er-plugtest-server
 
 # variable for this Makefile
@@ -60,3 +62,10 @@ connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/embedd-vm-merkurboard/flash.sh b/examples/osd/embedd-vm-merkurboard/flash.sh
index fe0d83f0d..e82962073 100755
--- a/examples/osd/embedd-vm-merkurboard/flash.sh
+++ b/examples/osd/embedd-vm-merkurboard/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:embedd-vm-server.osd-merkur.hex:a -U eeprom:w:embedd-vm-server.osd-merkur.eep:a
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/embedd-vm-merkurboard/run.sh b/examples/osd/embedd-vm-merkurboard/run.sh
index cd9abaee7..5d5cbbbb4 100755
--- a/examples/osd/embedd-vm-merkurboard/run.sh
+++ b/examples/osd/embedd-vm-merkurboard/run.sh
@@ -1,8 +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
-make TARGET=osd-merkur
-avr-size -C --mcu=MCU=atmega128rfa1 embedd-vm-server.osd-merkur
-avr-objcopy -j .text -j .data -O ihex embedd-vm-server.osd-merkur embedd-vm-server.osd-merkur.hex
-avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex embedd-vm-server.osd-merkur embedd-vm-server.osd-merkur.eep
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/er-rest-example-merkurboard/Makefile b/examples/osd/er-rest-example-merkurboard/Makefile
index b9ce03b4d..21cc867a2 100644
--- a/examples/osd/er-rest-example-merkurboard/Makefile
+++ b/examples/osd/er-rest-example-merkurboard/Makefile
@@ -1,11 +1,6 @@
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size-server er-example-server.osd-merkur.hex \
-    er-example-server.osd-merkur.eep                             \
-    avr-size-client er-example-client.osd-merkur.hex             \
-    er-example-client.osd-merkur.eep
-endif
+EXE=er-example-client er-example-server
 
-all: er-example-server er-example-client $(PLATFORM_FILES)
+all: $(EXE)
 
 # use target "er-plugtest-server" explicitly when requried 
 
@@ -81,38 +76,15 @@ connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-rout
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0 
 
-avr-size-server: er-example-server.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
+avr-size-server: er-example-server.$(TARGET).sz
 
-er-example-server.osd-merkur.hex: er-example-server.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur \
-	    er-example-server.osd-merkur.hex
+avr-size-client: er-example-server.$(TARGET).sz
 
-er-example-server.osd-merkur.eep: er-example-server.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    er-example-server.osd-merkur er-example-server.osd-merkur.eep
+flash-server: er-example-server.$(TARGET).u er-example-server.$(TARGET).eu
 
-flash-server: er-example-server.osd-merkur.hex er-example-server.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:er-example-server.osd-merkur.hex:a -U \
-	    eeprom:w:er-example-server.osd-merkur.eep:a
-
-avr-size-client: er-example-client.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 er-example-client.osd-merkur
-
-er-example-client.osd-merkur.hex: er-example-client.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex er-example-client.osd-merkur \
-	    er-example-client.osd-merkur.hex
-
-er-example-client.osd-merkur.eep: er-example-client.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    er-example-client.osd-merkur er-example-client.osd-merkur.eep
-
-flash-client: er-example-client.osd-merkur.hex er-example-client.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:er-example-client.osd-merkur.hex:a -U \
-	    eeprom:w:er-example-client.osd-merkur.eep:a
+flash-client: er-example-client.$(TARGET).u er-example-client.$(TARGET).eu
 
 .PHONY: flash-client avr-size-client flash-server avr-size-server
+.PRECIOUS: er-example-server.$(TARGET).hex er-example-server.$(TARGET).eep \
+           er-example-client.$(TARGET).hex er-example-client.$(TARGET).eep
+
diff --git a/examples/osd/er-rest-example-merkurboard/flash.sh b/examples/osd/er-rest-example-merkurboard/flash.sh
index c75149555..e82962073 100755
--- a/examples/osd/er-rest-example-merkurboard/flash.sh
+++ b/examples/osd/er-rest-example-merkurboard/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo make flash-server
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/er-rest-example-merkurboard/run.sh b/examples/osd/er-rest-example-merkurboard/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/er-rest-example-merkurboard/run.sh
+++ b/examples/osd/er-rest-example-merkurboard/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/led-strip/Makefile b/examples/osd/led-strip/Makefile
deleted file mode 100644
index cced7c282..000000000
--- a/examples/osd/led-strip/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-SERIAL=/dev/ttyUSB0
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size led-strip.osd-merkur.hex \
-    led-strip.osd-merkur.eep
-endif
-
-all: led-strip $(PLATFORM_FILES)
-
-CONTIKI=../../..
-
-# Contiki IPv6 configuration
-WITH_UIP6=1
-UIP_CONF_IPV6=1
-CFLAGS += -DUIP_CONF_IPV6=1
-CFLAGS += -DUIP_CONF_IPV6_RPL=1
-
-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
-
-# automatically build RESTful resources
-REST_RESOURCES_DIR = ./resources
-REST_RESOURCES_DIR_COMMON = ../resources-common
-REST_RESOURCES_FILES= $(notdir \
-    $(shell find $(REST_RESOURCES_DIR_COMMON) -name '*.c') \
-    )
-
-PROJECTDIRS += $(REST_RESOURCES_DIR_COMMON)
-PROJECT_SOURCEFILES += $(REST_RESOURCES_FILES)
-
-# linker optimizations
-SMALL=1
-
-# REST Engine shall use Erbium CoAP implementation
-APPS += er-coap
-APPS += rest-engine
-APPS += json json-resource
-
-# optional rules to get assembly
-#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
-#CUSTOM_RULE_S_TO_OBJECTDIR_O = 1
-
-include $(CONTIKI)/Makefile.include
-
-# minimal-net target is currently broken in Contiki
-ifeq ($(TARGET), minimal-net)
-CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\"
-${info INFO: compiling with large buffers}
-CFLAGS += -DUIP_CONF_BUFFER_SIZE=1300
-CFLAGS += -DREST_MAX_CHUNK_SIZE=1024
-CFLAGS += -DCOAP_MAX_HEADER_SIZE=176
-CFLAGS += -DUIP_CONF_IPV6_RPL=0
-endif
-
-# optional rules to get assembly
-#$(OBJECTDIR)/%.o: asmdir/%.S
-#	$(CC) $(CFLAGS) -MMD -c $< -o $@
-#	@$(FINALIZE_DEPENDENCY)
-#
-#asmdir/%.S: %.c
-#	$(CC) $(CFLAGS) -MMD -S $< -o $@
-
-# border router rules
-$(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 -p 60001 aaaa::1/64
-
-connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-router.native
-	sudo $(CONTIKI)/exmples/ipv6/native-border-router/border-router.native -a 127.0.0.1 -p 60001 aaaa::1/64
-
-connect-minimal:
-	sudo ip address add fdfd::1/64 dev tap0 
-
-avr-size: led-strip.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 led-strip.osd-merkur
-
-led-strip.osd-merkur.hex: led-strip.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex led-strip.osd-merkur \
-	    led-strip.osd-merkur.hex
-
-led-strip.osd-merkur.eep: led-strip.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    led-strip.osd-merkur led-strip.osd-merkur.eep
-
-flash: led-strip.osd-merkur.hex led-strip.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P$(SERIAL) -b57600 -e -U \
-	    flash:w:led-strip.osd-merkur.hex:a -U \
-	    eeprom:w:led-strip.osd-merkur.eep:a
-
-.PHONY: flash avr-size
diff --git a/examples/osd/led-strip/flash.sh b/examples/osd/led-strip/flash.sh
deleted file mode 100755
index 2b14c43f4..000000000
--- a/examples/osd/led-strip/flash.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-make flash TARGET=osd-merkur
diff --git a/examples/osd/led-strip/led-strip.c b/examples/osd/led-strip/led-strip.c
deleted file mode 100644
index d691a91a5..000000000
--- a/examples/osd/led-strip/led-strip.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2015, Ralf Schlatterbeck Open Source Consulting
- * 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
- *      LED-strip driver for Seeed Studio LED-Strip
- * \author
- *      Ralf Schlatterbeck <rsc@runtux.com>
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-#include "contiki.h"
-#include "contiki-net.h"
-#include "rest-engine.h"
-#include "generic_resource.h"
-
-/*
- * Resources to be activated need to be imported through the extern keyword.
- * The build system automatically compiles the resources in the
- * corresponding sub-directory.
- */
- 
-#if PLATFORM_HAS_BATTERY
-#include "dev/battery-sensor.h"
-extern resource_t res_battery;
-#endif
-
-#if PLATFORM_HAS_RADIO
-#include "dev/radio-sensor.h"
-extern resource_t res_radio;
-#endif
-
-#include "LED_Strip_Suli.h"
-
-uint8_t color_rgb [3] = {0, 255, 0};
-
-static uint8_t name_to_offset (const char * name)
-{
-  uint8_t offset = 0;
-  if (0 == strcmp (name, "green")) {
-    offset = 1;
-  } else if (0 == strcmp (name, "blue")) {
-    offset = 2;
-  }
-  return offset;
-}
-
-static size_t
-color_to_string (const char *name, const char *uri, char *buf, size_t bsize)
-{
-  return snprintf (buf, bsize, "%d", color_rgb [name_to_offset (name)]);
-}
-
-int color_from_string (const char *name, const char *uri, const char *s)
-{
-  color_rgb [name_to_offset (name)] = atoi (s);
-  led_strip_begin ();
-  led_strip_set_color (color_rgb [0], color_rgb [1], color_rgb [2]);
-  led_strip_end ();
-  printf ("Set to R:%d G:%d B:%d\n"
-         , color_rgb [0], color_rgb [1], color_rgb [2])
-         ;
-  return 0;
-}
-
-GENERIC_RESOURCE
-  ( red
-  , RED_LED
-  , s
-  , 1
-  , color_from_string
-  , color_to_string
-  );
-
-GENERIC_RESOURCE
-  ( green
-  , GREEN_LED
-  , s
-  , 1
-  , color_from_string
-  , color_to_string
-  );
-
-GENERIC_RESOURCE
-  ( blue
-  , BLUE_LED
-  , s
-  , 1
-  , color_from_string
-  , color_to_string
-  );
-
-
-PROCESS(led_strip, "LED Strip Example");
-AUTOSTART_PROCESSES(&led_strip);
-
-PROCESS_THREAD(led_strip, ev, data)
-{
-
-  PROCESS_BEGIN();
-
-  /* Initialize the REST engine. */
-  rest_init_engine ();
-  printf ("Initialized\n");
-  led_strip_init   (3, 14);
-  led_strip_begin ();
-  led_strip_set_color (color_rgb [0], color_rgb [1], color_rgb [2]);
-  led_strip_end ();
-  printf ("Set to R:%d G:%d B:%d\n"
-         , color_rgb [0], color_rgb [1], color_rgb [2])
-         ;
-
-  /* Activate the application-specific resources. */
-#if PLATFORM_HAS_BATTERY
-  SENSORS_ACTIVATE(battery_sensor);
-  rest_activate_resource (&res_battery,"s/battery");
-#endif
-  rest_activate_resource (&res_red,   "led/R");
-  rest_activate_resource (&res_green, "led/G");
-  rest_activate_resource (&res_blue,  "led/B");
-
-  /* Define application-specific events here. */
-  /* Don't do anything for now, everything done in resources */
-  while(1) {
-    PROCESS_WAIT_EVENT();
-  } /* while (1) */
-
-  PROCESS_END();
-}
diff --git a/examples/osd/led-strip/project-conf.h b/examples/osd/led-strip/project-conf.h
deleted file mode 100644
index e45478f02..000000000
--- a/examples/osd/led-strip/project-conf.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2013, Matthias Kovatsch
- * 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_ERBIUM_CONF_H_
-#define PROJECT_ERBIUM_CONF_H_
-
-#define PLATFORM_HAS_INFO 1
-#define PLATFORM_HAS_BATTERY 1
-//#define PLATFORM_HAS_DHT11TEMP   1
-#define PLATFORM_HAS_LEDS    1
-
-/* For Debug: Dont allow MCU sleeping between channel checks */
-#undef RDC_CONF_MCU_SLEEP
-#define RDC_CONF_MCU_SLEEP       0
-
-/* Some platforms have weird includes. */
-#undef IEEE802154_CONF_PANID
-
-/* 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
-
-/* 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
-*/
-
-/* Save some memory for the sky platform. */
-/*
-#undef NBR_TABLE_CONF_MAX_NEIGHBORS
-#define NBR_TABLE_CONF_MAX_NEIGHBORS     10
-#undef UIP_CONF_MAX_ROUTES
-#define UIP_CONF_MAX_ROUTES   10
-*/
-
-/* Reduce 802.15.4 frame queue to save RAM. */
-/*
-#undef QUEUEBUF_CONF_NUM
-#define QUEUEBUF_CONF_NUM       4
-*/
-
-/*
-#undef SICSLOWPAN_CONF_FRAG
-#define SICSLOWPAN_CONF_FRAG	1
-*/
-#endif /* PROJECT_ERBIUM_CONF_H_ */
diff --git a/examples/osd/led-strip/run.sh b/examples/osd/led-strip/run.sh
deleted file mode 100755
index 0fceb01ce..000000000
--- a/examples/osd/led-strip/run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/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
-make TARGET=osd-merkur
diff --git a/examples/osd/light-actor/Makefile b/examples/osd/light-actor/Makefile
index 02b345590..881d7002c 100644
--- a/examples/osd/light-actor/Makefile
+++ b/examples/osd/light-actor/Makefile
@@ -1,10 +1,6 @@
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size er-example-server.osd-merkur.hex \
-    er-example-server.osd-merkur.eep
-endif
+EXE=er-example-server
 
-all: er-example-server $(PLATFORM_FILES)
-# use this target explicitly if requried: er-plugtest-server
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -41,25 +37,6 @@ APPS += json json-resource
 
 include $(CONTIKI)/Makefile.include
 
-avr-size: er-example-server.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
-
-er-example-server.osd-merkur.hex: er-example-server.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur \
-	    er-example-server.osd-merkur.hex
-
-er-example-server.osd-merkur.eep: er-example-server.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    er-example-server.osd-merkur er-example-server.osd-merkur.eep
-
-flash: er-example-server.osd-merkur.hex er-example-server.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:er-example-server.osd-merkur.hex:a -U \
-	    eeprom:w:er-example-server.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -71,3 +48,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/light-actor/flash.sh b/examples/osd/light-actor/flash.sh
index e92d472f6..e82962073 100755
--- a/examples/osd/light-actor/flash.sh
+++ b/examples/osd/light-actor/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-merkur.hex:a -U eeprom:w:er-example-server.osd-merkur.eep:a
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/light-actor/pcintkey.c b/examples/osd/light-actor/pcintkey.c
index 5fc065e24..f9553efd4 100644
--- a/examples/osd/light-actor/pcintkey.c
+++ b/examples/osd/light-actor/pcintkey.c
@@ -55,9 +55,32 @@ ISR(PCINT0_vect)
 //    }
 //  }
 }
+
+/* Compatibility of old vs new definitions in io.h */
+#ifndef DDE0
+#define DDE0 DDRE0
+#define DDE1 DDRE1
+#define DDE2 DDRE2
+#define DDE3 DDRE3
+#define DDE4 DDRE4
+#define DDE5 DDRE5
+#define DDE6 DDRE6
+#define DDE7 DDRE7
+#endif
+#ifndef DDF0
+#define DDF0 DDRF0
+#define DDF1 DDRF1
+#define DDF2 DDRF2
+#define DDF3 DDRF3
+#define DDF4 DDRF4
+#define DDF5 DDRF5
+#define DDF6 DDRF6
+#define DDF7 DDRF7
+#endif
+
 /**
  *   \brief This will intialize the KEY for button readings.
-*/
+ */
 void
 key_init(void)
 {
diff --git a/examples/osd/light-actor/run.sh b/examples/osd/light-actor/run.sh
index 4b11e9d2a..5d5cbbbb4 100755
--- a/examples/osd/light-actor/run.sh
+++ b/examples/osd/light-actor/run.sh
@@ -1,8 +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
-make TARGET=osd-merkur
-avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
-avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
-avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/light-shutter-control/Makefile b/examples/osd/light-shutter-control/Makefile
index 7a3466655..340032d58 100644
--- a/examples/osd/light-shutter-control/Makefile
+++ b/examples/osd/light-shutter-control/Makefile
@@ -1,6 +1,6 @@
-all: er-example-server
-# use this target explicitly if requried: er-plugtest-server
+EXE=er-example-server
 
+all: $(EXE)
 
 # variable for this Makefile
 # configure CoAP implementation (3|7|12|13) (er-coap-07 also supports CoAP draft 08)
@@ -96,3 +96,10 @@ connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/light-shutter-control/flash.sh b/examples/osd/light-shutter-control/flash.sh
index e92d472f6..e82962073 100755
--- a/examples/osd/light-shutter-control/flash.sh
+++ b/examples/osd/light-shutter-control/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-merkur.hex:a -U eeprom:w:er-example-server.osd-merkur.eep:a
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/light-shutter-control/pcintkey.c b/examples/osd/light-shutter-control/pcintkey.c
index a6e90afa5..8bbf5fcee 100644
--- a/examples/osd/light-shutter-control/pcintkey.c
+++ b/examples/osd/light-shutter-control/pcintkey.c
@@ -55,9 +55,32 @@ ISR(PCINT0_vect)
 //    }
 //  }
 }
+
+/* Compatibility of old vs new definitions in io.h */
+#ifndef DDE0
+#define DDE0 DDRE0
+#define DDE1 DDRE1
+#define DDE2 DDRE2
+#define DDE3 DDRE3
+#define DDE4 DDRE4
+#define DDE5 DDRE5
+#define DDE6 DDRE6
+#define DDE7 DDRE7
+#endif
+#ifndef DDF0
+#define DDF0 DDRF0
+#define DDF1 DDRF1
+#define DDF2 DDRF2
+#define DDF3 DDRF3
+#define DDF4 DDRF4
+#define DDF5 DDRF5
+#define DDF6 DDRF6
+#define DDF7 DDRF7
+#endif
+
 /**
  *   \brief This will intialize the KEY for button readings.
-*/
+ */
 void
 key_init(void)
 {
diff --git a/examples/osd/light-shutter-control/run.sh b/examples/osd/light-shutter-control/run.sh
index 4b11e9d2a..5d5cbbbb4 100755
--- a/examples/osd/light-shutter-control/run.sh
+++ b/examples/osd/light-shutter-control/run.sh
@@ -1,8 +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
-make TARGET=osd-merkur
-avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
-avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
-avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/merkurboard/Makefile b/examples/osd/merkurboard/Makefile
index 58d6ce4ac..9cd7198da 100644
--- a/examples/osd/merkurboard/Makefile
+++ b/examples/osd/merkurboard/Makefile
@@ -1,13 +1,6 @@
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size-server er-example-server.osd-merkur.hex \
-    er-example-server.osd-merkur.eep                             \
-    avr-size-client er-example-client.osd-merkur.hex             \
-    er-example-client.osd-merkur.eep
-endif
+EXE=er-example-server er-example-client
 
-all: er-example-server er-example-client $(PLATFORM_FILES)
-
-# use target "er-plugtest-server" explicitly when requried 
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -72,38 +65,15 @@ connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-rout
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0 
 
-avr-size-server: er-example-server.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
+avr-size-server: er-example-server.$(TARGET).sz
 
-er-example-server.osd-merkur.hex: er-example-server.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur \
-	    er-example-server.osd-merkur.hex
+avr-size-client: er-example-server.$(TARGET).sz
 
-er-example-server.osd-merkur.eep: er-example-server.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    er-example-server.osd-merkur er-example-server.osd-merkur.eep
+flash-server: er-example-server.$(TARGET).u er-example-server.$(TARGET).eu
 
-flash-server: er-example-server.osd-merkur.hex er-example-server.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:er-example-server.osd-merkur.hex:a -U \
-	    eeprom:w:er-example-server.osd-merkur.eep:a
-
-avr-size-client: er-example-client.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 er-example-client.osd-merkur
-
-er-example-client.osd-merkur.hex: er-example-client.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex er-example-client.osd-merkur \
-	    er-example-client.osd-merkur.hex
-
-er-example-client.osd-merkur.eep: er-example-client.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    er-example-client.osd-merkur er-example-client.osd-merkur.eep
-
-flash-client: er-example-client.osd-merkur.hex er-example-client.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:er-example-client.osd-merkur.hex:a -U \
-	    eeprom:w:er-example-client.osd-merkur.eep:a
+flash-client: er-example-client.$(TARGET).u er-example-client.$(TARGET).eu
 
 .PHONY: flash-client avr-size-client flash-server avr-size-server
+.PRECIOUS: er-example-server.$(TARGET).hex er-example-server.$(TARGET).eep \
+           er-example-client.$(TARGET).hex er-example-client.$(TARGET).eep
+
diff --git a/examples/osd/merkurboard/flash.sh b/examples/osd/merkurboard/flash.sh
index c75149555..824d375a0 100755
--- a/examples/osd/merkurboard/flash.sh
+++ b/examples/osd/merkurboard/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo make flash-server
+make TARGET=osd-merkur-128 flash-server
diff --git a/examples/osd/merkurboard/run.sh b/examples/osd/merkurboard/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/merkurboard/run.sh
+++ b/examples/osd/merkurboard/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/native-border-router/Makefile b/examples/osd/native-border-router/Makefile
index d781ed35c..442a39e78 100644
--- a/examples/osd/native-border-router/Makefile
+++ b/examples/osd/native-border-router/Makefile
@@ -1,5 +1,5 @@
-CONTIKI_PROJECT=border-router
-all: $(CONTIKI_PROJECT)
+EXE=border-router
+all: $(EXE)
 APPS = slip-cmd
 
 CONTIKI=../../..
@@ -25,3 +25,11 @@ include $(CONTIKI)/Makefile.include
 
 connect-router:	border-router.native
 	sudo ./border-router.native aaaa::1/64
+
+avr-size: $(EXE).$(TARGET).sz
+
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
+
+.PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep
+
diff --git a/examples/osd/pingtheplug/Makefile b/examples/osd/pingtheplug/Makefile
index 02b345590..881d7002c 100644
--- a/examples/osd/pingtheplug/Makefile
+++ b/examples/osd/pingtheplug/Makefile
@@ -1,10 +1,6 @@
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size er-example-server.osd-merkur.hex \
-    er-example-server.osd-merkur.eep
-endif
+EXE=er-example-server
 
-all: er-example-server $(PLATFORM_FILES)
-# use this target explicitly if requried: er-plugtest-server
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -41,25 +37,6 @@ APPS += json json-resource
 
 include $(CONTIKI)/Makefile.include
 
-avr-size: er-example-server.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
-
-er-example-server.osd-merkur.hex: er-example-server.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur \
-	    er-example-server.osd-merkur.hex
-
-er-example-server.osd-merkur.eep: er-example-server.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    er-example-server.osd-merkur er-example-server.osd-merkur.eep
-
-flash: er-example-server.osd-merkur.hex er-example-server.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:er-example-server.osd-merkur.hex:a -U \
-	    eeprom:w:er-example-server.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -71,3 +48,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/pingtheplug/er-example-server.c b/examples/osd/pingtheplug/er-example-server.c
index ea6357e87..2b62e47ec 100644
--- a/examples/osd/pingtheplug/er-example-server.c
+++ b/examples/osd/pingtheplug/er-example-server.c
@@ -678,7 +678,7 @@ AUTOSTART_PROCESSES(&rest_server_example, &sensors_process);
 PROCESS_THREAD(rest_server_example, ev, data)
 {
   static struct etimer ds_periodic_timer;
-  static int ext4=0;
+//  static int ext4=0;
   static int ext5=0;
   static int ext6=0;
 //  ext4 = is_button_ext4();
diff --git a/examples/osd/pingtheplug/flash.sh b/examples/osd/pingtheplug/flash.sh
index e92d472f6..e82962073 100755
--- a/examples/osd/pingtheplug/flash.sh
+++ b/examples/osd/pingtheplug/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-merkur.hex:a -U eeprom:w:er-example-server.osd-merkur.eep:a
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/pingtheplug/pcintkey.c b/examples/osd/pingtheplug/pcintkey.c
index 5fc065e24..f9553efd4 100644
--- a/examples/osd/pingtheplug/pcintkey.c
+++ b/examples/osd/pingtheplug/pcintkey.c
@@ -55,9 +55,32 @@ ISR(PCINT0_vect)
 //    }
 //  }
 }
+
+/* Compatibility of old vs new definitions in io.h */
+#ifndef DDE0
+#define DDE0 DDRE0
+#define DDE1 DDRE1
+#define DDE2 DDRE2
+#define DDE3 DDRE3
+#define DDE4 DDRE4
+#define DDE5 DDRE5
+#define DDE6 DDRE6
+#define DDE7 DDRE7
+#endif
+#ifndef DDF0
+#define DDF0 DDRF0
+#define DDF1 DDRF1
+#define DDF2 DDRF2
+#define DDF3 DDRF3
+#define DDF4 DDRF4
+#define DDF5 DDRF5
+#define DDF6 DDRF6
+#define DDF7 DDRF7
+#endif
+
 /**
  *   \brief This will intialize the KEY for button readings.
-*/
+ */
 void
 key_init(void)
 {
diff --git a/examples/osd/pingtheplug/run.sh b/examples/osd/pingtheplug/run.sh
index 4b11e9d2a..5d5cbbbb4 100755
--- a/examples/osd/pingtheplug/run.sh
+++ b/examples/osd/pingtheplug/run.sh
@@ -1,8 +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
-make TARGET=osd-merkur
-avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
-avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
-avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/pir-sensor/Makefile b/examples/osd/pir-sensor/Makefile
index 8a253c40d..0675e5538 100644
--- a/examples/osd/pir-sensor/Makefile
+++ b/examples/osd/pir-sensor/Makefile
@@ -1,6 +1,6 @@
-all: er-example-server
-# use this target explicitly if requried: er-plugtest-server
+EXE=er-example-server
 
+all: $(EXE)
 
 # variable for this Makefile
 # configure CoAP implementation (3|7|12|13) (er-coap-07 also supports CoAP draft 08)
@@ -92,3 +92,10 @@ connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/pir-sensor/flash.sh b/examples/osd/pir-sensor/flash.sh
index e92d472f6..e82962073 100755
--- a/examples/osd/pir-sensor/flash.sh
+++ b/examples/osd/pir-sensor/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-merkur.hex:a -U eeprom:w:er-example-server.osd-merkur.eep:a
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/pir-sensor/run.sh b/examples/osd/pir-sensor/run.sh
index 4b11e9d2a..5d5cbbbb4 100755
--- a/examples/osd/pir-sensor/run.sh
+++ b/examples/osd/pir-sensor/run.sh
@@ -1,8 +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
-make TARGET=osd-merkur
-avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
-avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
-avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/poti/Makefile b/examples/osd/poti/Makefile
index 536488828..8593b01cb 100644
--- a/examples/osd/poti/Makefile
+++ b/examples/osd/poti/Makefile
@@ -1,10 +1,6 @@
-SERIAL=/dev/ttyUSB0
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size poti.osd-merkur.hex \
-    poti.osd-merkur.eep
-endif
+EXE=poti
 
-all: poti $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -74,21 +70,9 @@ connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-rout
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0 
 
-avr-size: poti.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 poti.osd-merkur
+avr-size: $(EXE).$(TARGET).sz
 
-poti.osd-merkur.hex: poti.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex poti.osd-merkur \
-	    poti.osd-merkur.hex
-
-poti.osd-merkur.eep: poti.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    poti.osd-merkur poti.osd-merkur.eep
-
-flash: poti.osd-merkur.hex poti.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P$(SERIAL) -b57600 -e -U \
-	    flash:w:poti.osd-merkur.hex:a -U \
-	    eeprom:w:poti.osd-merkur.eep:a
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
 
 .PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep
diff --git a/examples/osd/poti/flash.sh b/examples/osd/poti/flash.sh
index 2b14c43f4..e82962073 100755
--- a/examples/osd/poti/flash.sh
+++ b/examples/osd/poti/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-make flash TARGET=osd-merkur
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/poti/run.sh b/examples/osd/poti/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/poti/run.sh
+++ b/examples/osd/poti/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/powerbox/Makefile b/examples/osd/powerbox/Makefile
index fa0c805ea..72ffc56e5 100644
--- a/examples/osd/powerbox/Makefile
+++ b/examples/osd/powerbox/Makefile
@@ -1,8 +1,6 @@
-all: er-example-server
-# use this target explicitly if requried: er-plugtest-server
+EXE=er-example-server
 
-
-# variable for this Makefile
+all: $(EXE)
 
 # for some platforms
 UIP_CONF_IPV6=1
@@ -59,3 +57,10 @@ connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/powerbox/flash.sh b/examples/osd/powerbox/flash.sh
index e92d472f6..e82962073 100755
--- a/examples/osd/powerbox/flash.sh
+++ b/examples/osd/powerbox/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-merkur.hex:a -U eeprom:w:er-example-server.osd-merkur.eep:a
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/powerbox/run.sh b/examples/osd/powerbox/run.sh
index 4b11e9d2a..5d5cbbbb4 100755
--- a/examples/osd/powerbox/run.sh
+++ b/examples/osd/powerbox/run.sh
@@ -1,8 +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
-make TARGET=osd-merkur
-avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
-avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
-avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/pwm-example/Makefile b/examples/osd/pwm-example/Makefile
index 8aa7ec9c1..c10f7ff31 100644
--- a/examples/osd/pwm-example/Makefile
+++ b/examples/osd/pwm-example/Makefile
@@ -1,10 +1,6 @@
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size er-example-server.osd-merkur.hex \
-    er-example-server.osd-merkur.eep
-endif
+EXE=er-example-server
 
-all: er-example-server $(PLATFORM_FILES)
-# use this target explicitly if requried: er-plugtest-server
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -39,25 +35,6 @@ APPS += json json-resource
 
 include $(CONTIKI)/Makefile.include
 
-avr-size: er-example-server.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
-
-er-example-server.osd-merkur.hex: er-example-server.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur \
-	    er-example-server.osd-merkur.hex
-
-er-example-server.osd-merkur.eep: er-example-server.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    er-example-server.osd-merkur er-example-server.osd-merkur.eep
-
-flash: er-example-server.osd-merkur.hex er-example-server.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:er-example-server.osd-merkur.hex:a -U \
-	    eeprom:w:er-example-server.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -69,3 +46,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/pwm-example/flash.sh b/examples/osd/pwm-example/flash.sh
index e9cb40bfc..e82962073 100755
--- a/examples/osd/pwm-example/flash.sh
+++ b/examples/osd/pwm-example/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/pwm-example/run.sh b/examples/osd/pwm-example/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/pwm-example/run.sh
+++ b/examples/osd/pwm-example/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/rpl-border-router/Makefile b/examples/osd/rpl-border-router/Makefile
index ce90a4eac..e57591e80 100644
--- a/examples/osd/rpl-border-router/Makefile
+++ b/examples/osd/rpl-border-router/Makefile
@@ -1,5 +1,5 @@
-CONTIKI_PROJECT=border-router
-all: $(CONTIKI_PROJECT) 
+EXE=border-router
+all: $(EXE) 
 
 CONTIKI=../../..
 
@@ -47,3 +47,10 @@ connect-router:	$(CONTIKI)/tools/tunslip6
 
 connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 $(PREFIX)
+
+avr-size: $(EXE).$(TARGET).sz
+
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
+
+.PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep
diff --git a/examples/osd/rpl-border-router/flash.sh b/examples/osd/rpl-border-router/flash.sh
index 07cfc9a65..e82962073 100755
--- a/examples/osd/rpl-border-router/flash.sh
+++ b/examples/osd/rpl-border-router/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:border-router.osd-merkur.hex:a -U eeprom:w:border-router.osd-merkur.eep:a
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/rpl-border-router/run.sh b/examples/osd/rpl-border-router/run.sh
index 9833eba6b..dc2b12de9 100755
--- a/examples/osd/rpl-border-router/run.sh
+++ b/examples/osd/rpl-border-router/run.sh
@@ -1,8 +1,6 @@
 #!/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
-make TARGET=osd-merkur
-avr-size -C --mcu=MCU=atmega128rfa1 border-router.osd-merkur
-avr-objcopy -j .text -j .data -O ihex border-router.osd-merkur border-router.osd-merkur.hex
-avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex border-router.osd-merkur border-router.osd-merkur.eep
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
+make TARGET=osd-merkur-128 avr-size
diff --git a/examples/osd/servo-sensor/Makefile b/examples/osd/servo-sensor/Makefile
index 0349fc11f..72ffc56e5 100644
--- a/examples/osd/servo-sensor/Makefile
+++ b/examples/osd/servo-sensor/Makefile
@@ -1,10 +1,6 @@
-all: er-example-server
-# use this target explicitly if requried: er-plugtest-server
+EXE=er-example-server
 
-
-# variable for this Makefile
-# configure CoAP implementation (3|7|12|13) (er-coap-07 also supports CoAP draft 08)
-WITH_COAP=13
+all: $(EXE)
 
 # for some platforms
 UIP_CONF_IPV6=1
@@ -61,3 +57,10 @@ connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 
 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
diff --git a/examples/osd/servo-sensor/flash.sh b/examples/osd/servo-sensor/flash.sh
index b91668634..e82962073 100755
--- a/examples/osd/servo-sensor/flash.sh
+++ b/examples/osd/servo-sensor/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-merkur.hex:a -U eeprom:w:er-example-server.osd-merkur.eep:a
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/servo-sensor/run.sh b/examples/osd/servo-sensor/run.sh
index 4b11e9d2a..5d5cbbbb4 100755
--- a/examples/osd/servo-sensor/run.sh
+++ b/examples/osd/servo-sensor/run.sh
@@ -1,8 +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
-make TARGET=osd-merkur
-avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
-avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
-avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/slip-radio/Makefile b/examples/osd/slip-radio/Makefile
index 9d6f8ca88..d6bb0802c 100644
--- a/examples/osd/slip-radio/Makefile
+++ b/examples/osd/slip-radio/Makefile
@@ -1,5 +1,5 @@
-CONTIKI_PROJECT=slip-radio
-all: $(CONTIKI_PROJECT)
+EXE=slip-radio
+all: $(EXE)
 APPS = slip-cmd
 
 ifeq ($(TARGET),)
@@ -26,3 +26,10 @@ endif
 CONTIKI_WITH_RPL = 0
 CONTIKI_WITH_IPV6 = 1
 include $(CONTIKI)/Makefile.include
+
+avr-size: $(EXE).$(TARGET).sz
+
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
+
+.PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep
diff --git a/examples/osd/slip-radio/flash.sh b/examples/osd/slip-radio/flash.sh
index 633f3f434..e82962073 100755
--- a/examples/osd/slip-radio/flash.sh
+++ b/examples/osd/slip-radio/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:slip-radio.osd-merkur.hex:a -U eeprom:w:slip-radio.osd-merkur.eep:a
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/slip-radio/run.sh b/examples/osd/slip-radio/run.sh
index eebc9a53a..5d5cbbbb4 100755
--- a/examples/osd/slip-radio/run.sh
+++ b/examples/osd/slip-radio/run.sh
@@ -1,8 +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
-make TARGET=osd-merkur
-avr-size slip-radio.osd-merkur
-avr-objcopy -j .text -j .data -O ihex slip-radio.osd-merkur slip-radio.osd-merkur.hex
-avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex slip-radio.osd-merkur slip-radio.osd-merkur.eep
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/wallclock-time/Makefile b/examples/osd/wallclock-time/Makefile
index 5c0062751..46d8e4625 100644
--- a/examples/osd/wallclock-time/Makefile
+++ b/examples/osd/wallclock-time/Makefile
@@ -1,10 +1,6 @@
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size er-example-server.osd-merkur.hex \
-    er-example-server.osd-merkur.eep
-endif
+EXE=wallclock
 
-all: er-example-server $(PLATFORM_FILES)
-# use target "er-plugtest-server" explicitly when requried 
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -28,62 +24,25 @@ APPS += er-coap
 APPS += rest-engine
 APPS += json json-resource time
 
-# optional rules to get assembly
-#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
-#CUSTOM_RULE_S_TO_OBJECTDIR_O = 1
-
 CONTIKI_WITH_IPV6 = 1
 include $(CONTIKI)/Makefile.include
 
-# minimal-net target is currently broken in Contiki
-ifeq ($(TARGET), minimal-net)
-CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\"
-${info INFO: er-example compiling with large buffers}
-CFLAGS += -DUIP_CONF_BUFFER_SIZE=1300
-CFLAGS += -DREST_MAX_CHUNK_SIZE=1024
-CFLAGS += -DCOAP_MAX_HEADER_SIZE=176
-CONTIKI_WITH_RPL=0
-endif
-
-# optional rules to get assembly
-#$(OBJECTDIR)/%.o: asmdir/%.S
-#	$(CC) $(CFLAGS) -MMD -c $< -o $@
-#	@$(FINALIZE_DEPENDENCY)
-#
-#asmdir/%.S: %.c
-#	$(CC) $(CFLAGS) -MMD -S $< -o $@
-
-# border router rules
-$(CONTIKI)/tools/tunslip6:	$(CONTIKI)/tools/tunslip6.c
+$(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
-connect-router:	$(CONTIKI)/tools/tunslip6
+connect-router: $(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 aaaa::1/64
 
-connect-router-cooja:	$(CONTIKI)/tools/tunslip6
+connect-router-cooja: $(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 -p 60001 aaaa::1/64
 
-connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-router.native
-	sudo $(CONTIKI)/exmples/ipv6/native-border-router/border-router.native -a 127.0.0.1 -p 60001 aaaa::1/64
-
 connect-minimal:
-	sudo ip address add fdfd::1/64 dev tap0 
+	sudo ip address add fdfd::1/64 dev tap0
 
-avr-size: er-example-server.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
+avr-size: $(EXE).$(TARGET).sz
 
-er-example-server.osd-merkur.hex: er-example-server.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur \
-	    er-example-server.osd-merkur.hex
-
-er-example-server.osd-merkur.eep: er-example-server.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    er-example-server.osd-merkur er-example-server.osd-merkur.eep
-
-flash: er-example-server.osd-merkur.hex er-example-server.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:er-example-server.osd-merkur.hex:a -U \
-	    eeprom:w:er-example-server.osd-merkur.eep:a
+# At some point we may want to include the eeprom file
+flash: $(EXE).$(TARGET).u # $(EXE).$(TARGET).eu
 
 .PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep
diff --git a/examples/osd/wallclock-time/flash.sh b/examples/osd/wallclock-time/flash.sh
index e9cb40bfc..e82962073 100755
--- a/examples/osd/wallclock-time/flash.sh
+++ b/examples/osd/wallclock-time/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/wallclock-time/run.sh b/examples/osd/wallclock-time/run.sh
index 0fceb01ce..5d5cbbbb4 100755
--- a/examples/osd/wallclock-time/run.sh
+++ b/examples/osd/wallclock-time/run.sh
@@ -1,5 +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
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/examples/osd/wallclock-time/er-example-server.c b/examples/osd/wallclock-time/wallclock.c
similarity index 99%
rename from examples/osd/wallclock-time/er-example-server.c
rename to examples/osd/wallclock-time/wallclock.c
index 709844d2d..9e0013b78 100644
--- a/examples/osd/wallclock-time/er-example-server.c
+++ b/examples/osd/wallclock-time/wallclock.c
@@ -134,6 +134,7 @@ PROCESS_THREAD(rest_server_example, ev, data)
 
   /* Initialize the OSD Hardware. */
   hw_init ();
+  led_set (0);
   /* Initialize the REST engine. */
   rest_init_engine ();
 
diff --git a/examples/osd/wirelessplug/Makefile b/examples/osd/wirelessplug/Makefile
index 17792e430..aeaa5e2ad 100644
--- a/examples/osd/wirelessplug/Makefile
+++ b/examples/osd/wirelessplug/Makefile
@@ -1,11 +1,6 @@
-all: er-example-server er-example-client
-# use this target explicitly if requried: er-plugtest-server
-
-
-# variable for this Makefile
-# configure CoAP implementation (3|7|12|13) (er-coap-07 also supports CoAP draft 08)
-WITH_COAP=13
+EXE=er-example-server er-example-client
 
+all: $(EXE)
 
 # variable for Makefile.include
 WITH_UIP6=1
@@ -95,3 +90,16 @@ connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
+
+avr-size-server: er-example-server.$(TARGET).sz
+
+avr-size-client: er-example-server.$(TARGET).sz
+
+flash-server: er-example-server.$(TARGET).u er-example-server.$(TARGET).eu
+
+flash-client: er-example-client.$(TARGET).u er-example-client.$(TARGET).eu
+
+.PHONY: flash-client avr-size-client flash-server avr-size-server
+.PRECIOUS: er-example-server.$(TARGET).hex er-example-server.$(TARGET).eep \
+           er-example-client.$(TARGET).hex er-example-client.$(TARGET).eep
+
diff --git a/examples/osd/wirelessplug/flash.sh b/examples/osd/wirelessplug/flash.sh
index e92d472f6..e82962073 100755
--- a/examples/osd/wirelessplug/flash.sh
+++ b/examples/osd/wirelessplug/flash.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-merkur.hex:a -U eeprom:w:er-example-server.osd-merkur.eep:a
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/wirelessplug/run.sh b/examples/osd/wirelessplug/run.sh
index 4b11e9d2a..5d5cbbbb4 100755
--- a/examples/osd/wirelessplug/run.sh
+++ b/examples/osd/wirelessplug/run.sh
@@ -1,8 +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
-make TARGET=osd-merkur
-avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
-avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
-avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128
diff --git a/platform/guhRF/dev/button-sensor.c b/platform/guhRF/dev/button-sensor.c
deleted file mode 100644
index a524a99b1..000000000
--- a/platform/guhRF/dev/button-sensor.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Sensor routine */
-
-#include "lib/sensors.h"
-#include "dev/button-sensor.h"
-
-#include <avr/interrupt.h>
-#include <avr/io.h>
-
-const struct sensors_sensor button_sensor;
-
-static struct timer debouncetimer;
-static int status(int type);
-static int enabled = 0;
-struct sensors_sensor *sensors[1];
-unsigned char sensors_flags[1];
-
-#define BUTTON_BIT INTF4
-#define BUTTON_CHECK_IRQ() (EIFR & BUTTON_BIT) ? 0 : 1
-
-#define PRINTF(...) printf(__VA_ARGS__)
-/*---------------------------------------------------------------------------*/
-ISR(INT4_vect)
-{
-  if(BUTTON_CHECK_IRQ()) {
-    if(timer_expired(&debouncetimer)) {
-      timer_set(&debouncetimer, CLOCK_SECOND / 4);
-      sensors_changed(&button_sensor);
-    }
-  }
-}
-/*---------------------------------------------------------------------------*/
-
-static int
-value(int type)
-{
- return (PINE & _BV(PE4) ? 0 : 1) || !timer_expired(&debouncetimer);
-
- //return 0;
-}
-
-static int
-configure(int type, int c)
-{
-	switch (type) {
-	case SENSORS_ACTIVE:
-		if (c) {
-			if(!status(SENSORS_ACTIVE)) {
-				timer_set(&debouncetimer, 0);
-				DDRE  |= (0<<DDRE4); // Set pin as input
-				PORTE |= (1<<PORTE4); // Set port PORTE bint 5 with pullup resistor
-				EICRB |= (1<<ISC40); // For falling edge
-				EIMSK |= (1<<INT4); // Set int
-				enabled = 1;
-				sei();
-			}
-		} else {
-				enabled = 0;
-				EIMSK &= ~(1<<INT4); // clear int
-		}
-		return 1;
-	}
-	return 0;
-}
-
-static int
-status(int type)
-{
-	switch (type) {
-	case SENSORS_ACTIVE:
-	case SENSORS_READY:
-		return enabled;//(EIMSK & (1<<INT5) ? 0 : 1);//BUTTON_IRQ_ENABLED();
-	}
-	return 0;
-}
-
-SENSORS_SENSOR(button_sensor, BUTTON_SENSOR,
-	       value, configure, status);
-
diff --git a/platform/guhRF/dev/led.c b/platform/guhRF/dev/led.c
deleted file mode 100644
index b447a2749..000000000
--- a/platform/guhRF/dev/led.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  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 guhRF LED support.
- *
- * \author
- *      Harald Pichler harald@the-develop.net
- *      Bernhard Trinnes bernhard.trinnes@guh.guru
- *
- */
-
-#include "led.h"
-
-/**
- * \addtogroup relay
- * \{
-*/
-/*---------------------------------------------------------------------------*/
-
-/**
- * \brief Turns the LED1 on.
-*/
-void
-led1_off(void)
-{
-    PORTE &= ~(1<<PINE5);
-    DDRE  |=  (1<<PINE5);
-}
-
-/*---------------------------------------------------------------------------*/
-
-/**
- *  \brief Turns the LED1 off.
-*/
-void
-led1_on(void)
-{
-    PORTE |= (1<<PINE5);
-    DDRE  |= (1<<PINE5);
-}
-/*---------------------------------------------------------------------------*/
-
diff --git a/platform/guhRF/dev/led.h b/platform/guhRF/dev/led.h
deleted file mode 100644
index 68ed89ab4..000000000
--- a/platform/guhRF/dev/led.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  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 __LED_H__
-#define __LED_H__
-
-#include <avr/io.h>
-
-/** @name LED Functions */
-/** @{ */
-void led1_on(void);
-void led1_off(void);
-/** @} */
-
-#endif /* __LED_H__ */
diff --git a/platform/guhRF/dev/pir-sensor.c b/platform/guhRF/dev/pir-sensor.c
deleted file mode 100644
index 37a97c025..000000000
--- a/platform/guhRF/dev/pir-sensor.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Sensor routine */
-#include "contiki.h"
-#include "lib/sensors.h"
-#include "dev/pir-sensor.h"
-
-#include <avr/interrupt.h>
-#include "led.h" // debug
-
-const struct sensors_sensor pir_sensor;
-
-static struct timer debouncetimer;
-static int status(int type);
-static int enabled = 0;
-struct sensors_sensor *sensors[1];
-unsigned char sensors_flags[1];
-
-#define PIR_BIT INTF6
-#define PIR_CHECK_IRQ() (EIFR & PIR_BIT) ? 0 : 1
-
-#define PRINTF(...) printf(__VA_ARGS__)
-/*---------------------------------------------------------------------------*/
-ISR(INT6_vect)
-{
-
-//  leds_toggle(LEDS_YELLOW);
-  
-  if(PIR_CHECK_IRQ()) {
-    if(timer_expired(&debouncetimer)) {
- //   led1_on();
-      timer_set(&debouncetimer, CLOCK_SECOND / 4);
-      sensors_changed(&pir_sensor);
- //   led1_off();
-    }
-  }
-
-}
-/*---------------------------------------------------------------------------*/
-
-static int
-value(int type)
-{
- return (PORTE & _BV(PE6) ? 0 : 1) || !timer_expired(&debouncetimer);
- //return 0;
-}
-
-static int
-configure(int type, int c)
-{
-	switch (type) {
-	case SENSORS_ACTIVE:
-		if (c) {
-			if(!status(SENSORS_ACTIVE)) {
-  //  led1_on();
-				timer_set(&debouncetimer, 0);
-				DDRE |= (0<<DDRE6); // Set pin as input
-				PORTE |= (1<<PORTE6); // Set port PORTE bint 6 with pullup resistor
-				EICRB |= (3<<ISC60); // For rising edge
-				EIMSK |= (1<<INT6); // Set int
-				enabled = 1;
-				sei();
-  //  led1_off();
-			}
-		} else {
-				enabled = 0;
-				EIMSK &= ~(1<<INT6); // clear int
-		}
-		return 1;
-	}
-	return 0;
-}
-
-static int
-status(int type)
-{
-	switch (type) {
-	case SENSORS_ACTIVE:
-	case SENSORS_READY:
-		return enabled;//(EIMSK & (1<<INT6) ? 0 : 1);//PIR_IRQ_ENABLED();
-	}
-	return 0;
-}
-
-SENSORS_SENSOR(pir_sensor, PIR_SENSOR,
-	       value, configure, status);
-
diff --git a/platform/guhRF/dev/wiring_private.h b/platform/guhRF/dev/wiring_private.h
deleted file mode 100644
index 37c263352..000000000
--- a/platform/guhRF/dev/wiring_private.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-  wiring_private.h - Internal header file.
-  Part of Arduino - http://www.arduino.cc/
-
-  Copyright (c) 2005-2006 David A. Mellis
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General
-  Public License along with this library; if not, write to the
-  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA  02111-1307  USA
-
-  $Id: wiring.h 239 2007-01-12 17:58:39Z mellis $
-*/
-
-#ifndef WiringPrivate_h
-#define WiringPrivate_h
-
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Arduino.h"
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-#ifndef cbi
-#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
-#endif
-#ifndef sbi
-#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
-#endif
-
-#define EXTERNAL_INT_0 0
-#define EXTERNAL_INT_1 1
-#define EXTERNAL_INT_2 2
-#define EXTERNAL_INT_3 3
-#define EXTERNAL_INT_4 4
-#define EXTERNAL_INT_5 5
-#define EXTERNAL_INT_6 6
-#define EXTERNAL_INT_7 7
-
-#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-#define EXTERNAL_NUM_INTERRUPTS 8
-#elif defined(__AVR_ATmega128RFA1__) || (__AVR_ATmega256RFR2__)
-#define EXTERNAL_NUM_INTERRUPTS 8
-#else
-#define EXTERNAL_NUM_INTERRUPTS 2
-#endif
-
-typedef void (*voidFuncPtr)(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif
diff --git a/platform/osd-merkur/Makefile.osd-merkur b/platform/osd-merkur-128/Makefile.osd-merkur-128
similarity index 70%
rename from platform/osd-merkur/Makefile.osd-merkur
rename to platform/osd-merkur-128/Makefile.osd-merkur-128
index 1527cdc6c..8817f3855 100644
--- a/platform/osd-merkur/Makefile.osd-merkur
+++ b/platform/osd-merkur-128/Makefile.osd-merkur-128
@@ -1,10 +1,11 @@
-CONTIKI_TARGET_DIRS = . dev dev/LED_Strip_Suli apps net loader dev/arduino
+CONTIKI_TARGET_DIRS = . dev apps net loader dev/arduino
 
 CONTIKI_CORE=contiki-main
 CONTIKI_TARGET_MAIN = ${CONTIKI_CORE}.o
 CONTIKI_TARGET_SOURCEFILES += contiki-main.c params.c node-id.c
 #Needed for slip
-CONTIKI_TARGET_SOURCEFILES += temperature-sensor.c adc.c led.c sensors.c slip_uart0.c slip.c leds-arch.c
+CONTIKI_TARGET_SOURCEFILES += led.c sensors.c slip_uart0.c slip.c leds-arch.c
+CONTIKI_TARGET_SOURCEFILES += temperature-sensor.c adc.c
 #Needed for Button
 CONTIKI_TARGET_SOURCEFILES += button-sensor.c
 # i2c Master
@@ -19,7 +20,6 @@ CONTIKI_TARGET_SOURCEFILES += battery-sensor.c batmon.c
 CONTIKI_TARGET_SOURCEFILES += pir-sensor.c
 #Needed for OPTRIAC
 CONTIKI_TARGET_SOURCEFILES += optriac-sensor.c
-CONTIKIAVR=$(CONTIKI)/cpu/avr
 #Needed for SERVO
 CONTIKI_TARGET_SOURCEFILES += servo.c servo-sensor.c
 #Needed for Timer4 Servo
@@ -28,11 +28,13 @@ CONTIKI_TARGET_SOURCEFILES += servo.c servo-sensor.c
 CONTIKI_TARGET_SOURCEFILES += relay.c relay-sensor.c
 # Arduino
 CONTIKI_TARGET_SOURCEFILES += wiring_digital.c
-CONTIKI_TARGET_SOURCEFILES += LED_Strip_Suli.c
 CONTIKI_TARGET_SOURCEFILES += new.cpp twi.c Wire.cpp WMath.cpp
 CONTIKI_TARGET_SOURCEFILES += Print.cpp Stream.cpp WString.cpp
+# guh Source Files
+# Smart Grid Ready Interface
+CONTIKI_TARGET_SOURCEFILES += sg-ready.c
 
-SULI_DIR=$(CONTIKI)/platform/$(TARGET)/dev/LED_Strip_Suli
+CONTIKIAVR=$(CONTIKI)/cpu/avr
 
 CONTIKIBOARD=.
 BOOTLOADER_START = 0x1F000
@@ -40,19 +42,29 @@ CONTIKI_PLAT_DEFS = -DF_CPU=16000000UL -DAUTO_CRC_PADDING=2 -DPLAT_TIMER=5
 
 MCU=atmega128rfa1
 
-AVRDUDE_PROGRAMMER=jtag2
+#AVRDUDE_PROGRAMMER=jtag2
+AVRDUDE_PROGRAMMER=arduino
 
-# For usb devices, you may either use PORT=usb, or (e.g. if you have more than one
-# programmer connected) you can use the following trick to find out the serial number:
+# For usb devices, you may either use PORT=usb, or (e.g. if you have
+# more than one programmer connected) you can use the following trick to
+# find out the serial number:
 #
 # The example is for an JTAGICE mkII used to program an ATmega128:
 # avrdude -v -P usb:xxxx -c jtag2 -p atmega128
-AVRDUDE_PORT=usb:00B000000D79
-
+# AVRDUDE_PORT=usb:00B000000D79
+# For serial devices with bootloader we also use the AVRDUDE_PORT setting:
+AVRDUDE_PORT=/dev/ttyUSB0
+# Only needed for serial devices, use empty setting for other
+# programmers
+AVRDUDE_BAUD_OPTION=-b 57600
 
 # Additional avrdude options
-# Verify off
-AVRDUDE_OPTIONS=-V
+# First some flash options:
+# Verify off is -V
+# Erase is -e
+# No-Erase (needed by some stk500 variants) is -D
+AVRDUDE_FLASH_OPTIONS=-e
+AVRDUDE_OPTIONS=$(AVRDUDE_BAUD_OPTION) $(AVRDUDE_FLASH_OPTIONS)
 AVRDUDE_MCU=m128rfa1
 
 #debug
diff --git a/platform/osd-merkur/contiki-conf.h b/platform/osd-merkur-128/contiki-conf.h
similarity index 81%
rename from platform/osd-merkur/contiki-conf.h
rename to platform/osd-merkur-128/contiki-conf.h
index 65d1c0510..043dff995 100644
--- a/platform/osd-merkur/contiki-conf.h
+++ b/platform/osd-merkur-128/contiki-conf.h
@@ -66,21 +66,8 @@ typedef uint32_t clock_time_t;
 void clock_delay_msec(uint16_t howlong);
 void clock_adjust_ticks(clock_time_t howmany);
 
-/* Michael Hartman's atmega128rfa1 board has an external 32768Hz crystal connected to TOSC1 and 2 pins similar to the Raven 1284p */
-/* and theoretically can use TIMER2 with it to keep time. Else TIMER0 is used. */
-/* The sleep timer requires the crystal and adds a TIMER2 interrupt routine if not already define by clock.c */
-#define AVR_CONF_USE32KCRYSTAL 0
-
-/* Michael Hartman's protobyte board has LED on PORTE1, used for radio on indication */
-/* However this results in disabling UART0. */
-#define RF230BB_CONF_LEDONPORTE1  0
-
-/* COM port to be used for SLIP connection. This is usually UART0, but see above */
-#if RF230BB_CONF_LEDONPORTE1
-#define SLIP_PORT RS232_PORT_1
-#else
+/* COM port to be used for SLIP connection. This is usually UART0. */
 #define SLIP_PORT RS232_PORT_0
-#endif
 
 /* Pre-allocated memory for loadable modules heap space (in bytes)*/
 /* Default is 4096. Currently used only when elfloader is present. Not tested on Raven */
@@ -124,8 +111,11 @@ typedef unsigned short uip_stats_t;
 #define RF230_MAX_TX_POWER 15
 #define RF230_MIN_RX_POWER 30
  */
-  /* The rf231 and atmega128rfa1 can use an rssi threshold for triggering rx_busy that saves 0.5ma in rx mode */
-/* 1 - 15 maps into -90 to -48 dBm; the register is written with RF230_MIN_RX_POWER/6 + 1. Undefine for -100dBm sensitivity */
+  /* The rf231, atmega128rfa1 and atmega256rfr2 can use an rssi
+   * threshold for triggering rx_busy that saves 0.5ma in rx mode
+   * 1 - 15 maps into -90 to -48 dBm; the register is written with
+   * RF230_MIN_RX_POWER/6 + 1. Undefine for -100dBm sensitivity
+   */
 //#define RF230_MIN_RX_POWER        0
 
 /* Network setup */
@@ -134,7 +124,7 @@ typedef unsigned short uip_stats_t;
 /* TX routine does automatic cca and optional backoffs */
 #define RDC_CONF_HARDWARE_CSMA   1
 /* Allow MCU sleeping between channel checks */
-#define RDC_CONF_MCU_SLEEP         1
+#define RDC_CONF_MCU_SLEEP       1
 
 #if NETSTACK_CONF_WITH_IPV6
 #define LINKADDR_CONF_SIZE        8
@@ -218,7 +208,7 @@ typedef unsigned short uip_stats_t;
 #define NBR_TABLE_CONF_MAX_NEIGHBORS      20
 #define UIP_CONF_DS6_DEFRT_NBU    2
 #define UIP_CONF_DS6_PREFIX_NBU   3
-#define UIP_CONF_MAX_ROUTES    20
+#define UIP_CONF_MAX_ROUTES      20
 #define UIP_CONF_DS6_ADDR_NBU     3
 #define UIP_CONF_DS6_MADDR_NBU    0
 #define UIP_CONF_DS6_AADDR_NBU    0
@@ -234,9 +224,9 @@ typedef unsigned short uip_stats_t;
 /* So without the header this needed for RPL mesh to form */
 #define CONTIKIMAC_FRAMER_CONF_SHORTEST_PACKET_SIZE   43-18  //multicast RPL DIS length
 /* Not tested much yet */
-#define CONTIKIMAC_CONF_WITH_PHASE_OPTIMIZATION       0
-#define CONTIKIMAC_CONF_COMPOWER               1
-#define RIMESTATS_CONF_ENABLED                 0
+#define CONTIKIMAC_CONF_WITH_PHASE_OPTIMIZATION 0
+#define CONTIKIMAC_CONF_COMPOWER                1
+#define RIMESTATS_CONF_ENABLED                  0
 
 #if NETSTACK_CONF_WITH_IPV6
 #define NETSTACK_CONF_FRAMER      framer_802154
@@ -266,51 +256,11 @@ typedef unsigned short uip_stats_t;
 #define NBR_TABLE_CONF_MAX_NEIGHBORS      20
 #define UIP_CONF_DS6_DEFRT_NBU    2
 #define UIP_CONF_DS6_PREFIX_NBU   3
-#define UIP_CONF_MAX_ROUTES    4
+#define UIP_CONF_MAX_ROUTES       4
 #define UIP_CONF_DS6_ADDR_NBU     3
 #define UIP_CONF_DS6_MADDR_NBU    0
 #define UIP_CONF_DS6_AADDR_NBU    0
 
-
-#elif 1  /* cx-mac radio cycling */
-/* RF230 does clear-channel assessment in extended mode (autoretries>0) */
-/* These values are guesses */
-#define RF230_CONF_FRAME_RETRIES  10
-#define RF230_CONF_CSMA_RETRIES   2
-#if RF230_CONF_CSMA_RETRIES
-#define NETSTACK_CONF_MAC         nullmac_driver
-#else
-#define NETSTACK_CONF_MAC         csma_driver
-#endif
-#define NETSTACK_CONF_RDC         cxmac_driver
-#define NETSTACK_CONF_FRAMER      framer_802154
-#define NETSTACK_CONF_RADIO       rf230_driver
-#define CHANNEL_802_15_4          26
-#define RF230_CONF_AUTOACK        1
-#define SICSLOWPAN_CONF_FRAG      1
-#define SICSLOWPAN_CONF_MAXAGE    3
-#define CXMAC_CONF_ANNOUNCEMENTS  0
-#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
-/* 211 bytes per queue buffer. Burst mode will need 15 for a 1280 byte MTU */
-#define QUEUEBUF_CONF_NUM         15
-/* 54 bytes per queue ref buffer */
-#define QUEUEBUF_CONF_REF_NUM     2
-/* Allocate remaining RAM. Not much left due to queuebuf increase  */
-#define UIP_CONF_MAX_CONNECTIONS  2
-#define UIP_CONF_MAX_LISTENPORTS  4
-#define UIP_CONF_UDP_CONNS        5
-#define NBR_TABLE_CONF_MAX_NEIGHBORS      4
-#define UIP_CONF_DS6_DEFRT_NBU    2
-#define UIP_CONF_DS6_PREFIX_NBU   3
-#define UIP_CONF_MAX_ROUTES    4
-#define UIP_CONF_DS6_ADDR_NBU     3
-#define UIP_CONF_DS6_MADDR_NBU    0
-#define UIP_CONF_DS6_AADDR_NBU    0
-//Below gives 10% duty cycle, undef for default 5%
-//#define CXMAC_CONF_ON_TIME (RTIMER_ARCH_SECOND / 80)
-//Below gives 50% duty cycle
-//#define CXMAC_CONF_ON_TIME (RTIMER_ARCH_SECOND / 16)
-
 #else
 #error Network configuration not specified!
 #endif   /* Network setup */
@@ -321,7 +271,7 @@ typedef unsigned short uip_stats_t;
 #if UIP_CONF_IPV6_RPL
 
 #define UIP_CONF_ROUTER                 1
-#define UIP_CONF_ND6_SEND_RA		    0
+#define UIP_CONF_ND6_SEND_RA            0
 #define UIP_CONF_ND6_REACHABLE_TIME     600000
 #define UIP_CONF_ND6_RETRANS_TIMER      10000
 
diff --git a/platform/osd-merkur/contiki-main.c b/platform/osd-merkur-128/contiki-main.c
similarity index 93%
rename from platform/osd-merkur/contiki-main.c
rename to platform/osd-merkur-128/contiki-main.c
index 4be90c6e5..142d6edd7 100644
--- a/platform/osd-merkur/contiki-main.c
+++ b/platform/osd-merkur-128/contiki-main.c
@@ -69,10 +69,6 @@
 #include "dev/serial-line.h"
 #include "dev/slip.h"
 
-#ifdef RAVEN_LCD_INTERFACE
-#include "raven-lcd.h"
-#endif
-
 #if AVR_WEBSERVER
 #include "httpd-fs.h"
 #include "httpd-cgi.h"
@@ -186,27 +182,15 @@ void initialize(void)
   watchdog_init();
   watchdog_start();
 
-/* The Raven implements a serial command and data interface via uart0 to a 3290p,
- * which could be duplicated using another host computer.
- */
-#if !RF230BB_CONF_LEDONPORTE1   //Conflicts with USART0
-#ifdef RAVEN_LCD_INTERFACE
-  rs232_init(RS232_PORT_0, USART_BAUD_38400,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
-  rs232_set_input(0,raven_lcd_serial_input);
-#else
   /* Generic or slip connection on uart0 */
   rs232_init(RS232_PORT_0, USART_BAUD_38400,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
-#endif
-#endif
 
   /* Second rs232 port for debugging or slip alternative */
 //  rs232_init(RS232_PORT_1, USART_BAUD_57600,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
+
   /* Redirect stdout */
-#if RF230BB_CONF_LEDONPORTE1 || defined(RAVEN_LCD_INTERFACE)
-  rs232_redirect_stdout(RS232_PORT_1);
-#else
   rs232_redirect_stdout(RS232_PORT_0);
-#endif
+
   clock_init();
 
   if(MCUSR & (1<<PORF )) PRINTD("Power-on reset.\n");
@@ -327,10 +311,6 @@ uint8_t i;
   process_start(&tcpip_process, NULL);
 #endif
 
-#ifdef RAVEN_LCD_INTERFACE
-  process_start(&raven_lcd_process, NULL);
-#endif
-
   process_start(&sensors_process, NULL);
 
   /* Autostart other processes */
@@ -403,11 +383,6 @@ uint8_t i;
 #endif
 #endif /* ANNOUNCE_BOOT */
 
-#if RF230BB_CONF_LEDONPORTE1
-  /* NB: PORTE1 conflicts with UART0 */
-  DDRE|=(1<<DDE1);  //set led pin to output (Micheal Hatrtman board)
-  PORTE&=~(1<<PE1); //and low to turn led off
-#endif
 }
 
 #if ROUTES && NETSTACK_CONF_WITH_IPV6
@@ -451,14 +426,6 @@ main(void)
     /* Turn off LED after a while */
     if (ledtimer) {
       if (--ledtimer==0) {
-#if RF230BB_CONF_LEDONPORTE1
-        PORTE&=~(1<<PE1);
-#endif
-#if defined(RAVEN_LCD_INTERFACE)&&0
-       /* ledtimer can be set by received ping; ping the other way for testing */
-       extern void raven_ping6(void);         
-       raven_ping6();
-#endif
       }
     }
 #endif
diff --git a/platform/osd-merkur/dev/leds-arch.c b/platform/osd-merkur-128/dev/leds-arch.c
similarity index 83%
rename from platform/osd-merkur/dev/leds-arch.c
rename to platform/osd-merkur-128/dev/leds-arch.c
index c53dd2d47..4c8e6756f 100644
--- a/platform/osd-merkur/dev/leds-arch.c
+++ b/platform/osd-merkur-128/dev/leds-arch.c
@@ -45,41 +45,27 @@
 #include "dev/leds.h"
 #include "leds-arch.h"
 
-
 /*---------------------------------------------------------------------------*/
 void
 leds_arch_init(void)
 {
-DDRE|=(1<<DDE5);	// Set pins as output since leds are mounted on the VDD bus
+DDRE  |=  (1<<DDE5);	// Set pins as output since leds are mounted on the VDD bus
 LEDS_OFF();
 }
 /*---------------------------------------------------------------------------*/
 unsigned char
 leds_arch_get(void)
 {
-  return ((LED_OUT & BIT_RED) ? 0 : LEDS_RED)
-    | ((LED_OUT & BIT_GREEN) ? 0 : LEDS_GREEN)
-    | ((LED_OUT & BIT_YELLOW) ? 0 : LEDS_YELLOW);
-
+  return ((LED_OUT & BIT_GREEN) ? 1 : 0);
 }
 /*---------------------------------------------------------------------------*/
 void
 leds_arch_set(unsigned char leds)
 {
   if(leds & LEDS_GREEN) {
-    LED_OUT &= ~BIT_GREEN;
+    LED_GREEN_ON();
   } else {
-    LED_OUT |= BIT_GREEN;
-  }
-  if(leds & LEDS_YELLOW) {
-    LED_OUT &= ~BIT_YELLOW;
-  } else {
-    LED_OUT |= BIT_YELLOW;
-  }
-  if(leds & LEDS_RED) {
-    LED_OUT &= ~BIT_RED;
-  } else {
-    LED_OUT |= BIT_RED;
+    LED_GREEN_OFF();
   }
 }
 /*---------------------------------------------------------------------------*/
diff --git a/platform/guhRF/dev/leds-arch.h b/platform/osd-merkur-128/dev/leds-arch.h
similarity index 88%
rename from platform/guhRF/dev/leds-arch.h
rename to platform/osd-merkur-128/dev/leds-arch.h
index 92532dafa..97c5ede06 100644
--- a/platform/guhRF/dev/leds-arch.h
+++ b/platform/osd-merkur-128/dev/leds-arch.h
@@ -1,7 +1,6 @@
 /*
-	guhRF Platform has just one green LED on PIN E5
-
-*/
+ *  osd-merkur Platforms have just one green LED on PIN E5
+ */
 
 #ifndef __LEDS_ARCH_H__
 #define __LEDS_ARCH_H__
diff --git a/platform/guhRF/dev/pins_arduino.h b/platform/osd-merkur-128/dev/pins_arduino.h
similarity index 100%
rename from platform/guhRF/dev/pins_arduino.h
rename to platform/osd-merkur-128/dev/pins_arduino.h
diff --git a/platform/guhRF/node-id.c b/platform/osd-merkur-128/node-id.c
similarity index 100%
rename from platform/guhRF/node-id.c
rename to platform/osd-merkur-128/node-id.c
diff --git a/platform/guhRF/node-id.h b/platform/osd-merkur-128/node-id.h
similarity index 100%
rename from platform/guhRF/node-id.h
rename to platform/osd-merkur-128/node-id.h
diff --git a/platform/guhRF/params.c b/platform/osd-merkur-128/params.c
similarity index 100%
rename from platform/guhRF/params.c
rename to platform/osd-merkur-128/params.c
diff --git a/platform/osd-merkur/params.h b/platform/osd-merkur-128/params.h
similarity index 91%
rename from platform/osd-merkur/params.h
rename to platform/osd-merkur-128/params.h
index ce368de97..f338e75e1 100644
--- a/platform/osd-merkur/params.h
+++ b/platform/osd-merkur-128/params.h
@@ -17,16 +17,15 @@
 
 // end default settings
 
-#define CONTIKI_CONF_RANDOM_MAC 0        //adds 78 bytes
+#define CONTIKI_CONF_RANDOM_MAC       0  //adds 78 bytes
 #define CONTIKI_CONF_SETTINGS_MANAGER 0  //adds 1696 bytes
-#define BOOTLOADER_GET_MAC 0x0001ff80    // get mac from bootloader, need bootloader bonsai, PARAMETER_STORAGE 0
+#define BOOTLOADER_GET_MAC   0x0001ff80  // get mac from bootloader
 
 #if CONTIKI_CONF_SETTINGS_MANAGER
 //#define PARAMETER_STORAGE 2
 #define PARAMETER_STORAGE 2
 #else
-//#define PARAMETER_STORAGE 1
-#define PARAMETER_STORAGE 0           // get mac form boolaoder, need bootlaoder bonsai, PARAMETER_STORAGE 0
+#define PARAMETER_STORAGE 0           // 0:get mac from booloader (see above)
 #endif
 
 /* Include settings.h, then dummy out the write routines */
@@ -75,7 +74,7 @@ extern uint8_t eemem_domain_name[30];
 #if UIP_CONF_LL_802154
 //#define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN}
 //#define PARAMS_EUI64ADDR {0x00, 0x21, 0x2e, 0xff, 0xff, 0x00, 0x1E, 0xFB}
-#define PARAMS_EUI64ADDR {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01}
+#define PARAMS_EUI64ADDR {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x11}
 #else
 //#define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xff, 0xfe, 0xNN, 0xNN, 0xNN}
 #define PARAMS_EUI64ADDR {0x00, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x03}
diff --git a/platform/guhRF/slip_uart0.c b/platform/osd-merkur-128/slip_uart0.c
similarity index 100%
rename from platform/guhRF/slip_uart0.c
rename to platform/osd-merkur-128/slip_uart0.c
diff --git a/platform/guhRF/Makefile.guhRF b/platform/osd-merkur-256/Makefile.osd-merkur-256
similarity index 50%
rename from platform/guhRF/Makefile.guhRF
rename to platform/osd-merkur-256/Makefile.osd-merkur-256
index 2a5b159ef..0a60d2044 100644
--- a/platform/guhRF/Makefile.guhRF
+++ b/platform/osd-merkur-256/Makefile.osd-merkur-256
@@ -1,85 +1,81 @@
-CONTIKI_TARGET_DIRS = . dev apps net loader
+CONTIKI_TARGET_DIRS = . dev apps net loader dev/arduino
 
 CONTIKI_CORE=contiki-main
 CONTIKI_TARGET_MAIN = ${CONTIKI_CORE}.o
 CONTIKI_TARGET_SOURCEFILES += contiki-main.c params.c node-id.c
-
 #Needed for slip
 CONTIKI_TARGET_SOURCEFILES += led.c sensors.c slip_uart0.c slip.c leds-arch.c
-
-#CONTIKI_TARGET_SOURCEFILES += temperature-sensor.c adc.c 
+CONTIKI_TARGET_SOURCEFILES += temperature-sensor.c adc.c
 #Needed for Button
 CONTIKI_TARGET_SOURCEFILES += button-sensor.c
-
 # i2c Master
 #CONTIKI_TARGET_SOURCEFILES += i2c.c
 #Needed for DHT11 humidity sensor
-#CONTIKI_TARGET_SOURCEFILES += dht11.c
+CONTIKI_TARGET_SOURCEFILES += dht11.c
 #Needed for DS18S20 temperature sensor
-#CONTIKI_TARGET_SOURCEFILES += ds1820.c
-
+CONTIKI_TARGET_SOURCEFILES += ds1820.c
 #Needed for Battery test
 CONTIKI_TARGET_SOURCEFILES += battery-sensor.c batmon.c
-
 #Needed for PIR
-#CONTIKI_TARGET_SOURCEFILES += pir-sensor.c
+CONTIKI_TARGET_SOURCEFILES += pir-sensor.c
 #Needed for OPTRIAC
-#CONTIKI_TARGET_SOURCEFILES += optriac-sensor.c
-
-CONTIKIAVR=$(CONTIKI)/cpu/avr
-
+CONTIKI_TARGET_SOURCEFILES += optriac-sensor.c
 #Needed for SERVO
-#CONTIKI_TARGET_SOURCEFILES += servo.c servo-sensor.c
+CONTIKI_TARGET_SOURCEFILES += servo.c servo-sensor.c
 #Needed for Timer4 Servo
-##CONTIKI_TARGET_SOURCEFILES += t4-servo.c t4-servo-sensor.c
+#CONTIKI_TARGET_SOURCEFILES += t4-servo.c t4-servo-sensor.c
 #Needed for Relay 1 to 4
-#CONTIKI_TARGET_SOURCEFILES += relay.c relay-sensor.c
-
-#-------------------------------------------------------------------------------
+CONTIKI_TARGET_SOURCEFILES += relay.c relay-sensor.c
+# Arduino
+CONTIKI_TARGET_SOURCEFILES += wiring_digital.c
+CONTIKI_TARGET_SOURCEFILES += new.cpp twi.c Wire.cpp WMath.cpp
+CONTIKI_TARGET_SOURCEFILES += Print.cpp Stream.cpp WString.cpp
 # guh Source Files
-
-
 # Smart Grid Ready Interface
 CONTIKI_TARGET_SOURCEFILES += sg-ready.c
 
-
-
-#-------------------------------------------------------------------------------
-
+CONTIKIAVR=$(CONTIKI)/cpu/avr
 
 CONTIKIBOARD=.
-#BOOTLOADER_START = 0x1F000
 BOOTLOADER_START = 0x3E000
 CONTIKI_PLAT_DEFS = -DF_CPU=16000000UL -DAUTO_CRC_PADDING=2 -DPLAT_TIMER=5
 
 MCU=atmega256rfr2
 
-AVRDUDE_PROGRAMMER=jtag2
+#AVRDUDE_PROGRAMMER=jtag2
+AVRDUDE_PROGRAMMER=stk500v2
 
-# For usb devices, you may either use PORT=usb, or (e.g. if you have more than one
-# programmer connected) you can use the following trick to find out the serial number:
+# For usb devices, you may either use PORT=usb, or (e.g. if you have
+# more than one programmer connected) you can use the following trick to
+# find out the serial number:
 #
 # The example is for an JTAGICE mkII used to program an atmega256:
 # avrdude -v -P usb:xxxx -c jtag2 -p atmega256
-AVRDUDE_PORT=usb:00B000000D79
-
+# AVRDUDE_PORT=usb:00B000000D79
+# For serial devices with bootloader we also use the AVRDUDE_PORT setting:
+AVRDUDE_PORT=/dev/ttyUSB0
+# Only needed for serial devices, use empty setting for other
+# programmers
+AVRDUDE_BAUD_OPTION=-b 57600
 
 # Additional avrdude options
-# Verify off
-AVRDUDE_OPTIONS=-V
+# First some flash options:
+# Verify off is -V
+# Erase is -e
+# No-Erase (needed by our stk500 variant) is -D
+# Note that it really doesn't turn off erase: It doesn't issue an
+# explicit erase command (which is not implemented) but the bootloader
+# *always* does an implicit erase when programming.
+AVRDUDE_FLASH_OPTIONS=-D
+AVRDUDE_OPTIONS=$(AVRDUDE_BAUD_OPTION) $(AVRDUDE_FLASH_OPTIONS)
 AVRDUDE_MCU=m256rfr2
 
 #debug
 # CFLAGS  += -save-temps
 # Bootloader bonsai
 # LDFLAGS  += -save-temps
-# For the old bonsai bootloader compiled with squeeze gcc-avr we
-# directly used the address of the bootloader:
-#BOOTLOADER_GET_MAC=0x0001f3a0
-# For newer bonsai we have a jump table at the end of the bootloader
-# section:
-#BOOTLOADER_GET_MAC=0x0001ff80
-#guhRF Bootloader MAC Address
+# For newer bootloaders we have a jump table at the end of the bootloader
+# section: guhRF Bootloader MAC Address
 BOOTLOADER_GET_MAC=0x0003ff80
 
 LDFLAGS  += -Wl,--defsym,bootloader_get_mac=$(BOOTLOADER_GET_MAC)
diff --git a/platform/guhRF/contiki-conf.h b/platform/osd-merkur-256/contiki-conf.h
similarity index 90%
rename from platform/guhRF/contiki-conf.h
rename to platform/osd-merkur-256/contiki-conf.h
index 27745193d..fb8cf3178 100644
--- a/platform/guhRF/contiki-conf.h
+++ b/platform/osd-merkur-256/contiki-conf.h
@@ -36,20 +36,19 @@
  *         Configuration for Atmel ATMEGA256RFR2
  * \author
  *         David Kopf <dak664@embarqmail.com>
-	   Bernhard Trinnes <bernhard.trinnes@guh.guru>
+ *         Bernhard Trinnes <bernhard.trinnes@guh.guru>
  */
 
 #ifndef CONTIKI_CONF_H_
 #define CONTIKI_CONF_H_
 
 /* Platform name, type, and MCU clock rate */
-#define PLATFORM_NAME  "guhRF"
+#define PLATFORM_NAME  "RFR2"
 #define PLATFORM_TYPE  ATMEGA256RFR2
 #ifndef F_CPU
 #define F_CPU          16000000UL
 #endif
 
-
 #include <stdint.h>
 
 #define IEEE802154_CONF_PANID     0xABCD // default panid
@@ -60,29 +59,15 @@
  */
  /* Clock ticks per second */
 #define CLOCK_CONF_SECOND 128
-#if 1
-/* 16 bit counter overflows every ~10 minutes */
-typedef unsigned short clock_time_t;
-#define CLOCK_LT(a,b)  ((signed short)((a)-(b)) < 0)
-#define INFINITE_TIME 0xffff
-#define RIME_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME INFINITE_TIME/CLOCK_CONF_SECOND /* Default uses 600 */
-#define COLLECT_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME INFINITE_TIME/CLOCK_CONF_SECOND /* Default uses 600 */
-#else
-typedef unsigned long clock_time_t;
-#define CLOCK_LT(a,b)  ((signed long)((a)-(b)) < 0)
-#define INFINITE_TIME 0xffffffff
-#endif
+
+typedef uint32_t clock_time_t;
+#define CLOCK_LT(a,b)  ((int32_t)((a)-(b)) < 0)
+
 /* These routines are not part of the contiki core but can be enabled in cpu/avr/clock.c */
 void clock_delay_msec(uint16_t howlong);
 void clock_adjust_ticks(clock_time_t howmany);
 
-
-/* and theoretically can use TIMER2 with it to keep time. Else TIMER0 is used. */
-/* The sleep timer requires the crystal and adds a TIMER2 interrupt routine if not already define by clock.c */
-#define AVR_CONF_USE32KCRYSTAL 0
-
-
-/* COM port to be used for SLIP connection. This is usually UART0, but see above */
+/* COM port to be used for SLIP connection. This is usually UART0. */
 #define SLIP_PORT RS232_PORT_0
 
 /* Pre-allocated memory for loadable modules heap space (in bytes)*/
@@ -127,8 +112,11 @@ typedef unsigned short uip_stats_t;
 #define RF230_MAX_TX_POWER 15
 #define RF230_MIN_RX_POWER 30
  */
-  /* The rf231 and ATMEGA256RFR2 can use an rssi threshold for triggering rx_busy that saves 0.5ma in rx mode */
-/* 1 - 15 maps into -90 to -48 dBm; the register is written with RF230_MIN_RX_POWER/6 + 1. Undefine for -100dBm sensitivity */
+  /* The rf231, atmega128rfa1 and atmega256rfr2 can use an rssi
+   * threshold for triggering rx_busy that saves 0.5ma in rx mode
+   * 1 - 15 maps into -90 to -48 dBm; the register is written with
+   * RF230_MIN_RX_POWER/6 + 1. Undefine for -100dBm sensitivity
+   */
 //#define RF230_MIN_RX_POWER        0
 
 /* Network setup */
@@ -137,8 +125,7 @@ typedef unsigned short uip_stats_t;
 /* TX routine does automatic cca and optional backoffs */
 #define RDC_CONF_HARDWARE_CSMA   1
 /* Allow MCU sleeping between channel checks */
-#define RDC_CONF_MCU_SLEEP        1
-
+#define RDC_CONF_MCU_SLEEP       1
 
 #if NETSTACK_CONF_WITH_IPV6
 #define LINKADDR_CONF_SIZE        8
@@ -222,7 +209,7 @@ typedef unsigned short uip_stats_t;
 #define NBR_TABLE_CONF_MAX_NEIGHBORS      20
 #define UIP_CONF_DS6_DEFRT_NBU    2
 #define UIP_CONF_DS6_PREFIX_NBU   3
-#define UIP_CONF_MAX_ROUTES       20
+#define UIP_CONF_MAX_ROUTES      20
 #define UIP_CONF_DS6_ADDR_NBU     3
 #define UIP_CONF_DS6_MADDR_NBU    0
 #define UIP_CONF_DS6_AADDR_NBU    0
@@ -239,8 +226,8 @@ typedef unsigned short uip_stats_t;
 #define CONTIKIMAC_FRAMER_CONF_SHORTEST_PACKET_SIZE   43-18  //multicast RPL DIS length
 /* Not tested much yet */
 #define CONTIKIMAC_CONF_WITH_PHASE_OPTIMIZATION 0
-#define CONTIKIMAC_CONF_COMPOWER               1
-#define RIMESTATS_CONF_ENABLED                 0
+#define CONTIKIMAC_CONF_COMPOWER                1
+#define RIMESTATS_CONF_ENABLED                  0
 
 #if NETSTACK_CONF_WITH_IPV6
 #define NETSTACK_CONF_FRAMER      framer_802154
@@ -285,7 +272,7 @@ typedef unsigned short uip_stats_t;
 #if UIP_CONF_IPV6_RPL
 
 #define UIP_CONF_ROUTER                 1
-#define UIP_CONF_ND6_SEND_RA		0
+#define UIP_CONF_ND6_SEND_RA            0
 #define UIP_CONF_ND6_REACHABLE_TIME     600000
 #define UIP_CONF_ND6_RETRANS_TIMER      10000
 
diff --git a/platform/guhRF/contiki-main.c b/platform/osd-merkur-256/contiki-main.c
similarity index 99%
rename from platform/guhRF/contiki-main.c
rename to platform/osd-merkur-256/contiki-main.c
index 1b12f3da5..420871524 100644
--- a/platform/guhRF/contiki-main.c
+++ b/platform/osd-merkur-256/contiki-main.c
@@ -48,7 +48,6 @@
 #include <avr/pgmspace.h>
 #include <avr/fuse.h>
 #include <avr/eeprom.h>
-#include <avr/io.h>
 #include <stdio.h>
 #include <string.h>
 #include <dev/watchdog.h>
@@ -144,7 +143,8 @@ FUSES ={.low = 0xC2, .high = 0x99, .extended = 0xfe,};
 #include "lib/sensors.h"
 #include "dev/button-sensor.h"
 #include "dev/battery-sensor.h"
-
+#include "dev/pir-sensor.h"
+SENSORS(&button_sensor, &pir_sensor);
 
 uint8_t
 rng_get_uint8(void) {
@@ -185,14 +185,12 @@ void initialize(void)
   /* Generic or slip connection on uart0 */
   rs232_init(RS232_PORT_0, USART_BAUD_38400,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
 
-
   /* Second rs232 port for debugging or slip alternative */
 //  rs232_init(RS232_PORT_1, USART_BAUD_57600,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
 
   /* Redirect stdout */
   rs232_redirect_stdout(RS232_PORT_0);
 
-
   clock_init();
 
   if(MCUSR & (1<<PORF )) PRINTD("Power-on reset.\n");
diff --git a/platform/guhRF/dev/leds-arch.c b/platform/osd-merkur-256/dev/leds-arch.c
similarity index 100%
rename from platform/guhRF/dev/leds-arch.c
rename to platform/osd-merkur-256/dev/leds-arch.c
diff --git a/platform/osd-merkur-256/dev/leds-arch.h b/platform/osd-merkur-256/dev/leds-arch.h
new file mode 100644
index 000000000..97c5ede06
--- /dev/null
+++ b/platform/osd-merkur-256/dev/leds-arch.h
@@ -0,0 +1,25 @@
+/*
+ *  osd-merkur Platforms have just one green LED on PIN E5
+ */
+
+#ifndef __LEDS_ARCH_H__
+#define __LEDS_ARCH_H__
+
+#define LED_OUT PORTE
+
+#define BIT_GREEN _BV(PE5)
+
+#define LED_GREEN_OFF() LED_OUT &= ~BIT_GREEN
+#define LED_GREEN_ON()  LED_OUT |=  BIT_GREEN
+
+#define LED_GREEN_TOGGLE() LED_OUT ^= BIT_GREEN
+
+#define LEDS_OFF() LED_OUT &= ~BIT_GREEN
+#define LEDS_ON() LED_OUT |=   BIT_GREEN
+
+
+void leds_arch_init(void);
+unsigned char leds_arch_get(void);
+void leds_arch_set(unsigned char leds);
+
+#endif /* __LEDS_ARCH_H__ */
diff --git a/platform/osd-merkur/dev/pins_arduino.h b/platform/osd-merkur-256/dev/pins_arduino.h
similarity index 100%
rename from platform/osd-merkur/dev/pins_arduino.h
rename to platform/osd-merkur-256/dev/pins_arduino.h
diff --git a/platform/osd-merkur/node-id.c b/platform/osd-merkur-256/node-id.c
similarity index 100%
rename from platform/osd-merkur/node-id.c
rename to platform/osd-merkur-256/node-id.c
diff --git a/platform/osd-merkur/node-id.h b/platform/osd-merkur-256/node-id.h
similarity index 100%
rename from platform/osd-merkur/node-id.h
rename to platform/osd-merkur-256/node-id.h
diff --git a/platform/osd-merkur/params.c b/platform/osd-merkur-256/params.c
similarity index 100%
rename from platform/osd-merkur/params.c
rename to platform/osd-merkur-256/params.c
diff --git a/platform/guhRF/params.h b/platform/osd-merkur-256/params.h
similarity index 91%
rename from platform/guhRF/params.h
rename to platform/osd-merkur-256/params.h
index f6648888d..7b074c198 100644
--- a/platform/guhRF/params.h
+++ b/platform/osd-merkur-256/params.h
@@ -13,20 +13,19 @@
  * Note the parameters in this file can be changed without forcing a complete rebuild.
  */
 // default settings
-#define CHANNEL_802_15_4          26     // default frequency (11-26) 
+#define CHANNEL_802_15_4          25     // default frequency (11-26) 
 
 // end default settings
 
 #define CONTIKI_CONF_RANDOM_MAC       0  //adds 78 bytes
 #define CONTIKI_CONF_SETTINGS_MANAGER 0  //adds 1696 bytes
-#define BOOTLOADER_GET_MAC            0  // get mac from booloader, need bootloader bonsai, PARAMETER_STORAGE 0
+#define BOOTLOADER_GET_MAC   0x0003ff80  // get mac from bootloader
 
 #if CONTIKI_CONF_SETTINGS_MANAGER
 //#define PARAMETER_STORAGE 2
 #define PARAMETER_STORAGE 2
 #else
-//#define PARAMETER_STORAGE 1
-#define PARAMETER_STORAGE 1           // get mac from booloader, need bootloader bonsai, PARAMETER_STORAGE 0
+#define PARAMETER_STORAGE 0           // 0:get mac from booloader (see above)
 #endif
 
 /* Include settings.h, then dummy out the write routines */
diff --git a/platform/osd-merkur/slip_uart0.c b/platform/osd-merkur-256/slip_uart0.c
similarity index 100%
rename from platform/osd-merkur/slip_uart0.c
rename to platform/osd-merkur-256/slip_uart0.c
diff --git a/platform/osd-merkur/dev/LED_Strip_Suli b/platform/osd-merkur/dev/LED_Strip_Suli
deleted file mode 160000
index 56b7ce6c3..000000000
--- a/platform/osd-merkur/dev/LED_Strip_Suli
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 56b7ce6c3227aeac131b59e39829c4991e7caefd
diff --git a/platform/osd-merkur/dev/Suli.h b/platform/osd-merkur/dev/Suli.h
deleted file mode 100644
index 892c8cef7..000000000
--- a/platform/osd-merkur/dev/Suli.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2015, Ralf Schlatterbeck Open Source Consulting
- * 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.
- */
-
-/**
- * \defgroup Suli compatibility
- *
- * Seeed Unified Library Interface for Contiki OS
- * See also https://github.com/Seeed-Studio/Suli
- *
- * Note: For now this only implements what we need to the LED_Strip example
- * working. We're re-using existing Arduino wrappers where possible.
- *
- * @{
- */
-
-/**
- * \file
- *        Header file for Seeed compatibility
- * \author
- *        Ralf Schlatterbeck <rsc@runtux.com>
- */
-
-#include <Arduino.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define suli_delay_ms(ms) clock_delay_msec(ms)
-#define suli_delay_us(us) clock_delay_usec(us)
-
-/* These are used by Suli */
-typedef uint8_t  uint8;
-typedef uint16_t uint16;
-typedef uint32_t uint32;
-typedef int16_t  int16;
-typedef int32_t  int32;
-
-typedef int IO_T;    // IO type
-typedef int PIN_T;   // pin name
-typedef int DIR_T;   // pin direction
-
-/* From Arduino.h */
-#define HAL_PIN_INPUT  INPUT
-#define HAL_PIN_OUTPUT OUTPUT
-#define HAL_PIN_HIGH   HIGH
-#define HAL_PIN_LOW    LOW
-
-static inline void suli_pin_init (IO_T *pio, PIN_T pin)
-{
-    *pio = pin;
-}
-
-static inline void suli_pin_dir (IO_T *pio, DIR_T dir)
-{
-    pinMode (*pio, dir);
-}
-
-static inline void suli_pin_write (IO_T *pio, int16 state)
-{
-    digitalWrite (*pio, state);
-}
-
-static inline int16 suli_pin_read (IO_T *pio)
-{
-    return digitalRead (*pio);
-}
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-/*
- * VI settings, see coding style
- * ex:ts=8:et:sw=2
- */
-
-/** @} */
diff --git a/platform/osd-merkur/dev/adc.c b/platform/osd-merkur/dev/adc.c
deleted file mode 100644
index 7efde72e1..000000000
--- a/platform/osd-merkur/dev/adc.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-* Copyright (c) 2012, BinaryLabs.
-* 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.
-*
-* @(#)$Id: adc.c,v 1.1 2010/08/25 19:34:06 nifi Exp $
-*/
-
-/**
-* \file
-* ADC file for Atmega128rfa1.
-* \author
-* Paulo Louro <paulolouro@binarylabs.dk>
-*/
-
-#include "adc.h"
-
-static uint8_t analog_reference = ADC_DEFAULT;
-
-/*
- * For arduino interface for setting external reference voltage
- * Note that applying an external voltage *and* then setting the analog
- * reference to something internal will short the internal and the
- * external reference voltage and most likely destroy the processor.
- */
-void analogReference(uint8_t mode)
-{
-    analog_reference = mode;
-}
-
-int readADC(uint8_t pin)
-{
-  int result = 0;
-
-  adc_setup (analog_reference, pin);
-  result = adc_read ();
-  adc_fin ();
-  return result;
-}
-
-/**
-* \return Internal temperature in 0.01C, e.g. 25C is 2500
-*/
-int readInternalTemp(void)
-{
-  int reading = 0;
-
-  ADCSRB |= _BV(MUX5);
-  ADMUX = _BV(REFS1) | _BV(REFS0) | 0b1001 ;
-  ADCSRA = _BV(ADEN) | _BV(ADPS0) | _BV(ADPS2) ;
-
-  ADCSRA |= 1 << ADSC;
-  loop_until_bit_is_clear(ADCSRA,ADSC);
-  reading = ADC;
-
-  ADCSRB=0; //disable ADC, need to write B first for MUX5 bit
-  ADCSRA=0; //disable ADC
-  ADMUX=0; //turn off internal vref
-
-  return reading * 113 - 27280;
-}
diff --git a/platform/osd-merkur/dev/adc.h b/platform/osd-merkur/dev/adc.h
deleted file mode 100644
index e3ff516b1..000000000
--- a/platform/osd-merkur/dev/adc.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef __ADC_ARCH_H__
-#define __ADC_ARCH_H__
-
-#include <avr/io.h>
-
-/*
- * Reference voltage
- * The default is 1.6V reference voltage
- * The selected reference voltage is the maximum voltage that can be
- * measured.
- * Directly provide shifted variants so we don't need to shift.
- */
-#define ADC_1_5      (2<<6)
-#define ADC_1_6      (3<<6)
-#define ADC_1_8      (1<<6)
-#define ADC_EXTERNAL (0<<6)
-#define ADC_DEFAULT  ADC_1_6
-
-/* sometimes it's desirable to decouple setup / finish from sampling */
-
-static inline void adc_setup (uint8_t ref_volt, uint8_t pin)
-{
-  ADMUX = ref_volt | (pin & 0x7);
-  ADCSRA = _BV(ADEN) | _BV(ADPS0) | _BV(ADPS2);
-}
-
-static inline int adc_read (void)
-{
-  ADCSRA |= (1 << ADSC);
-  loop_until_bit_is_clear (ADCSRA, ADSC);
-  return ADC;
-}
-
-static inline void adc_fin (void)
-{
-    ADCSRA = 0;
-    ADMUX  = 0;
-}
-  
-static inline void adc_init (void)
-{
-    uint8_t temp;
-    ADCSRC = 0;
-    ADCSRB = 0;
-    adc_fin ();
-    /*
-     * Disable JTAG interface
-     * Hardware manual about JTD bit:
-     * "In order to avoid unintentional disabling or enabling of the
-     * JTAG interface, a timed sequence must be followed when changing
-     * this bit: The application software must write this bit to the
-     * desired value twice within four cycles to change its value."
-     * 15.4.1 "MCUCR - MCU Control Register", p. 219
-     */
-    temp = MCUCR | (1 << JTD);
-    MCUCR = temp;
-    MCUCR = temp;
-}
-
-int readADC(uint8_t pin);
-long readVcc();
-int readInternalTemp(void);
-void analogReference(uint8_t mode);
-
-#endif /* __ADC_ARCH_H__ */
diff --git a/platform/osd-merkur/dev/arduino/Arduino.h b/platform/osd-merkur/dev/arduino/Arduino.h
deleted file mode 100644
index e0ea47b10..000000000
--- a/platform/osd-merkur/dev/arduino/Arduino.h
+++ /dev/null
@@ -1,172 +0,0 @@
-#ifndef Arduino_h
-#define Arduino_h
-
-#include <hw-arduino.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#include <avr/pgmspace.h>
-#include <avr/io.h>
-#include <avr/interrupt.h>
-
-#include "binary.h"
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-#define HIGH 0x1
-#define LOW  0x0
-
-#define INPUT 0x0
-#define OUTPUT 0x1
-#define INPUT_PULLUP 0x2
-
-#define true 0x1
-#define false 0x0
-
-#define PI 3.1415926535897932384626433832795
-#define HALF_PI 1.5707963267948966192313216916398
-#define TWO_PI 6.283185307179586476925286766559
-#define DEG_TO_RAD 0.017453292519943295769236907684886
-#define RAD_TO_DEG 57.295779513082320876798154814105
-
-#define SERIAL  0x0
-#define DISPLAY 0x1
-
-#define LSBFIRST 0
-#define MSBFIRST 1
-
-#define CHANGE 1
-#define FALLING 2
-#define RISING 3
-
-#define DEFAULT  ADC_DEFAULT
-#define EXTERNAL ADC_EXTERNAL
-
-// undefine stdlib's abs if encountered
-#ifdef abs
-#undef abs
-#endif
-
-#define min(a,b) ((a)<(b)?(a):(b))
-#define max(a,b) ((a)>(b)?(a):(b))
-#define abs(x) ((x)>0?(x):-(x))
-#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
-#define round(x)     ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
-#define radians(deg) ((deg)*DEG_TO_RAD)
-#define degrees(rad) ((rad)*RAD_TO_DEG)
-#define sq(x) ((x)*(x))
-
-#define interrupts() sei()
-#define noInterrupts() cli()
-
-#define lowByte(w) ((uint8_t) ((w) & 0xff))
-#define highByte(w) ((uint8_t) ((w) >> 8))
-
-#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
-#define bitSet(value, bit) ((value) |= (1UL << (bit)))
-#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
-#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
-
-
-typedef unsigned int word;
-
-#define bit(b) (1UL << (b))
-
-typedef uint8_t boolean;
-typedef uint8_t byte;
-
-void pinMode(uint8_t, uint8_t);
-void digitalWrite(uint8_t, uint8_t);
-int digitalRead(uint8_t);
-
-unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
-
-void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
-uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
-
-void attachInterrupt(uint8_t, void (*)(void), int mode);
-void detachInterrupt(uint8_t);
-
-void setup(void);
-void loop(void);
-
-// Get the bit location within the hardware port of the given virtual pin.
-// This comes from the pins_*.c file for the active board configuration.
-
-#define analogInPinToBit(P) (P)
-
-// On the ATmega1280, the addresses of some of the port registers are
-// greater than 255, so we can't store them in uint8_t's.
-extern const uint16_t PROGMEM port_to_mode_PGM[];
-extern const uint16_t PROGMEM port_to_input_PGM[];
-extern const uint16_t PROGMEM port_to_output_PGM[];
-
-extern const uint8_t PROGMEM digital_pin_to_port_PGM[];
-// extern const uint8_t PROGMEM digital_pin_to_bit_PGM[];
-extern const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[];
-
-// Get the bit location within the hardware port of the given virtual pin.
-// This comes from the pins_*.c file for the active board configuration.
-// 
-// These perform slightly better as macros compared to inline functions
-//
-#define digitalPinToPort(P) ( pgm_read_byte( digital_pin_to_port_PGM + (P) ) )
-#define digitalPinToBitMask(P) ( pgm_read_byte( digital_pin_to_bit_mask_PGM + (P) ) )
-#define analogInPinToBit(P) (P)
-#define portOutputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_output_PGM + (P))) )
-#define portInputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_input_PGM + (P))) )
-#define portModeRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_mode_PGM + (P))) )
-
-#define NOT_A_PIN 0
-#define NOT_A_PORT 0
-
-#ifdef ARDUINO_MAIN
-#define PA 1
-#define PB 2
-#define PC 3
-#define PD 4
-#define PE 5
-#define PF 6
-#define PG 7
-#define PH 8
-#define PJ 10
-#define PK 11
-#define PL 12
-#endif
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#ifdef __cplusplus
-// look at this again when considering implementing serial
-//#include "WCharacter.h"
-//#include "WString.h"
-//#include "HardwareSerial.h"
-
-uint16_t makeWord(uint16_t w);
-uint16_t makeWord(byte h, byte l);
-
-#define word(...) makeWord(__VA_ARGS__)
-
-unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
-
-void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0);
-void noTone(uint8_t _pin);
-
-// WMath prototypes
-long random(long);
-long random(long, long);
-void randomSeed(unsigned int);
-long map(long, long, long, long, long);
-
-#endif
-
-#include "pins_arduino.h"
-
-#include "dev/arduino/arduino-compat.h"
-
-#endif
diff --git a/platform/osd-merkur/dev/arduino/hw-arduino.h b/platform/osd-merkur/dev/arduino/hw-arduino.h
deleted file mode 100644
index bcd626ec6..000000000
--- a/platform/osd-merkur/dev/arduino/hw-arduino.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2014, Ralf Schlatterbeck Open Source Consulting
- * 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.
- */
-
-/**
- * \defgroup compatibility Arduino - Contiki
- *
- * This defines contiki-compatible hardware definitions for running
- * arduino sketches (or just to call arduino-compatible function). 
- * For now only for osd hardware, a similar file should exist for each
- * arduino-compatible hardware.
- *
- * @{
- */
-
-/**
- * \file
- *        Header file for arduino compatibility
- * \author
- *        Ralf Schlatterbeck <rsc@runtux.com>
- *
- */
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-#include "contiki.h"
-
-/*
- * The OSD hardware only supports timer 3 for PWM, timer 2 is used by
- * contiki for sleep/wakeup timing and is not usable for PWM.
- */
-#define digitalPinToTimer(pin)                \
-    ( (pin) == 2                              \
-    ? TIMER3A                                 \
-    : ( (pin) == 3                            \
-      ? TIMER3B                               \
-      : ((pin == 4) ? TIMER3C : NOT_ON_TIMER) \
-      )                                       \
-    )
-
-/* Only init timer 3 with phase correct pwm 8-bit and prescaler 64 */
-#define arduino_pwm_timer_init() \
-  (hwtimer_ini (3, HWT_WGM_PWM_PHASE_8_BIT, HWT_CLOCK_PRESCALER_64, 0))
-
-/*
- * VI settings, see coding style
- * ex:ts=8:et:sw=2
- */
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-/** @} */
diff --git a/platform/osd-merkur/dev/arduino/wiring_digital.c b/platform/osd-merkur/dev/arduino/wiring_digital.c
deleted file mode 100644
index 75b6745d6..000000000
--- a/platform/osd-merkur/dev/arduino/wiring_digital.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-  wiring_digital.c - digital input and output functions
-  Part of Arduino - http://www.arduino.cc/
-
-  Copyright (c) 2005-2006 David A. Mellis
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General
-  Public License along with this library; if not, write to the
-  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA  02111-1307  USA
-
-  Modified 28 September 2010 by Mark Sproul
-
-  $Id: wiring.c 248 2007-02-03 15:36:30Z mellis $
-*/
-
-#define ARDUINO_MAIN
-#include "wiring_private.h"
-#include "pins_arduino.h"
-
-void pinMode(uint8_t pin, uint8_t mode)
-{
-	uint8_t bit = digitalPinToBitMask(pin);
-	uint8_t port = digitalPinToPort(pin);
-	volatile uint8_t *reg, *out;
-
-	if (port == NOT_A_PIN) return;
-
-	// JWS: can I let the optimizer do this?
-	reg = portModeRegister(port);
-	out = portOutputRegister(port);
-
-	if (mode == INPUT) { 
-		uint8_t oldSREG = SREG;
-                cli();
-		*reg &= ~bit;
-		*out &= ~bit;
-		SREG = oldSREG;
-	} else if (mode == INPUT_PULLUP) {
-		uint8_t oldSREG = SREG;
-                cli();
-		*reg &= ~bit;
-		*out |= bit;
-		SREG = oldSREG;
-	} else {
-		uint8_t oldSREG = SREG;
-                cli();
-		*reg |= bit;
-		SREG = oldSREG;
-	}
-}
-
-void digitalWrite(uint8_t pin, uint8_t val)
-{
-	uint8_t timer = digitalPinToTimer(pin);
-	uint8_t bit = digitalPinToBitMask(pin);
-	uint8_t port = digitalPinToPort(pin);
-	volatile uint8_t *out;
-
-	if (port == NOT_A_PIN) return;
-
-	// If the pin that support PWM output, we need to turn it off
-	// before doing a digital write.
-	if (timer != NOT_ON_TIMER) turnOffPWM(timer);
-
-	out = portOutputRegister(port);
-
-	uint8_t oldSREG = SREG;
-	cli();
-
-	if (val == LOW) {
-		*out &= ~bit;
-	} else {
-		*out |= bit;
-	}
-
-	SREG = oldSREG;
-}
-
-int digitalRead(uint8_t pin)
-{
-	uint8_t timer = digitalPinToTimer(pin);
-	uint8_t bit = digitalPinToBitMask(pin);
-	uint8_t port = digitalPinToPort(pin);
-
-	if (port == NOT_A_PIN) return LOW;
-
-	// If the pin that support PWM output, we need to turn it off
-	// before getting a digital reading.
-	if (timer != NOT_ON_TIMER) turnOffPWM(timer);
-
-	if (*portInputRegister(port) & bit) return HIGH;
-	return LOW;
-}
diff --git a/platform/osd-merkur/dev/batmon.c b/platform/osd-merkur/dev/batmon.c
deleted file mode 100644
index 5c61d125f..000000000
--- a/platform/osd-merkur/dev/batmon.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "contiki.h"
-#include "batmon.h"
-#include <util/delay.h>
-
-
-
-
-int8_t batmon_init()
-{
-	return 0;
-}	
-
-int8_t batmon_get_voltage(uint16_t* voltage)
-{
-	uint16_t volt = 0;
-	uint16_t resolution = 75;
-	uint16_t offset = 2550;
-	int8_t ctr = 0;
-	
-	BATMON = 0 | _BV(BATMON_HR);
-	_delay_us(2);
-	
-	if(BATMON & _BV(BATMON_OK))
-	{
-		// voltage above 2.550 V
-		resolution = 75;
-		offset = 2550;
-		for(ctr=15; ctr>=0; ctr--)
-		{
-			BATMON = (BATMON & 0xF0) | (ctr);
-			_delay_us(2);
-			if(BATMON & _BV(BATMON_OK)) break;
-		}
-	}
-	else
-	{
-		// voltage below 2.550 V
-		resolution = 50;
-		offset = 1700;
-		
-		BATMON &= ~_BV(BATMON_HR);
-		
-		for(ctr=15; ctr>=0; ctr--)
-		{
-			BATMON = (BATMON & 0xF0) | (ctr);
-			_delay_us(2);
-			if(BATMON & _BV(BATMON_OK)) break;
-		}
-	}
-	
-	volt = resolution*ctr+offset;
-	*voltage=volt; 
-	
-	return 0;
-}
diff --git a/platform/osd-merkur/dev/batmon.h b/platform/osd-merkur/dev/batmon.h
deleted file mode 100644
index c05f48200..000000000
--- a/platform/osd-merkur/dev/batmon.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef BATMON_H_
-#define BATMON_H_
-
-int8_t batmon_init();
-int8_t batmon_get_voltage(uint16_t* voltage);
-
-
-#endif /* BATMON_H_ */
diff --git a/platform/osd-merkur/dev/battery-sensor.c b/platform/osd-merkur/dev/battery-sensor.c
deleted file mode 100644
index 1eb7906b4..000000000
--- a/platform/osd-merkur/dev/battery-sensor.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-* Copyright (c) 2012, BinaryLabs.
-* 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.
-*
-* @(#)$Id: battery-sensor.h,v 1.1 2012/08/25 19:34:06 nifi Exp $
-*/
-
-/**
-* \file
-* Battery sensor file for Atmega128rfa1.
-* \author
-* Paulo Louro <paulolouro@binarylabs.dk>
-* Harald Pichler <harald@the-develop.net>
-*/
-
-/**
-*The atmel rf23x radios have a low voltage detector that can be configured in units of 75 millivolts. Here is example *code for the ATmega128rfa1, where the BATMON register is in extended io space [dak664]
-*/
-
-#include "dev/battery-sensor.h"
-#include "dev/batmon.h"
-
-const struct sensors_sensor battery_sensor;
-/*---------------------------------------------------------------------------*/
-
-/**
-* \return Voltage on battery measurement with BATMON register.
-*/
-static int
-value(int type)
-{
-
-  uint16_t h;
-/*
-  uint8_t p1;
-  BATMON = 16; //give BATMON time to stabilize at highest range and lowest voltage
-
-// Bandgap can't be measured against supply voltage in this chip.
-// Use BATMON register instead
-  for ( p1=16; p1<31; p1++) {
-    BATMON = p1;
-    clock_delay_usec(100); // delay needed !!
-    if ((BATMON&(1<<BATMON_OK))==0) break;
-  }
-  h=2550-75*16-75+75*p1; //-75 to take the floor of the 75 mv transition window
-*/
-  batmon_get_voltage(&h);
-  return h;
-}
-/*---------------------------------------------------------------------------*/
-static int
-configure(int type, int c)
-{
-  // No configuration needed. readADC() handles all the config needed.
-  batmon_init();
-  return type == SENSORS_ACTIVE;
-}
-/*---------------------------------------------------------------------------*/
-static int
-status(int type)
-{
-  // analog sensors are always ready
-  return 1;
-}
-/*---------------------------------------------------------------------------*/
-SENSORS_SENSOR(battery_sensor, BATTERY_SENSOR, value, configure, status);
diff --git a/platform/osd-merkur/dev/battery-sensor.h b/platform/osd-merkur/dev/battery-sensor.h
deleted file mode 100644
index 20e0c8c92..000000000
--- a/platform/osd-merkur/dev/battery-sensor.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2012, BinaryLabs.
-* 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.
-*
-* @(#)$Id: battery-sensor.h,v 1.1 2012/08/25 19:34:06 nifi Exp $
-*/
-
-/**
-* \file
-* Battery sensor header file for Atmega128rfa1.
-* \author
-* Paulo Louro <paulolouro@binarylabs.dk>
-*/
-
-#ifndef __BATTERY_SENSOR_H__
-#define __BATTERY_SENSOR_H__
-
-#include "lib/sensors.h"
-
-extern const struct sensors_sensor battery_sensor;
-
-#define BATTERY_SENSOR "Battery"
-
-#endif /* __BATTERY_SENSOR_H__ */
\ No newline at end of file
diff --git a/platform/osd-merkur/dev/binary.h b/platform/osd-merkur/dev/binary.h
deleted file mode 100644
index af1498033..000000000
--- a/platform/osd-merkur/dev/binary.h
+++ /dev/null
@@ -1,515 +0,0 @@
-#ifndef Binary_h
-#define Binary_h
-
-#define B0 0
-#define B00 0
-#define B000 0
-#define B0000 0
-#define B00000 0
-#define B000000 0
-#define B0000000 0
-#define B00000000 0
-#define B1 1
-#define B01 1
-#define B001 1
-#define B0001 1
-#define B00001 1
-#define B000001 1
-#define B0000001 1
-#define B00000001 1
-#define B10 2
-#define B010 2
-#define B0010 2
-#define B00010 2
-#define B000010 2
-#define B0000010 2
-#define B00000010 2
-#define B11 3
-#define B011 3
-#define B0011 3
-#define B00011 3
-#define B000011 3
-#define B0000011 3
-#define B00000011 3
-#define B100 4
-#define B0100 4
-#define B00100 4
-#define B000100 4
-#define B0000100 4
-#define B00000100 4
-#define B101 5
-#define B0101 5
-#define B00101 5
-#define B000101 5
-#define B0000101 5
-#define B00000101 5
-#define B110 6
-#define B0110 6
-#define B00110 6
-#define B000110 6
-#define B0000110 6
-#define B00000110 6
-#define B111 7
-#define B0111 7
-#define B00111 7
-#define B000111 7
-#define B0000111 7
-#define B00000111 7
-#define B1000 8
-#define B01000 8
-#define B001000 8
-#define B0001000 8
-#define B00001000 8
-#define B1001 9
-#define B01001 9
-#define B001001 9
-#define B0001001 9
-#define B00001001 9
-#define B1010 10
-#define B01010 10
-#define B001010 10
-#define B0001010 10
-#define B00001010 10
-#define B1011 11
-#define B01011 11
-#define B001011 11
-#define B0001011 11
-#define B00001011 11
-#define B1100 12
-#define B01100 12
-#define B001100 12
-#define B0001100 12
-#define B00001100 12
-#define B1101 13
-#define B01101 13
-#define B001101 13
-#define B0001101 13
-#define B00001101 13
-#define B1110 14
-#define B01110 14
-#define B001110 14
-#define B0001110 14
-#define B00001110 14
-#define B1111 15
-#define B01111 15
-#define B001111 15
-#define B0001111 15
-#define B00001111 15
-#define B10000 16
-#define B010000 16
-#define B0010000 16
-#define B00010000 16
-#define B10001 17
-#define B010001 17
-#define B0010001 17
-#define B00010001 17
-#define B10010 18
-#define B010010 18
-#define B0010010 18
-#define B00010010 18
-#define B10011 19
-#define B010011 19
-#define B0010011 19
-#define B00010011 19
-#define B10100 20
-#define B010100 20
-#define B0010100 20
-#define B00010100 20
-#define B10101 21
-#define B010101 21
-#define B0010101 21
-#define B00010101 21
-#define B10110 22
-#define B010110 22
-#define B0010110 22
-#define B00010110 22
-#define B10111 23
-#define B010111 23
-#define B0010111 23
-#define B00010111 23
-#define B11000 24
-#define B011000 24
-#define B0011000 24
-#define B00011000 24
-#define B11001 25
-#define B011001 25
-#define B0011001 25
-#define B00011001 25
-#define B11010 26
-#define B011010 26
-#define B0011010 26
-#define B00011010 26
-#define B11011 27
-#define B011011 27
-#define B0011011 27
-#define B00011011 27
-#define B11100 28
-#define B011100 28
-#define B0011100 28
-#define B00011100 28
-#define B11101 29
-#define B011101 29
-#define B0011101 29
-#define B00011101 29
-#define B11110 30
-#define B011110 30
-#define B0011110 30
-#define B00011110 30
-#define B11111 31
-#define B011111 31
-#define B0011111 31
-#define B00011111 31
-#define B100000 32
-#define B0100000 32
-#define B00100000 32
-#define B100001 33
-#define B0100001 33
-#define B00100001 33
-#define B100010 34
-#define B0100010 34
-#define B00100010 34
-#define B100011 35
-#define B0100011 35
-#define B00100011 35
-#define B100100 36
-#define B0100100 36
-#define B00100100 36
-#define B100101 37
-#define B0100101 37
-#define B00100101 37
-#define B100110 38
-#define B0100110 38
-#define B00100110 38
-#define B100111 39
-#define B0100111 39
-#define B00100111 39
-#define B101000 40
-#define B0101000 40
-#define B00101000 40
-#define B101001 41
-#define B0101001 41
-#define B00101001 41
-#define B101010 42
-#define B0101010 42
-#define B00101010 42
-#define B101011 43
-#define B0101011 43
-#define B00101011 43
-#define B101100 44
-#define B0101100 44
-#define B00101100 44
-#define B101101 45
-#define B0101101 45
-#define B00101101 45
-#define B101110 46
-#define B0101110 46
-#define B00101110 46
-#define B101111 47
-#define B0101111 47
-#define B00101111 47
-#define B110000 48
-#define B0110000 48
-#define B00110000 48
-#define B110001 49
-#define B0110001 49
-#define B00110001 49
-#define B110010 50
-#define B0110010 50
-#define B00110010 50
-#define B110011 51
-#define B0110011 51
-#define B00110011 51
-#define B110100 52
-#define B0110100 52
-#define B00110100 52
-#define B110101 53
-#define B0110101 53
-#define B00110101 53
-#define B110110 54
-#define B0110110 54
-#define B00110110 54
-#define B110111 55
-#define B0110111 55
-#define B00110111 55
-#define B111000 56
-#define B0111000 56
-#define B00111000 56
-#define B111001 57
-#define B0111001 57
-#define B00111001 57
-#define B111010 58
-#define B0111010 58
-#define B00111010 58
-#define B111011 59
-#define B0111011 59
-#define B00111011 59
-#define B111100 60
-#define B0111100 60
-#define B00111100 60
-#define B111101 61
-#define B0111101 61
-#define B00111101 61
-#define B111110 62
-#define B0111110 62
-#define B00111110 62
-#define B111111 63
-#define B0111111 63
-#define B00111111 63
-#define B1000000 64
-#define B01000000 64
-#define B1000001 65
-#define B01000001 65
-#define B1000010 66
-#define B01000010 66
-#define B1000011 67
-#define B01000011 67
-#define B1000100 68
-#define B01000100 68
-#define B1000101 69
-#define B01000101 69
-#define B1000110 70
-#define B01000110 70
-#define B1000111 71
-#define B01000111 71
-#define B1001000 72
-#define B01001000 72
-#define B1001001 73
-#define B01001001 73
-#define B1001010 74
-#define B01001010 74
-#define B1001011 75
-#define B01001011 75
-#define B1001100 76
-#define B01001100 76
-#define B1001101 77
-#define B01001101 77
-#define B1001110 78
-#define B01001110 78
-#define B1001111 79
-#define B01001111 79
-#define B1010000 80
-#define B01010000 80
-#define B1010001 81
-#define B01010001 81
-#define B1010010 82
-#define B01010010 82
-#define B1010011 83
-#define B01010011 83
-#define B1010100 84
-#define B01010100 84
-#define B1010101 85
-#define B01010101 85
-#define B1010110 86
-#define B01010110 86
-#define B1010111 87
-#define B01010111 87
-#define B1011000 88
-#define B01011000 88
-#define B1011001 89
-#define B01011001 89
-#define B1011010 90
-#define B01011010 90
-#define B1011011 91
-#define B01011011 91
-#define B1011100 92
-#define B01011100 92
-#define B1011101 93
-#define B01011101 93
-#define B1011110 94
-#define B01011110 94
-#define B1011111 95
-#define B01011111 95
-#define B1100000 96
-#define B01100000 96
-#define B1100001 97
-#define B01100001 97
-#define B1100010 98
-#define B01100010 98
-#define B1100011 99
-#define B01100011 99
-#define B1100100 100
-#define B01100100 100
-#define B1100101 101
-#define B01100101 101
-#define B1100110 102
-#define B01100110 102
-#define B1100111 103
-#define B01100111 103
-#define B1101000 104
-#define B01101000 104
-#define B1101001 105
-#define B01101001 105
-#define B1101010 106
-#define B01101010 106
-#define B1101011 107
-#define B01101011 107
-#define B1101100 108
-#define B01101100 108
-#define B1101101 109
-#define B01101101 109
-#define B1101110 110
-#define B01101110 110
-#define B1101111 111
-#define B01101111 111
-#define B1110000 112
-#define B01110000 112
-#define B1110001 113
-#define B01110001 113
-#define B1110010 114
-#define B01110010 114
-#define B1110011 115
-#define B01110011 115
-#define B1110100 116
-#define B01110100 116
-#define B1110101 117
-#define B01110101 117
-#define B1110110 118
-#define B01110110 118
-#define B1110111 119
-#define B01110111 119
-#define B1111000 120
-#define B01111000 120
-#define B1111001 121
-#define B01111001 121
-#define B1111010 122
-#define B01111010 122
-#define B1111011 123
-#define B01111011 123
-#define B1111100 124
-#define B01111100 124
-#define B1111101 125
-#define B01111101 125
-#define B1111110 126
-#define B01111110 126
-#define B1111111 127
-#define B01111111 127
-#define B10000000 128
-#define B10000001 129
-#define B10000010 130
-#define B10000011 131
-#define B10000100 132
-#define B10000101 133
-#define B10000110 134
-#define B10000111 135
-#define B10001000 136
-#define B10001001 137
-#define B10001010 138
-#define B10001011 139
-#define B10001100 140
-#define B10001101 141
-#define B10001110 142
-#define B10001111 143
-#define B10010000 144
-#define B10010001 145
-#define B10010010 146
-#define B10010011 147
-#define B10010100 148
-#define B10010101 149
-#define B10010110 150
-#define B10010111 151
-#define B10011000 152
-#define B10011001 153
-#define B10011010 154
-#define B10011011 155
-#define B10011100 156
-#define B10011101 157
-#define B10011110 158
-#define B10011111 159
-#define B10100000 160
-#define B10100001 161
-#define B10100010 162
-#define B10100011 163
-#define B10100100 164
-#define B10100101 165
-#define B10100110 166
-#define B10100111 167
-#define B10101000 168
-#define B10101001 169
-#define B10101010 170
-#define B10101011 171
-#define B10101100 172
-#define B10101101 173
-#define B10101110 174
-#define B10101111 175
-#define B10110000 176
-#define B10110001 177
-#define B10110010 178
-#define B10110011 179
-#define B10110100 180
-#define B10110101 181
-#define B10110110 182
-#define B10110111 183
-#define B10111000 184
-#define B10111001 185
-#define B10111010 186
-#define B10111011 187
-#define B10111100 188
-#define B10111101 189
-#define B10111110 190
-#define B10111111 191
-#define B11000000 192
-#define B11000001 193
-#define B11000010 194
-#define B11000011 195
-#define B11000100 196
-#define B11000101 197
-#define B11000110 198
-#define B11000111 199
-#define B11001000 200
-#define B11001001 201
-#define B11001010 202
-#define B11001011 203
-#define B11001100 204
-#define B11001101 205
-#define B11001110 206
-#define B11001111 207
-#define B11010000 208
-#define B11010001 209
-#define B11010010 210
-#define B11010011 211
-#define B11010100 212
-#define B11010101 213
-#define B11010110 214
-#define B11010111 215
-#define B11011000 216
-#define B11011001 217
-#define B11011010 218
-#define B11011011 219
-#define B11011100 220
-#define B11011101 221
-#define B11011110 222
-#define B11011111 223
-#define B11100000 224
-#define B11100001 225
-#define B11100010 226
-#define B11100011 227
-#define B11100100 228
-#define B11100101 229
-#define B11100110 230
-#define B11100111 231
-#define B11101000 232
-#define B11101001 233
-#define B11101010 234
-#define B11101011 235
-#define B11101100 236
-#define B11101101 237
-#define B11101110 238
-#define B11101111 239
-#define B11110000 240
-#define B11110001 241
-#define B11110010 242
-#define B11110011 243
-#define B11110100 244
-#define B11110101 245
-#define B11110110 246
-#define B11110111 247
-#define B11111000 248
-#define B11111001 249
-#define B11111010 250
-#define B11111011 251
-#define B11111100 252
-#define B11111101 253
-#define B11111110 254
-#define B11111111 255
-
-#endif
diff --git a/platform/osd-merkur/dev/dht11.c b/platform/osd-merkur/dev/dht11.c
deleted file mode 100644
index 39e1a7701..000000000
--- a/platform/osd-merkur/dev/dht11.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- DHT-11 Library
- (c) Created by Charalampos Andrianakis on 18/12/11.
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- */
-
-#include <avr/io.h>
-#include "contiki.h"
-#include "dht11.h"
-#include "led.h" // debug
-
-#define udelay(u) clock_delay_usec(u)
-#define mdelay(u) clock_delay_msec(u)
-
-// todo: set DHT22 or DHT11 in project file
-// define for DHT11 else for DHT22, RHT03 
-//   #define DHT11	1
-
-uint8_t DHT_Read_Data(uint16_t *temperature, uint16_t *humidity){
-
-    //data[5] is 8byte table where data come from DHT are stored
-    //laststate holds laststate value
-    //counter is used to count microSeconds
-    uint8_t data[5], laststate = 0, counter = 0, j = 0, i = 0;
-    
-    //Clear array
-    data[0] = data[1] = data[2] = data[3] = data[4] = 0;
-
-    uint8_t volatile sreg;
-    sreg = SREG;    /* Save status register before disabling interrupts. */
-    cli();          /* Disable interrupts. */
-
-    //Set pin Output
-    //Pin High
-    DHT_DRIVE();
-    mdelay(100);                     //Wait for 100mS
-    
-    //Send Request Signal
-    //Pin Low
-    OUTP_0();                      //20ms Low 
-    mdelay(20);
-    //Pin High
-    OUTP_1();
-    udelay(40);                      //40us High
-    
-    //Set pin Input to read Bus
-    //Set pin Input
-    DHT_RELEASE();
-    laststate=DHT_INP();             //Read Pin value
-    
-    //Repeat for each Transistions
-    for (i=0; i<MAXTIMINGS; i++) {
-        //While state is the same count microseconds
-   //led1_on();
-   //led1_off();
- 
-       while (laststate==DHT_INP()) {
-            udelay(1);
-            counter++;
-            if (counter>254) break;
-        }
-
-        if (counter>254) break;
-        
-        //laststate==_BV(DHT_PIN) checks if laststate was High
-        //ignore the first 2 transitions which are the DHT Response
-        //if (laststate==_BV(DHT_PIN) && (i > 2)) {
-        if ((i&0x01) && (i > 2)) {
-            //Save bits in segments of bytes
-            //Shift data[] value 1 position left
-            //Example. 01010100 if we shift it left one time it will be
-            //10101000
- 
-            data[j/8]<<=1;
-            if (counter >= 15) {    //If it was high for more than 40uS
-   //led1_on();
-                data[j/8]|=1;       //it means it is bit '1' so make a logic
-   //led1_off();
-            }                       //OR with the value (save it)
-            j++;                    //making an OR by 1 to this value 10101000
-        }                           //we will have the resault 10101001
-                                    //1 in 8-bit binary is 00000001
-        //j/8 changes table record every 8 bits which means a byte has been saved
-        //so change to next record. 0/8=0 1/8=0 ... 7/8=0 8/8=1 ... 15/8=1 16/8=2
-        laststate=DHT_INP();     //save current state
-        counter=0;                  //reset counter
-        
-    }
-    SREG = sreg;    /* Enable interrupts. */
-    //printf("HUM %d %d %d %d %d %d",data[0],data[1],data[2],data[3],data[4],(uint8_t)(data[0] + data[1] + data[2] + data[3]) );
-    //Check if data received are correct by checking the CheckSum
-    if ((uint8_t)(data[0] + data[1] + data[2] + data[3]) == data[4]) {
-#ifdef DHT11
-        *humidity = data[0]*100;
-        *temperature = data[2]*100;
-#else
-        *humidity = ((uint16_t)data[0]<<8 | data[1])*10;
-        *temperature = ((uint16_t)data[2]<<8 | data[3])*10;
-#endif
-        return 0;
-    }else{
-        *humidity = 2;
-        *temperature = 2;
-//        uart_puts("\r\nCheck Sum Error");
-    }
- 
-     return 0xff;  // Check Sum Error
-}
diff --git a/platform/osd-merkur/dev/dht11.h b/platform/osd-merkur/dev/dht11.h
deleted file mode 100644
index 6cf757e5d..000000000
--- a/platform/osd-merkur/dev/dht11.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- DHT-11 Library
- (c) Created by Charalampos Andrianakis on 18/12/11.
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <avr/io.h>
-#include <util/delay.h>
-
-/* DHT 1-wire is at PortE.6 */
-#define DHT_PIN_READ PINE
-#define DHT_PIN_MASK _BV(PE6)
-#define DHT_PxOUT PORTE
-#define DHT_PxDIR DDRE
-
-#define SET_PIN_INPUT() (DHT_PxDIR &= ~DHT_PIN_MASK)
-#define SET_PIN_OUTPUT() (DHT_PxDIR |= DHT_PIN_MASK)
-
-#define OUTP_0() (DHT_PxOUT &= ~DHT_PIN_MASK)
-#define OUTP_1() (DHT_PxOUT |= DHT_PIN_MASK) 
-
-#define PIN_INIT() do{  \
-                     SET_PIN_INPUT();    \
-                     OUTP_0();           \
-                   } while(0)
-
-
-/* Drive the one wire interface hight */
-#define DHT_DRIVE() do {                    \
-                     SET_PIN_OUTPUT();     \
-                     OUTP_1();             \
-                   } while (0)
-
-/* Release the one wire by turning on the internal pull-up. */
-#define DHT_RELEASE() do {                  \
-                       SET_PIN_INPUT();    \
-                       OUTP_1();           \
-                     } while (0)
-
-/* Read one bit. */
-#define DHT_INP()  (DHT_PIN_READ & DHT_PIN_MASK)
-
-//The packet size is 40bit but each bit consists of low and high state
-//so 40 x 2 = 80 transitions. Also we have 2 transistions DHT response
-//and 2 transitions which indicates End Of Frame. In total 84
-#define MAXTIMINGS  84
-
-//This is the main function which requests and reads the packet
-uint8_t DHT_Read_Data(uint16_t *temperature, uint16_t *humidity);
diff --git a/platform/osd-merkur/dev/ds1820.c b/platform/osd-merkur/dev/ds1820.c
deleted file mode 100644
index 9de3fc8a9..000000000
--- a/platform/osd-merkur/dev/ds1820.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Copyright (c) 2005, 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.
- *
- * This file is part of the Contiki operating system.
- *
- * @(#)$Id: ds1820.c,v 1.5 2010/08/25 18:35:52 nifi Exp $
- */
-/*
- * Device driver for the Dallas Semiconductor DS1820 chip. Heavily
- * based on the application note 126 "1-Wire Communications Through
- * Software".
- *
- * http://www.maxim-ic.com/appnotes.cfm/appnote_number/126
- */
-
-/*
- * For now we stuff in Moteiv Corporation's unique OUI.
- * From http://www.ethereal.com/distribution/manuf.txt:
- * 00:12:75    Moteiv    # Moteiv Corporation
- *
- * The EUI-64 is a concatenation of the 24-bit OUI value assigned by
- * the IEEE Registration Authority and a 40-bit extension identifier
- * assigned by the organization with that OUI assignment.
- */
-
-#include <avr/io.h>
-#include <string.h>
-#include "contiki.h"
-#include "ds1820.h"
-
-
-unsigned char ds1820_id[8];
-unsigned char ds1820_ok[8];
-
-/* 1-wire is at PortE.3 */
-#define SERIAL_ID_PIN_READ PINE
-//#define SERIAL_ID_PIN_MASK _BV(PE3)
-#define SERIAL_ID_PIN_MASK _BV(PE4)
-#define SERIAL_ID_PxOUT PORTE
-#define SERIAL_ID_PxDIR DDRE
-
-#define SET_PIN_INPUT() (SERIAL_ID_PxDIR &= ~SERIAL_ID_PIN_MASK)
-#define SET_PIN_OUTPUT() (SERIAL_ID_PxDIR |= SERIAL_ID_PIN_MASK)
-
-#define OUTP_0() (SERIAL_ID_PxOUT &= ~SERIAL_ID_PIN_MASK)
-#define OUTP_1() (SERIAL_ID_PxOUT |= SERIAL_ID_PIN_MASK) 
-
-#define PIN_INIT() do{  \
-                     SET_PIN_INPUT();    \
-                     OUTP_0();           \
-                   } while(0)
-
-
-/* Drive the one wire interface low */
-#define OW_DRIVE() do {                    \
-                     SET_PIN_OUTPUT();     \
-                     OUTP_0();             \
-                   } while (0)
-
-/* Release the one wire by turning on the internal pull-up. */
-#define OW_RELEASE() do {                  \
-                       SET_PIN_INPUT();    \
-                       OUTP_1();           \
-                     } while (0)
-
-/* Read one bit. */
-#define INP()  (SERIAL_ID_PIN_READ & SERIAL_ID_PIN_MASK)
-
-
-/*
- * Delay times in us.
- */
-#define tA 6          /* min-5, recommended-6, max-15 */              
-#define tB 64         /* min-59, recommended-64, max-N/A */
-#define tC 60         /* min-60, recommended-60, max-120 */			
-#define tD 10         /* min-5.3, recommended-10, max-N/A */
-#define tE 9          /* min-0.3, recommended-9, max-9.3 */
-#define tF 55         /* min-50, recommended-55, max-N/A */
-#define tG 0          /* min-0, recommended-0, max-0 */
-#define tH 480        /* min-480, recommended-480, max-640 */
-#define tI 70         /* min-60.3, recommended-70, max-75.3 */
-#define tJ 410        /* min-410, recommended-410, max-N/A */
-/*---------------------------------------------------------------------------*/
-#define udelay(u) clock_delay_usec(u)
-/*---------------------------------------------------------------------------*/
-
-static int
-owreset(void)
-{
-  int result;
-
-  OW_DRIVE();
-  udelay(tH);     /* 480 < tH < 640 */
-  OW_RELEASE();    /* Releases the bus */
-  udelay(tI);
-  result = INP();
-  udelay(tJ);
-  return result;
-}
-/*---------------------------------------------------------------------------*/
-static void
-owwriteb(unsigned byte)
-{
-  int i = 7;
-
-  do {
-    if(byte & 0x01) {
-      OW_DRIVE();
-      udelay(tA);
-      OW_RELEASE();    /* Releases the bus */
-      udelay(tB);
-    } else {
-      OW_DRIVE();
-      udelay(tC);
-      OW_RELEASE();    /* Releases the bus */
-      udelay(tD);
-    }
-    if(i == 0) {
-      return;
-    }
-    i--;
-    byte >>= 1;
-  } while(1);
-}
-/*---------------------------------------------------------------------------*/
-static unsigned
-owreadb(void)
-{
-  unsigned result = 0;
-  int i = 7;
-
-  do {
-    OW_DRIVE();
-    udelay(tA);
-    OW_RELEASE();	/* Releases the bus */
-    udelay(tE);
-    if (INP()){
-      result |= 0x80;	/* LSbit first */
-    }
-    udelay(tF);
-    if(i == 0) {
-      return result;
-    }
-    i--;
-    result >>= 1;
-  } while(1);
-}
-/*---------------------------------------------------------------------------*/
-/* Polynomial ^8 + ^5 + ^4 + 1 */
-static unsigned
-crc8_add(unsigned acc, unsigned byte)
-{
-  int i;
-  acc ^= byte;
-  for(i = 0; i < 8; i++) {
-    if(acc & 1) {
-      acc = (acc >> 1) ^ 0x8c;
-    } else {
-      acc >>= 1;
-    }
-  }
-  return acc;
-}
-/*---------------------------------------------------------------------------*/
-int
-ds1820_init()
-{
-  int i;
-  unsigned family, crc, acc;
-
-  PIN_INIT();
-
-  if(owreset() == 0) {	/* Something pulled down 1-wire. */
-
-    owwriteb(0x33);		/* Read ROM command. */
-    family = owreadb();
-    /* We receive 6 bytes in the reverse order, LSbyte first. */
-    for(i = 7; i >= 2; i--) {
-      ds1820_id[i] = owreadb();
-    }
-    crc = owreadb();
-
-    /* Verify family DS1820 and that CRC match. */
-    if(family != 0x10) {
-      goto fail;
-    }
-    acc = crc8_add(0x0, family);
-    for(i = 7; i >= 2; i--) {
-      acc = crc8_add(acc, ds1820_id[i]);
-    }
-    if(acc == crc) {
-      ds1820_id[0] = 0x00;
-      ds1820_id[1] = 0x00;
-      ds1820_id[2] = 0x00;
-      return 1;			/* Success! */
-    }
-  } else {
-  }
-
-
- fail:
-  memset(ds1820_id, 0x0, sizeof(ds1820_id));
-  return 0;			/* Fail! */
-}
-/*---------------------------------------------------------------------------*/
-int
-ds1820_temp()
-{
-    ds1820_convert();
-// wait max 750ms pin lo
-    clock_wait(CLOCK_SECOND);
-    ds1820_read();
-    return 1;
-}
-
-int
-ds1820_convert()
-{
-  unsigned i;
-
-  PIN_INIT();
-  for(i=0;i<3;i++){
-  if(owreset() == 0) {	/* Something pulled down 1-wire. */
-    owwriteb(0xCC);		/* Skip ROM command. */
-    owwriteb(0x44);		/* Convert T command. */
-    OW_RELEASE();    /* Releases the bus */
-    return 1;
-  } else {
-  }
-  }
-  return 0;			/* Fail! */
-}
-/*---------------------------------------------------------------------------*/
-int
-ds1820_read()
-{
-  int i;
-  unsigned crc, acc;
-
-  if(owreset() == 0) {	/* Something pulled down 1-wire. */
-    owwriteb(0xCC);		/* Skip ROM command. */
-    owwriteb(0xBE);		/* Read Scratchpad command. */
-    /* We receive 8 bytes in the reverse order, LSbyte first. */
-    for(i = 0; i < 8; i++) {
-      ds1820_id[i] = owreadb();
-    }
-      crc = owreadb();
-
-    acc=0;
-    for(i = 0; i < 8; i++) {
-      acc = crc8_add(acc, ds1820_id[i]);
-    }
-    if(acc == crc) {
-      // store temp
-      for(i = 0; i < 8; i++) {
-         ds1820_ok[i]=ds1820_id[i];
-      }
-      return 1;			/* Success! */
-    } else {
-        return 0;			/* Fail! */
-    }
-  } else {
-    return 0;			/* Fail! */
-  }
-  return 1;			/* Fail! */
-}
diff --git a/platform/osd-merkur/dev/ds1820.h b/platform/osd-merkur/dev/ds1820.h
deleted file mode 100644
index e4178d63e..000000000
--- a/platform/osd-merkur/dev/ds1820.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2005, 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.
- *
- * This file is part of the Contiki operating system.
- *
- * @(#)$Id: ds1820.h,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $
- */
-/* -*- C -*- */
-/* @(#)$Id: ds1820.h,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $ */
-
-#ifndef DS1820_H
-#define DS1820_H
-
-extern unsigned char ds1820_id[8];
-extern unsigned char ds1820_ok[8];
-extern int ds1820_init();
-extern int ds1820_convert();
-extern int ds1820_read();
-extern int ds1820_temp();
-#endif /* DS1820_H */
diff --git a/platform/osd-merkur/dev/i2c.c b/platform/osd-merkur/dev/i2c.c
deleted file mode 100644
index 0fa295849..000000000
--- a/platform/osd-merkur/dev/i2c.c
+++ /dev/null
@@ -1,391 +0,0 @@
-/*
- * Copyright (c) 2014, Ingo Gulyas Intembsys
- * 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
- *         I2C driver for ATMEGA128rfa1
- *
- * \author
- *         Ingo Gulyas Intembsys
- *         office@intembsys.at
- *         www.intembsys.at
- */
-
-
-#include "i2c.h"
-#include "contiki-conf.h"
-#include <stdint.h>
-#include <avr/power.h>
-#include <stdbool.h>
-#include <stddef.h>
-
-#if I2C_TD != 0
-#include <stdio.h>
-#include <avr/pgmspace.h>
-#include "system_mgmt.h"
-#define PRINTD(FORMAT,args...) {sleep_acquire_lock(); printf_P(PSTR(FORMAT),##args); sleep_release_lock();}
-#else
-#define PRINTD(...)
-#endif
-
-#if WITH_RTDEBUG == 1
-#include "rtdebug.h"
-#define RTDEBUG_PUSH(x) rtdebug_push(x)
-#else
-#warning "I2C Driver compiling without RTDEBUG!"
-#define RTDEBUG_PUSH(x)
-#endif
-
-#ifndef TIMEOUT_TIMER
-#warning "I2C Driver compiling without TIMEOUT!"
-#endif
-
-
-static int8_t wait_job();
-static int8_t wait_stop();
-
-static int8_t i2c_ioctl(const i2c_driver* const me, uint8_t cmd, uint8_t arg);
-static int8_t i2c_read(const i2c_driver* const me, uint8_t cmd_flags, uint8_t* buffer, uint8_t len);
-static int8_t i2c_write(const i2c_driver* const me, uint8_t cmd_flags, const uint8_t* data, uint8_t len);
-
-
-// static linkage of member functions
-i2c_driver i2c_drv = {i2c_ioctl, i2c_read, i2c_write};
-// lock spi if driver opened to prevent further opening access
-static volatile bool i2c_lock = false;
-
-
-///////////////////////////////////////////////////////////////
-// global functions
-///////////////////////////////////////////////////////////////
-
-i2c_driver* i2c_open(void)
-{
-	if(i2c_lock == true)
-	{
-		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_OPEN__DEVICE_BUSY);
-		return NULL;
-	}	
-	 
-	i2c_lock = true;
-	power_twi_enable();
-	I2C_INIT();	
-
-	TWBR = I2C_FREQ_STANDARD;
-	TWSR &= ~((1<<TWPS1) | (1<<TWPS0));
-	TWSR |= (1<<TWPS0);
-	TWCR = (1<<TWEN);
-	
-	return &i2c_drv;
-}
-
-void i2c_close(i2c_driver* const me)
-{
-	if(me == NULL || i2c_lock == false)
-	{
-		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_CLOSE__NO_DEVICE);
-		return;
-	}
-	
-	i2c_reset();
-	
-	return;
-}
-
-void i2c_reset(void)
-{
-	TWCR &= ~(1<<TWEN);
-	I2C_DEINIT();
-	power_twi_disable();
-	i2c_lock = false;
-	
-	return;
-}
-
-
-///////////////////////////////////////////////////////////////
-// local helper functions
-///////////////////////////////////////////////////////////////
-
-#ifdef TIMEOUT_TIMER
-	static int8_t wait_job()
-	{
-		int8_t status = I2C_OK;	
-		uint16_t timeout = TIMEOUT_TIMER_NOW_ADD(I2C_TIMEOUT);
-	
-
-		while (!(TWCR & (1<<TWINT)))
-		{
-			if(!(TIMEOUT_TIMER_LT(TIMEOUT_TIMER_NOW(), timeout)))
-			{
-				status = I2C_ERROR_TIMEOUT;
-				break;
-			}	
-		}
-	
-		return status;
-	}
-	
-	static int8_t wait_stop()
-	{
-		int8_t status = I2C_OK;	
-		uint16_t timeout = TIMEOUT_TIMER_NOW_ADD(I2C_TIMEOUT);
-	
-
-		while (TWCR & (1<<TWSTO))
-		{
-			if(!(TIMEOUT_TIMER_LT(TIMEOUT_TIMER_NOW(), timeout)))
-			{
-				status = I2C_ERROR_TIMEOUT;
-				break;
-			}	
-		}
-	
-		return status;
-	}
-#else
-	static int8_t wait_job()
-	{
-		while (!(TWCR & (1<<TWINT)));
-		return I2C_OK;
-	}
-	
-	static int8_t wait_stop()
-	{
-		while (TWCR & (1<<TWSTO));
-		return I2C_OK;
-	}
-#endif
-
-
-///////////////////////////////////////////////////////////////
-// member functions
-///////////////////////////////////////////////////////////////
-
-static int8_t i2c_ioctl(const i2c_driver* const me, uint8_t cmd, uint8_t arg)
-{
-	if(me == NULL || i2c_lock == false)
-	{
-		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_IOCTL__DEVICE_CLOSED);
-		return I2C_ERROR_DRIVER;
-	}
-		
-	if(cmd == I2C_IOCTL_CMD_SET_FREQ)
-	{
-		switch(arg)
-		{
-			case I2C_FREQ_400KHZ:	TWBR = I2C_FREQ_400KHZ; break;
-			case I2C_FREQ_250KHZ:	TWBR = I2C_FREQ_250KHZ; break;
-			case I2C_FREQ_100KHZ:	TWBR = I2C_FREQ_100KHZ; break;
-			case I2C_FREQ_50KHZ:	TWBR = I2C_FREQ_50KHZ; break;
-			case I2C_FREQ_10KHZ:	TWBR = I2C_FREQ_10KHZ; break;
-			default:
-			{
-				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_IOCTL__ARG_INVALID);
-				return I2C_ERROR_DRIVER;
-			}			
-		}
-	}
-	else
-	{
-		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_IOCTL__CMD_INVALID);
-		return I2C_ERROR_DRIVER;
-	}
-	
-	return I2C_OK;
-}
-
-static int8_t i2c_read(const i2c_driver* const me, uint8_t cmd_flags, uint8_t* buffer, uint8_t len)
-{
-	uint8_t i = 0;
-	int8_t status = I2C_OK;
-	
-	
-	if(me == NULL || i2c_lock == false)
-	{
-		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__DEVICE_CLOSED);
-		return I2C_ERROR_DRIVER;
-	}	
-	
-	if((len > 0) && (buffer == NULL))
-	{
-		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__ERROR_NULLPOINTER);
-		return I2C_ERROR_DRIVER;
-	}
-	
-	do 
-	{
-		if(cmd_flags & I2C_CMD_FLAG_START)
-		{
-			I2C_START();
-			if(wait_job() != I2C_OK)
-			{
-				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__START_TIMEOUT);
-				status = I2C_ERROR_TIMEOUT;
-				break;
-			}
-			if((I2C_STATUS() != I2C_STATUS_START) && (I2C_STATUS() != I2C_STATUS_START_REP))
-			{
-				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__START_ERROR);
-				status = I2C_ERROR_START;
-				break;
-			}
-			PRINTD("I2C-RD-START\n");
-		}
-		
-		if(len == 0) break;
-		
-		for(i=0; i<(len-1); i++)
-		{
-			I2C_READ_BYTE_ACK();
-			if(wait_job() != I2C_OK)
-			{
-				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__READ_BYTE_ACK_TIMEOUT);
-				status = I2C_ERROR_TIMEOUT;
-				break;
-			}
-			if(I2C_STATUS() != I2C_STATUS_DATAR_ACK)
-			{
-				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__READ_BYTE_ACK_ERROR);
-				status = I2C_ERROR_READ;
-				break;
-			}
-			buffer[i] = I2C_RX_REG;
-			PRINTD("I2C-RD-RACK: 0x%02X\n", buffer[i]);
-		}
-		
-		I2C_READ_BYTE_NACK();
-		if(wait_job() != I2C_OK)
-		{
-			RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__READ_BYTE_NACK_TIMEOUT);
-			status = I2C_ERROR_TIMEOUT;
-			break;
-		}
-		if(I2C_STATUS() != I2C_STATUS_DATAR_NACK)
-		{
-			RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__READ_BYTE_NACK_ERROR);
-			status = I2C_ERROR_READ;
-			break;
-		}
-		buffer[i] = I2C_RX_REG;
-		PRINTD("I2C-RD-RNACK: 0x%02X\n", buffer[i]);
-		
-	} while (0);
-	
-	if(cmd_flags & I2C_CMD_FLAG_STOP)
-	{
-		I2C_STOP();
-		if(wait_stop() != I2C_OK)
-		{
-			RTDEBUG_PUSH(RTDEBUG_CODE__I2C_READ__STOP_TIMEOUT);
-			status = I2C_ERROR_TIMEOUT;
-		}
-		PRINTD("I2C-RD_STOP\n");
-	}
-	
-	return status;
-}
-
-static int8_t i2c_write(const i2c_driver* const me, uint8_t cmd_flags, const uint8_t* data, uint8_t len)
-{
-	uint8_t i = 0;
-	int8_t status = I2C_OK;
-	
-	
-	if(me == NULL || i2c_lock == false)
-	{
-		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__DEVICE_CLOSED);
-		return I2C_ERROR_DRIVER;
-	}
-	
-	if((len > 0) && (data == NULL))
-	{
-		RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__ERROR_NULLPOINTER);
-		return I2C_ERROR_DRIVER;
-	}
-	
-	do 
-	{		
-		if(cmd_flags & I2C_CMD_FLAG_START)
-		{
-			I2C_START();
-			if(wait_job() != I2C_OK)
-			{
-				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__START_TIMEOUT);
-				status = I2C_ERROR_TIMEOUT;
-				break;
-			}
-			if((I2C_STATUS() != I2C_STATUS_START) && (I2C_STATUS() != I2C_STATUS_START_REP))
-			{
-				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__START_ERROR);
-				status = I2C_ERROR_START;
-				break;
-			}
-			PRINTD("I2C-WR-START\n");
-		}
-		
-		
-	
-		for(i=0; i<len; i++)
-		{
-			I2C_TX_REG = data[i];
-			I2C_WRITE_BYTE();
-			if(wait_job() != I2C_OK)
-			{
-				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__WRITE_BYTE_TIMEOUT);
-				status = I2C_ERROR_TIMEOUT;
-				break;
-			}
-			if((I2C_STATUS() != I2C_STATUS_DATAW_ACK) && (I2C_STATUS() != I2C_STATUS_SLAW_ACK) && (I2C_STATUS() != I2C_STATUS_SLAR_ACK))
-			{
-				RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__WRITE_BYTE_ERROR);
-				status = I2C_ERROR_WRITE;
-				break;
-			}
-			PRINTD("I2C-WR-BYTE: 0x%02X\n", data[i]);
-		}
-
-	} while (0);
-	
-	if(cmd_flags & I2C_CMD_FLAG_STOP)
-	{
-		I2C_STOP();
-		if(wait_stop() != I2C_OK)
-		{
-			RTDEBUG_PUSH(RTDEBUG_CODE__I2C_WRITE__STOP_TIMEOUT);
-			status = I2C_ERROR_TIMEOUT;
-		}
-		PRINTD("I2C-WR-STOP\n");
-	}
-	
-	return status;
-}
diff --git a/platform/osd-merkur/dev/i2c.h b/platform/osd-merkur/dev/i2c.h
deleted file mode 100644
index bed70fc0a..000000000
--- a/platform/osd-merkur/dev/i2c.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2014, Ingo Gulyas Intembsys
- * 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
- *         I2C driver for ATMEGA128rfa1
- *
- * \author
- *         Ingo Gulyas Intembsys
- *         office@intembsys.at
- *         www.intembsys.at
- */
- 
-
-#ifndef I2C_H_
-#define I2C_H_
-
-
-#include <stdint.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////
-// CONFIGURATION SECTION:
-
-#define I2C_TD          0			// compiler switch: i2c testdriver code
-
-#define I2C_PORT            PORTD
-#define I2C_DDR             DDRD
-#define I2C_SCL_PIN         0
-#define I2C_SDA_PIN         1
-
-// END OF CONFIGURATION SECTION
-////////////////////////////////////////////////////////////////////////////////////////////
-
-#define I2C_INIT()          ({I2C_DDR &= ~((1<<I2C_SCL_PIN) | (1<<I2C_SDA_PIN)); I2C_PORT |= ((1<<I2C_SCL_PIN) | (1<<I2C_SDA_PIN));})
-#define I2C_DEINIT()        ({I2C_DDR &= ~((1<<I2C_SCL_PIN) | (1<<I2C_SDA_PIN)); I2C_PORT |= ((1<<I2C_SCL_PIN) | (1<<I2C_SDA_PIN));})
-
-#define I2C_FREQ_STANDARD I2C_FREQ_50KHZ
-
-#if F_CPU == 16000000UL
-	#define	I2C_FREQ_400KHZ  0x03
-	#define	I2C_FREQ_250KHZ  0x06
-	#define	I2C_FREQ_100KHZ  0x12
-	#define	I2C_FREQ_50KHZ   0x26
-	#define I2C_FREQ_10KHZ   0xC6
-#else
-	#error "NO I2C FREQUENCY DEFINED -> CHECK F_CPU SETTINGS!"
-#endif
-
-
-#define I2C_STATUS_REG        TWSR
-#define I2C_TX_REG            TWDR
-#define I2C_RX_REG            TWDR
-
-#define I2C_START()           (TWCR = (1<<TWINT) |(1<<TWSTA) | (1<<TWEN))
-#define I2C_STOP()            (TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO))
-#define I2C_WRITE_BYTE()      (TWCR = (1<<TWINT) | (1<<TWEN))
-#define I2C_READ_BYTE_ACK()   (TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWEA))
-#define I2C_READ_BYTE_NACK()  (TWCR = (1<<TWINT) | (1<<TWEN))
-#define I2C_STATUS()          (I2C_STATUS_REG & I2C_STATUS_MASK)
-
-#define I2C_STATUS_MASK       0xF8
-#define I2C_STATUS_START      0x08
-#define I2C_STATUS_START_REP  0x10
-#define I2C_STATUS_SLAW_ACK   0x18
-#define I2C_STATUS_DATAW_ACK  0x28
-#define I2C_STATUS_SLAR_ACK   0x40
-#define I2C_STATUS_DATAR_ACK  0x50
-#define I2C_STATUS_DATAR_NACK 0x58
-
-#define I2C_ADR_WR(adr)       ((adr<<1) & ~(1<<0))
-#define I2C_ADR_RD(adr)       ((adr<<1) | (1<<0))
-
-#define I2C_CMD_FLAG_NONE     0x00
-#define I2C_CMD_FLAG_START    (1<<0)
-#define I2C_CMD_FLAG_STOP     (1<<1)
-
-
-#define I2C_OK                0
-#define I2C_ERROR_DRIVER      -1
-#define I2C_ERROR_TIMEOUT     -2
-#define I2C_ERROR_START       -3
-#define I2C_ERROR_WRITE       -4
-#define I2C_ERROR_READ        -5
-
-
-#define I2C_IOCTL_CMD_SET_FREQ 0x01
-
-
-typedef struct i2c_driver i2c_driver;
-struct i2c_driver
-{
-	int8_t (*ioctl)(const i2c_driver* const me, uint8_t cmd, uint8_t arg);
-	int8_t (*read)(const i2c_driver* const me, uint8_t cmd_flags, uint8_t* buffer, uint8_t len);
-	int8_t (*write)(const i2c_driver* const me, uint8_t cmd_flags, const uint8_t* data, uint8_t len);
-};
-
-i2c_driver* i2c_open(void);
-void i2c_close(i2c_driver* const me);
-void i2c_reset(void);
-
-
-#endif /* I2C_H_ */
diff --git a/platform/osd-merkur/dev/key.c b/platform/osd-merkur/dev/key.c
deleted file mode 100644
index 20d852c18..000000000
--- a/platform/osd-merkur/dev/key.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Copyright (c) 2010  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 KEY support.
- *
- * \author
- *      Harald Pichler harald@the-develop.net
- *
- */
-
-#include "key.h"
-
-/*---------------------------------------------------------------------------*/
-
-/**
- *   \brief This will intialize the KEY for button readings.
-*/
-void
-key_init(void)
-{
-    /* Enter is input w/pullup */
-    DDRF &= ~(1<<PINF1);
-}
-
-/*---------------------------------------------------------------------------*/
-
-/**
- *   \brief This will poll run key_task() to determine if a button has been pressed.
- *
- *   \retval True if button is pressed
- *   \retval False if button is not pressed
-*/
-uint8_t
-is_button(void)
-{
-    /* Return true if button has been pressed. */
-    if ( PINF & (1<<PINF1) ) {
-        return 0;
-    }
-    else{
-        return 1;
-    }
-}
diff --git a/platform/osd-merkur/dev/key.h b/platform/osd-merkur/dev/key.h
deleted file mode 100644
index 8d64b8423..000000000
--- a/platform/osd-merkur/dev/key.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2010  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 Key support.
- *
- * \author
- *      Harald Pixhlwe harald@the-develop.net
- *
- */
-
-#ifndef __KEY_H__
-#define __KEY_H__
-
-#include <stdint.h>
-#include <avr/io.h>
-
-void	key_init(void);
-uint8_t	is_button(void);
-
-#endif /* __KEY_H__ */
diff --git a/platform/osd-merkur/dev/leds-arch.h b/platform/osd-merkur/dev/leds-arch.h
deleted file mode 100644
index b790ad5b8..000000000
--- a/platform/osd-merkur/dev/leds-arch.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef __LEDS_ARCH_H__
-#define __LEDS_ARCH_H__
-
-#define LED_OUT PORTE
-
-#define BIT_RED   _BV(PE5)
-#define BIT_BLUE   BIT_RED
-#define BIT_GREEN  BIT_RED
-#define BIT_YELLOW BIT_RED
-
-#define LED_GREEN_ON() LED_OUT &= ~BIT_GREEN
-#define LED_GREEN_OFF() LED_OUT |= BIT_GREEN
-#define LED_YELLOW_ON() LED_OUT &= ~BIT_YELLOW
-#define LED_YELLOW_OFF() LED_OUT |= BIT_YELLOW
-#define LED_RED_ON() LED_OUT &= ~BIT_RED
-#define LED_RED_OFF() LED_OUT |= BIT_RED
-
-
-#define LED_GREEN_TOGGLE() LED_OUT ^= BIT_GREEN
-#define LED_YELLOW_TOGGLE() LED_OUT ^= BIT_YELLOW
-#define LED_RED_TOGGLE() LED_OUT ^= BIT_RED
-
-#define LEDS_ON() LED_OUT &= ~(BIT_BLUE | BIT_GREEN | BIT_RED)
-#define LEDS_OFF() LED_OUT |= (BIT_BLUE | BIT_GREEN | BIT_RED)
-
-
-void leds_arch_init(void);
-unsigned char leds_arch_get(void);
-void leds_arch_set(unsigned char leds);
-
-#endif /* __LEDS_ARCH_H__ */
diff --git a/platform/osd-merkur/dev/old/Printable.h b/platform/osd-merkur/dev/old/Printable.h
deleted file mode 100644
index d03c9af62..000000000
--- a/platform/osd-merkur/dev/old/Printable.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-  Printable.h - Interface class that allows printing of complex types
-  Copyright (c) 2011 Adrian McEwen.  All right reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifndef Printable_h
-#define Printable_h
-
-#include <new.h>
-
-class Print;
-
-/** The Printable class provides a way for new classes to allow themselves to be printed.
-    By deriving from Printable and implementing the printTo method, it will then be possible
-    for users to print out instances of this class by passing them into the usual
-    Print::print and Print::println methods.
-*/
-
-class Printable
-{
-  public:
-    virtual size_t printTo(Print& p) const = 0;
-};
-
-#endif
-
diff --git a/platform/osd-merkur/dev/old/Stream.cpp b/platform/osd-merkur/dev/old/Stream.cpp
deleted file mode 100644
index aafb7fcf9..000000000
--- a/platform/osd-merkur/dev/old/Stream.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- Stream.cpp - adds parsing methods to Stream class
- Copyright (c) 2008 David A. Mellis.  All right reserved.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
- Created July 2011
- parsing functions based on TextFinder library by Michael Margolis
- */
-
-#include "Arduino.h"
-#include "Stream.h"
-
-#define PARSE_TIMEOUT 1000  // default number of milli-seconds to wait
-#define NO_SKIP_CHAR  1  // a magic char not found in a valid ASCII numeric field
-
-// private method to read stream with timeout
-int Stream::timedRead()
-{
-  int c;
-  _startMillis = millis();
-  do {
-    c = read();
-    if (c >= 0) return c;
-  } while(millis() - _startMillis < _timeout);
-  return -1;     // -1 indicates timeout
-}
-
-// private method to peek stream with timeout
-int Stream::timedPeek()
-{
-  int c;
-  _startMillis = millis();
-  do {
-    c = peek();
-    if (c >= 0) return c;
-  } while(millis() - _startMillis < _timeout);
-  return -1;     // -1 indicates timeout
-}
-
-// returns peek of the next digit in the stream or -1 if timeout
-// discards non-numeric characters
-int Stream::peekNextDigit()
-{
-  int c;
-  while (1) {
-    c = timedPeek();
-    if (c < 0) return c;  // timeout
-    if (c == '-') return c;
-    if (c >= '0' && c <= '9') return c;
-    read();  // discard non-numeric
-  }
-}
-
-// Public Methods
-//////////////////////////////////////////////////////////////
-
-void Stream::setTimeout(unsigned long timeout)  // sets the maximum number of milliseconds to wait
-{
-  _timeout = timeout;
-}
-
- // find returns true if the target string is found
-bool  Stream::find(char *target)
-{
-  return findUntil(target, NULL);
-}
-
-// reads data from the stream until the target string of given length is found
-// returns true if target string is found, false if timed out
-bool Stream::find(char *target, size_t length)
-{
-  return findUntil(target, length, NULL, 0);
-}
-
-// as find but search ends if the terminator string is found
-bool  Stream::findUntil(char *target, char *terminator)
-{
-  return findUntil(target, strlen(target), terminator, strlen(terminator));
-}
-
-// reads data from the stream until the target string of the given length is found
-// search terminated if the terminator string is found
-// returns true if target string is found, false if terminated or timed out
-bool Stream::findUntil(char *target, size_t targetLen, char *terminator, size_t termLen)
-{
-  size_t index = 0;  // maximum target string length is 64k bytes!
-  size_t termIndex = 0;
-  int c;
-  
-  if( *target == 0)
-    return true;   // return true if target is a null string
-  while( (c = timedRead()) > 0){
-    
-    if(c != target[index])
-      index = 0; // reset index if any char does not match
-    
-    if( c == target[index]){
-      //////Serial.print("found "); Serial.write(c); Serial.print("index now"); Serial.println(index+1);
-      if(++index >= targetLen){ // return true if all chars in the target match
-        return true;
-      }
-    }
-    
-    if(termLen > 0 && c == terminator[termIndex]){
-      if(++termIndex >= termLen)
-        return false;       // return false if terminate string found before target string
-    }
-    else
-      termIndex = 0;
-  }
-  return false;
-}
-
-
-// returns the first valid (long) integer value from the current position.
-// initial characters that are not digits (or the minus sign) are skipped
-// function is terminated by the first character that is not a digit.
-long Stream::parseInt()
-{
-  return parseInt(NO_SKIP_CHAR); // terminate on first non-digit character (or timeout)
-}
-
-// as above but a given skipChar is ignored
-// this allows format characters (typically commas) in values to be ignored
-long Stream::parseInt(char skipChar)
-{
-  boolean isNegative = false;
-  long value = 0;
-  int c;
-
-  c = peekNextDigit();
-  // ignore non numeric leading characters
-  if(c < 0)
-    return 0; // zero returned if timeout
-
-  do{
-    if(c == skipChar)
-      ; // ignore this charactor
-    else if(c == '-')
-      isNegative = true;
-    else if(c >= '0' && c <= '9')        // is c a digit?
-      value = value * 10 + c - '0';
-    read();  // consume the character we got with peek
-    c = timedPeek();
-  }
-  while( (c >= '0' && c <= '9') || c == skipChar );
-
-  if(isNegative)
-    value = -value;
-  return value;
-}
-
-
-// as parseInt but returns a floating point value
-float Stream::parseFloat()
-{
-  return parseFloat(NO_SKIP_CHAR);
-}
-
-// as above but the given skipChar is ignored
-// this allows format characters (typically commas) in values to be ignored
-float Stream::parseFloat(char skipChar){
-  boolean isNegative = false;
-  boolean isFraction = false;
-  long value = 0;
-  char c;
-  float fraction = 1.0;
-
-  c = peekNextDigit();
-    // ignore non numeric leading characters
-  if(c < 0)
-    return 0; // zero returned if timeout
-
-  do{
-    if(c == skipChar)
-      ; // ignore
-    else if(c == '-')
-      isNegative = true;
-    else if (c == '.')
-      isFraction = true;
-    else if(c >= '0' && c <= '9')  {      // is c a digit?
-      value = value * 10 + c - '0';
-      if(isFraction)
-         fraction *= 0.1;
-    }
-    read();  // consume the character we got with peek
-    c = timedPeek();
-  }
-  while( (c >= '0' && c <= '9')  || c == '.' || c == skipChar );
-
-  if(isNegative)
-    value = -value;
-  if(isFraction)
-    return value * fraction;
-  else
-    return value;
-}
-
-// read characters from stream into buffer
-// terminates if length characters have been read, or timeout (see setTimeout)
-// returns the number of characters placed in the buffer
-// the buffer is NOT null terminated.
-//
-size_t Stream::readBytes(char *buffer, size_t length)
-{
-  size_t count = 0;
-  while (count < length) {
-    int c = timedRead();
-    if (c < 0) break;
-    *buffer++ = (char)c;
-    count++;
-  }
-  return count;
-}
-
-
-// as readBytes with terminator character
-// terminates if length characters have been read, timeout, or if the terminator character  detected
-// returns the number of characters placed in the buffer (0 means no valid data found)
-
-size_t Stream::readBytesUntil(char terminator, char *buffer, size_t length)
-{
-  if (length < 1) return 0;
-  size_t index = 0;
-  while (index < length) {
-    int c = timedRead();
-    if (c < 0 || c == terminator) break;
-    *buffer++ = (char)c;
-    index++;
-  }
-  return index; // return number of characters, not including null terminator
-}
-
-String Stream::readString()
-{
-  String ret;
-  int c = timedRead();
-  while (c >= 0)
-  {
-    ret += (char)c;
-    c = timedRead();
-  }
-  return ret;
-}
-
-String Stream::readStringUntil(char terminator)
-{
-  String ret;
-  int c = timedRead();
-  while (c >= 0 && c != terminator)
-  {
-    ret += (char)c;
-    c = timedRead();
-  }
-  return ret;
-}
-
diff --git a/platform/osd-merkur/dev/old/Stream.h b/platform/osd-merkur/dev/old/Stream.h
deleted file mode 100644
index 58bbf752f..000000000
--- a/platform/osd-merkur/dev/old/Stream.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-  Stream.h - base class for character-based streams.
-  Copyright (c) 2010 David A. Mellis.  All right reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-  parsing functions based on TextFinder library by Michael Margolis
-*/
-
-#ifndef Stream_h
-#define Stream_h
-
-#include <inttypes.h>
-#include "Print.h"
-
-// compatability macros for testing
-/*
-#define   getInt()            parseInt()
-#define   getInt(skipChar)    parseInt(skipchar)
-#define   getFloat()          parseFloat()
-#define   getFloat(skipChar)  parseFloat(skipChar)
-#define   getString( pre_string, post_string, buffer, length)
-readBytesBetween( pre_string, terminator, buffer, length)
-*/
-
-class Stream : public Print
-{
-  private:
-    unsigned long _timeout;      // number of milliseconds to wait for the next char before aborting timed read
-    unsigned long _startMillis;  // used for timeout measurement
-    int timedRead();    // private method to read stream with timeout
-    int timedPeek();    // private method to peek stream with timeout
-    int peekNextDigit(); // returns the next numeric digit in the stream or -1 if timeout
-
-  public:
-    virtual int available() = 0;
-    virtual int read() = 0;
-    virtual int peek() = 0;
-    virtual void flush() = 0;
-
-    Stream() {_timeout=1000;}
-
-// parsing methods
-
-  void setTimeout(unsigned long timeout);  // sets maximum milliseconds to wait for stream data, default is 1 second
-
-  bool find(char *target);   // reads data from the stream until the target string is found
-  // returns true if target string is found, false if timed out (see setTimeout)
-
-  bool find(char *target, size_t length);   // reads data from the stream until the target string of given length is found
-  // returns true if target string is found, false if timed out
-
-  bool findUntil(char *target, char *terminator);   // as find but search ends if the terminator string is found
-
-  bool findUntil(char *target, size_t targetLen, char *terminate, size_t termLen);   // as above but search ends if the terminate string is found
-
-
-  long parseInt(); // returns the first valid (long) integer value from the current position.
-  // initial characters that are not digits (or the minus sign) are skipped
-  // integer is terminated by the first character that is not a digit.
-
-  float parseFloat();               // float version of parseInt
-
-  size_t readBytes( char *buffer, size_t length); // read chars from stream into buffer
-  // terminates if length characters have been read or timeout (see setTimeout)
-  // returns the number of characters placed in the buffer (0 means no valid data found)
-
-  size_t readBytesUntil( char terminator, char *buffer, size_t length); // as readBytes with terminator character
-  // terminates if length characters have been read, timeout, or if the terminator character  detected
-  // returns the number of characters placed in the buffer (0 means no valid data found)
-
-  // Arduino String functions to be added here
-  String readString();
-  String readStringUntil(char terminator);
-
-  protected:
-  long parseInt(char skipChar); // as above but the given skipChar is ignored
-  // as above but the given skipChar is ignored
-  // this allows format characters (typically commas) in values to be ignored
-
-  float parseFloat(char skipChar);  // as above but the given skipChar is ignored
-};
-
-#endif
diff --git a/platform/osd-merkur/dev/old/WString.cpp b/platform/osd-merkur/dev/old/WString.cpp
deleted file mode 100644
index c6839fc0d..000000000
--- a/platform/osd-merkur/dev/old/WString.cpp
+++ /dev/null
@@ -1,645 +0,0 @@
-/*
-  WString.cpp - String library for Wiring & Arduino
-  ...mostly rewritten by Paul Stoffregen...
-  Copyright (c) 2009-10 Hernando Barragan.  All rights reserved.
-  Copyright 2011, Paul Stoffregen, paul@pjrc.com
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#include "WString.h"
-
-
-/*********************************************/
-/*  Constructors                             */
-/*********************************************/
-
-String::String(const char *cstr)
-{
-	init();
-	if (cstr) copy(cstr, strlen(cstr));
-}
-
-String::String(const String &value)
-{
-	init();
-	*this = value;
-}
-
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
-String::String(String &&rval)
-{
-	init();
-	move(rval);
-}
-String::String(StringSumHelper &&rval)
-{
-	init();
-	move(rval);
-}
-#endif
-
-String::String(char c)
-{
-	init();
-	char buf[2];
-	buf[0] = c;
-	buf[1] = 0;
-	*this = buf;
-}
-
-String::String(unsigned char value, unsigned char base)
-{
-	init();
-	char buf[9];
-	utoa(value, buf, base);
-	*this = buf;
-}
-
-String::String(int value, unsigned char base)
-{
-	init();
-	char buf[18];
-	itoa(value, buf, base);
-	*this = buf;
-}
-
-String::String(unsigned int value, unsigned char base)
-{
-	init();
-	char buf[17];
-	utoa(value, buf, base);
-	*this = buf;
-}
-
-String::String(long value, unsigned char base)
-{
-	init();
-	char buf[34];
-	ltoa(value, buf, base);
-	*this = buf;
-}
-
-String::String(unsigned long value, unsigned char base)
-{
-	init();
-	char buf[33];
-	ultoa(value, buf, base);
-	*this = buf;
-}
-
-String::~String()
-{
-	free(buffer);
-}
-
-/*********************************************/
-/*  Memory Management                        */
-/*********************************************/
-
-inline void String::init(void)
-{
-	buffer = NULL;
-	capacity = 0;
-	len = 0;
-	flags = 0;
-}
-
-void String::invalidate(void)
-{
-	if (buffer) free(buffer);
-	buffer = NULL;
-	capacity = len = 0;
-}
-
-unsigned char String::reserve(unsigned int size)
-{
-	if (buffer && capacity >= size) return 1;
-	if (changeBuffer(size)) {
-		if (len == 0) buffer[0] = 0;
-		return 1;
-	}
-	return 0;
-}
-
-unsigned char String::changeBuffer(unsigned int maxStrLen)
-{
-	char *newbuffer = (char *)realloc(buffer, maxStrLen + 1);
-	if (newbuffer) {
-		buffer = newbuffer;
-		capacity = maxStrLen;
-		return 1;
-	}
-	return 0;
-}
-
-/*********************************************/
-/*  Copy and Move                            */
-/*********************************************/
-
-String & String::copy(const char *cstr, unsigned int length)
-{
-	if (!reserve(length)) {
-		invalidate();
-		return *this;
-	}
-	len = length;
-	strcpy(buffer, cstr);
-	return *this;
-}
-
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
-void String::move(String &rhs)
-{
-	if (buffer) {
-		if (capacity >= rhs.len) {
-			strcpy(buffer, rhs.buffer);
-			len = rhs.len;
-			rhs.len = 0;
-			return;
-		} else {
-			free(buffer);
-		}
-	}
-	buffer = rhs.buffer;
-	capacity = rhs.capacity;
-	len = rhs.len;
-	rhs.buffer = NULL;
-	rhs.capacity = 0;
-	rhs.len = 0;
-}
-#endif
-
-String & String::operator = (const String &rhs)
-{
-	if (this == &rhs) return *this;
-	
-	if (rhs.buffer) copy(rhs.buffer, rhs.len);
-	else invalidate();
-	
-	return *this;
-}
-
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
-String & String::operator = (String &&rval)
-{
-	if (this != &rval) move(rval);
-	return *this;
-}
-
-String & String::operator = (StringSumHelper &&rval)
-{
-	if (this != &rval) move(rval);
-	return *this;
-}
-#endif
-
-String & String::operator = (const char *cstr)
-{
-	if (cstr) copy(cstr, strlen(cstr));
-	else invalidate();
-	
-	return *this;
-}
-
-/*********************************************/
-/*  concat                                   */
-/*********************************************/
-
-unsigned char String::concat(const String &s)
-{
-	return concat(s.buffer, s.len);
-}
-
-unsigned char String::concat(const char *cstr, unsigned int length)
-{
-	unsigned int newlen = len + length;
-	if (!cstr) return 0;
-	if (length == 0) return 1;
-	if (!reserve(newlen)) return 0;
-	strcpy(buffer + len, cstr);
-	len = newlen;
-	return 1;
-}
-
-unsigned char String::concat(const char *cstr)
-{
-	if (!cstr) return 0;
-	return concat(cstr, strlen(cstr));
-}
-
-unsigned char String::concat(char c)
-{
-	char buf[2];
-	buf[0] = c;
-	buf[1] = 0;
-	return concat(buf, 1);
-}
-
-unsigned char String::concat(unsigned char num)
-{
-	char buf[4];
-	itoa(num, buf, 10);
-	return concat(buf, strlen(buf));
-}
-
-unsigned char String::concat(int num)
-{
-	char buf[7];
-	itoa(num, buf, 10);
-	return concat(buf, strlen(buf));
-}
-
-unsigned char String::concat(unsigned int num)
-{
-	char buf[6];
-	utoa(num, buf, 10);
-	return concat(buf, strlen(buf));
-}
-
-unsigned char String::concat(long num)
-{
-	char buf[12];
-	ltoa(num, buf, 10);
-	return concat(buf, strlen(buf));
-}
-
-unsigned char String::concat(unsigned long num)
-{
-	char buf[11];
-	ultoa(num, buf, 10);
-	return concat(buf, strlen(buf));
-}
-
-/*********************************************/
-/*  Concatenate                              */
-/*********************************************/
-
-StringSumHelper & operator + (const StringSumHelper &lhs, const String &rhs)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(rhs.buffer, rhs.len)) a.invalidate();
-	return a;
-}
-
-StringSumHelper & operator + (const StringSumHelper &lhs, const char *cstr)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!cstr || !a.concat(cstr, strlen(cstr))) a.invalidate();
-	return a;
-}
-
-StringSumHelper & operator + (const StringSumHelper &lhs, char c)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(c)) a.invalidate();
-	return a;
-}
-
-StringSumHelper & operator + (const StringSumHelper &lhs, unsigned char num)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(num)) a.invalidate();
-	return a;
-}
-
-StringSumHelper & operator + (const StringSumHelper &lhs, int num)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(num)) a.invalidate();
-	return a;
-}
-
-StringSumHelper & operator + (const StringSumHelper &lhs, unsigned int num)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(num)) a.invalidate();
-	return a;
-}
-
-StringSumHelper & operator + (const StringSumHelper &lhs, long num)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(num)) a.invalidate();
-	return a;
-}
-
-StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(num)) a.invalidate();
-	return a;
-}
-
-/*********************************************/
-/*  Comparison                               */
-/*********************************************/
-
-int String::compareTo(const String &s) const
-{
-	if (!buffer || !s.buffer) {
-		if (s.buffer && s.len > 0) return 0 - *(unsigned char *)s.buffer;
-		if (buffer && len > 0) return *(unsigned char *)buffer;
-		return 0;
-	}
-	return strcmp(buffer, s.buffer);
-}
-
-unsigned char String::equals(const String &s2) const
-{
-	return (len == s2.len && compareTo(s2) == 0);
-}
-
-unsigned char String::equals(const char *cstr) const
-{
-	if (len == 0) return (cstr == NULL || *cstr == 0);
-	if (cstr == NULL) return buffer[0] == 0;
-	return strcmp(buffer, cstr) == 0;
-}
-
-unsigned char String::operator<(const String &rhs) const
-{
-	return compareTo(rhs) < 0;
-}
-
-unsigned char String::operator>(const String &rhs) const
-{
-	return compareTo(rhs) > 0;
-}
-
-unsigned char String::operator<=(const String &rhs) const
-{
-	return compareTo(rhs) <= 0;
-}
-
-unsigned char String::operator>=(const String &rhs) const
-{
-	return compareTo(rhs) >= 0;
-}
-
-unsigned char String::equalsIgnoreCase( const String &s2 ) const
-{
-	if (this == &s2) return 1;
-	if (len != s2.len) return 0;
-	if (len == 0) return 1;
-	const char *p1 = buffer;
-	const char *p2 = s2.buffer;
-	while (*p1) {
-		if (tolower(*p1++) != tolower(*p2++)) return 0;
-	} 
-	return 1;
-}
-
-unsigned char String::startsWith( const String &s2 ) const
-{
-	if (len < s2.len) return 0;
-	return startsWith(s2, 0);
-}
-
-unsigned char String::startsWith( const String &s2, unsigned int offset ) const
-{
-	if (offset > len - s2.len || !buffer || !s2.buffer) return 0;
-	return strncmp( &buffer[offset], s2.buffer, s2.len ) == 0;
-}
-
-unsigned char String::endsWith( const String &s2 ) const
-{
-	if ( len < s2.len || !buffer || !s2.buffer) return 0;
-	return strcmp(&buffer[len - s2.len], s2.buffer) == 0;
-}
-
-/*********************************************/
-/*  Character Access                         */
-/*********************************************/
-
-char String::charAt(unsigned int loc) const
-{
-	return operator[](loc);
-}
-
-void String::setCharAt(unsigned int loc, char c) 
-{
-	if (loc < len) buffer[loc] = c;
-}
-
-char & String::operator[](unsigned int index)
-{
-	static char dummy_writable_char;
-	if (index >= len || !buffer) {
-		dummy_writable_char = 0;
-		return dummy_writable_char;
-	}
-	return buffer[index];
-}
-
-char String::operator[]( unsigned int index ) const
-{
-	if (index >= len || !buffer) return 0;
-	return buffer[index];
-}
-
-void String::getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index) const
-{
-	if (!bufsize || !buf) return;
-	if (index >= len) {
-		buf[0] = 0;
-		return;
-	}
-	unsigned int n = bufsize - 1;
-	if (n > len - index) n = len - index;
-	strncpy((char *)buf, buffer + index, n);
-	buf[n] = 0;
-}
-
-/*********************************************/
-/*  Search                                   */
-/*********************************************/
-
-int String::indexOf(char c) const
-{
-	return indexOf(c, 0);
-}
-
-int String::indexOf( char ch, unsigned int fromIndex ) const
-{
-	if (fromIndex >= len) return -1;
-	const char* temp = strchr(buffer + fromIndex, ch);
-	if (temp == NULL) return -1;
-	return temp - buffer;
-}
-
-int String::indexOf(const String &s2) const
-{
-	return indexOf(s2, 0);
-}
-
-int String::indexOf(const String &s2, unsigned int fromIndex) const
-{
-	if (fromIndex >= len) return -1;
-	const char *found = strstr(buffer + fromIndex, s2.buffer);
-	if (found == NULL) return -1;
-	return found - buffer;
-}
-
-int String::lastIndexOf( char theChar ) const
-{
-	return lastIndexOf(theChar, len - 1);
-}
-
-int String::lastIndexOf(char ch, unsigned int fromIndex) const
-{
-	if (fromIndex >= len) return -1;
-	char tempchar = buffer[fromIndex + 1];
-	buffer[fromIndex + 1] = '\0';
-	char* temp = strrchr( buffer, ch );
-	buffer[fromIndex + 1] = tempchar;
-	if (temp == NULL) return -1;
-	return temp - buffer;
-}
-
-int String::lastIndexOf(const String &s2) const
-{
-	return lastIndexOf(s2, len - s2.len);
-}
-
-int String::lastIndexOf(const String &s2, unsigned int fromIndex) const
-{
-  	if (s2.len == 0 || len == 0 || s2.len > len) return -1;
-	if (fromIndex >= len) fromIndex = len - 1;
-	int found = -1;
-	for (char *p = buffer; p <= buffer + fromIndex; p++) {
-		p = strstr(p, s2.buffer);
-		if (!p) break;
-		if ((unsigned int)(p - buffer) <= fromIndex) found = p - buffer;
-	}
-	return found;
-}
-
-String String::substring( unsigned int left ) const
-{
-	return substring(left, len);
-}
-
-String String::substring(unsigned int left, unsigned int right) const
-{
-	if (left > right) {
-		unsigned int temp = right;
-		right = left;
-		left = temp;
-	}
-	String out;
-	if (left > len) return out;
-	if (right > len) right = len;
-	char temp = buffer[right];  // save the replaced character
-	buffer[right] = '\0';	
-	out = buffer + left;  // pointer arithmetic
-	buffer[right] = temp;  //restore character
-	return out;
-}
-
-/*********************************************/
-/*  Modification                             */
-/*********************************************/
-
-void String::replace(char find, char replace)
-{
-	if (!buffer) return;
-	for (char *p = buffer; *p; p++) {
-		if (*p == find) *p = replace;
-	}
-}
-
-void String::replace(const String& find, const String& replace)
-{
-	if (len == 0 || find.len == 0) return;
-	int diff = replace.len - find.len;
-	char *readFrom = buffer;
-	char *foundAt;
-	if (diff == 0) {
-		while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
-			memcpy(foundAt, replace.buffer, replace.len);
-			readFrom = foundAt + replace.len;
-		}
-	} else if (diff < 0) {
-		char *writeTo = buffer;
-		while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
-			unsigned int n = foundAt - readFrom;
-			memcpy(writeTo, readFrom, n);
-			writeTo += n;
-			memcpy(writeTo, replace.buffer, replace.len);
-			writeTo += replace.len;
-			readFrom = foundAt + find.len;
-			len += diff;
-		}
-		strcpy(writeTo, readFrom);
-	} else {
-		unsigned int size = len; // compute size needed for result
-		while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
-			readFrom = foundAt + find.len;
-			size += diff;
-		}
-		if (size == len) return;
-		if (size > capacity && !changeBuffer(size)) return; // XXX: tell user!
-		int index = len - 1;
-		while (index >= 0 && (index = lastIndexOf(find, index)) >= 0) {
-			readFrom = buffer + index + find.len;
-			memmove(readFrom + diff, readFrom, len - (readFrom - buffer));
-			len += diff;
-			buffer[len] = 0;
-			memcpy(buffer + index, replace.buffer, replace.len);
-			index--;
-		}
-	}
-}
-
-void String::toLowerCase(void)
-{
-	if (!buffer) return;
-	for (char *p = buffer; *p; p++) {
-		*p = tolower(*p);
-	}
-}
-
-void String::toUpperCase(void)
-{
-	if (!buffer) return;
-	for (char *p = buffer; *p; p++) {
-		*p = toupper(*p);
-	}
-}
-
-void String::trim(void)
-{
-	if (!buffer || len == 0) return;
-	char *begin = buffer;
-	while (isspace(*begin)) begin++;
-	char *end = buffer + len - 1;
-	while (isspace(*end) && end >= begin) end--;
-	len = end + 1 - begin;
-	if (begin > buffer) memcpy(buffer, begin, len);
-	buffer[len] = 0;
-}
-
-/*********************************************/
-/*  Parsing / Conversion                     */
-/*********************************************/
-
-long String::toInt(void) const
-{
-	if (buffer) return atol(buffer);
-	return 0;
-}
-
-
diff --git a/platform/osd-merkur/dev/old/WString.h b/platform/osd-merkur/dev/old/WString.h
deleted file mode 100644
index 947325e5f..000000000
--- a/platform/osd-merkur/dev/old/WString.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-  WString.h - String library for Wiring & Arduino
-  ...mostly rewritten by Paul Stoffregen...
-  Copyright (c) 2009-10 Hernando Barragan.  All right reserved.
-  Copyright 2011, Paul Stoffregen, paul@pjrc.com
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifndef String_class_h
-#define String_class_h
-#ifdef __cplusplus
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <avr/pgmspace.h>
-
-// When compiling programs with this class, the following gcc parameters
-// dramatically increase performance and memory (RAM) efficiency, typically
-// with little or no increase in code size.
-//     -felide-constructors
-//     -std=c++0x
-
-class __FlashStringHelper;
-#define F(string_literal) (reinterpret_cast<const __FlashStringHelper *>(PSTR(string_literal)))
-
-// An inherited class for holding the result of a concatenation.  These
-// result objects are assumed to be writable by subsequent concatenations.
-class StringSumHelper;
-
-// The string class
-class String
-{
-	// use a function pointer to allow for "if (s)" without the
-	// complications of an operator bool(). for more information, see:
-	// http://www.artima.com/cppsource/safebool.html
-	typedef void (String::*StringIfHelperType)() const;
-	void StringIfHelper() const {}
-
-public:
-	// constructors
-	// creates a copy of the initial value.
-	// if the initial value is null or invalid, or if memory allocation
-	// fails, the string will be marked as invalid (i.e. "if (s)" will
-	// be false).
-	String(const char *cstr = "");
-	String(const String &str);
-	#ifdef __GXX_EXPERIMENTAL_CXX0X__
-	String(String &&rval);
-	String(StringSumHelper &&rval);
-	#endif
-	explicit String(char c);
-	explicit String(unsigned char, unsigned char base=10);
-	explicit String(int, unsigned char base=10);
-	explicit String(unsigned int, unsigned char base=10);
-	explicit String(long, unsigned char base=10);
-	explicit String(unsigned long, unsigned char base=10);
-	~String(void);
-
-	// memory management
-	// return true on success, false on failure (in which case, the string
-	// is left unchanged).  reserve(0), if successful, will validate an
-	// invalid string (i.e., "if (s)" will be true afterwards)
-	unsigned char reserve(unsigned int size);
-	inline unsigned int length(void) const {return len;}
-
-	// creates a copy of the assigned value.  if the value is null or
-	// invalid, or if the memory allocation fails, the string will be 
-	// marked as invalid ("if (s)" will be false).
-	String & operator = (const String &rhs);
-	String & operator = (const char *cstr);
-	#ifdef __GXX_EXPERIMENTAL_CXX0X__
-	String & operator = (String &&rval);
-	String & operator = (StringSumHelper &&rval);
-	#endif
-
-	// concatenate (works w/ built-in types)
-	
-	// returns true on success, false on failure (in which case, the string
-	// is left unchanged).  if the argument is null or invalid, the 
-	// concatenation is considered unsucessful.  
-	unsigned char concat(const String &str);
-	unsigned char concat(const char *cstr);
-	unsigned char concat(char c);
-	unsigned char concat(unsigned char c);
-	unsigned char concat(int num);
-	unsigned char concat(unsigned int num);
-	unsigned char concat(long num);
-	unsigned char concat(unsigned long num);
-	
-	// if there's not enough memory for the concatenated value, the string
-	// will be left unchanged (but this isn't signalled in any way)
-	String & operator += (const String &rhs)	{concat(rhs); return (*this);}
-	String & operator += (const char *cstr)		{concat(cstr); return (*this);}
-	String & operator += (char c)			{concat(c); return (*this);}
-	String & operator += (unsigned char num)		{concat(num); return (*this);}
-	String & operator += (int num)			{concat(num); return (*this);}
-	String & operator += (unsigned int num)		{concat(num); return (*this);}
-	String & operator += (long num)			{concat(num); return (*this);}
-	String & operator += (unsigned long num)	{concat(num); return (*this);}
-
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, const String &rhs);
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, const char *cstr);
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, char c);
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned char num);
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, int num);
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned int num);
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, long num);
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num);
-
-	// comparison (only works w/ Strings and "strings")
-	operator StringIfHelperType() const { return buffer ? &String::StringIfHelper : 0; }
-	int compareTo(const String &s) const;
-	unsigned char equals(const String &s) const;
-	unsigned char equals(const char *cstr) const;
-	unsigned char operator == (const String &rhs) const {return equals(rhs);}
-	unsigned char operator == (const char *cstr) const {return equals(cstr);}
-	unsigned char operator != (const String &rhs) const {return !equals(rhs);}
-	unsigned char operator != (const char *cstr) const {return !equals(cstr);}
-	unsigned char operator <  (const String &rhs) const;
-	unsigned char operator >  (const String &rhs) const;
-	unsigned char operator <= (const String &rhs) const;
-	unsigned char operator >= (const String &rhs) const;
-	unsigned char equalsIgnoreCase(const String &s) const;
-	unsigned char startsWith( const String &prefix) const;
-	unsigned char startsWith(const String &prefix, unsigned int offset) const;
-	unsigned char endsWith(const String &suffix) const;
-
-	// character acccess
-	char charAt(unsigned int index) const;
-	void setCharAt(unsigned int index, char c);
-	char operator [] (unsigned int index) const;
-	char& operator [] (unsigned int index);
-	void getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index=0) const;
-	void toCharArray(char *buf, unsigned int bufsize, unsigned int index=0) const
-		{getBytes((unsigned char *)buf, bufsize, index);}
-
-	// search
-	int indexOf( char ch ) const;
-	int indexOf( char ch, unsigned int fromIndex ) const;
-	int indexOf( const String &str ) const;
-	int indexOf( const String &str, unsigned int fromIndex ) const;
-	int lastIndexOf( char ch ) const;
-	int lastIndexOf( char ch, unsigned int fromIndex ) const;
-	int lastIndexOf( const String &str ) const;
-	int lastIndexOf( const String &str, unsigned int fromIndex ) const;
-	String substring( unsigned int beginIndex ) const;
-	String substring( unsigned int beginIndex, unsigned int endIndex ) const;
-
-	// modification
-	void replace(char find, char replace);
-	void replace(const String& find, const String& replace);
-	void toLowerCase(void);
-	void toUpperCase(void);
-	void trim(void);
-
-	// parsing/conversion
-	long toInt(void) const;
-
-protected:
-	char *buffer;	        // the actual char array
-	unsigned int capacity;  // the array length minus one (for the '\0')
-	unsigned int len;       // the String length (not counting the '\0')
-	unsigned char flags;    // unused, for future features
-protected:
-	void init(void);
-	void invalidate(void);
-	unsigned char changeBuffer(unsigned int maxStrLen);
-	unsigned char concat(const char *cstr, unsigned int length);
-
-	// copy and move
-	String & copy(const char *cstr, unsigned int length);
-	#ifdef __GXX_EXPERIMENTAL_CXX0X__
-	void move(String &rhs);
-	#endif
-};
-
-class StringSumHelper : public String
-{
-public:
-	StringSumHelper(const String &s) : String(s) {}
-	StringSumHelper(const char *p) : String(p) {}
-	StringSumHelper(char c) : String(c) {}
-	StringSumHelper(unsigned char num) : String(num) {}
-	StringSumHelper(int num) : String(num) {}
-	StringSumHelper(unsigned int num) : String(num) {}
-	StringSumHelper(long num) : String(num) {}
-	StringSumHelper(unsigned long num) : String(num) {}
-};
-
-#endif  // __cplusplus
-#endif  // String_class_h
diff --git a/platform/osd-merkur/dev/old/Wire.cpp b/platform/osd-merkur/dev/old/Wire.cpp
deleted file mode 100644
index 4e7a17c47..000000000
--- a/platform/osd-merkur/dev/old/Wire.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
-  TwoWire.cpp - TWI/I2C library for Wiring & Arduino
-  Copyright (c) 2006 Nicholas Zambetti.  All right reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- 
-  Modified 2012 by Todd Krein (todd@krein.org) to implement repeated starts
-*/
-
-extern "C" {
-  #include <stdlib.h>
-  #include <string.h>
-  #include <inttypes.h>
-  #include "twi.h"
-}
-
-#include "Wire.h"
-
-// Initialize Class Variables //////////////////////////////////////////////////
-
-uint8_t TwoWire::rxBuffer[BUFFER_LENGTH];
-uint8_t TwoWire::rxBufferIndex = 0;
-uint8_t TwoWire::rxBufferLength = 0;
-
-uint8_t TwoWire::txAddress = 0;
-uint8_t TwoWire::txBuffer[BUFFER_LENGTH];
-uint8_t TwoWire::txBufferIndex = 0;
-uint8_t TwoWire::txBufferLength = 0;
-
-uint8_t TwoWire::transmitting = 0;
-void (*TwoWire::user_onRequest)(void);
-void (*TwoWire::user_onReceive)(int);
-
-// Constructors ////////////////////////////////////////////////////////////////
-
-TwoWire::TwoWire()
-{
-}
-
-// Public Methods //////////////////////////////////////////////////////////////
-
-void TwoWire::begin(void)
-{
-  rxBufferIndex = 0;
-  rxBufferLength = 0;
-
-  txBufferIndex = 0;
-  txBufferLength = 0;
-
-  twi_init();
-}
-
-void TwoWire::begin(uint8_t address)
-{
-  twi_setAddress(address);
-  twi_attachSlaveTxEvent(onRequestService);
-  twi_attachSlaveRxEvent(onReceiveService);
-  begin();
-}
-
-void TwoWire::begin(int address)
-{
-  begin((uint8_t)address);
-}
-
-uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint8_t sendStop)
-{
-  // clamp to buffer length
-  if(quantity > BUFFER_LENGTH){
-    quantity = BUFFER_LENGTH;
-  }
-  // perform blocking read into buffer
-  uint8_t read = twi_readFrom(address, rxBuffer, quantity, sendStop);
-  // set rx buffer iterator vars
-  rxBufferIndex = 0;
-  rxBufferLength = read;
-
-  return read;
-}
-
-uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity)
-{
-  return requestFrom((uint8_t)address, (uint8_t)quantity, (uint8_t)true);
-}
-
-uint8_t TwoWire::requestFrom(int address, int quantity)
-{
-  return requestFrom((uint8_t)address, (uint8_t)quantity, (uint8_t)true);
-}
-
-uint8_t TwoWire::requestFrom(int address, int quantity, int sendStop)
-{
-  return requestFrom((uint8_t)address, (uint8_t)quantity, (uint8_t)sendStop);
-}
-
-void TwoWire::beginTransmission(uint8_t address)
-{
-  // indicate that we are transmitting
-  transmitting = 1;
-  // set address of targeted slave
-  txAddress = address;
-  // reset tx buffer iterator vars
-  txBufferIndex = 0;
-  txBufferLength = 0;
-}
-
-void TwoWire::beginTransmission(int address)
-{
-  beginTransmission((uint8_t)address);
-}
-
-//
-//	Originally, 'endTransmission' was an f(void) function.
-//	It has been modified to take one parameter indicating
-//	whether or not a STOP should be performed on the bus.
-//	Calling endTransmission(false) allows a sketch to 
-//	perform a repeated start. 
-//
-//	WARNING: Nothing in the library keeps track of whether
-//	the bus tenure has been properly ended with a STOP. It
-//	is very possible to leave the bus in a hung state if
-//	no call to endTransmission(true) is made. Some I2C
-//	devices will behave oddly if they do not see a STOP.
-//
-uint8_t TwoWire::endTransmission(uint8_t sendStop)
-{
-  // transmit buffer (blocking)
-  int8_t ret = twi_writeTo(txAddress, txBuffer, txBufferLength, 1, sendStop);
-  // reset tx buffer iterator vars
-  txBufferIndex = 0;
-  txBufferLength = 0;
-  // indicate that we are done transmitting
-  transmitting = 0;
-  return ret;
-}
-
-//	This provides backwards compatibility with the original
-//	definition, and expected behaviour, of endTransmission
-//
-uint8_t TwoWire::endTransmission(void)
-{
-  return endTransmission(true);
-}
-
-// must be called in:
-// slave tx event callback
-// or after beginTransmission(address)
-size_t TwoWire::write(uint8_t data)
-{
-  if(transmitting){
-  // in master transmitter mode
-    // don't bother if buffer is full
-    if(txBufferLength >= BUFFER_LENGTH){
-      setWriteError();
-      return 0;
-    }
-    // put byte in tx buffer
-    txBuffer[txBufferIndex] = data;
-    ++txBufferIndex;
-    // update amount in buffer   
-    txBufferLength = txBufferIndex;
-  }else{
-  // in slave send mode
-    // reply to master
-    twi_transmit(&data, 1);
-  }
-  return 1;
-}
-
-// must be called in:
-// slave tx event callback
-// or after beginTransmission(address)
-size_t TwoWire::write(const uint8_t *data, size_t quantity)
-{
-  if(transmitting){
-  // in master transmitter mode
-    for(size_t i = 0; i < quantity; ++i){
-      write(data[i]);
-    }
-  }else{
-  // in slave send mode
-    // reply to master
-    twi_transmit(data, quantity);
-  }
-  return quantity;
-}
-
-// must be called in:
-// slave rx event callback
-// or after requestFrom(address, numBytes)
-int TwoWire::available(void)
-{
-  return rxBufferLength - rxBufferIndex;
-}
-
-// must be called in:
-// slave rx event callback
-// or after requestFrom(address, numBytes)
-int TwoWire::read(void)
-{
-  int value = -1;
-  
-  // get each successive byte on each call
-  if(rxBufferIndex < rxBufferLength){
-    value = rxBuffer[rxBufferIndex];
-    ++rxBufferIndex;
-  }
-
-  return value;
-}
-
-// must be called in:
-// slave rx event callback
-// or after requestFrom(address, numBytes)
-int TwoWire::peek(void)
-{
-  int value = -1;
-  
-  if(rxBufferIndex < rxBufferLength){
-    value = rxBuffer[rxBufferIndex];
-  }
-
-  return value;
-}
-
-void TwoWire::flush(void)
-{
-  // XXX: to be implemented.
-}
-
-// behind the scenes function that is called when data is received
-void TwoWire::onReceiveService(uint8_t* inBytes, int numBytes)
-{
-  // don't bother if user hasn't registered a callback
-  if(!user_onReceive){
-    return;
-  }
-  // don't bother if rx buffer is in use by a master requestFrom() op
-  // i know this drops data, but it allows for slight stupidity
-  // meaning, they may not have read all the master requestFrom() data yet
-  if(rxBufferIndex < rxBufferLength){
-    return;
-  }
-  // copy twi rx buffer into local read buffer
-  // this enables new reads to happen in parallel
-  for(uint8_t i = 0; i < numBytes; ++i){
-    rxBuffer[i] = inBytes[i];    
-  }
-  // set rx iterator vars
-  rxBufferIndex = 0;
-  rxBufferLength = numBytes;
-  // alert user program
-  user_onReceive(numBytes);
-}
-
-// behind the scenes function that is called when data is requested
-void TwoWire::onRequestService(void)
-{
-  // don't bother if user hasn't registered a callback
-  if(!user_onRequest){
-    return;
-  }
-  // reset tx buffer iterator vars
-  // !!! this will kill any pending pre-master sendTo() activity
-  txBufferIndex = 0;
-  txBufferLength = 0;
-  // alert user program
-  user_onRequest();
-}
-
-// sets function called on slave write
-void TwoWire::onReceive( void (*function)(int) )
-{
-  user_onReceive = function;
-}
-
-// sets function called on slave read
-void TwoWire::onRequest( void (*function)(void) )
-{
-  user_onRequest = function;
-}
-
-// Preinstantiate Objects //////////////////////////////////////////////////////
-
-TwoWire Wire = TwoWire();
-
diff --git a/platform/osd-merkur/dev/old/Wire.h b/platform/osd-merkur/dev/old/Wire.h
deleted file mode 100644
index a93d0f5bb..000000000
--- a/platform/osd-merkur/dev/old/Wire.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-  TwoWire.h - TWI/I2C library for Arduino & Wiring
-  Copyright (c) 2006 Nicholas Zambetti.  All right reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-  Modified 2012 by Todd Krein (todd@krein.org) to implement repeated starts
-*/
-
-#ifndef TwoWire_h
-#define TwoWire_h
-
-#include <inttypes.h>
-#include "Stream.h"
-
-#define BUFFER_LENGTH 32
-
-class TwoWire : public Stream
-{
-  private:
-    static uint8_t rxBuffer[];
-    static uint8_t rxBufferIndex;
-    static uint8_t rxBufferLength;
-
-    static uint8_t txAddress;
-    static uint8_t txBuffer[];
-    static uint8_t txBufferIndex;
-    static uint8_t txBufferLength;
-
-    static uint8_t transmitting;
-    static void (*user_onRequest)(void);
-    static void (*user_onReceive)(int);
-    static void onRequestService(void);
-    static void onReceiveService(uint8_t*, int);
-  public:
-    TwoWire();
-    void begin();
-    void begin(uint8_t);
-    void begin(int);
-    void beginTransmission(uint8_t);
-    void beginTransmission(int);
-    uint8_t endTransmission(void);
-    uint8_t endTransmission(uint8_t);
-    uint8_t requestFrom(uint8_t, uint8_t);
-    uint8_t requestFrom(uint8_t, uint8_t, uint8_t);
-    uint8_t requestFrom(int, int);
-    uint8_t requestFrom(int, int, int);
-    virtual size_t write(uint8_t);
-    virtual size_t write(const uint8_t *, size_t);
-    virtual int available(void);
-    virtual int read(void);
-    virtual int peek(void);
-	virtual void flush(void);
-    void onReceive( void (*)(int) );
-    void onRequest( void (*)(void) );
-  
-    inline size_t write(unsigned long n) { return write((uint8_t)n); }
-    inline size_t write(long n) { return write((uint8_t)n); }
-    inline size_t write(unsigned int n) { return write((uint8_t)n); }
-    inline size_t write(int n) { return write((uint8_t)n); }
-    using Print::write;
-};
-
-extern TwoWire Wire;
-
-#endif
-
diff --git a/platform/osd-merkur/dev/old/new.cpp b/platform/osd-merkur/dev/old/new.cpp
deleted file mode 100644
index b81031e90..000000000
--- a/platform/osd-merkur/dev/old/new.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <new.h>
-
-void * operator new(size_t size)
-{
-  return malloc(size);
-}
-
-void * operator new[](size_t size)
-{
-  return malloc(size);
-}
-
-void operator delete(void * ptr)
-{
-  free(ptr);
-}
-
-void operator delete[](void * ptr)
-{
-  free(ptr);
-}
-
-int __cxa_guard_acquire(__guard *g) {return !*(char *)(g);};
-void __cxa_guard_release (__guard *g) {*(char *)g = 1;};
-void __cxa_guard_abort (__guard *) {}; 
-
-void __cxa_pure_virtual(void) {};
-
diff --git a/platform/osd-merkur/dev/old/new.h b/platform/osd-merkur/dev/old/new.h
deleted file mode 100644
index 991c86c75..000000000
--- a/platform/osd-merkur/dev/old/new.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Header to define new/delete operators as they aren't provided by avr-gcc by default
-   Taken from http://www.avrfreaks.net/index.php?name=PNphpBB2&file=viewtopic&t=59453 
- */
-
-#ifndef NEW_H
-#define NEW_H
-
-#include <stdlib.h>
-
-void * operator new(size_t size);
-void * operator new[](size_t size);
-void operator delete(void * ptr);
-void operator delete[](void * ptr);
-
-__extension__ typedef int __guard __attribute__((mode (__DI__)));
-
-extern "C" int __cxa_guard_acquire(__guard *);
-extern "C" void __cxa_guard_release (__guard *);
-extern "C" void __cxa_guard_abort (__guard *); 
-
-extern "C" void __cxa_pure_virtual(void);
-
-#endif
-
diff --git a/platform/osd-merkur/dev/old/twi.c b/platform/osd-merkur/dev/old/twi.c
deleted file mode 100644
index 6b2db3cdc..000000000
--- a/platform/osd-merkur/dev/old/twi.c
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
-  twi.c - TWI/I2C library for Wiring & Arduino
-  Copyright (c) 2006 Nicholas Zambetti.  All right reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-  Modified 2012 by Todd Krein (todd@krein.org) to implement repeated starts
-*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <compat/twi.h>
-#include "Arduino.h" // for digitalWrite
-
-#ifndef cbi
-#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
-#endif
-
-#ifndef sbi
-#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
-#endif
-
-#include "pins_arduino.h"
-#include "twi.h"
-
-static volatile uint8_t twi_state;
-static volatile uint8_t twi_slarw;
-static volatile uint8_t twi_sendStop;			// should the transaction end with a stop
-static volatile uint8_t twi_inRepStart;			// in the middle of a repeated start
-
-static void (*twi_onSlaveTransmit)(void);
-static void (*twi_onSlaveReceive)(uint8_t*, int);
-
-static uint8_t twi_masterBuffer[TWI_BUFFER_LENGTH];
-static volatile uint8_t twi_masterBufferIndex;
-static volatile uint8_t twi_masterBufferLength;
-
-static uint8_t twi_txBuffer[TWI_BUFFER_LENGTH];
-static volatile uint8_t twi_txBufferIndex;
-static volatile uint8_t twi_txBufferLength;
-
-static uint8_t twi_rxBuffer[TWI_BUFFER_LENGTH];
-static volatile uint8_t twi_rxBufferIndex;
-
-static volatile uint8_t twi_error;
-
-/* 
- * Function twi_init
- * Desc     readys twi pins and sets twi bitrate
- * Input    none
- * Output   none
- */
-void twi_init(void)
-{
-  // initialize state
-  twi_state = TWI_READY;
-  twi_sendStop = true;		// default value
-  twi_inRepStart = false;
-  
-  // activate internal pullups for twi.
-  digitalWrite(SDA, 1);
-  digitalWrite(SCL, 1);
-
-  // initialize twi prescaler and bit rate
-  cbi(TWSR, TWPS0);
-  cbi(TWSR, TWPS1);
-  TWBR = ((F_CPU / TWI_FREQ) - 16) / 2;
-
-  /* twi bit rate formula from atmega128 manual pg 204
-  SCL Frequency = CPU Clock Frequency / (16 + (2 * TWBR))
-  note: TWBR should be 10 or higher for master mode
-  It is 72 for a 16mhz Wiring board with 100kHz TWI */
-
-  // enable twi module, acks, and twi interrupt
-  TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA);
-}
-
-/* 
- * Function twi_slaveInit
- * Desc     sets slave address and enables interrupt
- * Input    none
- * Output   none
- */
-void twi_setAddress(uint8_t address)
-{
-  // set twi slave address (skip over TWGCE bit)
-  TWAR = address << 1;
-}
-
-/* 
- * Function twi_readFrom
- * Desc     attempts to become twi bus master and read a
- *          series of bytes from a device on the bus
- * Input    address: 7bit i2c device address
- *          data: pointer to byte array
- *          length: number of bytes to read into array
- *          sendStop: Boolean indicating whether to send a stop at the end
- * Output   number of bytes read
- */
-uint8_t twi_readFrom(uint8_t address, uint8_t* data, uint8_t length, uint8_t sendStop)
-{
-  uint8_t i;
-
-  // ensure data will fit into buffer
-  if(TWI_BUFFER_LENGTH < length){
-    return 0;
-  }
-
-  // wait until twi is ready, become master receiver
-  while(TWI_READY != twi_state){
-    continue;
-  }
-  twi_state = TWI_MRX;
-  twi_sendStop = sendStop;
-  // reset error state (0xFF.. no error occured)
-  twi_error = 0xFF;
-
-  // initialize buffer iteration vars
-  twi_masterBufferIndex = 0;
-  twi_masterBufferLength = length-1;  // This is not intuitive, read on...
-  // On receive, the previously configured ACK/NACK setting is transmitted in
-  // response to the received byte before the interrupt is signalled. 
-  // Therefor we must actually set NACK when the _next_ to last byte is
-  // received, causing that NACK to be sent in response to receiving the last
-  // expected byte of data.
-
-  // build sla+w, slave device address + w bit
-  twi_slarw = TW_READ;
-  twi_slarw |= address << 1;
-
-  if (true == twi_inRepStart) {
-    // if we're in the repeated start state, then we've already sent the start,
-    // (@@@ we hope), and the TWI statemachine is just waiting for the address byte.
-    // We need to remove ourselves from the repeated start state before we enable interrupts,
-    // since the ISR is ASYNC, and we could get confused if we hit the ISR before cleaning
-    // up. Also, don't enable the START interrupt. There may be one pending from the 
-    // repeated start that we sent outselves, and that would really confuse things.
-    twi_inRepStart = false;			// remember, we're dealing with an ASYNC ISR
-    TWDR = twi_slarw;
-    TWCR = _BV(TWINT) | _BV(TWEA) | _BV(TWEN) | _BV(TWIE);	// enable INTs, but not START
-  }
-  else
-    // send start condition
-    TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA) | _BV(TWINT) | _BV(TWSTA);
-
-  // wait for read operation to complete
-  while(TWI_MRX == twi_state){
-    continue;
-  }
-
-  if (twi_masterBufferIndex < length)
-    length = twi_masterBufferIndex;
-
-  // copy twi buffer to data
-  for(i = 0; i < length; ++i){
-    data[i] = twi_masterBuffer[i];
-  }
-	
-  return length;
-}
-
-/* 
- * Function twi_writeTo
- * Desc     attempts to become twi bus master and write a
- *          series of bytes to a device on the bus
- * Input    address: 7bit i2c device address
- *          data: pointer to byte array
- *          length: number of bytes in array
- *          wait: boolean indicating to wait for write or not
- *          sendStop: boolean indicating whether or not to send a stop at the end
- * Output   0 .. success
- *          1 .. length to long for buffer
- *          2 .. address send, NACK received
- *          3 .. data send, NACK received
- *          4 .. other twi error (lost bus arbitration, bus error, ..)
- */
-uint8_t twi_writeTo(uint8_t address, uint8_t* data, uint8_t length, uint8_t wait, uint8_t sendStop)
-{
-  uint8_t i;
-
-  // ensure data will fit into buffer
-  if(TWI_BUFFER_LENGTH < length){
-    return 1;
-  }
-
-  // wait until twi is ready, become master transmitter
-  while(TWI_READY != twi_state){
-    continue;
-  }
-  twi_state = TWI_MTX;
-  twi_sendStop = sendStop;
-  // reset error state (0xFF.. no error occured)
-  twi_error = 0xFF;
-
-  // initialize buffer iteration vars
-  twi_masterBufferIndex = 0;
-  twi_masterBufferLength = length;
-  
-  // copy data to twi buffer
-  for(i = 0; i < length; ++i){
-    twi_masterBuffer[i] = data[i];
-  }
-  
-  // build sla+w, slave device address + w bit
-  twi_slarw = TW_WRITE;
-  twi_slarw |= address << 1;
-  
-  // if we're in a repeated start, then we've already sent the START
-  // in the ISR. Don't do it again.
-  //
-  if (true == twi_inRepStart) {
-    // if we're in the repeated start state, then we've already sent the start,
-    // (@@@ we hope), and the TWI statemachine is just waiting for the address byte.
-    // We need to remove ourselves from the repeated start state before we enable interrupts,
-    // since the ISR is ASYNC, and we could get confused if we hit the ISR before cleaning
-    // up. Also, don't enable the START interrupt. There may be one pending from the 
-    // repeated start that we sent outselves, and that would really confuse things.
-    twi_inRepStart = false;			// remember, we're dealing with an ASYNC ISR
-    TWDR = twi_slarw;				
-    TWCR = _BV(TWINT) | _BV(TWEA) | _BV(TWEN) | _BV(TWIE);	// enable INTs, but not START
-  }
-  else
-    // send start condition
-    TWCR = _BV(TWINT) | _BV(TWEA) | _BV(TWEN) | _BV(TWIE) | _BV(TWSTA);	// enable INTs
-
-  // wait for write operation to complete
-  while(wait && (TWI_MTX == twi_state)){
-    continue;
-  }
-  
-  if (twi_error == 0xFF)
-    return 0;	// success
-  else if (twi_error == TW_MT_SLA_NACK)
-    return 2;	// error: address send, nack received
-  else if (twi_error == TW_MT_DATA_NACK)
-    return 3;	// error: data send, nack received
-  else
-    return 4;	// other twi error
-}
-
-/* 
- * Function twi_transmit
- * Desc     fills slave tx buffer with data
- *          must be called in slave tx event callback
- * Input    data: pointer to byte array
- *          length: number of bytes in array
- * Output   1 length too long for buffer
- *          2 not slave transmitter
- *          0 ok
- */
-uint8_t twi_transmit(const uint8_t* data, uint8_t length)
-{
-  uint8_t i;
-
-  // ensure data will fit into buffer
-  if(TWI_BUFFER_LENGTH < length){
-    return 1;
-  }
-  
-  // ensure we are currently a slave transmitter
-  if(TWI_STX != twi_state){
-    return 2;
-  }
-  
-  // set length and copy data into tx buffer
-  twi_txBufferLength = length;
-  for(i = 0; i < length; ++i){
-    twi_txBuffer[i] = data[i];
-  }
-  
-  return 0;
-}
-
-/* 
- * Function twi_attachSlaveRxEvent
- * Desc     sets function called before a slave read operation
- * Input    function: callback function to use
- * Output   none
- */
-void twi_attachSlaveRxEvent( void (*function)(uint8_t*, int) )
-{
-  twi_onSlaveReceive = function;
-}
-
-/* 
- * Function twi_attachSlaveTxEvent
- * Desc     sets function called before a slave write operation
- * Input    function: callback function to use
- * Output   none
- */
-void twi_attachSlaveTxEvent( void (*function)(void) )
-{
-  twi_onSlaveTransmit = function;
-}
-
-/* 
- * Function twi_reply
- * Desc     sends byte or readys receive line
- * Input    ack: byte indicating to ack or to nack
- * Output   none
- */
-void twi_reply(uint8_t ack)
-{
-  // transmit master read ready signal, with or without ack
-  if(ack){
-    TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWINT) | _BV(TWEA);
-  }else{
-	  TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWINT);
-  }
-}
-
-/* 
- * Function twi_stop
- * Desc     relinquishes bus master status
- * Input    none
- * Output   none
- */
-void twi_stop(void)
-{
-  // send stop condition
-  TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA) | _BV(TWINT) | _BV(TWSTO);
-
-  // wait for stop condition to be exectued on bus
-  // TWINT is not set after a stop condition!
-  while(TWCR & _BV(TWSTO)){
-    continue;
-  }
-
-  // update twi state
-  twi_state = TWI_READY;
-}
-
-/* 
- * Function twi_releaseBus
- * Desc     releases bus control
- * Input    none
- * Output   none
- */
-void twi_releaseBus(void)
-{
-  // release bus
-  TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA) | _BV(TWINT);
-
-  // update twi state
-  twi_state = TWI_READY;
-}
-
-SIGNAL(TWI_vect)
-{
-  switch(TW_STATUS){
-    // All Master
-    case TW_START:     // sent start condition
-    case TW_REP_START: // sent repeated start condition
-      // copy device address and r/w bit to output register and ack
-      TWDR = twi_slarw;
-      twi_reply(1);
-      break;
-
-    // Master Transmitter
-    case TW_MT_SLA_ACK:  // slave receiver acked address
-    case TW_MT_DATA_ACK: // slave receiver acked data
-      // if there is data to send, send it, otherwise stop 
-      if(twi_masterBufferIndex < twi_masterBufferLength){
-        // copy data to output register and ack
-        TWDR = twi_masterBuffer[twi_masterBufferIndex++];
-        twi_reply(1);
-      }else{
-	if (twi_sendStop)
-          twi_stop();
-	else {
-	  twi_inRepStart = true;	// we're gonna send the START
-	  // don't enable the interrupt. We'll generate the start, but we 
-	  // avoid handling the interrupt until we're in the next transaction,
-	  // at the point where we would normally issue the start.
-	  TWCR = _BV(TWINT) | _BV(TWSTA)| _BV(TWEN) ;
-	  twi_state = TWI_READY;
-	}
-      }
-      break;
-    case TW_MT_SLA_NACK:  // address sent, nack received
-      twi_error = TW_MT_SLA_NACK;
-      twi_stop();
-      break;
-    case TW_MT_DATA_NACK: // data sent, nack received
-      twi_error = TW_MT_DATA_NACK;
-      twi_stop();
-      break;
-    case TW_MT_ARB_LOST: // lost bus arbitration
-      twi_error = TW_MT_ARB_LOST;
-      twi_releaseBus();
-      break;
-
-    // Master Receiver
-    case TW_MR_DATA_ACK: // data received, ack sent
-      // put byte into buffer
-      twi_masterBuffer[twi_masterBufferIndex++] = TWDR;
-    case TW_MR_SLA_ACK:  // address sent, ack received
-      // ack if more bytes are expected, otherwise nack
-      if(twi_masterBufferIndex < twi_masterBufferLength){
-        twi_reply(1);
-      }else{
-        twi_reply(0);
-      }
-      break;
-    case TW_MR_DATA_NACK: // data received, nack sent
-      // put final byte into buffer
-      twi_masterBuffer[twi_masterBufferIndex++] = TWDR;
-	if (twi_sendStop)
-          twi_stop();
-	else {
-	  twi_inRepStart = true;	// we're gonna send the START
-	  // don't enable the interrupt. We'll generate the start, but we 
-	  // avoid handling the interrupt until we're in the next transaction,
-	  // at the point where we would normally issue the start.
-	  TWCR = _BV(TWINT) | _BV(TWSTA)| _BV(TWEN) ;
-	  twi_state = TWI_READY;
-	}    
-	break;
-    case TW_MR_SLA_NACK: // address sent, nack received
-      twi_stop();
-      break;
-    // TW_MR_ARB_LOST handled by TW_MT_ARB_LOST case
-
-    // Slave Receiver
-    case TW_SR_SLA_ACK:   // addressed, returned ack
-    case TW_SR_GCALL_ACK: // addressed generally, returned ack
-    case TW_SR_ARB_LOST_SLA_ACK:   // lost arbitration, returned ack
-    case TW_SR_ARB_LOST_GCALL_ACK: // lost arbitration, returned ack
-      // enter slave receiver mode
-      twi_state = TWI_SRX;
-      // indicate that rx buffer can be overwritten and ack
-      twi_rxBufferIndex = 0;
-      twi_reply(1);
-      break;
-    case TW_SR_DATA_ACK:       // data received, returned ack
-    case TW_SR_GCALL_DATA_ACK: // data received generally, returned ack
-      // if there is still room in the rx buffer
-      if(twi_rxBufferIndex < TWI_BUFFER_LENGTH){
-        // put byte in buffer and ack
-        twi_rxBuffer[twi_rxBufferIndex++] = TWDR;
-        twi_reply(1);
-      }else{
-        // otherwise nack
-        twi_reply(0);
-      }
-      break;
-    case TW_SR_STOP: // stop or repeated start condition received
-      // put a null char after data if there's room
-      if(twi_rxBufferIndex < TWI_BUFFER_LENGTH){
-        twi_rxBuffer[twi_rxBufferIndex] = '\0';
-      }
-      // sends ack and stops interface for clock stretching
-      twi_stop();
-      // callback to user defined callback
-      twi_onSlaveReceive(twi_rxBuffer, twi_rxBufferIndex);
-      // since we submit rx buffer to "wire" library, we can reset it
-      twi_rxBufferIndex = 0;
-      // ack future responses and leave slave receiver state
-      twi_releaseBus();
-      break;
-    case TW_SR_DATA_NACK:       // data received, returned nack
-    case TW_SR_GCALL_DATA_NACK: // data received generally, returned nack
-      // nack back at master
-      twi_reply(0);
-      break;
-    
-    // Slave Transmitter
-    case TW_ST_SLA_ACK:          // addressed, returned ack
-    case TW_ST_ARB_LOST_SLA_ACK: // arbitration lost, returned ack
-      // enter slave transmitter mode
-      twi_state = TWI_STX;
-      // ready the tx buffer index for iteration
-      twi_txBufferIndex = 0;
-      // set tx buffer length to be zero, to verify if user changes it
-      twi_txBufferLength = 0;
-      // request for txBuffer to be filled and length to be set
-      // note: user must call twi_transmit(bytes, length) to do this
-      twi_onSlaveTransmit();
-      // if they didn't change buffer & length, initialize it
-      if(0 == twi_txBufferLength){
-        twi_txBufferLength = 1;
-        twi_txBuffer[0] = 0x00;
-      }
-      // transmit first byte from buffer, fall
-    case TW_ST_DATA_ACK: // byte sent, ack returned
-      // copy data to output register
-      TWDR = twi_txBuffer[twi_txBufferIndex++];
-      // if there is more to send, ack, otherwise nack
-      if(twi_txBufferIndex < twi_txBufferLength){
-        twi_reply(1);
-      }else{
-        twi_reply(0);
-      }
-      break;
-    case TW_ST_DATA_NACK: // received nack, we are done 
-    case TW_ST_LAST_DATA: // received ack, but we are done already!
-      // ack future responses
-      twi_reply(1);
-      // leave slave receiver state
-      twi_state = TWI_READY;
-      break;
-
-    // All
-    case TW_NO_INFO:   // no state information
-      break;
-    case TW_BUS_ERROR: // bus error, illegal stop/start
-      twi_error = TW_BUS_ERROR;
-      twi_stop();
-      break;
-  }
-}
-
diff --git a/platform/osd-merkur/dev/old/twi.h b/platform/osd-merkur/dev/old/twi.h
deleted file mode 100644
index 652659339..000000000
--- a/platform/osd-merkur/dev/old/twi.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-  twi.h - TWI/I2C library for Wiring & Arduino
-  Copyright (c) 2006 Nicholas Zambetti.  All right reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifndef twi_h
-#define twi_h
-
-  #include <inttypes.h>
-
-  //#define ATMEGA8
-
-  #ifndef TWI_FREQ
-  #define TWI_FREQ 100000L
-  #endif
-
-  #ifndef TWI_BUFFER_LENGTH
-  #define TWI_BUFFER_LENGTH 32
-  #endif
-
-  #define TWI_READY 0
-  #define TWI_MRX   1
-  #define TWI_MTX   2
-  #define TWI_SRX   3
-  #define TWI_STX   4
-  
-  void twi_init(void);
-  void twi_setAddress(uint8_t);
-  uint8_t twi_readFrom(uint8_t, uint8_t*, uint8_t, uint8_t);
-  uint8_t twi_writeTo(uint8_t, uint8_t*, uint8_t, uint8_t, uint8_t);
-  uint8_t twi_transmit(const uint8_t*, uint8_t);
-  void twi_attachSlaveRxEvent( void (*)(uint8_t*, int) );
-  void twi_attachSlaveTxEvent( void (*)(void) );
-  void twi_reply(uint8_t);
-  void twi_stop(void);
-  void twi_releaseBus(void);
-
-#endif
-
diff --git a/platform/osd-merkur/dev/optriac-sensor.c b/platform/osd-merkur/dev/optriac-sensor.c
deleted file mode 100644
index 2f0566bc4..000000000
--- a/platform/osd-merkur/dev/optriac-sensor.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-* Copyright (c) , 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:
-* 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.
-*
-* @(#)$Id: servo-sensor.c,v 1.0 2013/02/20 19:34:06 nifi Exp $
-*/
-
-/**
-* \file
-* optriac sensor header file for Atmega128rfa1.
-* \author
-* Harald Pichler <harald@the-develop.net>
-*/
-
-#include "contiki.h"
-#include "Arduino.h"
-#include "dev/optriac-sensor.h"
-
-#define PRINTF(...) printf(__VA_ARGS__)
-
-const struct sensors_sensor optriac_sensor;
-static int status(int type);
-static int enabled = 0;
-static int optriac[2]={0,0};
-static int optriacpin[8]={OPTRIAC_PIN_1,OPTRIAC_PIN_2};
-
-/*---------------------------------------------------------------------------*/
-static int
-value(int type)
-{
-  return optriac[type];
-}
-/*---------------------------------------------------------------------------*/
-static int
-configure(int type, int c)
-{
-  switch(type) {
-  case SENSORS_ACTIVE:
-    if(c) {
-      if(!status(SENSORS_ACTIVE)) {
-		pinMode(optriacpin[OPTRIAC_SENSOR_1], OUTPUT);
-		digitalWrite(optriacpin[OPTRIAC_SENSOR_1], LOW);
-		pinMode(optriacpin[OPTRIAC_SENSOR_2], OUTPUT);
-		digitalWrite(optriacpin[OPTRIAC_SENSOR_2], LOW);
-
-        enabled = 1;
-      }
-    } else {
-      enabled = 1;
-    }
-    break;
-  case OPTRIAC_SENSOR_1:
-  case OPTRIAC_SENSOR_2:
-
-    if(c==0){
-	digitalWrite(optriacpin[type], LOW);
-	optriac[type]=0;
-    }else{
-	digitalWrite(optriacpin[type], HIGH);
-	optriac[type]=1;
-    };
-    break;
-  }
-  return 0;	
-}
-/*---------------------------------------------------------------------------*/
-static int
-status(int type)
-{
-  switch(type) {
-  case SENSORS_ACTIVE:
-  case SENSORS_READY:
-    return enabled;
-  }
-  return 0;
-}
-/*---------------------------------------------------------------------------*/
-SENSORS_SENSOR(optriac_sensor, OPTRIAC_SENSOR, value, configure, status); 
diff --git a/platform/osd-merkur/dev/optriac-sensor.h b/platform/osd-merkur/dev/optriac-sensor.h
deleted file mode 100644
index 8cec46c14..000000000
--- a/platform/osd-merkur/dev/optriac-sensor.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-* Copyright (c), 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:
-* 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.
-*
-* @(#)$Id: servo-sensor.h,v 1.0 2013/02/20 19:34:06 nifi Exp $
-*/
-
-/**
-* \file
-* Servo sensor header file for Atmega128rfa1.
-* \author
-* Harald Pichler <harald@the-develop.net>
-*/
-
-#ifndef __OPTRIAC_SENSOR_H__
-#define __OPTRIAC_SENSOR_H__
-
-#include "lib/sensors.h"
-
-extern const struct sensors_sensor optriac_sensor;
-
-#define OPTRIAC_SENSOR "TRIAC"
-#define OPTRIAC_SENSOR_1          0
-#define OPTRIAC_SENSOR_2          1
-
-/* default pins Arduino-Merkurboard */
-#define OPTRIAC_PIN_1          2
-#define OPTRIAC_PIN_2          3
-
-#endif /* __OPTRIAC_SENSOR_H__ */ 
diff --git a/platform/osd-merkur/dev/pir-sensor.h b/platform/osd-merkur/dev/pir-sensor.h
deleted file mode 100644
index ac59e0f9f..000000000
--- a/platform/osd-merkur/dev/pir-sensor.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2012, BinaryLabs.
-* 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.
-*
-* @(#)$Id: battery-sensor.h,v 1.1 2012/08/25 19:34:06 nifi Exp $
-*/
-
-/**
-* \file
-* PIR sensor header file for Atmega128rfa1.
-* \author
-* Harald Pichler <harald@the-develop.net>
-*/
-
-#ifndef __PIR_SENSOR_H__
-#define __PIR_SENSOR_H__
-
-#include "lib/sensors.h"
-
-extern const struct sensors_sensor pir_sensor;
-
-#define PIR_SENSOR "PIR"
-
-#endif /* __PIR_SENSOR_H__ */
\ No newline at end of file
diff --git a/platform/osd-merkur/dev/relay-sensor.c b/platform/osd-merkur/dev/relay-sensor.c
deleted file mode 100644
index 6415926c9..000000000
--- a/platform/osd-merkur/dev/relay-sensor.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-* Copyright (c) , 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:
-* 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.
-*
-* @(#)$Id: relay-sensor.c,v 1.0 2013/11/22 19:34:06 nifi Exp $
-*/
-
-/**
-* \file
-* relay sensor header file for Atmega128rfa1.
-* \author
-* Harald Pichler <harald@the-develop.net>
-*/
-
-#include "contiki.h"
-#include "dev/relay.h"
-#include "dev/relay-sensor.h"
-
-#define PRINTF(...) printf(__VA_ARGS__)
-
-const struct sensors_sensor relay_sensor;
-static int status(int type);
-static int enabled = 0;
-static int relay[8]={0,0,0,0,0,0,0,0};
-static int relaypin[8]={RELAY_PIN_1,RELAY_PIN_2,RELAY_PIN_3,RELAY_PIN_4,RELAY_PIN_5,RELAY_PIN_6,RELAY_PIN_7,RELAY_PIN_8};
-/*---------------------------------------------------------------------------*/
-static int
-value(int type)
-{
-    return relay[type];
-}
-/*---------------------------------------------------------------------------*/
-static int
-configure(int type, int c)
-{
-  switch(type) {
-  case SENSORS_ACTIVE:
-    if(c) {
-      if(!status(SENSORS_ACTIVE)) {
-		relay_init(relaypin[RELAY_SENSOR_1]);
-		relay_init(relaypin[RELAY_SENSOR_2]);
-		relay_init(relaypin[RELAY_SENSOR_3]);
-		relay_init(relaypin[RELAY_SENSOR_4]);
-		relay_init(relaypin[RELAY_SENSOR_5]);
-		relay_init(relaypin[RELAY_SENSOR_6]);
-		relay_init(relaypin[RELAY_SENSOR_7]);
-		relay_init(relaypin[RELAY_SENSOR_8]);
-        enabled = 1;
-      }
-    } else {
-      enabled = 1;
-    }
-    break;
-  case RELAY_SENSOR_1:
-  case RELAY_SENSOR_2:
-  case RELAY_SENSOR_3:
-  case RELAY_SENSOR_4:
-  case RELAY_SENSOR_5:
-  case RELAY_SENSOR_6:
-  case RELAY_SENSOR_7:
-  case RELAY_SENSOR_8:
-    if(c==0){
-	relay_off(relaypin[type]);
-	relay[type]=0;
-    }else{
-	relay_on(relaypin[type]);
-	relay[type]=1;
-    };
-    break;
-  }
-  return 0;
-}
-/*---------------------------------------------------------------------------*/
-static int
-status(int type)
-{
-  switch(type) {
-  case SENSORS_ACTIVE:
-  case SENSORS_READY:
-    return enabled;
-  }
-  return 0;
-}
-/*---------------------------------------------------------------------------*/
-SENSORS_SENSOR(relay_sensor, RELAY_SENSOR, value, configure, status); 
diff --git a/platform/osd-merkur/dev/relay-sensor.h b/platform/osd-merkur/dev/relay-sensor.h
deleted file mode 100644
index 88b9dd0f5..000000000
--- a/platform/osd-merkur/dev/relay-sensor.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* Copyright (c), 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:
-* 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.
-*
-* @(#)$Id: relay-sensor.h,v 1.0 2013/11/22 19:34:06 nifi Exp $
-*/
-
-/**
-* \file
-* Relay sensor header file for Atmega128rfa1.
-* \author
-* Harald Pichler <harald@the-develop.net>
-*/
-
-#ifndef __RELAY_SENSOR_H__
-#define __RELAY_SENSOR_H__
-
-#include "lib/sensors.h"
-
-extern const struct sensors_sensor relay_sensor;
-
-#define RELAY_SENSOR "RELAY"
-#define RELAY_SENSOR_1          0
-#define RELAY_SENSOR_2          1
-#define RELAY_SENSOR_3          2
-#define RELAY_SENSOR_4          3
-#define RELAY_SENSOR_5          4
-#define RELAY_SENSOR_6          5
-#define RELAY_SENSOR_7          6
-#define RELAY_SENSOR_8          7
-
-/* default pins Arduino-Merkurboard */
-#define RELAY_PIN_1          10
-#define RELAY_PIN_2          11
-#define RELAY_PIN_3          12
-#define RELAY_PIN_4          13
-#define RELAY_PIN_5          15
-#define RELAY_PIN_6          16
-#define RELAY_PIN_7          17
-#define RELAY_PIN_8          18
-
-#endif /* __RELAY_SENSOR_H__ */ 
diff --git a/platform/osd-merkur/dev/relay.c b/platform/osd-merkur/dev/relay.c
deleted file mode 100644
index 67d9c7f5b..000000000
--- a/platform/osd-merkur/dev/relay.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  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 "Arduino.h"
-#include "relay.h"
-
-/**
- * \addtogroup relay
- * \{
-*/
-/*---------------------------------------------------------------------------*/
-/**
- * \brief  init RELAY PINS.
-*/
-void
-relay_init(uint8_t pin)
-{
-   pinMode(pin, OUTPUT);
-   digitalWrite(pin, LOW);
-}
-/**
- * \brief Turns the RELAY on.
-*/
-
-void
-relay_on(uint8_t pin)
-{
-   digitalWrite(pin, HIGH);
-}
-
-/*---------------------------------------------------------------------------*/
-
-/**
- *  \brief Turns the RELAY off
-*/
-void
-relay_off(uint8_t pin)
-{
-   digitalWrite(pin, LOW);
-}
diff --git a/platform/osd-merkur/dev/relay.h b/platform/osd-merkur/dev/relay.h
deleted file mode 100644
index 3b9b48759..000000000
--- a/platform/osd-merkur/dev/relay.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  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 relay_init(uint8_t pin);
-void relay_on(uint8_t pin);
-void relay_off(uint8_t pin);
-
-/** @} */
-
-#endif /* __RELAY_H__ */
diff --git a/platform/osd-merkur/dev/servo-sensor.c b/platform/osd-merkur/dev/servo-sensor.c
deleted file mode 100644
index 9da3caf80..000000000
--- a/platform/osd-merkur/dev/servo-sensor.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-* Copyright (c) , 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:
-* 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.
-*
-* @(#)$Id: servo-sensor.c,v 1.0 2013/02/20 19:34:06 nifi Exp $
-*/
-
-/**
-* \file
-* Servo sensor header file for Atmega128rfa1.
-* \author
-* Harald Pichler <harald@the-develop.net>
-*/
-
-#include "contiki.h"
-#include "dev/servo.h"
-#include "dev/servo-sensor.h"
-
-#define PRINTF(...) printf(__VA_ARGS__)
-
-const struct sensors_sensor servo_sensor;
-static int status(int type);
-static int enabled = 0;
-
-/*---------------------------------------------------------------------------*/
-static int
-value(int type)
-{
-  switch(type) {
-  case SERVO_SENSOR_A:
-    return servo_get(0);;
-
-    /* Total Solar Radiation. */
-  case SERVO_SENSOR_B:
-    return servo_get(1);
-  }
-  return 0;
-}
-/*---------------------------------------------------------------------------*/
-static int
-configure(int type, int c)
-{
-  switch(type) {
-  case SENSORS_ACTIVE:
-    if(c) {
-      if(!status(SENSORS_ACTIVE)) {
-	servo_init();
-        enabled = 1;
-      }
-    } else {
-      servo_off();
-      enabled = 1;
-    }
-    break;
-  case SERVO_SENSOR_A:
-    servo_set(0,c);
-    break;
-  case SERVO_SENSOR_B:
-    servo_set(1,c);
-    break;
-  }
-  return 0;
-}
-/*---------------------------------------------------------------------------*/
-static int
-status(int type)
-{
-  switch(type) {
-  case SENSORS_ACTIVE:
-  case SENSORS_READY:
-    return enabled;
-  }
-  return 0;
-}
-/*---------------------------------------------------------------------------*/
-SENSORS_SENSOR(servo_sensor, SERVO_SENSOR, value, configure, status); 
diff --git a/platform/osd-merkur/dev/servo-sensor.h b/platform/osd-merkur/dev/servo-sensor.h
deleted file mode 100644
index 44e50c0f8..000000000
--- a/platform/osd-merkur/dev/servo-sensor.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-* Copyright (c), 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:
-* 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.
-*
-* @(#)$Id: servo-sensor.h,v 1.0 2013/02/20 19:34:06 nifi Exp $
-*/
-
-/**
-* \file
-* Servo sensor header file for Atmega128rfa1.
-* \author
-* Harald Pichler <harald@the-develop.net>
-*/
-
-#ifndef __SERVO_SENSOR_H__
-#define __SERVO_SENSOR_H__
-
-#include "lib/sensors.h"
-
-extern const struct sensors_sensor servo_sensor;
-
-#define SERVO_SENSOR "Servo"
-#define SERVO_SENSOR_A          0
-#define SERVO_SENSOR_B          1
-
-#endif /* __SERVO_SENSOR_H__ */ 
diff --git a/platform/osd-merkur/dev/servo.c b/platform/osd-merkur/dev/servo.c
deleted file mode 100644
index 874e98b89..000000000
--- a/platform/osd-merkur/dev/servo.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2007, 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.
- *
- */
-
-/*
- * Device driver for the Sensirion SHT1x/SHT7x family of humidity and
- * temperature sensors.
- */
-
-#include "contiki.h"
-#include <stdio.h>
-#include <dev/servo.h>
-
-#define DEBUG 0
-
-#if DEBUG
-#include <stdio.h>
-#define PRINTF(...) printf(__VA_ARGS__)
-#else
-#define PRINTF(...)
-#endif
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-/*
- * servo device
- */
-
-unsigned int servoa=SERVO_INIT;
-unsigned int servob=SERVO_INIT;
-
-void
-servo_init(void)
-{
-  // Port E initialization
-  // Set Pin 3 and 4 to output mode for OCR1A and OCR2A
-  DDRE |= 1<<3 | 1<<4;
-
-  // Timer/Counter 3 initialization
-  // Clock source: System Clock
-  // Clock value: 2000.000 kHz
-  // Mode: Ph. & fr. cor. PWM top=ICR1
-  // OC3A output: Connected
-  // OC3B output: Connected
-  // OC3C output: Connected
-  // Noise Canceler: Off
-  // Input Capture on Falling Edge
-  // Timer3 Overflow Interrupt: Off
-  // Input Capture Interrupt: Off
-  // Compare A Match Interrupt: Off
-  // Compare B Match Interrupt: Off
-  // Compare C Match Interrupt: Off
-
-  /* TCCR3A = [COM3A1|COM3A0|COM3B1|COM3B0||FOC3A|FOC3B|WGM31|WGM30] */
-  /*                1      0      1      0      1     0     0     0  */
-  TCCR3A=0xA8;
-  /* TCCR3B = [ ICNC3| ICES3|     -| WGM33||WGM32| CS32| CS31| CS30] */
-  /*                0      0      0      1      0     0     1     0  */
-  TCCR3B=0x12;
-  TCNT3H=0x00;
-  TCNT3L=0x00;
-  // ICR3 has a computed value of 20,000 - see the chip manual for how this
-  // value was derived.
-  // 20000 == 0x4e20 so that's what goes into the high and low byte of the ICR3 register
-  // alternatively, Codevision would let you just do ICR3 = 20000;
-  ICR3H=0x4E;
-  ICR3L=0x20;
-
-  // OCR3A will govern the steering servo, OCR3B will govern throttle
-  OCR3A = servoa;  // set it to an initial position somewhere in the middle of the 1 to 2ms range
-
-  // OCR3A will govern the steering servo, OCR3B will govern throttle
-  OCR3B = servob;  // set it to an initial position somewhere in the middle of the 1 to 2ms range
-  // start with motor off - no duty cycle at all
-  OCR3CH=0x00;
-  OCR3CL=0x00;
-}
-/*---------------------------------------------------------------------------*/
-/*
- * Power of device.
- */
-void
-servo_off(void)
-{
-
-}
-/*---------------------------------------------------------------------------*/
-/*
- * get servo position
- */
-unsigned int
-servo_get(unsigned int i)
-{
-  if(i==0)
-    return servoa;
-  if(i==1)
-    return servob;
-  return 0;
-}
-/*---------------------------------------------------------------------------*/
-/*
- * Set servo position
- */
-unsigned int
-servo_set(unsigned i,unsigned int j)
-{
-  if(j > SERVO_MAX)
-    j=SERVO_MAX;
-  if(j < SERVO_MIN)
-    j=SERVO_MIN;
-
-  if(i==0)
-  {
-    servoa=j;
-    OCR3A = servoa;
-    return 1;
-  }
-  if(i==1)
-  {
-    servob=j;
-    OCR3B = servob;
-    return 1;
-  }
-
-  return 0;
-}
diff --git a/platform/osd-merkur/dev/servo.h b/platform/osd-merkur/dev/servo.h
deleted file mode 100644
index c6ae4ab57..000000000
--- a/platform/osd-merkur/dev/servo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2007, 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 SERVO_H
-#define SERVO_H
-
-#define SERVO_MIN   575
-#define SERVO_MAX  2425
-#define SERVO_INIT 1500
-
-void servo_init(void);
-void servo_off(void);
-
-unsigned int servo_get(unsigned int i);
-unsigned int servo_set(unsigned i,unsigned int j);
-
-#endif /* SHT11_H */
diff --git a/platform/osd-merkur/dev/t4-servo-sensor.c b/platform/osd-merkur/dev/t4-servo-sensor.c
deleted file mode 100644
index a35b2de02..000000000
--- a/platform/osd-merkur/dev/t4-servo-sensor.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-** Copyright (C) 2013-2014 Marcus Priesch, All rights reserved
-** In Prandnern 31, A--2122 Riedenthal, Austria. office@priesch.co.at
-**
-** 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.
-**
-**++
-** Name
-**    t4-servo-sensor
-**
-** Purpose
-**    Implements a sensor around t4servo.c
-**
-**
-** Revision Dates
-**    31-Mar-2013 (MPR) Creation
-**    12-Mar-2014 (MPR) Factored to support configurable amount of pwm's
-**    ««revision-date»»···
-**--
-*/
-
-#include "contiki.h"
-#include "dev/t4-servo.h"
-#include "dev/t4-servo-sensor.h"
-
-const struct sensors_sensor t4_servo_sensor;
-
-static int status(int type);
-static int enabled = 0;
-
-static int value (int channel)
-  {
-    if (channel >= SERVO_COUNT)
-      return -1;
-    else if (channel < 0)
-      return -2;
-    else
-      return t4_servo_get (channel);
-  }
-
-static int configure (int type, int c) // type, c: SENSORS_ACTIVE, 1 -> act.
-                                       // type, c: SENSORS_ACTIVE, 0 -> deact.
-  {
-    switch (type)
-      {
-        case SENSORS_ACTIVE :
-          if (c == 0)
-            {
-              t4_servo_off ();
-            }
-          else if (c == 1)
-            {
-              t4_servo_init ();
-            }
-          break;
-
-        default :
-          if (type >= SERVO_COUNT)
-            return -1;
-          else
-            t4_servo_set (type, c);
-          break;
-
-      }
-    return 0;
-  }
-
-static int status(int type)
-  {
-    switch (type)
-      {
-        case SENSORS_ACTIVE:
-        case SENSORS_READY:
-          return enabled;
-      }
-    return 0;
-  }
-
-SENSORS_SENSOR(t4_servo_sensor, T4_SENSOR_NAME, value, configure, status);
diff --git a/platform/osd-merkur/dev/t4-servo-sensor.h b/platform/osd-merkur/dev/t4-servo-sensor.h
deleted file mode 100644
index 099bb4c66..000000000
--- a/platform/osd-merkur/dev/t4-servo-sensor.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-** Copyright (C) 2013-2014 Marcus Priesch, All rights reserved
-** In Prandnern 31, A--2122 Riedenthal, Austria. office@priesch.co.at
-**
-** 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.
-**
-**++
-** Name
-**    t4-servo-sensor
-**
-** Purpose
-**    Implements a sensor around t4servo.c
-**
-**
-** Revision Dates
-**    31-Mar-2013 (MPR) Creation
-**    12-Mar-2014 (MPR) Factored to support configurable amount of pwm's
-      ««revision-date»»···
-**--
-*/
-
-#ifndef __T4_SERVO_SENSOR_H__
-#define __T4_SERVO_SENSOR_H__
-
-#include "lib/sensors.h"
-#include "t4-servo-config.h"
-
-extern const struct sensors_sensor t4_servo_sensor;
-
-#endif /* __T4_SERVO_SENSOR_H__ */
diff --git a/platform/osd-merkur/dev/t4-servo.c b/platform/osd-merkur/dev/t4-servo.c
deleted file mode 100644
index 45f74ad9b..000000000
--- a/platform/osd-merkur/dev/t4-servo.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-** Copyright (C) 2013-2014 Marcus Priesch, All rights reserved
-** In Prandnern 31, A--2122 Riedenthal, Austria. office@priesch.co.at
-**
-** 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.
-**
-**++
-** Name
-**    t4-servo
-**
-** Purpose
-**    Implements software pwm on any portpins via timer 4
-**
-**
-** Revision Dates
-**    31-Mar-2013 (MPR) Creation
-**    12-Mar-2014 (MPR) Factored to support configurable amount of pwm's
-**    ««revision-date»»···
-**--
-*/
-
-#include "t4-servo.h"
-#include "t4-servo-config.h"
-#include "t4-servo-hardware.h"
-#include <avr/io.h>
-#include <avr/interrupt.h>
-
-// static servo_channel_type servo_channels [SERVO_COUNT];
-
-// timer 4: CTC OCR4A
-#define WGM4 0x4
-
-void t4_servo_init (void)
-{
-  unsigned char channel;
-
-  for (channel = 0; channel < SERVO_COUNT;  channel ++)
-    {
-      _SFR_IO8 (servo_channels [channel].ddr ) |=   servo_channels [channel].pin;
-      _SFR_IO8 (servo_channels [channel].port) &= ~(servo_channels [channel].pin);
-    }
-
-  cli ();
-  TCCR4A               = 0x00;
-  TCCR4A_struct.wgm4   =  WGM4 & 0x3;
-  TCCR4B_struct.wgm4   = (WGM4 & 0xc) >> 2;
-  TCCR4B_struct.cs4    = 0x1; // No prescaler
-  TCCR4C               = 0x00;
-  OCR4A                = (T4_VALUE);
-  TIMSK4_struct.ocie4a = 1;
-  TIMSK4_struct.toie4  = 1;
-  sei();
-}
-
-void t4_servo_off (void)
-  {
-    TIMSK4_struct.toie4  = 0;
-    TIMSK4_struct.ocie4a = 0;
-  }
-
-int t4_servo_get (unsigned int channel)
-  {
-    if (channel >= SERVO_COUNT)
-      return -1;
-    //printf ("t4_servo_get: %d, %d\n", channel, servo_channels [channel].duty);
-    return servo_channels [channel].duty;
-  }
-
-int t4_servo_set (unsigned int channel, unsigned char duty)
-  {
-    //printf ("t4_servo_set: %d, %d\n", channel, duty);
-
-    if (channel >= SERVO_COUNT)
-      return -1;
-
-    if (duty > SERVO_MAX)
-      return -2;
-
-    if (duty < SERVO_MIN)
-      return -3;
-
-    servo_channels [channel].duty = duty;
-    return 0;
-  }
-
-ISR (TIMER4_COMPA_vect, ISR_NOBLOCK)
-  {
-    unsigned char channel;
-    static unsigned int tick_count = 0;
-
-  cli ();
-    for (channel = 0; channel < SERVO_COUNT;  channel ++)
-      {
-        if (tick_count < servo_channels [channel].duty)
-          {
-            // turn on
-//            _SFR_IO8 (servo_channels [channel].ddr ) |= servo_channels [channel].pin;
-            _SFR_IO8 (servo_channels [channel].port) |= servo_channels [channel].pin;
-          }
-        else
-          {
-            // turn off
-            _SFR_IO8 (servo_channels [channel].port) &= ~(servo_channels [channel].pin);
-//            _SFR_IO8 (servo_channels [channel].ddr ) |=   servo_channels [channel].pin;
-          }
-      }
-
-    tick_count ++;
-
-    if (tick_count >= (SERVO_MAX + SERVO_OFFSET))
-      {
-        tick_count = 0;
-      }
-  sei();
-
-  }
-
diff --git a/platform/osd-merkur/dev/t4-servo.h b/platform/osd-merkur/dev/t4-servo.h
deleted file mode 100644
index 5acdc4013..000000000
--- a/platform/osd-merkur/dev/t4-servo.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-** Copyright (C) 2013-2014 Marcus Priesch, All rights reserved
-** In Prandnern 31, A--2122 Riedenthal, Austria. office@priesch.co.at
-**
-** 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.
-**
-**++
-** Name
-**    t4-servo
-**
-** Purpose
-**    Implements software pwm on any portpins via timer 4
-**
-**
-** Revision Dates
-**    31-Mar-2013 (MPR) Creation
-**    12-Mar-2014 (MPR) Factored to support configurable amount of pwm's
-      ««revision-date»»···
-**--
-*/
-
-#ifndef __T4_SERVO_H__
-#define __T4_SERVO_H__
-
-typedef struct struct_servo_channel
-{
-  unsigned char port;
-  unsigned char ddr;
-  unsigned char pin;
-  unsigned char duty;
-} servo_channel_type;
-
-void t4_servo_init(void);
-void t4_servo_off(void);
-
-int t4_servo_get(unsigned int channel);
-int t4_servo_set(unsigned int channel, unsigned char duty);
-
-#endif /* __T4_SERVO_H__ */
diff --git a/platform/osd-merkur/dev/temperature-sensor.c b/platform/osd-merkur/dev/temperature-sensor.c
deleted file mode 100644
index c85896178..000000000
--- a/platform/osd-merkur/dev/temperature-sensor.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* Copyright (c) 2012, BinaryLabs.
-* 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.
-*
-* @(#)$Id: temperature-sensor.c,v 1.1 2010/08/25 19:34:06 nifi Exp $
-*/
-
-/**
-* \file
-* Temperature sensor header file for Atmega128rfa1.
-* \author
-* Paulo Louro <paulolouro@binarylabs.dk>
-*/
-
-#include "contiki.h"
-#include "dev/temperature-sensor.h"
-
-#define PRINTF(...) printf(__VA_ARGS__)
-
-
-const struct sensors_sensor temperature_sensor;
-
-/*---------------------------------------------------------------------------*/
-static int
-value(int type)
-{
-  return readInternalTemp();
-}
-/*---------------------------------------------------------------------------*/
-static int
-configure(int type, int c)
-{
-  return 1;
-}
-/*---------------------------------------------------------------------------*/
-static int
-status(int type)
-{
-  return 1;
-}
-/*---------------------------------------------------------------------------*/
-SENSORS_SENSOR(temperature_sensor, TEMPERATURE_SENSOR, value, configure, status);
\ No newline at end of file
diff --git a/platform/osd-merkur/dev/temperature-sensor.h b/platform/osd-merkur/dev/temperature-sensor.h
deleted file mode 100644
index 6cf5dbf26..000000000
--- a/platform/osd-merkur/dev/temperature-sensor.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2012, BinaryLabs.
-* 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.
-*
-* @(#)$Id: temperature-sensor.h,v 1.1 2012/08/25 19:34:06 nifi Exp $
-*/
-
-/**
-* \file
-* Temperature sensor header file for Atmega128rfa1.
-* \author
-* Paulo Louro <paulolouro@binarylabs.dk>
-*/
-
-#ifndef __TEMPERATURE_SENSOR_H__
-#define __TEMPERATURE_SENSOR_H__
-
-#include "lib/sensors.h"
-#include "dev/adc.h"
-
-extern const struct sensors_sensor temperature_sensor;
-
-#define TEMPERATURE_SENSOR "Temperature"
-
-#endif /* __TEMPERATURE_SENSOR_H__ */
\ No newline at end of file
diff --git a/regression-tests/20-compile-osd-ports/Makefile b/regression-tests/20-compile-osd-ports/Makefile
index f4f21e8ff..26224a1b5 100644
--- a/regression-tests/20-compile-osd-ports/Makefile
+++ b/regression-tests/20-compile-osd-ports/Makefile
@@ -3,28 +3,52 @@ EXAMPLESDIR=../../examples
 TOOLSDIR=../../tools
 
 EXAMPLES = \
-hello-world/osd-merkur \
-osd/er-rest-example-merkurboard/osd-merkur \
-osd/rpl-border-router/osd-merkur \
-osd/slip-radio/osd-merkur \
-osd/arduino-dooralert/osd-merkur \
-osd/arduino-merkurboard/osd-merkur \
-osd/arduino-plantobserving/osd-merkur \
-osd/arduino-roomalert/osd-merkur \
-osd/arduino-sketch/osd-merkur \
-osd/arduino-wateralert/osd-merkur \
-osd/climate/osd-merkur \
-osd/climate2/osd-merkur \
-osd/servo-sensor/osd-merkur \
-osd/pingtheplug/osd-merkur \
-osd/powerbox/osd-merkur \
-osd/embedd-vm-merkurboard/osd-merkur \
-osd/light-actor/osd-merkur \
-#osd/dual-rgbw-actor/osd-merkur \
-#osd/light-shutter-control/osd-merkur \
-#osd/pir-sensor/osd-merkur \
-#osd/pwm-example/osd-merkur \
-#osd/wallclock-timer/osd-merkur
+hello-world/osd-merkur-128                     \
+osd/er-rest-example-merkurboard/osd-merkur-128 \
+osd/rpl-border-router/osd-merkur-128           \
+osd/slip-radio/osd-merkur-128                  \
+osd/arduino-dooralert/osd-merkur-128           \
+osd/arduino-merkurboard/osd-merkur-128         \
+osd/arduino-plantobserving/osd-merkur-128      \
+osd/arduino-roomalert/osd-merkur-128           \
+osd/arduino-sketch/osd-merkur-128              \
+osd/arduino-wateralert/osd-merkur-128          \
+osd/climate/osd-merkur-128                     \
+osd/climate2/osd-merkur-128                    \
+osd/servo-sensor/osd-merkur-128                \
+osd/pingtheplug/osd-merkur-128                 \
+osd/powerbox/osd-merkur-128                    \
+osd/embedd-vm-merkurboard/osd-merkur-128       \
+osd/light-actor/osd-merkur-128                 \
+hello-world/osd-merkur-256                     \
+osd/er-rest-example-merkurboard/osd-merkur-256 \
+osd/rpl-border-router/osd-merkur-256           \
+osd/slip-radio/osd-merkur-256                  \
+osd/arduino-dooralert/osd-merkur-256           \
+osd/arduino-merkurboard/osd-merkur-256         \
+osd/arduino-plantobserving/osd-merkur-256      \
+osd/arduino-roomalert/osd-merkur-256           \
+osd/arduino-sketch/osd-merkur-256              \
+osd/arduino-wateralert/osd-merkur-256          \
+osd/climate/osd-merkur-256                     \
+osd/climate2/osd-merkur-256                    \
+osd/servo-sensor/osd-merkur-256                \
+osd/pingtheplug/osd-merkur-256                 \
+osd/powerbox/osd-merkur-256                    \
+osd/embedd-vm-merkurboard/osd-merkur-256       \
+osd/light-actor/osd-merkur-256                 \
+
+#osd/dual-rgbw-actor/osd-merkur-128             \
+#osd/light-shutter-control/osd-merkur-128       \
+#osd/pir-sensor/osd-merkur-128                  \
+#osd/pwm-example/osd-merkur-128                 \
+#osd/wallclock-timer/osd-merkur-128             \
+
+#osd/dual-rgbw-actor/osd-merkur-256             \
+#osd/light-shutter-control/osd-merkur-256       \
+#osd/pir-sensor/osd-merkur-256                  \
+#osd/pwm-example/osd-merkur-256                 \
+#osd/wallclock-timer/osd-merkur-256             \
 
 TOOLS=
 

From f8c4d1155f675db1eb5e9544ed5444f670bcf216 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Sat, 23 Apr 2016 01:15:21 +0200
Subject: [PATCH 194/393] Disable RPL DAO ACK by default

---
 core/net/rpl/rpl-conf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h
index 6822ff550..b86a36a85 100644
--- a/core/net/rpl/rpl-conf.h
+++ b/core/net/rpl/rpl-conf.h
@@ -242,7 +242,7 @@
 #ifdef RPL_CONF_WITH_DAO_ACK
 #define RPL_WITH_DAO_ACK RPL_CONF_WITH_DAO_ACK
 #else
-#define RPL_WITH_DAO_ACK 1
+#define RPL_WITH_DAO_ACK 0
 #endif /* RPL_CONF_WITH_DAO_ACK */
 
 /*

From 753a557903eca3bf09bdefc80bae4a7d5c08df99 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Sat, 23 Apr 2016 07:58:06 +0200
Subject: [PATCH 195/393] Travis: use a single random seed rather than two. As
 a result, a single failed simulation results in overall failure

---
 regression-tests/Makefile.simulation-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regression-tests/Makefile.simulation-test b/regression-tests/Makefile.simulation-test
index 58818c328..9995eeea8 100644
--- a/regression-tests/Makefile.simulation-test
+++ b/regression-tests/Makefile.simulation-test
@@ -31,7 +31,7 @@ TESTLOGS=$(patsubst %.csc,%.testlog,$(TESTS))
 LOGS=$(patsubst %.csc,%.log,$(TESTS))
 FAILLOGS=$(patsubst %.csc,%.*.faillog,$(TESTS))
 #Set random seeds to create reproduceable results.
-RANDOMSEED=1 5
+RANDOMSEED=1
 
 CONTIKI=../..
 

From 03ae4c91fac1805d84fc35e19fec1087b3c64040 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Sat, 23 Apr 2016 01:10:00 +0200
Subject: [PATCH 196/393] Fix output of RPL tests

---
 regression-tests/12-rpl/01-rpl-up-route.csc            | 10 ++++------
 regression-tests/12-rpl/02-rpl-root-reboot.csc         | 10 ++++------
 regression-tests/12-rpl/03-rpl-28-hours.csc            | 10 ++++------
 regression-tests/12-rpl/04-rpl-large-network.csc       | 10 ++++------
 regression-tests/12-rpl/05-rpl-up-and-down-routes.csc  | 10 ++++------
 regression-tests/12-rpl/06-rpl-temporary-root-loss.csc | 10 ++++------
 regression-tests/12-rpl/08-rpl-dao-route-loss-0.csc    | 10 ++++------
 regression-tests/12-rpl/08-rpl-dao-route-loss-1.csc    | 10 ++++------
 regression-tests/12-rpl/08-rpl-dao-route-loss-2.csc    | 10 ++++------
 regression-tests/12-rpl/08-rpl-dao-route-loss-3.csc    | 10 ++++------
 regression-tests/12-rpl/08-rpl-dao-route-loss-4.csc    | 10 ++++------
 regression-tests/12-rpl/08-rpl-dao-route-loss-5.csc    | 10 ++++------
 regression-tests/12-rpl/09-rpl-probing.csc             | 10 ++++------
 regression-tests/12-rpl/10-rpl-multi-dodag.csc         | 10 ++++------
 14 files changed, 56 insertions(+), 84 deletions(-)

diff --git a/regression-tests/12-rpl/01-rpl-up-route.csc b/regression-tests/12-rpl/01-rpl-up-route.csc
index 5af9d8857..fc79cfc27 100644
--- a/regression-tests/12-rpl/01-rpl-up-route.csc
+++ b/regression-tests/12-rpl/01-rpl-up-route.csc
@@ -315,22 +315,20 @@ while(true) {&#xD;
     } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
         hops++;&#xD;
     } else if(msg.startsWith("Data")) {&#xD;
-//        log.log("" + msg + "\n");    &#xD;
         data = msg.split(" ");&#xD;
         num = parseInt(data[14]);&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
-        log.log("" + hops + " " + packets + "\n");&#xD;
-//        log.log("Num " + num + "\n");&#xD;
         if(lastMsg != -1) {&#xD;
           if(num != lastMsg + 1) {&#xD;
             numMissed = num - lastMsg - 1;&#xD;
-            lostMsgs += numMissed;&#xD;
+            lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
 }</script>
diff --git a/regression-tests/12-rpl/02-rpl-root-reboot.csc b/regression-tests/12-rpl/02-rpl-root-reboot.csc
index ce9f3cee0..14f87c7a9 100644
--- a/regression-tests/12-rpl/02-rpl-root-reboot.csc
+++ b/regression-tests/12-rpl/02-rpl-root-reboot.csc
@@ -315,22 +315,20 @@ while(true) {&#xD;
     } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
         hops++;&#xD;
     } else if(msg.startsWith("Data")) {&#xD;
-//        log.log("" + msg + "\n");    &#xD;
         data = msg.split(" ");&#xD;
         num = parseInt(data[14]);&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
-        log.log("" + hops + " " + packets + "\n");&#xD;
-//        log.log("Num " + num + "\n");&#xD;
         if(lastMsg != -1) {&#xD;
           if(num != lastMsg + 1) {&#xD;
             numMissed = num - lastMsg - 1;&#xD;
-            lostMsgs += numMissed;&#xD;
+            lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
 }</script>
diff --git a/regression-tests/12-rpl/03-rpl-28-hours.csc b/regression-tests/12-rpl/03-rpl-28-hours.csc
index a8cefd469..1cf2c5e43 100644
--- a/regression-tests/12-rpl/03-rpl-28-hours.csc
+++ b/regression-tests/12-rpl/03-rpl-28-hours.csc
@@ -264,22 +264,20 @@ while(true) {&#xD;
     } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
         hops++;&#xD;
     } else if(msg.startsWith("Data")) {&#xD;
-//        log.log("" + msg + "\n");    &#xD;
         data = msg.split(" ");&#xD;
         num = parseInt(data[14]);&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
-        log.log("" + hops + " " + packets + "\n");&#xD;
-//        log.log("Num " + num + "\n");&#xD;
         if(lastMsg != -1) {&#xD;
           if(num != lastMsg + 1) {&#xD;
             numMissed = num - lastMsg - 1;&#xD;
-            lostMsgs += numMissed;&#xD;
+            lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
 }</script>
diff --git a/regression-tests/12-rpl/04-rpl-large-network.csc b/regression-tests/12-rpl/04-rpl-large-network.csc
index 145cad14c..e40b7a339 100644
--- a/regression-tests/12-rpl/04-rpl-large-network.csc
+++ b/regression-tests/12-rpl/04-rpl-large-network.csc
@@ -7030,22 +7030,20 @@ while(true) {&#xD;
     } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
         hops++;&#xD;
     } else if(msg.startsWith("Data")) {&#xD;
-//        log.log("" + msg + "\n");    &#xD;
         data = msg.split(" ");&#xD;
         num = parseInt(data[14]);&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
-        log.log("" + hops + " " + packets + "\n");&#xD;
-//        log.log("Num " + num + "\n");&#xD;
         if(lastMsg != -1) {&#xD;
           if(num != lastMsg + 1) {&#xD;
             numMissed = num - lastMsg - 1;&#xD;
-            lostMsgs += numMissed;&#xD;
+            lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
 }</script>
diff --git a/regression-tests/12-rpl/05-rpl-up-and-down-routes.csc b/regression-tests/12-rpl/05-rpl-up-and-down-routes.csc
index 3ed5a71f7..c2b3cb506 100644
--- a/regression-tests/12-rpl/05-rpl-up-and-down-routes.csc
+++ b/regression-tests/12-rpl/05-rpl-up-and-down-routes.csc
@@ -313,22 +313,20 @@ while(true) {&#xD;
     } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
         hops++;&#xD;
     } else if(msg.startsWith("Data")) {&#xD;
-//        log.log("" + msg + "\n");    &#xD;
         data = msg.split(" ");&#xD;
         num = parseInt(data[14]);&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
-        log.log("" + hops + " " + packets + "\n");&#xD;
-//        log.log("Num " + num + "\n");&#xD;
         if(lastMsg != -1) {&#xD;
           if(num != lastMsg + 1) {&#xD;
             numMissed = num - lastMsg - 1;&#xD;
-            lostMsgs += numMissed;&#xD;
+            lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
 }</script>
diff --git a/regression-tests/12-rpl/06-rpl-temporary-root-loss.csc b/regression-tests/12-rpl/06-rpl-temporary-root-loss.csc
index bd771d7e7..08126f22b 100644
--- a/regression-tests/12-rpl/06-rpl-temporary-root-loss.csc
+++ b/regression-tests/12-rpl/06-rpl-temporary-root-loss.csc
@@ -318,23 +318,21 @@ while(true) {&#xD;
     } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
         hops++;&#xD;
     } else if(msg.startsWith("Data")) {&#xD;
-//        log.log("" + msg + "\n");    &#xD;
         data = msg.split(" ");&#xD;
         num = parseInt(data[14]);&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
-        log.log("" + hops + " " + packets + "\n");&#xD;
-//        log.log("Num " + num + "\n");&#xD;
         if(lastMsg != -1) {&#xD;
           if(num != lastMsg + 1) {&#xD;
             lastMissed = num;&#xD;
             numMissed = num - lastMsg - 1;&#xD;
-            lostMsgs += numMissed;&#xD;
+            lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
 }</script>
diff --git a/regression-tests/12-rpl/08-rpl-dao-route-loss-0.csc b/regression-tests/12-rpl/08-rpl-dao-route-loss-0.csc
index afdbed672..b5aeac9b2 100644
--- a/regression-tests/12-rpl/08-rpl-dao-route-loss-0.csc
+++ b/regression-tests/12-rpl/08-rpl-dao-route-loss-0.csc
@@ -330,23 +330,21 @@ while(true) {&#xD;
     } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
         hops++;&#xD;
     } else if(msg.startsWith("Data")) {&#xD;
-//        log.log("" + msg + "\n");    &#xD;
         data = msg.split(" ");&#xD;
         num = parseInt(data[14]);&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
-        log.log("" + hops + " " + packets + "\n");&#xD;
         seenMsgs++;&#xD;
-//        log.log("Num " + num + "\n");&#xD;
         if(lastMsg != -1) {&#xD;
           if(num != lastMsg + 1) {&#xD;
             numMissed = num - lastMsg - 1;&#xD;
-            lostMsgs += numMissed;&#xD;
+            lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
 }</script>
diff --git a/regression-tests/12-rpl/08-rpl-dao-route-loss-1.csc b/regression-tests/12-rpl/08-rpl-dao-route-loss-1.csc
index 3657d4b8a..d17bc193c 100644
--- a/regression-tests/12-rpl/08-rpl-dao-route-loss-1.csc
+++ b/regression-tests/12-rpl/08-rpl-dao-route-loss-1.csc
@@ -330,23 +330,21 @@ while(true) {&#xD;
     } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
         hops++;&#xD;
     } else if(msg.startsWith("Data")) {&#xD;
-//        log.log("" + msg + "\n");    &#xD;
         data = msg.split(" ");&#xD;
         num = parseInt(data[14]);&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
-        log.log("" + hops + " " + packets + "\n");&#xD;
         seenMsgs++;&#xD;
-//        log.log("Num " + num + "\n");&#xD;
         if(lastMsg != -1) {&#xD;
           if(num != lastMsg + 1) {&#xD;
             numMissed = num - lastMsg - 1;&#xD;
-            lostMsgs += numMissed;&#xD;
+            lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
 }</script>
diff --git a/regression-tests/12-rpl/08-rpl-dao-route-loss-2.csc b/regression-tests/12-rpl/08-rpl-dao-route-loss-2.csc
index 8c78725a3..fe3db3dc3 100644
--- a/regression-tests/12-rpl/08-rpl-dao-route-loss-2.csc
+++ b/regression-tests/12-rpl/08-rpl-dao-route-loss-2.csc
@@ -330,23 +330,21 @@ while(true) {&#xD;
     } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
         hops++;&#xD;
     } else if(msg.startsWith("Data")) {&#xD;
-//        log.log("" + msg + "\n");    &#xD;
         data = msg.split(" ");&#xD;
         num = parseInt(data[14]);&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
-        log.log("" + hops + " " + packets + "\n");&#xD;
         seenMsgs++;&#xD;
-//        log.log("Num " + num + "\n");&#xD;
         if(lastMsg != -1) {&#xD;
           if(num != lastMsg + 1) {&#xD;
             numMissed = num - lastMsg - 1;&#xD;
-            lostMsgs += numMissed;&#xD;
+            lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
 }</script>
diff --git a/regression-tests/12-rpl/08-rpl-dao-route-loss-3.csc b/regression-tests/12-rpl/08-rpl-dao-route-loss-3.csc
index fd1983379..7ee838b2c 100644
--- a/regression-tests/12-rpl/08-rpl-dao-route-loss-3.csc
+++ b/regression-tests/12-rpl/08-rpl-dao-route-loss-3.csc
@@ -330,23 +330,21 @@ while(true) {&#xD;
     } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
         hops++;&#xD;
     } else if(msg.startsWith("Data")) {&#xD;
-//        log.log("" + msg + "\n");    &#xD;
         data = msg.split(" ");&#xD;
         num = parseInt(data[14]);&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
-        log.log("" + hops + " " + packets + "\n");&#xD;
         seenMsgs++;&#xD;
-//        log.log("Num " + num + "\n");&#xD;
         if(lastMsg != -1) {&#xD;
           if(num != lastMsg + 1) {&#xD;
             numMissed = num - lastMsg - 1;&#xD;
-            lostMsgs += numMissed;&#xD;
+            lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
 }</script>
diff --git a/regression-tests/12-rpl/08-rpl-dao-route-loss-4.csc b/regression-tests/12-rpl/08-rpl-dao-route-loss-4.csc
index 8db19c568..35c5bd753 100644
--- a/regression-tests/12-rpl/08-rpl-dao-route-loss-4.csc
+++ b/regression-tests/12-rpl/08-rpl-dao-route-loss-4.csc
@@ -330,23 +330,21 @@ while(true) {&#xD;
     } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
         hops++;&#xD;
     } else if(msg.startsWith("Data")) {&#xD;
-//        log.log("" + msg + "\n");    &#xD;
         data = msg.split(" ");&#xD;
         num = parseInt(data[14]);&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
-        log.log("" + hops + " " + packets + "\n");&#xD;
         seenMsgs++;&#xD;
-//        log.log("Num " + num + "\n");&#xD;
         if(lastMsg != -1) {&#xD;
           if(num != lastMsg + 1) {&#xD;
             numMissed = num - lastMsg - 1;&#xD;
-            lostMsgs += numMissed;&#xD;
+            lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
 }</script>
diff --git a/regression-tests/12-rpl/08-rpl-dao-route-loss-5.csc b/regression-tests/12-rpl/08-rpl-dao-route-loss-5.csc
index 0f4d7db7d..4dc5038bc 100644
--- a/regression-tests/12-rpl/08-rpl-dao-route-loss-5.csc
+++ b/regression-tests/12-rpl/08-rpl-dao-route-loss-5.csc
@@ -330,23 +330,21 @@ while(true) {&#xD;
     } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
         hops++;&#xD;
     } else if(msg.startsWith("Data")) {&#xD;
-//        log.log("" + msg + "\n");    &#xD;
         data = msg.split(" ");&#xD;
         num = parseInt(data[14]);&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
-        log.log("" + hops + " " + packets + "\n");&#xD;
         seenMsgs++;&#xD;
-//        log.log("Num " + num + "\n");&#xD;
         if(lastMsg != -1) {&#xD;
           if(num != lastMsg + 1) {&#xD;
             numMissed = num - lastMsg - 1;&#xD;
-            lostMsgs += numMissed;&#xD;
+            lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
 }</script>
diff --git a/regression-tests/12-rpl/09-rpl-probing.csc b/regression-tests/12-rpl/09-rpl-probing.csc
index bc29029af..5206f1cfd 100644
--- a/regression-tests/12-rpl/09-rpl-probing.csc
+++ b/regression-tests/12-rpl/09-rpl-probing.csc
@@ -226,23 +226,21 @@ while(true) {&#xD;
     } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
         hops++;&#xD;
     } else if(msg.startsWith("Data")) {&#xD;
-//        log.log("" + msg + "\n");    &#xD;
         data = msg.split(" ");&#xD;
         num = parseInt(data[14]);&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
-        log.log("" + hops + " " + packets + "\n");&#xD;
-//        log.log("Num " + num + "\n");&#xD;
         if(lastMsg != -1) {&#xD;
           if(num != lastMsg + 1) {&#xD;
             numMissed = num - lastMsg - 1;&#xD;
-            lostMsgs += numMissed;&#xD;
+            lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
         lastMsgHops = hops;&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
 }</script>
diff --git a/regression-tests/12-rpl/10-rpl-multi-dodag.csc b/regression-tests/12-rpl/10-rpl-multi-dodag.csc
index aa0ab3d43..fa015e8d9 100644
--- a/regression-tests/12-rpl/10-rpl-multi-dodag.csc
+++ b/regression-tests/12-rpl/10-rpl-multi-dodag.csc
@@ -356,12 +356,8 @@ while(true) {&#xD;
     } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
         hops++;&#xD;
     } else if(msg.startsWith("Data")) {&#xD;
-//        log.log("" + msg + "\n");    &#xD;
         data = msg.split(" ");&#xD;
         num = parseInt(data[14]);&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
-        log.log("" + hops + " " + packets + "\n");&#xD;
-//        log.log("Num " + num + "\n");&#xD;
         if(newSink) {&#xD;
           newDagOk++;&#xD;
           newSink = 0;&#xD;
@@ -369,13 +365,15 @@ while(true) {&#xD;
         if(lastMsg != -1) {&#xD;
           if(num != lastMsg + 1) {&#xD;
             numMissed = num - lastMsg - 1;&#xD;
-            lostMsgs += numMissed;&#xD;
+            lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
 }</script>

From 944f1b06d6093720c32e0c3218e90ff2f3d8d551 Mon Sep 17 00:00:00 2001
From: Harald Pichler <harald@the-develop.net>
Date: Sun, 24 Apr 2016 17:45:35 +0200
Subject: [PATCH 197/393] add led resource

---
 .../resources/{res-door.c => res-led.c}       | 44 ++++++++++++++-----
 examples/osd/arduino-merkurboard/sketch.pde   | 14 +++---
 2 files changed, 40 insertions(+), 18 deletions(-)
 rename examples/osd/arduino-merkurboard/resources/{res-door.c => res-led.c} (72%)

diff --git a/examples/osd/arduino-merkurboard/resources/res-door.c b/examples/osd/arduino-merkurboard/resources/res-led.c
similarity index 72%
rename from examples/osd/arduino-merkurboard/resources/res-door.c
rename to examples/osd/arduino-merkurboard/resources/res-led.c
index 97a5e9b72..fb0fa138f 100644
--- a/examples/osd/arduino-merkurboard/resources/res-door.c
+++ b/examples/osd/arduino-merkurboard/resources/res-led.c
@@ -43,35 +43,33 @@
 #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_door,
-         "title=\"Moisture status\";rt=\"Moisture\"",
+RESOURCE(res_led,
+         "title=\"LED: , POST/PUT mode=on|off\";rt=\"Control\"",
          res_get_handler,
-         NULL,
-         NULL,
+         res_post_put_handler,
+         res_post_put_handler,
          NULL);
 
-extern  uint8_t door_pin;
-extern  uint8_t door_status;
+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)
 {
-  
-  door_status = digitalRead(door_pin);
-  
   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", door_status);
+    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, "{'door':%d}", door_status);
+    snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "{'led':%d}", led_status);
 
     REST.set_response_payload(response, buffer, strlen((char *)buffer));
   } else {
@@ -80,3 +78,27 @@ res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferr
     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);
+  }
+}
diff --git a/examples/osd/arduino-merkurboard/sketch.pde b/examples/osd/arduino-merkurboard/sketch.pde
index c5b3bc3db..41df5a847 100644
--- a/examples/osd/arduino-merkurboard/sketch.pde
+++ b/examples/osd/arduino-merkurboard/sketch.pde
@@ -15,21 +15,21 @@ extern "C" {
 #include "rest-engine.h"
 #include "net/netstack.h"
 
-extern resource_t res_leds, res_battery, res_cputemp;
-uint8_t door_pin = 3;
-uint8_t door_status = 0;
+extern resource_t res_led, res_battery, res_cputemp;
 
-#define LED_PIN 4
+uint8_t led_pin=4;
+uint8_t led_status;
 }
 
 void setup (void)
 {
     // switch off the led
-    pinMode(LED_PIN, OUTPUT);
-    digitalWrite(LED_PIN, HIGH);
+    pinMode(led_pin, OUTPUT);
+    digitalWrite(led_pin, HIGH);
+    led_status=0;
     // init coap resourcen
     rest_init_engine ();
-    rest_activate_resource (&res_leds, "s/leds");
+    rest_activate_resource (&res_led, "s/led");
     rest_activate_resource (&res_battery, "s/battery");
     rest_activate_resource (&res_cputemp, "s/cputemp");
     

From 70d94133ea2fc6b3050932886aacd53a6d9514e4 Mon Sep 17 00:00:00 2001
From: Pere Tuset <peretuset@gmail.com>
Date: Mon, 25 Apr 2016 01:50:23 +0200
Subject: [PATCH 198/393] Updated OpenMote example and platform.

---
 examples/openmote-cc2538/openmote-demo.c |  20 +++--
 platform/openmote-cc2538/dev/adxl346.c   | 100 ++++++++++++++++++++---
 platform/openmote-cc2538/dev/adxl346.h   |  10 ++-
 3 files changed, 109 insertions(+), 21 deletions(-)

diff --git a/examples/openmote-cc2538/openmote-demo.c b/examples/openmote-cc2538/openmote-demo.c
index 46a301511..393203a0c 100644
--- a/examples/openmote-cc2538/openmote-demo.c
+++ b/examples/openmote-cc2538/openmote-demo.c
@@ -85,25 +85,29 @@ PROCESS_THREAD(openmote_demo_process, ev, data)
   static struct etimer et;
   static int16_t counter;
   static uint16_t adxl346_present, sht21_present, max44009_present;
-  static uint16_t accel, light, temperature, humidity;
+  static int16_t accel, light, temperature, humidity;
 
   PROCESS_EXITHANDLER(broadcast_close(&bc))
 
   PROCESS_BEGIN();
 
-  /* Initialize and activate the ADXL346 sensor */
+  /* Initialize and calibrate the ADXL346 sensor */
   adxl346_present = SENSORS_ACTIVATE(adxl346);
   if(adxl346_present == ADXL346_ERROR) {
     printf("ADXL346 sensor is NOT present!\n");
     leds_on(LEDS_YELLOW);
+  } else {
+    adxl346.configure(ADXL346_CALIB_OFFSET, 0);
   }
 
+  /* Initialize the MAX44009 sensor */
   max44009_present = SENSORS_ACTIVATE(max44009);
   if(max44009_present == MAX44009_ERROR) {
     printf("MAX44009 sensor is NOT present!\n");
     leds_on(LEDS_ORANGE);
   }
 
+  /* Initialize the SHT21 sensor */
   sht21_present = SENSORS_ACTIVATE(sht21);
   if(sht21_present == SHT21_ERROR) {
     printf("SHT21 sensor is NOT present!\n");
@@ -123,12 +127,12 @@ PROCESS_THREAD(openmote_demo_process, ev, data)
     if(ev == PROCESS_EVENT_TIMER) {
       if(adxl346_present != ADXL346_ERROR) {
         leds_on(LEDS_YELLOW);
-        accel = adxl346.value(ADXL346_READ_X);
-        printf("X Acceleration: %u\n", accel);
-        accel = adxl346.value(ADXL346_READ_Y);
-        printf("Y Acceleration: %u\n", accel);
-        accel = adxl346.value(ADXL346_READ_Z);
-        printf("Z Acceleration: %u\n", accel);
+        accel = adxl346.value(ADXL346_READ_X_mG);
+        printf("X Acceleration: %d.%u G\n", accel / 1000, accel % 1000);
+        accel = adxl346.value(ADXL346_READ_Y_mG);
+        printf("Y Acceleration: %d.%u G\n", accel / 1000, accel % 1000);
+        accel = adxl346.value(ADXL346_READ_Z_mG);
+        printf("Z Acceleration: %d.%u G\n", accel / 1000, accel % 1000);
         leds_off(LEDS_YELLOW);
       }
 
diff --git a/platform/openmote-cc2538/dev/adxl346.c b/platform/openmote-cc2538/dev/adxl346.c
index 7fb406051..09d725474 100644
--- a/platform/openmote-cc2538/dev/adxl346.c
+++ b/platform/openmote-cc2538/dev/adxl346.c
@@ -153,6 +153,9 @@
 #define ADXL346_DATA_FORMAT_RANGE_PM_4g     (1)
 #define ADXL346_DATA_FORMAT_RANGE_PM_8g     (2)
 #define ADXL346_DATA_FORMAT_RANGE_PM_16g    (3)
+
+#define ADXL346_USER_CONFIGURATION          (ADXL346_DATA_FORMAT_RANGE_PM_2g)
+
 /** @} */
 /*---------------------------------------------------------------------------*/
 static uint8_t enabled;
@@ -163,13 +166,11 @@ adxl346_init(void)
   uint8_t config[2];
 
   config[0] = ADXL346_BW_RATE_ADDR;
-  config[1] = (ADXL346_BW_RATE_RATE(11));
+  config[1] = (ADXL346_BW_RATE_RATE(6));
   i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
 
   config[0] = ADXL346_DATA_FORMAT_ADDR;
-  config[1] = (ADXL346_DATA_FORMAT_SELF_TEST |
-               ADXL346_DATA_FORMAT_FULL_RES |
-               ADXL346_DATA_FORMAT_RANGE_PM_16g);
+  config[1] = (ADXL346_USER_CONFIGURATION);
   i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
 
   config[0] = ADXL346_POWER_CTL_ADDR;
@@ -185,23 +186,86 @@ adxl346_is_present(void)
   i2c_single_send(ADXL346_ADDRESS, ADXL346_DEVID_ADDR);
   i2c_single_receive(ADXL346_ADDRESS, &is_present);
 
-  return is_present == ADXL346_DEVID_VALUE;
+  return (is_present == ADXL346_DEVID_VALUE);
 }
 /*---------------------------------------------------------------------------*/
-static uint16_t
+static int16_t
 adxl346_read_accel(uint8_t addr1, uint8_t addr2)
 {
   uint8_t acceleration[2];
-  uint16_t z;
+  int16_t result;
 
   i2c_single_send(ADXL346_ADDRESS, addr1);
   i2c_single_receive(ADXL346_ADDRESS, &acceleration[0]);
   i2c_single_send(ADXL346_ADDRESS, addr2);
   i2c_single_receive(ADXL346_ADDRESS, &acceleration[1]);
 
-  z = (acceleration[0] << 8) | acceleration[1];
+  result = (acceleration[1] << 8) | acceleration[0];
+
+  return result;
+}
+/*---------------------------------------------------------------------------*/
+static int16_t
+adxl346_convert_accel(int16_t accel)
+{
+  int32_t result;
+
+  result = (1000 * accel) / 256;
+
+  return (int16_t) result;
+}
+/*---------------------------------------------------------------------------*/
+static void
+adxl346_calibrate_offset(void)
+{
+	int32_t accum_x = 0;
+	int32_t accum_y = 0;
+	int32_t accum_z = 0;
+	uint8_t config[2];
+	int8_t offset;
+
+  config[0] = ADXL346_OFSX_ADDR;
+  config[1] = 0;
+  i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
+  config[0] = ADXL346_OFSY_ADDR;
+  config[1] = 0;
+  i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
+  config[0] = ADXL346_OFSZ_ADDR;
+  config[1] = 0;
+  i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
+
+	uint16_t i;
+	for (i = 0; i < 100; i++) {
+		uint16_t x, y, z;
+
+		x = adxl346_read_accel(ADXL346_DATAX0_ADDR, ADXL346_DATAX1_ADDR);
+		accum_x += x;
+
+		y = adxl346_read_accel(ADXL346_DATAY0_ADDR, ADXL346_DATAY1_ADDR);
+		accum_y += y;
+
+		z = adxl346_read_accel(ADXL346_DATAZ0_ADDR, ADXL346_DATAZ1_ADDR);
+		accum_z += z;
+	}
+
+	offset    = (64 * accum_x) / 25600;
+	config[0] = ADXL346_OFSX_ADDR;
+	config[1] = -offset;
+	i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
+	PRINTF("ADXL346: X calibration offset is %d\n", offset);
+
+	offset    = (64 * accum_y) / 25600;
+	config[0] = ADXL346_OFSY_ADDR;
+	config[1] = -offset;
+	i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
+	PRINTF("ADXL346: Y calibration offset is %d\n", offset);
+	
+	offset    = (64 * accum_z) / 25600;
+	config[0] = ADXL346_OFSZ_ADDR;
+	config[1] = -offset;
+	i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
+	PRINTF("ADXL346: Z calibration offset is %d\n", offset);
 
-  return z;
 }
 /*---------------------------------------------------------------------------*/
 static int
@@ -218,6 +282,7 @@ status(int type)
 static int
 value(int type)
 {
+  int16_t accel;
   if(!enabled) {
     PRINTF("ADXL346: sensor not started\n");
     return ADXL346_ERROR;
@@ -225,10 +290,19 @@ value(int type)
 
   if(type == ADXL346_READ_X) {
     return adxl346_read_accel(ADXL346_DATAX0_ADDR, ADXL346_DATAX1_ADDR);
-  } else if(type == ADXL346_READ_Y) {
+      } else if(type == ADXL346_READ_Y) {
     return adxl346_read_accel(ADXL346_DATAY0_ADDR, ADXL346_DATAY1_ADDR);
   } else if(type == ADXL346_READ_Z) {
     return adxl346_read_accel(ADXL346_DATAZ0_ADDR, ADXL346_DATAZ1_ADDR);
+  } else if(type == ADXL346_READ_X_mG) {
+    accel = adxl346_read_accel(ADXL346_DATAX0_ADDR, ADXL346_DATAX1_ADDR);
+    return adxl346_convert_accel(accel);
+  } else if(type == ADXL346_READ_Y_mG) {
+    accel = adxl346_read_accel(ADXL346_DATAY0_ADDR, ADXL346_DATAY1_ADDR);
+    return adxl346_convert_accel(accel);
+  } else if(type == ADXL346_READ_Z_mG) {
+    accel = adxl346_read_accel(ADXL346_DATAZ0_ADDR, ADXL346_DATAZ1_ADDR);
+    return adxl346_convert_accel(accel);
   } else {
     PRINTF("ADXL346: invalid value requested\n");
     return ADXL346_ERROR;
@@ -243,6 +317,7 @@ configure(int type, int value)
   if(type == ADXL346_ACTIVATE) {
     if(!adxl346_is_present()) {
       PRINTF("ADXL346: is not present\n");
+      enabled = 0;
       return ADXL346_ERROR;
     } else {
       adxl346_init();
@@ -251,6 +326,11 @@ configure(int type, int value)
     }
   }
 
+  if(type == ADXL346_CALIB_OFFSET && enabled) {
+  	adxl346_calibrate_offset();
+    return ADXL346_SUCCESS;
+  }
+
   return ADXL346_ERROR;
 }
 /*---------------------------------------------------------------------------*/
diff --git a/platform/openmote-cc2538/dev/adxl346.h b/platform/openmote-cc2538/dev/adxl346.h
index acd0d21f5..401e601d1 100644
--- a/platform/openmote-cc2538/dev/adxl346.h
+++ b/platform/openmote-cc2538/dev/adxl346.h
@@ -51,9 +51,13 @@
 #define ADXL346_SUCCESS           (0)
 #define ADXL346_ACTIVATE          (SENSORS_ACTIVE)
 #define ADXL346_READ_X            (2)
-#define ADXL346_READ_Y            (3)
-#define ADXL346_READ_Z            (4)
-#define ADXL346_NONE              (5)
+#define ADXL346_READ_X_mG         (3)
+#define ADXL346_READ_Y            (4)
+#define ADXL346_READ_Y_mG         (5)
+#define ADXL346_READ_Z            (6)
+#define ADXL346_READ_Z_mG         (7)
+#define ADXL346_CALIB_OFFSET      (8)
+#define ADXL346_NONE              (9)
 /*---------------------------------------------------------------------------*/
 #define ADXL346_SENSOR "ADXL346 Sensor"
 /*---------------------------------------------------------------------------*/

From 0296e6aba06647ec01fff0122dbca0fb16eb6c61 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Fri, 22 Apr 2016 21:41:03 +0200
Subject: [PATCH 199/393] Indent tcpip.c

---
 core/net/ip/tcpip.c | 322 ++++++++++++++++++++++----------------------
 1 file changed, 161 insertions(+), 161 deletions(-)

diff --git a/core/net/ip/tcpip.c b/core/net/ip/tcpip.c
index 23b9605eb..ff514a186 100644
--- a/core/net/ip/tcpip.c
+++ b/core/net/ip/tcpip.c
@@ -219,7 +219,7 @@ struct uip_conn *
 tcp_connect(const uip_ipaddr_t *ripaddr, uint16_t port, void *appstate)
 {
   struct uip_conn *c;
-  
+
   c = uip_connect(ripaddr, port);
   if(c == NULL) {
     return NULL;
@@ -227,9 +227,9 @@ tcp_connect(const uip_ipaddr_t *ripaddr, uint16_t port, void *appstate)
 
   c->appstate.p = PROCESS_CURRENT();
   c->appstate.state = appstate;
-  
+
   tcpip_poll_tcp(c);
-  
+
   return c;
 }
 #endif /* UIP_ACTIVE_OPEN */
@@ -300,7 +300,7 @@ udp_new(const uip_ipaddr_t *ripaddr, uint16_t port, void *appstate)
 {
   struct uip_udp_conn *c;
   uip_udp_appstate_t *s;
-  
+
   c = uip_udp_new(ripaddr, port);
   if(c == NULL) {
     return NULL;
@@ -365,151 +365,151 @@ eventhandler(process_event_t ev, process_data_t data)
   struct process *p;
 
   switch(ev) {
-    case PROCESS_EVENT_EXITED:
-      /* This is the event we get if a process has exited. We go through
+  case PROCESS_EVENT_EXITED:
+    /* This is the event we get if a process has exited. We go through
          the TCP/IP tables to see if this process had any open
          connections or listening TCP ports. If so, we'll close those
          connections. */
 
-      p = (struct process *)data;
+    p = (struct process *)data;
 #if UIP_TCP
-      l = s.listenports;
-      for(i = 0; i < UIP_LISTENPORTS; ++i) {
-        if(l->p == p) {
-          uip_unlisten(l->port);
-          l->port = 0;
-          l->p = PROCESS_NONE;
-        }
-        ++l;
+    l = s.listenports;
+    for(i = 0; i < UIP_LISTENPORTS; ++i) {
+      if(l->p == p) {
+        uip_unlisten(l->port);
+        l->port = 0;
+        l->p = PROCESS_NONE;
       }
-	 
-      {
-        struct uip_conn *cptr;
-	    
-        for(cptr = &uip_conns[0]; cptr < &uip_conns[UIP_CONNS]; ++cptr) {
-          if(cptr->appstate.p == p) {
-            cptr->appstate.p = PROCESS_NONE;
-            cptr->tcpstateflags = UIP_CLOSED;
-          }
+      ++l;
+    }
+
+    {
+      struct uip_conn *cptr;
+
+      for(cptr = &uip_conns[0]; cptr < &uip_conns[UIP_CONNS]; ++cptr) {
+        if(cptr->appstate.p == p) {
+          cptr->appstate.p = PROCESS_NONE;
+          cptr->tcpstateflags = UIP_CLOSED;
         }
       }
+    }
 #endif /* UIP_TCP */
 #if UIP_UDP
-      {
-        struct uip_udp_conn *cptr;
+    {
+      struct uip_udp_conn *cptr;
 
-        for(cptr = &uip_udp_conns[0];
-            cptr < &uip_udp_conns[UIP_UDP_CONNS]; ++cptr) {
-          if(cptr->appstate.p == p) {
-            cptr->lport = 0;
-          }
+      for(cptr = &uip_udp_conns[0];
+          cptr < &uip_udp_conns[UIP_UDP_CONNS]; ++cptr) {
+        if(cptr->appstate.p == p) {
+          cptr->lport = 0;
         }
       }
+    }
 #endif /* UIP_UDP */
-      break;
+    break;
 
-    case PROCESS_EVENT_TIMER:
-      /* We get this event if one of our timers have expired. */
-      {
-        /* Check the clock so see if we should call the periodic uIP
+  case PROCESS_EVENT_TIMER:
+    /* We get this event if one of our timers have expired. */
+  {
+    /* Check the clock so see if we should call the periodic uIP
            processing. */
-        if(data == &periodic &&
-           etimer_expired(&periodic)) {
+    if(data == &periodic &&
+        etimer_expired(&periodic)) {
 #if UIP_TCP
-          for(i = 0; i < UIP_CONNS; ++i) {
-            if(uip_conn_active(i)) {
-              /* Only restart the timer if there are active
+      for(i = 0; i < UIP_CONNS; ++i) {
+        if(uip_conn_active(i)) {
+          /* Only restart the timer if there are active
                  connections. */
-              etimer_restart(&periodic);
-              uip_periodic(i);
+          etimer_restart(&periodic);
+          uip_periodic(i);
 #if NETSTACK_CONF_WITH_IPV6
-              tcpip_ipv6_output();
+          tcpip_ipv6_output();
 #else
-              if(uip_len > 0) {
-		PRINTF("tcpip_output from periodic len %d\n", uip_len);
-                tcpip_output();
-		PRINTF("tcpip_output after periodic len %d\n", uip_len);
-              }
-#endif /* NETSTACK_CONF_WITH_IPV6 */
-            }
+          if(uip_len > 0) {
+            PRINTF("tcpip_output from periodic len %d\n", uip_len);
+            tcpip_output();
+            PRINTF("tcpip_output after periodic len %d\n", uip_len);
           }
+#endif /* NETSTACK_CONF_WITH_IPV6 */
+        }
+      }
 #endif /* UIP_TCP */
 #if UIP_CONF_IP_FORWARD
-          uip_fw_periodic();
+      uip_fw_periodic();
 #endif /* UIP_CONF_IP_FORWARD */
-        }
-        
+    }
+
 #if NETSTACK_CONF_WITH_IPV6
 #if UIP_CONF_IPV6_REASSEMBLY
-        /*
-         * check the timer for reassembly
-         */
-        if(data == &uip_reass_timer &&
-           etimer_expired(&uip_reass_timer)) {
-          uip_reass_over();
-          tcpip_ipv6_output();
-        }
+    /*
+     * check the timer for reassembly
+     */
+    if(data == &uip_reass_timer &&
+        etimer_expired(&uip_reass_timer)) {
+      uip_reass_over();
+      tcpip_ipv6_output();
+    }
 #endif /* UIP_CONF_IPV6_REASSEMBLY */
-        /*
-         * check the different timers for neighbor discovery and
-         * stateless autoconfiguration
-         */
-        /*if(data == &uip_ds6_timer_periodic &&
+    /*
+     * check the different timers for neighbor discovery and
+     * stateless autoconfiguration
+     */
+    /*if(data == &uip_ds6_timer_periodic &&
            etimer_expired(&uip_ds6_timer_periodic)) {
           uip_ds6_periodic();
           tcpip_ipv6_output();
         }*/
 #if !UIP_CONF_ROUTER
-        if(data == &uip_ds6_timer_rs &&
-           etimer_expired(&uip_ds6_timer_rs)) {
-          uip_ds6_send_rs();
-          tcpip_ipv6_output();
-        }
+    if(data == &uip_ds6_timer_rs &&
+        etimer_expired(&uip_ds6_timer_rs)) {
+      uip_ds6_send_rs();
+      tcpip_ipv6_output();
+    }
 #endif /* !UIP_CONF_ROUTER */
-        if(data == &uip_ds6_timer_periodic &&
-           etimer_expired(&uip_ds6_timer_periodic)) {
-          uip_ds6_periodic();
-          tcpip_ipv6_output();
-        }
+    if(data == &uip_ds6_timer_periodic &&
+        etimer_expired(&uip_ds6_timer_periodic)) {
+      uip_ds6_periodic();
+      tcpip_ipv6_output();
+    }
 #endif /* NETSTACK_CONF_WITH_IPV6 */
-      }
-      break;
-	 
+  }
+  break;
+
 #if UIP_TCP
-    case TCP_POLL:
-      if(data != NULL) {
-        uip_poll_conn(data);
+  case TCP_POLL:
+    if(data != NULL) {
+      uip_poll_conn(data);
 #if NETSTACK_CONF_WITH_IPV6
-        tcpip_ipv6_output();
+      tcpip_ipv6_output();
 #else /* NETSTACK_CONF_WITH_IPV6 */
-        if(uip_len > 0) {
-	  PRINTF("tcpip_output from tcp poll len %d\n", uip_len);
-          tcpip_output();
-        }
-#endif /* NETSTACK_CONF_WITH_IPV6 */
-        /* Start the periodic polling, if it isn't already active. */
-        start_periodic_tcp_timer();
+      if(uip_len > 0) {
+        PRINTF("tcpip_output from tcp poll len %d\n", uip_len);
+        tcpip_output();
       }
-      break;
+#endif /* NETSTACK_CONF_WITH_IPV6 */
+      /* Start the periodic polling, if it isn't already active. */
+      start_periodic_tcp_timer();
+    }
+    break;
 #endif /* UIP_TCP */
 #if UIP_UDP
-    case UDP_POLL:
-      if(data != NULL) {
-        uip_udp_periodic_conn(data);
+  case UDP_POLL:
+    if(data != NULL) {
+      uip_udp_periodic_conn(data);
 #if NETSTACK_CONF_WITH_IPV6
-        tcpip_ipv6_output();
+      tcpip_ipv6_output();
 #else
-        if(uip_len > 0) {
-          tcpip_output();
-        }
-#endif /* UIP_UDP */
+      if(uip_len > 0) {
+        tcpip_output();
       }
-      break;
+#endif /* UIP_UDP */
+    }
+    break;
 #endif /* UIP_UDP */
 
-    case PACKET_INPUT:
-      packet_input();
-      break;
+  case PACKET_INPUT:
+    packet_input();
+    break;
   };
 }
 /*---------------------------------------------------------------------------*/
@@ -563,25 +563,25 @@ tcpip_ipv6_output(void)
         nexthop = uip_ds6_defrt_choose();
         if(nexthop == NULL) {
 #ifdef UIP_FALLBACK_INTERFACE
-	  PRINTF("FALLBACK: removing ext hdrs & setting proto %d %d\n", 
-		 uip_ext_len, *((uint8_t *)UIP_IP_BUF + 40));
-	  if(uip_ext_len > 0) {
-	    extern void remove_ext_hdr(void);
-	    uint8_t proto = *((uint8_t *)UIP_IP_BUF + 40);
-	    remove_ext_hdr();
-	    /* This should be copied from the ext header... */
-	    UIP_IP_BUF->proto = proto;
-	  }
-	  /* Inform the other end that the destination is not reachable. If it's
-	   * not informed routes might get lost unexpectedly until there's a need
-	   * to send a new packet to the peer */
-	  if(UIP_FALLBACK_INTERFACE.output() < 0) {
-	    PRINTF("FALLBACK: output error. Reporting DST UNREACH\n");
-	    uip_icmp6_error_output(ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADDR, 0);
-	    uip_flags = 0;
-	    tcpip_ipv6_output();
-	    return;
-	  }
+          PRINTF("FALLBACK: removing ext hdrs & setting proto %d %d\n",
+              uip_ext_len, *((uint8_t *)UIP_IP_BUF + 40));
+          if(uip_ext_len > 0) {
+            extern void remove_ext_hdr(void);
+            uint8_t proto = *((uint8_t *)UIP_IP_BUF + 40);
+            remove_ext_hdr();
+            /* This should be copied from the ext header... */
+            UIP_IP_BUF->proto = proto;
+          }
+          /* Inform the other end that the destination is not reachable. If it's
+           * not informed routes might get lost unexpectedly until there's a need
+           * to send a new packet to the peer */
+          if(UIP_FALLBACK_INTERFACE.output() < 0) {
+            PRINTF("FALLBACK: output error. Reporting DST UNREACH\n");
+            uip_icmp6_error_output(ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADDR, 0);
+            uip_flags = 0;
+            tcpip_ipv6_output();
+            return;
+          }
 #else
           PRINTF("tcpip_ipv6_output: Destination off-link but no route\n");
 #endif /* !UIP_FALLBACK_INTERFACE */
@@ -655,13 +655,13 @@ tcpip_ipv6_output(void)
           uip_packetqueue_set_buflen(&nbr->packethandle, uip_len);
         }
 #endif
-      /* RFC4861, 7.2.2:
-       * "If the source address of the packet prompting the solicitation is the
-       * same as one of the addresses assigned to the outgoing interface, that
-       * address SHOULD be placed in the IP Source Address of the outgoing
-       * solicitation.  Otherwise, any one of the addresses assigned to the
-       * interface should be used."*/
-       if(uip_ds6_is_my_addr(&UIP_IP_BUF->srcipaddr)){
+        /* RFC4861, 7.2.2:
+         * "If the source address of the packet prompting the solicitation is the
+         * same as one of the addresses assigned to the outgoing interface, that
+         * address SHOULD be placed in the IP Source Address of the outgoing
+         * solicitation.  Otherwise, any one of the addresses assigned to the
+         * interface should be used."*/
+        if(uip_ds6_is_my_addr(&UIP_IP_BUF->srcipaddr)){
           uip_nd6_ns_output(&UIP_IP_BUF->srcipaddr, NULL, &nbr->ipaddr);
         } else {
           uip_nd6_ns_output(NULL, NULL, &nbr->ipaddr);
@@ -747,7 +747,7 @@ void
 tcpip_uipcall(void)
 {
   uip_udp_appstate_t *ts;
-  
+
 #if UIP_UDP
   if(uip_conn != NULL) {
     ts = &uip_conn->appstate;
@@ -759,30 +759,30 @@ tcpip_uipcall(void)
 #endif /* UIP_UDP */
 
 #if UIP_TCP
- {
-   unsigned char i;
-   struct listenport *l;
+  {
+    unsigned char i;
+    struct listenport *l;
 
-   /* If this is a connection request for a listening port, we must
+    /* If this is a connection request for a listening port, we must
       mark the connection with the right process ID. */
-   if(uip_connected()) {
-     l = &s.listenports[0];
-     for(i = 0; i < UIP_LISTENPORTS; ++i) {
-       if(l->port == uip_conn->lport &&
-	  l->p != PROCESS_NONE) {
-	 ts->p = l->p;
-	 ts->state = NULL;
-	 break;
-       }
-       ++l;
-     }
-     
-     /* Start the periodic polling, if it isn't already active. */
-     start_periodic_tcp_timer();
-   }
- }
+    if(uip_connected()) {
+      l = &s.listenports[0];
+      for(i = 0; i < UIP_LISTENPORTS; ++i) {
+        if(l->port == uip_conn->lport &&
+            l->p != PROCESS_NONE) {
+          ts->p = l->p;
+          ts->state = NULL;
+          break;
+        }
+        ++l;
+      }
+
+      /* Start the periodic polling, if it isn't already active. */
+      start_periodic_tcp_timer();
+    }
+  }
 #endif /* UIP_TCP */
-  
+
   if(ts->p != NULL) {
     process_post_synch(ts->p, tcpip_event, ts->state);
   }
@@ -793,14 +793,14 @@ PROCESS_THREAD(tcpip_process, ev, data)
   PROCESS_BEGIN();
 
 #if UIP_TCP
- {
-   unsigned char i;
+  {
+    unsigned char i;
 
-   for(i = 0; i < UIP_LISTENPORTS; ++i) {
-     s.listenports[i].port = 0;
-   }
-   s.p = PROCESS_CURRENT();
- }
+    for(i = 0; i < UIP_LISTENPORTS; ++i) {
+      s.listenports[i].port = 0;
+    }
+    s.p = PROCESS_CURRENT();
+  }
 #endif
 
   tcpip_event = process_alloc_event();
@@ -813,7 +813,7 @@ PROCESS_THREAD(tcpip_process, ev, data)
 #ifdef UIP_FALLBACK_INTERFACE
   UIP_FALLBACK_INTERFACE.init();
 #endif
-/* initialize RPL if configured for using RPL */
+  /* initialize RPL if configured for using RPL */
 #if NETSTACK_CONF_WITH_IPV6 && UIP_CONF_IPV6_RPL
   rpl_init();
 #endif /* UIP_CONF_IPV6_RPL */
@@ -822,7 +822,7 @@ PROCESS_THREAD(tcpip_process, ev, data)
     PROCESS_YIELD();
     eventhandler(ev, data);
   }
-  
+
   PROCESS_END();
 }
 /*---------------------------------------------------------------------------*/

From f0f13fa58b3423164848a6d681db9bddcd4a330a Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Fri, 22 Apr 2016 21:44:24 +0200
Subject: [PATCH 200/393] Indent uip6.c

---
 core/net/ipv6/uip6.c | 888 +++++++++++++++++++++----------------------
 1 file changed, 444 insertions(+), 444 deletions(-)

diff --git a/core/net/ipv6/uip6.c b/core/net/ipv6/uip6.c
index 7e9ab0016..a8caee054 100644
--- a/core/net/ipv6/uip6.c
+++ b/core/net/ipv6/uip6.c
@@ -468,7 +468,7 @@ uip_connect(const uip_ipaddr_t *ripaddr, uint16_t rport)
   register struct uip_conn *conn, *cconn;
 
   /* Find an unused local port. */
- again:
+  again:
   ++lastport;
 
   if(lastport >= 32000) {
@@ -563,7 +563,7 @@ uip_udp_new(const uip_ipaddr_t *ripaddr, uint16_t rport)
   register struct uip_udp_conn *conn;
 
   /* Find an unused local port. */
- again:
+  again:
   ++lastport;
 
   if(lastport >= 32000) {
@@ -787,7 +787,7 @@ uip_reass(void)
         return 0;
       }
 
-     /* If we have come this far, we have a full packet in the
+      /* If we have come this far, we have a full packet in the
          buffer, so we copy it to uip_buf. We also reset the timer. */
       uip_reass_on = 0;
       etimer_stop(&uip_reass_timer);
@@ -811,7 +811,7 @@ uip_reass(void)
 void
 uip_reass_over(void)
 {
-   /* to late, we abandon the reassembly of the packet */
+  /* to late, we abandon the reassembly of the packet */
 
   uip_reass_on = 0;
   etimer_stop(&uip_reass_timer);
@@ -859,77 +859,77 @@ uip_add_rcv_nxt(uint16_t n)
 static uint8_t
 ext_hdr_options_process(void)
 {
- /*
-  * Length field in the extension header: length of the header in units of
-  * 8 bytes, excluding the first 8 bytes
-  * length field in an option : the length of data in the option
-  */
+  /*
+   * Length field in the extension header: length of the header in units of
+   * 8 bytes, excluding the first 8 bytes
+   * length field in an option : the length of data in the option
+   */
   uip_ext_opt_offset = 2;
   while(uip_ext_opt_offset < ((UIP_EXT_BUF->len << 3) + 8)) {
     switch(UIP_EXT_HDR_OPT_BUF->type) {
-      /*
-       * for now we do not support any options except padding ones
-       * PAD1 does not make sense as the header must be 8bytes aligned,
-       * hence we can only have
+    /*
+     * for now we do not support any options except padding ones
+     * PAD1 does not make sense as the header must be 8bytes aligned,
+     * hence we can only have
+     */
+    case UIP_EXT_HDR_OPT_PAD1:
+      PRINTF("Processing PAD1 option\n");
+      uip_ext_opt_offset += 1;
+      break;
+    case UIP_EXT_HDR_OPT_PADN:
+      PRINTF("Processing PADN option\n");
+      uip_ext_opt_offset += UIP_EXT_HDR_OPT_PADN_BUF->opt_len + 2;
+      break;
+    case UIP_EXT_HDR_OPT_RPL:
+      /* Fixes situation when a node that is not using RPL
+       * joins a network which does. The received packages will include the
+       * RPL header and processed by the "default" case of the switch
+       * (0x63 & 0xC0 = 0x40). Hence, the packet is discarded as the header
+       * is considered invalid.
+       * Using this fix, the header is ignored, and the next header (if
+       * present) is processed.
        */
-      case UIP_EXT_HDR_OPT_PAD1:
-        PRINTF("Processing PAD1 option\n");
-        uip_ext_opt_offset += 1;
-        break;
-      case UIP_EXT_HDR_OPT_PADN:
-        PRINTF("Processing PADN option\n");
-        uip_ext_opt_offset += UIP_EXT_HDR_OPT_PADN_BUF->opt_len + 2;
-        break;
-      case UIP_EXT_HDR_OPT_RPL:
-        /* Fixes situation when a node that is not using RPL
-         * joins a network which does. The received packages will include the
-         * RPL header and processed by the "default" case of the switch
-         * (0x63 & 0xC0 = 0x40). Hence, the packet is discarded as the header
-         * is considered invalid.
-         * Using this fix, the header is ignored, and the next header (if
-         * present) is processed.
-         */
 #if UIP_CONF_IPV6_RPL
-        PRINTF("Processing RPL option\n");
-        if(rpl_verify_header(uip_ext_opt_offset)) {
-          PRINTF("RPL Option Error: Dropping Packet\n");
+      PRINTF("Processing RPL option\n");
+      if(rpl_verify_header(uip_ext_opt_offset)) {
+        PRINTF("RPL Option Error: Dropping Packet\n");
+        return 1;
+      }
+#endif /* UIP_CONF_IPV6_RPL */
+      uip_ext_opt_offset += (UIP_EXT_HDR_OPT_BUF->len) + 2;
+      return 0;
+    default:
+      /*
+       * check the two highest order bits of the option
+       * - 00 skip over this option and continue processing the header.
+       * - 01 discard the packet.
+       * - 10 discard the packet and, regardless of whether or not the
+       *   packet's Destination Address was a multicast address, send an
+       *   ICMP Parameter Problem, Code 2, message to the packet's
+       *   Source Address, pointing to the unrecognized Option Type.
+       * - 11 discard the packet and, only if the packet's Destination
+       *   Address was not a multicast address, send an ICMP Parameter
+       *   Problem, Code 2, message to the packet's Source Address,
+       *   pointing to the unrecognized Option Type.
+       */
+      PRINTF("MSB %x\n", UIP_EXT_HDR_OPT_BUF->type);
+      switch(UIP_EXT_HDR_OPT_BUF->type & 0xC0) {
+      case 0:
+        break;
+      case 0x40:
+        return 1;
+      case 0xC0:
+        if(uip_is_addr_mcast(&UIP_IP_BUF->destipaddr)) {
           return 1;
         }
-#endif /* UIP_CONF_IPV6_RPL */
-        uip_ext_opt_offset += (UIP_EXT_HDR_OPT_BUF->len) + 2;
-        return 0;
-      default:
-        /*
-         * check the two highest order bits of the option
-         * - 00 skip over this option and continue processing the header.
-         * - 01 discard the packet.
-         * - 10 discard the packet and, regardless of whether or not the
-         *   packet's Destination Address was a multicast address, send an
-         *   ICMP Parameter Problem, Code 2, message to the packet's
-         *   Source Address, pointing to the unrecognized Option Type.
-         * - 11 discard the packet and, only if the packet's Destination
-         *   Address was not a multicast address, send an ICMP Parameter
-         *   Problem, Code 2, message to the packet's Source Address,
-         *   pointing to the unrecognized Option Type.
-         */
-        PRINTF("MSB %x\n", UIP_EXT_HDR_OPT_BUF->type);
-        switch(UIP_EXT_HDR_OPT_BUF->type & 0xC0) {
-          case 0:
-            break;
-          case 0x40:
-            return 1;
-          case 0xC0:
-            if(uip_is_addr_mcast(&UIP_IP_BUF->destipaddr)) {
-              return 1;
-            }
-          case 0x80:
-            uip_icmp6_error_output(ICMP6_PARAM_PROB, ICMP6_PARAMPROB_OPTION,
-                             (uint32_t)UIP_IPH_LEN + uip_ext_len + uip_ext_opt_offset);
-            return 2;
-        }
-        /* in the cases were we did not discard, update ext_opt* */
-        uip_ext_opt_offset += UIP_EXT_HDR_OPT_BUF->len + 2;
-        break;
+      case 0x80:
+        uip_icmp6_error_output(ICMP6_PARAM_PROB, ICMP6_PARAMPROB_OPTION,
+            (uint32_t)UIP_IPH_LEN + uip_ext_len + uip_ext_opt_offset);
+        return 2;
+      }
+      /* in the cases were we did not discard, update ext_opt* */
+      uip_ext_opt_offset += UIP_EXT_HDR_OPT_BUF->len + 2;
+      break;
     }
   }
   return 0;
@@ -1039,33 +1039,33 @@ uip_process(uint8_t flag)
            */
           UIP_STAT(++uip_stat.tcp.rexmit);
           switch(uip_connr->tcpstateflags & UIP_TS_MASK) {
-            case UIP_SYN_RCVD:
-              /* In the SYN_RCVD state, we should retransmit our SYNACK. */
-              goto tcp_send_synack;
+          case UIP_SYN_RCVD:
+            /* In the SYN_RCVD state, we should retransmit our SYNACK. */
+            goto tcp_send_synack;
 
 #if UIP_ACTIVE_OPEN
-            case UIP_SYN_SENT:
-              /* In the SYN_SENT state, we retransmit out SYN. */
-              UIP_TCP_BUF->flags = 0;
-              goto tcp_send_syn;
+          case UIP_SYN_SENT:
+            /* In the SYN_SENT state, we retransmit out SYN. */
+            UIP_TCP_BUF->flags = 0;
+            goto tcp_send_syn;
 #endif /* UIP_ACTIVE_OPEN */
 
-            case UIP_ESTABLISHED:
-              /*
-               * In the ESTABLISHED state, we call upon the application
-               * to do the actual retransmit after which we jump into
-               * the code for sending out the packet (the apprexmit
-               * label).
-               */
-              uip_flags = UIP_REXMIT;
-              UIP_APPCALL();
-              goto apprexmit;
+          case UIP_ESTABLISHED:
+            /*
+             * In the ESTABLISHED state, we call upon the application
+             * to do the actual retransmit after which we jump into
+             * the code for sending out the packet (the apprexmit
+             * label).
+             */
+            uip_flags = UIP_REXMIT;
+            UIP_APPCALL();
+            goto apprexmit;
 
-            case UIP_FIN_WAIT_1:
-            case UIP_CLOSING:
-            case UIP_LAST_ACK:
-              /* In all these states we should retransmit a FINACK. */
-              goto tcp_send_finack;
+          case UIP_FIN_WAIT_1:
+          case UIP_CLOSING:
+          case UIP_LAST_ACK:
+            /* In all these states we should retransmit a FINACK. */
+            goto tcp_send_finack;
           }
         }
       } else if((uip_connr->tcpstateflags & UIP_TS_MASK) == UIP_ESTABLISHED) {
@@ -1162,20 +1162,20 @@ uip_process(uint8_t flag)
     uip_ext_bitmap |= UIP_EXT_HDR_BITMAP_HBHO;
 #endif /* UIP_CONF_IPV6_CHECKS */
     switch(ext_hdr_options_process()) {
-      case 0:
-        /* continue */
-        uip_next_hdr = &UIP_EXT_BUF->next;
-        uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
-        break;
-      case 1:
-        PRINTF("Dropping packet after extension header processing\n");
-        /* silently discard */
-        goto drop;
-      case 2:
-        PRINTF("Sending error message after extension header processing\n");
-        /* send icmp error message (created in ext_hdr_options_process)
-         * and discard*/
-        goto send;
+    case 0:
+      /* continue */
+      uip_next_hdr = &UIP_EXT_BUF->next;
+      uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
+      break;
+    case 1:
+      PRINTF("Dropping packet after extension header processing\n");
+      /* silently discard */
+      goto drop;
+    case 2:
+      PRINTF("Sending error message after extension header processing\n");
+      /* send icmp error message (created in ext_hdr_options_process)
+       * and discard*/
+      goto send;
     }
   }
 
@@ -1281,44 +1281,44 @@ uip_process(uint8_t flag)
   while(1) {
     switch(*uip_next_hdr){
 #if UIP_TCP
-      case UIP_PROTO_TCP:
-        /* TCP, for both IPv4 and IPv6 */
-        goto tcp_input;
+    case UIP_PROTO_TCP:
+      /* TCP, for both IPv4 and IPv6 */
+      goto tcp_input;
 #endif /* UIP_TCP */
 #if UIP_UDP
-      case UIP_PROTO_UDP:
-        /* UDP, for both IPv4 and IPv6 */
-        goto udp_input;
+    case UIP_PROTO_UDP:
+      /* UDP, for both IPv4 and IPv6 */
+      goto udp_input;
 #endif /* UIP_UDP */
-      case UIP_PROTO_ICMP6:
-        /* ICMPv6 */
-        goto icmp6_input;
-      case UIP_PROTO_HBHO:
-        PRINTF("Processing hbh header\n");
-        /* Hop by hop option header */
+    case UIP_PROTO_ICMP6:
+      /* ICMPv6 */
+      goto icmp6_input;
+    case UIP_PROTO_HBHO:
+      PRINTF("Processing hbh header\n");
+      /* Hop by hop option header */
 #if UIP_CONF_IPV6_CHECKS
-        /* Hop by hop option header. If we saw one HBH already, drop */
-        if(uip_ext_bitmap & UIP_EXT_HDR_BITMAP_HBHO) {
-          goto bad_hdr;
-        } else {
-          uip_ext_bitmap |= UIP_EXT_HDR_BITMAP_HBHO;
-        }
+      /* Hop by hop option header. If we saw one HBH already, drop */
+      if(uip_ext_bitmap & UIP_EXT_HDR_BITMAP_HBHO) {
+        goto bad_hdr;
+      } else {
+        uip_ext_bitmap |= UIP_EXT_HDR_BITMAP_HBHO;
+      }
 #endif /*UIP_CONF_IPV6_CHECKS*/
-        switch(ext_hdr_options_process()) {
-          case 0:
-            /*continue*/
-            uip_next_hdr = &UIP_EXT_BUF->next;
-            uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
-            break;
-          case 1:
-            /*silently discard*/
-            goto drop;
-          case 2:
-            /* send icmp error message (created in ext_hdr_options_process)
-             * and discard*/
-            goto send;
-        }
+      switch(ext_hdr_options_process()) {
+      case 0:
+        /*continue*/
+        uip_next_hdr = &UIP_EXT_BUF->next;
+        uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
         break;
+      case 1:
+        /*silently discard*/
+        goto drop;
+      case 2:
+        /* send icmp error message (created in ext_hdr_options_process)
+         * and discard*/
+        goto send;
+      }
+      break;
       case UIP_PROTO_DESTO:
 #if UIP_CONF_IPV6_CHECKS
         /* Destination option header. if we saw two already, drop */
@@ -1334,76 +1334,76 @@ uip_process(uint8_t flag)
         }
 #endif /*UIP_CONF_IPV6_CHECKS*/
         switch(ext_hdr_options_process()) {
-          case 0:
-            /*continue*/
-            uip_next_hdr = &UIP_EXT_BUF->next;
-            uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
-            break;
-          case 1:
-            /*silently discard*/
-            goto drop;
-          case 2:
-            /* send icmp error message (created in ext_hdr_options_process)
-             * and discard*/
-            goto send;
-        }
-        break;
-      case UIP_PROTO_ROUTING:
-#if UIP_CONF_IPV6_CHECKS
-        /* Routing header. If we saw one already, drop */
-        if(uip_ext_bitmap & UIP_EXT_HDR_BITMAP_ROUTING) {
-          goto bad_hdr;
-        } else {
-          uip_ext_bitmap |= UIP_EXT_HDR_BITMAP_ROUTING;
-        }
-#endif /*UIP_CONF_IPV6_CHECKS*/
-        /*
-         * Routing Header  length field is in units of 8 bytes, excluding
-         * As per RFC2460 section 4.4, if routing type is unrecognized:
-         * if segments left = 0, ignore the header
-         * if segments left > 0, discard packet and send icmp error pointing
-         * to the routing type
-         */
-
-        PRINTF("Processing Routing header\n");
-        if(UIP_ROUTING_BUF->seg_left > 0) {
-          uip_icmp6_error_output(ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER, UIP_IPH_LEN + uip_ext_len + 2);
-          UIP_STAT(++uip_stat.ip.drop);
-          UIP_LOG("ip6: unrecognized routing type");
-          goto send;
-        }
-        uip_next_hdr = &UIP_EXT_BUF->next;
-        uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
-        break;
-      case UIP_PROTO_FRAG:
-        /* Fragmentation header:call the reassembly function, then leave */
-#if UIP_CONF_IPV6_REASSEMBLY
-        PRINTF("Processing frag header\n");
-        uip_len = uip_reass();
-        if(uip_len == 0) {
+        case 0:
+          /*continue*/
+          uip_next_hdr = &UIP_EXT_BUF->next;
+          uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
+          break;
+        case 1:
+          /*silently discard*/
           goto drop;
-        }
-        if(uip_reassflags & UIP_REASS_FLAG_ERROR_MSG){
-          /* we are not done with reassembly, this is an error message */
+        case 2:
+          /* send icmp error message (created in ext_hdr_options_process)
+           * and discard*/
           goto send;
         }
-        /*packet is reassembled, reset the next hdr to the beginning
-           of the IP header and restart the parsing of the reassembled pkt*/
-        PRINTF("Processing reassembled packet\n");
-        uip_ext_len = 0;
-        uip_ext_bitmap = 0;
-        uip_next_hdr = &UIP_IP_BUF->proto;
         break;
+        case UIP_PROTO_ROUTING:
+#if UIP_CONF_IPV6_CHECKS
+          /* Routing header. If we saw one already, drop */
+          if(uip_ext_bitmap & UIP_EXT_HDR_BITMAP_ROUTING) {
+            goto bad_hdr;
+          } else {
+            uip_ext_bitmap |= UIP_EXT_HDR_BITMAP_ROUTING;
+          }
+#endif /*UIP_CONF_IPV6_CHECKS*/
+          /*
+           * Routing Header  length field is in units of 8 bytes, excluding
+           * As per RFC2460 section 4.4, if routing type is unrecognized:
+           * if segments left = 0, ignore the header
+           * if segments left > 0, discard packet and send icmp error pointing
+           * to the routing type
+           */
+
+          PRINTF("Processing Routing header\n");
+          if(UIP_ROUTING_BUF->seg_left > 0) {
+            uip_icmp6_error_output(ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER, UIP_IPH_LEN + uip_ext_len + 2);
+            UIP_STAT(++uip_stat.ip.drop);
+            UIP_LOG("ip6: unrecognized routing type");
+            goto send;
+          }
+          uip_next_hdr = &UIP_EXT_BUF->next;
+          uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
+          break;
+        case UIP_PROTO_FRAG:
+          /* Fragmentation header:call the reassembly function, then leave */
+#if UIP_CONF_IPV6_REASSEMBLY
+          PRINTF("Processing frag header\n");
+          uip_len = uip_reass();
+          if(uip_len == 0) {
+            goto drop;
+          }
+          if(uip_reassflags & UIP_REASS_FLAG_ERROR_MSG){
+            /* we are not done with reassembly, this is an error message */
+            goto send;
+          }
+          /*packet is reassembled, reset the next hdr to the beginning
+           of the IP header and restart the parsing of the reassembled pkt*/
+          PRINTF("Processing reassembled packet\n");
+          uip_ext_len = 0;
+          uip_ext_bitmap = 0;
+          uip_next_hdr = &UIP_IP_BUF->proto;
+          break;
 #else /* UIP_CONF_IPV6_REASSEMBLY */
-        UIP_STAT(++uip_stat.ip.drop);
-        UIP_STAT(++uip_stat.ip.fragerr);
-        UIP_LOG("ip: fragment dropped.");
-        goto drop;
+          UIP_STAT(++uip_stat.ip.drop);
+          UIP_STAT(++uip_stat.ip.fragerr);
+          UIP_LOG("ip: fragment dropped.");
+          goto drop;
 #endif /* UIP_CONF_IPV6_REASSEMBLY */
-      case UIP_PROTO_NONE:
-        goto drop;
-      default:
-        goto bad_hdr;
+        case UIP_PROTO_NONE:
+          goto drop;
+        default:
+          goto bad_hdr;
     }
   }
   bad_hdr:
@@ -1470,7 +1470,7 @@ uip_process(uint8_t flag)
 
 #if UIP_UDP
   /* UDP input processing. */
- udp_input:
+  udp_input:
 
   remove_ext_hdr();
   UIP_IP_BUF->proto = UIP_PROTO_UDP;
@@ -1528,7 +1528,7 @@ uip_process(uint8_t flag)
   uip_icmp6_error_output(ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT, 0);
   goto send;
 
- udp_found:
+  udp_found:
   PRINTF("In udp_found\n");
   UIP_STAT(++uip_stat.udp.recv);
 
@@ -1540,7 +1540,7 @@ uip_process(uint8_t flag)
   uip_slen = 0;
   UIP_UDP_APPCALL();
 
- udp_send:
+  udp_send:
   PRINTF("In udp_send\n");
 
   if(uip_slen == 0) {
@@ -1585,7 +1585,7 @@ uip_process(uint8_t flag)
 
 #if UIP_TCP
   /* TCP input processing. */
- tcp_input:
+  tcp_input:
 
   remove_ext_hdr();
   UIP_IP_BUF->proto = UIP_PROTO_TCP;
@@ -1640,7 +1640,7 @@ uip_process(uint8_t flag)
   /* No matching connection found, so we send a RST packet. */
   UIP_STAT(++uip_stat.tcp.synrst);
 
- reset:
+  reset:
   PRINTF("In reset\n");
   /* We do not send resets in response to resets. */
   if(UIP_TCP_BUF->flags & TCP_RST) {
@@ -1695,7 +1695,7 @@ uip_process(uint8_t flag)
   /* This label will be jumped to if we matched the incoming packet
      with a connection in LISTEN. In that case, we should create a new
      connection and send a SYNACK in return. */
- found_listen:
+  found_listen:
   PRINTF("In found listen\n");
   /* First we check if there are any connections avaliable. Unused
      connections are kept in the same table as used connections, but
@@ -1785,13 +1785,13 @@ uip_process(uint8_t flag)
 
   /* Our response will be a SYNACK. */
 #if UIP_ACTIVE_OPEN
- tcp_send_synack:
+  tcp_send_synack:
   UIP_TCP_BUF->flags = TCP_ACK;
 
- tcp_send_syn:
+  tcp_send_syn:
   UIP_TCP_BUF->flags |= TCP_SYN;
 #else /* UIP_ACTIVE_OPEN */
- tcp_send_synack:
+  tcp_send_synack:
   UIP_TCP_BUF->flags = TCP_SYN | TCP_ACK;
 #endif /* UIP_ACTIVE_OPEN */
 
@@ -1806,7 +1806,7 @@ uip_process(uint8_t flag)
   goto tcp_send;
 
   /* This label will be jumped to if we found an active connection. */
- found:
+  found:
   PRINTF("In found\n");
   uip_conn = uip_connr;
   uip_flags = 0;
@@ -1900,96 +1900,96 @@ uip_process(uint8_t flag)
 
   /* Do different things depending on in what state the connection is. */
   switch(uip_connr->tcpstateflags & UIP_TS_MASK) {
-    /* CLOSED and LISTEN are not handled here. CLOSE_WAIT is not
+  /* CLOSED and LISTEN are not handled here. CLOSE_WAIT is not
        implemented, since we force the application to close when the
        peer sends a FIN (hence the application goes directly from
        ESTABLISHED to LAST_ACK). */
-    case UIP_SYN_RCVD:
-      /* In SYN_RCVD we have sent out a SYNACK in response to a SYN, and
+  case UIP_SYN_RCVD:
+    /* In SYN_RCVD we have sent out a SYNACK in response to a SYN, and
          we are waiting for an ACK that acknowledges the data we sent
          out the last time. Therefore, we want to have the UIP_ACKDATA
          flag set. If so, we enter the ESTABLISHED state. */
-      if(uip_flags & UIP_ACKDATA) {
-        uip_connr->tcpstateflags = UIP_ESTABLISHED;
-        uip_flags = UIP_CONNECTED;
-        uip_connr->len = 0;
-        if(uip_len > 0) {
-          uip_flags |= UIP_NEWDATA;
-          uip_add_rcv_nxt(uip_len);
-        }
-        uip_slen = 0;
-        UIP_APPCALL();
-        goto appsend;
+    if(uip_flags & UIP_ACKDATA) {
+      uip_connr->tcpstateflags = UIP_ESTABLISHED;
+      uip_flags = UIP_CONNECTED;
+      uip_connr->len = 0;
+      if(uip_len > 0) {
+        uip_flags |= UIP_NEWDATA;
+        uip_add_rcv_nxt(uip_len);
       }
-      /* We need to retransmit the SYNACK */
-      if((UIP_TCP_BUF->flags & TCP_CTL) == TCP_SYN) {
-        goto tcp_send_synack;
-      }
-      goto drop;
+      uip_slen = 0;
+      UIP_APPCALL();
+      goto appsend;
+    }
+    /* We need to retransmit the SYNACK */
+    if((UIP_TCP_BUF->flags & TCP_CTL) == TCP_SYN) {
+      goto tcp_send_synack;
+    }
+    goto drop;
 #if UIP_ACTIVE_OPEN
-    case UIP_SYN_SENT:
-      /* In SYN_SENT, we wait for a SYNACK that is sent in response to
+  case UIP_SYN_SENT:
+    /* In SYN_SENT, we wait for a SYNACK that is sent in response to
          our SYN. The rcv_nxt is set to sequence number in the SYNACK
          plus one, and we send an ACK. We move into the ESTABLISHED
          state. */
-      if((uip_flags & UIP_ACKDATA) &&
-         (UIP_TCP_BUF->flags & TCP_CTL) == (TCP_SYN | TCP_ACK)) {
+    if((uip_flags & UIP_ACKDATA) &&
+        (UIP_TCP_BUF->flags & TCP_CTL) == (TCP_SYN | TCP_ACK)) {
 
-        /* Parse the TCP MSS option, if present. */
-        if((UIP_TCP_BUF->tcpoffset & 0xf0) > 0x50) {
-          for(c = 0; c < ((UIP_TCP_BUF->tcpoffset >> 4) - 5) << 2 ;) {
-            opt = uip_buf[UIP_IPTCPH_LEN + UIP_LLH_LEN + c];
-            if(opt == TCP_OPT_END) {
-              /* End of options. */
-              break;
-            } else if(opt == TCP_OPT_NOOP) {
-              ++c;
-              /* NOP option. */
-            } else if(opt == TCP_OPT_MSS &&
-                      uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c] == TCP_OPT_MSS_LEN) {
-              /* An MSS option with the right option length. */
-              tmp16 = (uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 2 + c] << 8) |
+      /* Parse the TCP MSS option, if present. */
+      if((UIP_TCP_BUF->tcpoffset & 0xf0) > 0x50) {
+        for(c = 0; c < ((UIP_TCP_BUF->tcpoffset >> 4) - 5) << 2 ;) {
+          opt = uip_buf[UIP_IPTCPH_LEN + UIP_LLH_LEN + c];
+          if(opt == TCP_OPT_END) {
+            /* End of options. */
+            break;
+          } else if(opt == TCP_OPT_NOOP) {
+            ++c;
+            /* NOP option. */
+          } else if(opt == TCP_OPT_MSS &&
+              uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c] == TCP_OPT_MSS_LEN) {
+            /* An MSS option with the right option length. */
+            tmp16 = (uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 2 + c] << 8) |
                 uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 3 + c];
-              uip_connr->initialmss =
+            uip_connr->initialmss =
                 uip_connr->mss = tmp16 > UIP_TCP_MSS? UIP_TCP_MSS: tmp16;
 
-              /* And we are done processing options. */
-              break;
-            } else {
-              /* All other options have a length field, so that we easily
+            /* And we are done processing options. */
+            break;
+          } else {
+            /* All other options have a length field, so that we easily
                  can skip past them. */
-              if(uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c] == 0) {
-                /* If the length field is zero, the options are malformed
+            if(uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c] == 0) {
+              /* If the length field is zero, the options are malformed
                    and we don't process them further. */
-                break;
-              }
-              c += uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c];
+              break;
             }
+            c += uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c];
           }
         }
-        uip_connr->tcpstateflags = UIP_ESTABLISHED;
-        uip_connr->rcv_nxt[0] = UIP_TCP_BUF->seqno[0];
-        uip_connr->rcv_nxt[1] = UIP_TCP_BUF->seqno[1];
-        uip_connr->rcv_nxt[2] = UIP_TCP_BUF->seqno[2];
-        uip_connr->rcv_nxt[3] = UIP_TCP_BUF->seqno[3];
-        uip_add_rcv_nxt(1);
-        uip_flags = UIP_CONNECTED | UIP_NEWDATA;
-        uip_connr->len = 0;
-        uip_clear_buf();
-        uip_slen = 0;
-        UIP_APPCALL();
-        goto appsend;
       }
-      /* Inform the application that the connection failed */
-      uip_flags = UIP_ABORT;
+      uip_connr->tcpstateflags = UIP_ESTABLISHED;
+      uip_connr->rcv_nxt[0] = UIP_TCP_BUF->seqno[0];
+      uip_connr->rcv_nxt[1] = UIP_TCP_BUF->seqno[1];
+      uip_connr->rcv_nxt[2] = UIP_TCP_BUF->seqno[2];
+      uip_connr->rcv_nxt[3] = UIP_TCP_BUF->seqno[3];
+      uip_add_rcv_nxt(1);
+      uip_flags = UIP_CONNECTED | UIP_NEWDATA;
+      uip_connr->len = 0;
+      uip_clear_buf();
+      uip_slen = 0;
       UIP_APPCALL();
-      /* The connection is closed after we send the RST */
-      uip_conn->tcpstateflags = UIP_CLOSED;
-      goto reset;
+      goto appsend;
+    }
+    /* Inform the application that the connection failed */
+    uip_flags = UIP_ABORT;
+    UIP_APPCALL();
+    /* The connection is closed after we send the RST */
+    uip_conn->tcpstateflags = UIP_CLOSED;
+    goto reset;
 #endif /* UIP_ACTIVE_OPEN */
 
-    case UIP_ESTABLISHED:
-      /* In the ESTABLISHED state, we call upon the application to feed
+  case UIP_ESTABLISHED:
+    /* In the ESTABLISHED state, we call upon the application to feed
          data into the uip_buf. If the UIP_ACKDATA flag is set, the
          application should put new data into the buffer, otherwise we are
          retransmitting an old segment, and the application should put that
@@ -2000,56 +2000,56 @@ uip_process(uint8_t flag)
          state. We require that there is no outstanding data; otherwise the
          sequence numbers will be screwed up. */
 
-      if(UIP_TCP_BUF->flags & TCP_FIN && !(uip_connr->tcpstateflags & UIP_STOPPED)) {
-        if(uip_outstanding(uip_connr)) {
-          goto drop;
-        }
-        uip_add_rcv_nxt(1 + uip_len);
-        uip_flags |= UIP_CLOSE;
-        if(uip_len > 0) {
-          uip_flags |= UIP_NEWDATA;
-        }
-        UIP_APPCALL();
-        uip_connr->len = 1;
-        uip_connr->tcpstateflags = UIP_LAST_ACK;
-        uip_connr->nrtx = 0;
+    if(UIP_TCP_BUF->flags & TCP_FIN && !(uip_connr->tcpstateflags & UIP_STOPPED)) {
+      if(uip_outstanding(uip_connr)) {
+        goto drop;
+      }
+      uip_add_rcv_nxt(1 + uip_len);
+      uip_flags |= UIP_CLOSE;
+      if(uip_len > 0) {
+        uip_flags |= UIP_NEWDATA;
+      }
+      UIP_APPCALL();
+      uip_connr->len = 1;
+      uip_connr->tcpstateflags = UIP_LAST_ACK;
+      uip_connr->nrtx = 0;
       tcp_send_finack:
-        UIP_TCP_BUF->flags = TCP_FIN | TCP_ACK;
-        goto tcp_send_nodata;
-      }
+      UIP_TCP_BUF->flags = TCP_FIN | TCP_ACK;
+      goto tcp_send_nodata;
+    }
 
-      /* Check the URG flag. If this is set, the segment carries urgent
+    /* Check the URG flag. If this is set, the segment carries urgent
          data that we must pass to the application. */
-      if((UIP_TCP_BUF->flags & TCP_URG) != 0) {
+    if((UIP_TCP_BUF->flags & TCP_URG) != 0) {
 #if UIP_URGDATA > 0
-        uip_urglen = (UIP_TCP_BUF->urgp[0] << 8) | UIP_TCP_BUF->urgp[1];
-        if(uip_urglen > uip_len) {
-          /* There is more urgent data in the next segment to come. */
-          uip_urglen = uip_len;
-        }
-        uip_add_rcv_nxt(uip_urglen);
-        uip_len -= uip_urglen;
-        uip_urgdata = uip_appdata;
-        uip_appdata += uip_urglen;
-      } else {
-        uip_urglen = 0;
-#else /* UIP_URGDATA > 0 */
-        uip_appdata = ((char *)uip_appdata) + ((UIP_TCP_BUF->urgp[0] << 8) | UIP_TCP_BUF->urgp[1]);
-        uip_len -= (UIP_TCP_BUF->urgp[0] << 8) | UIP_TCP_BUF->urgp[1];
-#endif /* UIP_URGDATA > 0 */
+      uip_urglen = (UIP_TCP_BUF->urgp[0] << 8) | UIP_TCP_BUF->urgp[1];
+      if(uip_urglen > uip_len) {
+        /* There is more urgent data in the next segment to come. */
+        uip_urglen = uip_len;
       }
+      uip_add_rcv_nxt(uip_urglen);
+      uip_len -= uip_urglen;
+      uip_urgdata = uip_appdata;
+      uip_appdata += uip_urglen;
+    } else {
+      uip_urglen = 0;
+#else /* UIP_URGDATA > 0 */
+      uip_appdata = ((char *)uip_appdata) + ((UIP_TCP_BUF->urgp[0] << 8) | UIP_TCP_BUF->urgp[1]);
+      uip_len -= (UIP_TCP_BUF->urgp[0] << 8) | UIP_TCP_BUF->urgp[1];
+#endif /* UIP_URGDATA > 0 */
+    }
 
-      /* If uip_len > 0 we have TCP data in the packet, and we flag this
+    /* If uip_len > 0 we have TCP data in the packet, and we flag this
          by setting the UIP_NEWDATA flag and update the sequence number
          we acknowledge. If the application has stopped the dataflow
          using uip_stop(), we must not accept any data packets from the
          remote host. */
-      if(uip_len > 0 && !(uip_connr->tcpstateflags & UIP_STOPPED)) {
-        uip_flags |= UIP_NEWDATA;
-        uip_add_rcv_nxt(uip_len);
-      }
+    if(uip_len > 0 && !(uip_connr->tcpstateflags & UIP_STOPPED)) {
+      uip_flags |= UIP_NEWDATA;
+      uip_add_rcv_nxt(uip_len);
+    }
 
-      /* Check if the available buffer space advertised by the other end
+    /* Check if the available buffer space advertised by the other end
          is smaller than the initial MSS for this connection. If so, we
          set the current MSS to the window size to ensure that the
          application does not send more data than the other end can
@@ -2060,15 +2060,15 @@ uip_process(uint8_t flag)
          of data. This data will not be acknowledged by the receiver,
          and the application will retransmit it. This is called the
          "persistent timer" and uses the retransmission mechanim.
-      */
-      tmp16 = ((uint16_t)UIP_TCP_BUF->wnd[0] << 8) + (uint16_t)UIP_TCP_BUF->wnd[1];
-      if(tmp16 > uip_connr->initialmss ||
-         tmp16 == 0) {
-        tmp16 = uip_connr->initialmss;
-      }
-      uip_connr->mss = tmp16;
+     */
+    tmp16 = ((uint16_t)UIP_TCP_BUF->wnd[0] << 8) + (uint16_t)UIP_TCP_BUF->wnd[1];
+    if(tmp16 > uip_connr->initialmss ||
+        tmp16 == 0) {
+      tmp16 = uip_connr->initialmss;
+    }
+    uip_connr->mss = tmp16;
 
-      /* If this packet constitutes an ACK for outstanding data (flagged
+    /* If this packet constitutes an ACK for outstanding data (flagged
          by the UIP_ACKDATA flag, we should call the application since it
          might want to send more data. If the incoming packet had data
          from the peer (as flagged by the UIP_NEWDATA flag), the
@@ -2084,166 +2084,166 @@ uip_process(uint8_t flag)
          put into the uip_appdata and the length of the data should be
          put into uip_len. If the application don't have any data to
          send, uip_len must be set to 0. */
-      if(uip_flags & (UIP_NEWDATA | UIP_ACKDATA)) {
-        uip_slen = 0;
-        UIP_APPCALL();
+    if(uip_flags & (UIP_NEWDATA | UIP_ACKDATA)) {
+      uip_slen = 0;
+      UIP_APPCALL();
 
       appsend:
 
-        if(uip_flags & UIP_ABORT) {
-          uip_slen = 0;
-          uip_connr->tcpstateflags = UIP_CLOSED;
-          UIP_TCP_BUF->flags = TCP_RST | TCP_ACK;
-          goto tcp_send_nodata;
-        }
+      if(uip_flags & UIP_ABORT) {
+        uip_slen = 0;
+        uip_connr->tcpstateflags = UIP_CLOSED;
+        UIP_TCP_BUF->flags = TCP_RST | TCP_ACK;
+        goto tcp_send_nodata;
+      }
 
-        if(uip_flags & UIP_CLOSE) {
-          uip_slen = 0;
-          uip_connr->len = 1;
-          uip_connr->tcpstateflags = UIP_FIN_WAIT_1;
-          uip_connr->nrtx = 0;
-          UIP_TCP_BUF->flags = TCP_FIN | TCP_ACK;
-          goto tcp_send_nodata;
-        }
+      if(uip_flags & UIP_CLOSE) {
+        uip_slen = 0;
+        uip_connr->len = 1;
+        uip_connr->tcpstateflags = UIP_FIN_WAIT_1;
+        uip_connr->nrtx = 0;
+        UIP_TCP_BUF->flags = TCP_FIN | TCP_ACK;
+        goto tcp_send_nodata;
+      }
 
-        /* If uip_slen > 0, the application has data to be sent. */
-        if(uip_slen > 0) {
+      /* If uip_slen > 0, the application has data to be sent. */
+      if(uip_slen > 0) {
 
-          /* If the connection has acknowledged data, the contents of
+        /* If the connection has acknowledged data, the contents of
              the ->len variable should be discarded. */
-          if((uip_flags & UIP_ACKDATA) != 0) {
-            uip_connr->len = 0;
-          }
+        if((uip_flags & UIP_ACKDATA) != 0) {
+          uip_connr->len = 0;
+        }
 
-          /* If the ->len variable is non-zero the connection has
+        /* If the ->len variable is non-zero the connection has
              already data in transit and cannot send anymore right
              now. */
-          if(uip_connr->len == 0) {
+        if(uip_connr->len == 0) {
 
-            /* The application cannot send more than what is allowed by
+          /* The application cannot send more than what is allowed by
                the mss (the minumum of the MSS and the available
                window). */
-            if(uip_slen > uip_connr->mss) {
-              uip_slen = uip_connr->mss;
-            }
+          if(uip_slen > uip_connr->mss) {
+            uip_slen = uip_connr->mss;
+          }
 
-            /* Remember how much data we send out now so that we know
+          /* Remember how much data we send out now so that we know
                when everything has been acknowledged. */
-            uip_connr->len = uip_slen;
-          } else {
+          uip_connr->len = uip_slen;
+        } else {
 
-            /* If the application already had unacknowledged data, we
+          /* If the application already had unacknowledged data, we
                make sure that the application does not send (i.e.,
                retransmit) out more than it previously sent out. */
-            uip_slen = uip_connr->len;
-          }
+          uip_slen = uip_connr->len;
         }
-        uip_connr->nrtx = 0;
+      }
+      uip_connr->nrtx = 0;
       apprexmit:
-        uip_appdata = uip_sappdata;
+      uip_appdata = uip_sappdata;
 
-        /* If the application has data to be sent, or if the incoming
+      /* If the application has data to be sent, or if the incoming
            packet had new data in it, we must send out a packet. */
-        if(uip_slen > 0 && uip_connr->len > 0) {
-          /* Add the length of the IP and TCP headers. */
-          uip_len = uip_connr->len + UIP_TCPIP_HLEN;
-          /* We always set the ACK flag in response packets. */
-          UIP_TCP_BUF->flags = TCP_ACK | TCP_PSH;
-          /* Send the packet. */
-          goto tcp_send_noopts;
-        }
-        /* If there is no data to send, just send out a pure ACK if
+      if(uip_slen > 0 && uip_connr->len > 0) {
+        /* Add the length of the IP and TCP headers. */
+        uip_len = uip_connr->len + UIP_TCPIP_HLEN;
+        /* We always set the ACK flag in response packets. */
+        UIP_TCP_BUF->flags = TCP_ACK | TCP_PSH;
+        /* Send the packet. */
+        goto tcp_send_noopts;
+      }
+      /* If there is no data to send, just send out a pure ACK if
            there is newdata. */
-        if(uip_flags & UIP_NEWDATA) {
-          uip_len = UIP_TCPIP_HLEN;
-          UIP_TCP_BUF->flags = TCP_ACK;
-          goto tcp_send_noopts;
-        }
+      if(uip_flags & UIP_NEWDATA) {
+        uip_len = UIP_TCPIP_HLEN;
+        UIP_TCP_BUF->flags = TCP_ACK;
+        goto tcp_send_noopts;
       }
-      goto drop;
-    case UIP_LAST_ACK:
-      /* We can close this connection if the peer has acknowledged our
+    }
+    goto drop;
+  case UIP_LAST_ACK:
+    /* We can close this connection if the peer has acknowledged our
          FIN. This is indicated by the UIP_ACKDATA flag. */
-      if(uip_flags & UIP_ACKDATA) {
-        uip_connr->tcpstateflags = UIP_CLOSED;
-        uip_flags = UIP_CLOSE;
-        UIP_APPCALL();
-      }
-      break;
+    if(uip_flags & UIP_ACKDATA) {
+      uip_connr->tcpstateflags = UIP_CLOSED;
+      uip_flags = UIP_CLOSE;
+      UIP_APPCALL();
+    }
+    break;
 
-    case UIP_FIN_WAIT_1:
-      /* The application has closed the connection, but the remote host
+  case UIP_FIN_WAIT_1:
+    /* The application has closed the connection, but the remote host
          hasn't closed its end yet. Thus we do nothing but wait for a
          FIN from the other side. */
-      if(uip_len > 0) {
-        uip_add_rcv_nxt(uip_len);
-      }
-      if(UIP_TCP_BUF->flags & TCP_FIN) {
-        if(uip_flags & UIP_ACKDATA) {
-          uip_connr->tcpstateflags = UIP_TIME_WAIT;
-          uip_connr->timer = 0;
-          uip_connr->len = 0;
-        } else {
-          uip_connr->tcpstateflags = UIP_CLOSING;
-        }
-        uip_add_rcv_nxt(1);
-        uip_flags = UIP_CLOSE;
-        UIP_APPCALL();
-        goto tcp_send_ack;
-      } else if(uip_flags & UIP_ACKDATA) {
-        uip_connr->tcpstateflags = UIP_FIN_WAIT_2;
-        uip_connr->len = 0;
-        goto drop;
-      }
-      if(uip_len > 0) {
-        goto tcp_send_ack;
-      }
-      goto drop;
-
-    case UIP_FIN_WAIT_2:
-      if(uip_len > 0) {
-        uip_add_rcv_nxt(uip_len);
-      }
-      if(UIP_TCP_BUF->flags & TCP_FIN) {
-        uip_connr->tcpstateflags = UIP_TIME_WAIT;
-        uip_connr->timer = 0;
-        uip_add_rcv_nxt(1);
-        uip_flags = UIP_CLOSE;
-        UIP_APPCALL();
-        goto tcp_send_ack;
-      }
-      if(uip_len > 0) {
-        goto tcp_send_ack;
-      }
-      goto drop;
-
-    case UIP_TIME_WAIT:
-      goto tcp_send_ack;
-
-    case UIP_CLOSING:
+    if(uip_len > 0) {
+      uip_add_rcv_nxt(uip_len);
+    }
+    if(UIP_TCP_BUF->flags & TCP_FIN) {
       if(uip_flags & UIP_ACKDATA) {
         uip_connr->tcpstateflags = UIP_TIME_WAIT;
         uip_connr->timer = 0;
+        uip_connr->len = 0;
+      } else {
+        uip_connr->tcpstateflags = UIP_CLOSING;
       }
+      uip_add_rcv_nxt(1);
+      uip_flags = UIP_CLOSE;
+      UIP_APPCALL();
+      goto tcp_send_ack;
+    } else if(uip_flags & UIP_ACKDATA) {
+      uip_connr->tcpstateflags = UIP_FIN_WAIT_2;
+      uip_connr->len = 0;
+      goto drop;
+    }
+    if(uip_len > 0) {
+      goto tcp_send_ack;
+    }
+    goto drop;
+
+  case UIP_FIN_WAIT_2:
+    if(uip_len > 0) {
+      uip_add_rcv_nxt(uip_len);
+    }
+    if(UIP_TCP_BUF->flags & TCP_FIN) {
+      uip_connr->tcpstateflags = UIP_TIME_WAIT;
+      uip_connr->timer = 0;
+      uip_add_rcv_nxt(1);
+      uip_flags = UIP_CLOSE;
+      UIP_APPCALL();
+      goto tcp_send_ack;
+    }
+    if(uip_len > 0) {
+      goto tcp_send_ack;
+    }
+    goto drop;
+
+  case UIP_TIME_WAIT:
+    goto tcp_send_ack;
+
+  case UIP_CLOSING:
+    if(uip_flags & UIP_ACKDATA) {
+      uip_connr->tcpstateflags = UIP_TIME_WAIT;
+      uip_connr->timer = 0;
+    }
   }
   goto drop;
 
   /* We jump here when we are ready to send the packet, and just want
      to set the appropriate TCP sequence numbers in the TCP header. */
- tcp_send_ack:
+  tcp_send_ack:
   UIP_TCP_BUF->flags = TCP_ACK;
 
- tcp_send_nodata:
+  tcp_send_nodata:
   uip_len = UIP_IPTCPH_LEN;
 
- tcp_send_noopts:
+  tcp_send_noopts:
   UIP_TCP_BUF->tcpoffset = (UIP_TCPH_LEN / 4) << 4;
 
   /* We're done with the input processing. We are now ready to send a
      reply. Our job is to fill in all the fields of the TCP and IP
      headers before calculating the checksum and finally send the
      packet. */
- tcp_send:
+  tcp_send:
   PRINTF("In tcp_send\n");
 
   UIP_TCP_BUF->ackno[0] = uip_connr->rcv_nxt[0];
@@ -2276,7 +2276,7 @@ uip_process(uint8_t flag)
     UIP_TCP_BUF->wnd[1] = ((UIP_RECEIVE_WINDOW) & 0xff);
   }
 
- tcp_send_noconn:
+  tcp_send_noconn:
   UIP_IP_BUF->proto = UIP_PROTO_TCP;
 
   UIP_IP_BUF->ttl = uip_ds6_if.cur_hop_limit;
@@ -2292,21 +2292,21 @@ uip_process(uint8_t flag)
 
 #endif /* UIP_TCP */
 #if UIP_UDP
- ip_send_nolen:
+  ip_send_nolen:
 #endif
   UIP_IP_BUF->vtc = 0x60;
   UIP_IP_BUF->tcflow = 0x00;
   UIP_IP_BUF->flow = 0x00;
- send:
+  send:
   PRINTF("Sending packet with length %d (%d)\n", uip_len,
-         (UIP_IP_BUF->len[0] << 8) | UIP_IP_BUF->len[1]);
+      (UIP_IP_BUF->len[0] << 8) | UIP_IP_BUF->len[1]);
 
   UIP_STAT(++uip_stat.ip.sent);
   /* Return and let the caller do the actual transmission. */
   uip_flags = 0;
   return;
 
- drop:
+  drop:
   uip_clear_buf();
   uip_ext_bitmap = 0;
   uip_flags = 0;
@@ -2332,8 +2332,8 @@ uip_send(const void *data, int len)
 
   if(uip_sappdata != NULL) {
     copylen = MIN(len, UIP_BUFSIZE - UIP_LLH_LEN - UIP_TCPIP_HLEN -
-                  (int)((char *)uip_sappdata -
-                        (char *)&uip_buf[UIP_LLH_LEN + UIP_TCPIP_HLEN]));
+        (int)((char *)uip_sappdata -
+            (char *)&uip_buf[UIP_LLH_LEN + UIP_TCPIP_HLEN]));
   } else {
     copylen = MIN(len, UIP_BUFSIZE - UIP_LLH_LEN - UIP_TCPIP_HLEN);
   }
@@ -2342,7 +2342,7 @@ uip_send(const void *data, int len)
     if(data != uip_sappdata) {
       if(uip_sappdata == NULL) {
         memcpy((char *)&uip_buf[UIP_LLH_LEN + UIP_TCPIP_HLEN],
-               (data), uip_slen);
+            (data), uip_slen);
       } else {
         memcpy(uip_sappdata, (data), uip_slen);
       }

From e1ea4955c71d61293cd80aeed768ba5e307e8f59 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Sat, 23 Apr 2016 00:28:07 +0200
Subject: [PATCH 201/393] TSCH: remove 'not for us' log

---
 core/net/mac/tsch/tsch-slot-operation.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/core/net/mac/tsch/tsch-slot-operation.c b/core/net/mac/tsch/tsch-slot-operation.c
index 03905617e..7c3257c84 100644
--- a/core/net/mac/tsch/tsch-slot-operation.c
+++ b/core/net/mac/tsch/tsch-slot-operation.c
@@ -810,12 +810,6 @@ PT_THREAD(tsch_rx_slot(struct pt *pt, struct rtimer *t))
               log->rx.sec_level = frame.aux_hdr.security_control.security_level;
               log->rx.estimated_drift = estimated_drift;
             );
-          } else {
-            TSCH_LOG_ADD(tsch_log_message,
-                  snprintf(log->message, sizeof(log->message),
-                      "!not for us %x:%x",
-                      destination_address.u8[LINKADDR_SIZE - 2], destination_address.u8[LINKADDR_SIZE - 1]);
-            );
           }
 
           /* Poll process for processing of pending input and logs */

From 39921f1231b807c34eb036a12148b3b0d24780c6 Mon Sep 17 00:00:00 2001
From: kkrentz <konrad.krentz@gmail.com>
Date: Sun, 24 Apr 2016 00:59:07 -0700
Subject: [PATCH 202/393] rdc.h: Read LLSEC802154_ENABLED instead of
 LLSEC802154_CONF_ENABLED

---
 core/net/mac/rdc.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/net/mac/rdc.h b/core/net/mac/rdc.h
index 72717455b..8ac34e444 100644
--- a/core/net/mac/rdc.h
+++ b/core/net/mac/rdc.h
@@ -43,6 +43,7 @@
 
 #include "contiki-conf.h"
 #include "net/mac/mac.h"
+#include "net/llsec/llsec802154.h"
 
 #ifdef RDC_CONF_WITH_DUPLICATE_DETECTION
 #define RDC_WITH_DUPLICATE_DETECTION RDC_CONF_WITH_DUPLICATE_DETECTION
@@ -51,7 +52,7 @@
    frame because it has seen its sequence number already. Replay
    protection should be implemented at the LLSEC layer where the
    authenticity of frames is verified. */
-#define RDC_WITH_DUPLICATE_DETECTION !LLSEC802154_CONF_ENABLED
+#define RDC_WITH_DUPLICATE_DETECTION !LLSEC802154_ENABLED
 #endif /* RDC_CONF_WITH_DUPLICATE_DETECTION */
 
 /* List of packets to be sent by RDC layer */

From ca0f32f45b23dfe8c0193c873d9433427bffda23 Mon Sep 17 00:00:00 2001
From: Billy Kozak <bkozak@scanimetrics.com>
Date: Fri, 1 Apr 2016 10:41:02 -0600
Subject: [PATCH 203/393] Use collisions for csma backoff and retry

The collision count is now used in the calculation fot the CSMA
backoff and transmission will fail after a certain number of
collisisons.
---
 core/net/mac/csma.c | 218 +++++++++++++++++++++++++-------------------
 1 file changed, 126 insertions(+), 92 deletions(-)

diff --git a/core/net/mac/csma.c b/core/net/mac/csma.c
index 4de46be19..e6f79b066 100644
--- a/core/net/mac/csma.c
+++ b/core/net/mac/csma.c
@@ -123,7 +123,6 @@ LIST(neighbor_list);
 
 static void packet_sent(void *ptr, int status, int num_transmissions);
 static void transmit_packet_list(void *ptr);
-
 /*---------------------------------------------------------------------------*/
 static struct neighbor_queue *
 neighbor_queue_from_addr(const linkaddr_t *addr)
@@ -150,7 +149,7 @@ default_timebase(void)
      does not turn the radio off), we make the retransmission time
      proportional to the configured MAC channel check rate. */
   if(time == 0) {
-    time = CLOCK_SECOND / NETSTACK_RDC_CHANNEL_CHECK_RATE;
+    time = (CLOCK_SECOND / 3125) ? (CLOCK_SECOND / 3125) : 1;
   }
   return time;
 }
@@ -202,34 +201,116 @@ free_packet(struct neighbor_queue *n, struct rdc_buf_list *p, int status)
 }
 /*---------------------------------------------------------------------------*/
 static void
+tx_done(int status, struct rdc_buf_list *q, struct neighbor_queue *n)
+{
+  mac_callback_t sent;
+  struct qbuf_metadata *metadata;
+  void *cptr;
+
+  metadata = (struct qbuf_metadata *)q->ptr;
+  sent = metadata->sent;
+  cptr = metadata->cptr;
+
+  switch(status) {
+  case MAC_TX_OK:
+    PRINTF("csma: rexmit ok %d\n", n->transmissions);
+    break;
+  case MAC_TX_COLLISION:
+  case MAC_TX_NOACK:
+    PRINTF("csma: drop with status %d after %d transmissions, %d collisions\n",
+                 status, n->transmissions, n->collisions);
+    break;
+  default:
+    PRINTF("csma: rexmit failed %d: %d\n", n->transmissions, status);
+    break;
+  }
+
+  free_packet(n, q, status);
+  mac_call_sent_callback(sent, cptr, status, n->transmissions);
+}
+/*---------------------------------------------------------------------------*/
+static void
+rexmit(struct rdc_buf_list *q, struct neighbor_queue *n)
+{
+  clock_time_t time;
+  int backoff_exponent;
+  int backoff_transmissions;
+
+  time = default_timebase();
+  backoff_exponent = n->collisions;
+
+  /* Proceed to exponentiation. */
+  backoff_transmissions = 1 << backoff_exponent;
+
+  /* Pick a time for next transmission, within the interval:
+         * [time, time + 2^backoff_exponent * time[ */
+  time = time + (random_rand() % (backoff_transmissions * time));
+
+  PRINTF("csma: retransmitting with time %lu %p\n", time, q);
+  ctimer_set(&n->transmit_timer, time, transmit_packet_list, n);
+  /* This is needed to correctly attribute energy that we spent
+     transmitting this packet. */
+  queuebuf_update_attr_from_packetbuf(q->buf);
+}
+/*---------------------------------------------------------------------------*/
+static void
+collision(struct rdc_buf_list *q, struct neighbor_queue *n,
+          int num_transmissions)
+{
+  struct qbuf_metadata *metadata;
+
+  metadata = (struct qbuf_metadata *)q->ptr;
+
+  n->collisions += num_transmissions;
+
+  if(n->collisions > CSMA_MAX_BACKOFF_EXPONENT) {
+    n->collisions = 0;
+    n->transmissions += num_transmissions;
+  }
+
+  if(n->transmissions >= metadata->max_transmissions) {
+    tx_done(MAC_TX_COLLISION, q, n);
+  } else {
+    PRINTF("csma: rexmit collision %d\n", n->transmissions);
+    rexmit(q, n);
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+noack(struct rdc_buf_list *q, struct neighbor_queue *n, int num_transmissions)
+{
+  struct qbuf_metadata *metadata;
+
+  metadata = (struct qbuf_metadata *)q->ptr;
+
+  n->transmissions += num_transmissions;
+  n->collisions = 0;
+
+  if(n->transmissions >= metadata->max_transmissions) {
+    tx_done(MAC_TX_NOACK, q, n);
+  } else {
+    PRINTF("csma: rexmit noack %d\n", n->transmissions);
+    rexmit(q, n);
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+tx_ok(struct rdc_buf_list *q, struct neighbor_queue *n, int num_transmissions)
+{
+  n->transmissions += num_transmissions;
+  tx_done(MAC_TX_OK, q, n);
+}
+/*---------------------------------------------------------------------------*/
+static void
 packet_sent(void *ptr, int status, int num_transmissions)
 {
   struct neighbor_queue *n;
   struct rdc_buf_list *q;
-  struct qbuf_metadata *metadata;
-  clock_time_t time = 0;
-  mac_callback_t sent;
-  void *cptr;
-  int num_tx;
-  int backoff_exponent;
-  int backoff_transmissions;
 
   n = ptr;
   if(n == NULL) {
     return;
   }
-  switch(status) {
-  case MAC_TX_OK:
-  case MAC_TX_NOACK:
-    n->transmissions += num_transmissions;
-    break;
-  case MAC_TX_COLLISION:
-    n->collisions += num_transmissions;
-    break;
-  case MAC_TX_DEFERRED:
-    n->deferrals += num_transmissions;
-    break;
-  }
 
   /* Find out what packet this callback refers to */
   for(q = list_head(n->queued_packet_list);
@@ -240,78 +321,31 @@ packet_sent(void *ptr, int status, int num_transmissions)
     }
   }
 
-  if(q != NULL) {
-    metadata = (struct qbuf_metadata *)q->ptr;
+  if(q == NULL) {
+    PRINTF("csma: seqno %d not found\n",
+           packetbuf_attr(PACKETBUF_ATTR_MAC_SEQNO));
+    return;
+  } else if(q->ptr == NULL) {
+    PRINTF("csma: no metadata\n");
+    return;
+  }
 
-    if(metadata != NULL) {
-      sent = metadata->sent;
-      cptr = metadata->cptr;
-      num_tx = n->transmissions;
-      if(status == MAC_TX_COLLISION ||
-         status == MAC_TX_NOACK) {
-
-        /* If the transmission was not performed because of a
-           collision or noack, we must retransmit the packet. */
-
-        switch(status) {
-        case MAC_TX_COLLISION:
-          PRINTF("csma: rexmit collision %d\n", n->transmissions);
-          break;
-        case MAC_TX_NOACK:
-          PRINTF("csma: rexmit noack %d\n", n->transmissions);
-          break;
-        default:
-          PRINTF("csma: rexmit err %d, %d\n", status, n->transmissions);
-        }
-
-        /* The retransmission time must be proportional to the channel
-           check interval of the underlying radio duty cycling layer. */
-        time = default_timebase();
-
-        /* The retransmission time uses a truncated exponential backoff
-         * so that the interval between the transmissions increase with
-         * each retransmit. */
-        backoff_exponent = num_tx;
-
-        /* Truncate the exponent if needed. */
-        if(backoff_exponent > CSMA_MAX_BACKOFF_EXPONENT) {
-          backoff_exponent = CSMA_MAX_BACKOFF_EXPONENT;
-        }
-
-        /* Proceed to exponentiation. */
-        backoff_transmissions = 1 << backoff_exponent;
-
-        /* Pick a time for next transmission, within the interval:
-         * [time, time + 2^backoff_exponent * time[ */
-        time = time + (random_rand() % (backoff_transmissions * time));
-
-        if(n->transmissions < metadata->max_transmissions) {
-          PRINTF("csma: retransmitting with time %lu %p\n", time, q);
-          ctimer_set(&n->transmit_timer, time,
-                     transmit_packet_list, n);
-          /* This is needed to correctly attribute energy that we spent
-             transmitting this packet. */
-          queuebuf_update_attr_from_packetbuf(q->buf);
-        } else {
-          PRINTF("csma: drop with status %d after %d transmissions, %d collisions\n",
-                 status, n->transmissions, n->collisions);
-          free_packet(n, q, status);
-          mac_call_sent_callback(sent, cptr, status, num_tx);
-        }
-      } else {
-        if(status == MAC_TX_OK) {
-          PRINTF("csma: rexmit ok %d\n", n->transmissions);
-        } else {
-          PRINTF("csma: rexmit failed %d: %d\n", n->transmissions, status);
-        }
-        free_packet(n, q, status);
-        mac_call_sent_callback(sent, cptr, status, num_tx);
-      }
-    } else {
-      PRINTF("csma: no metadata\n");
-    }
-  } else {
-    PRINTF("csma: seqno %d not found\n", packetbuf_attr(PACKETBUF_ATTR_MAC_SEQNO));
+  switch(status) {
+  case MAC_TX_OK:
+    tx_ok(q, n, num_transmissions);
+    break;
+  case MAC_TX_NOACK:
+    noack(q, n, num_transmissions);
+    break;
+  case MAC_TX_COLLISION:
+    collision(q, n, num_transmissions);
+    break;
+  case MAC_TX_DEFERRED:
+    n->deferrals += num_transmissions;
+    break;
+  default:
+    tx_done(status, q, n);
+    break;
   }
 }
 /*---------------------------------------------------------------------------*/

From 90b886aa71499a8486549f97ad7107fc487e7c0a Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Fri, 22 Apr 2016 23:27:43 +0200
Subject: [PATCH 204/393] Csma: comply with IEEE 802.15.4

---
 core/contiki-default-conf.h                 |   8 --
 core/net/ipv6/sicslowpan.c                  |   9 --
 core/net/mac/csma.c                         | 120 +++++++++++---------
 platform/cooja/contiki-conf.h               |   3 -
 platform/exp5438/contiki-conf.h             |   3 -
 platform/jn516x/contiki-conf.h              |   3 -
 platform/native/contiki-conf.h              |   3 -
 platform/sky/contiki-conf.h                 |   3 -
 platform/stm32nucleo-spirit1/contiki-conf.h |   4 -
 platform/wismote/contiki-conf.h             |   3 -
 10 files changed, 65 insertions(+), 94 deletions(-)

diff --git a/core/contiki-default-conf.h b/core/contiki-default-conf.h
index ed82c73ac..36bf6afe1 100644
--- a/core/contiki-default-conf.h
+++ b/core/contiki-default-conf.h
@@ -220,14 +220,6 @@
  * on the target platform, and are therefore platform-specific.
  */
 
-/* SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS specifies how many times the
-   MAC layer should resend packets if no link-layer ACK was
-   received. This only makes sense with the csma_driver
-   NETSTACK_CONF_MAC. */
-#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
-#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS 4
-#endif /* SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS */
-
 /* SICSLOWPAN_CONF_FRAG specifies if 6lowpan fragmentation should be
    used or not. Fragmentation is on by default. */
 #ifndef SICSLOWPAN_CONF_FRAG
diff --git a/core/net/ipv6/sicslowpan.c b/core/net/ipv6/sicslowpan.c
index de9d78181..942acd13b 100644
--- a/core/net/ipv6/sicslowpan.c
+++ b/core/net/ipv6/sicslowpan.c
@@ -92,12 +92,6 @@ void uip_log(char *msg);
 #define UIP_LOG(m)
 #endif /* UIP_LOGGING == 1 */
 
-#ifdef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
-#define SICSLOWPAN_MAX_MAC_TRANSMISSIONS SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
-#else
-#define SICSLOWPAN_MAX_MAC_TRANSMISSIONS 4
-#endif
-
 #ifndef SICSLOWPAN_COMPRESSION
 #ifdef SICSLOWPAN_CONF_COMPRESSION
 #define SICSLOWPAN_COMPRESSION SICSLOWPAN_CONF_COMPRESSION
@@ -1290,9 +1284,6 @@ output(const uip_lladdr_t *localdest)
   packetbuf_clear();
   packetbuf_ptr = packetbuf_dataptr();
 
-  packetbuf_set_attr(PACKETBUF_ATTR_MAX_MAC_TRANSMISSIONS,
-                     SICSLOWPAN_MAX_MAC_TRANSMISSIONS);
-
   if(callback) {
     /* call the attribution when the callback comes, but set attributes
        here ! */
diff --git a/core/net/mac/csma.c b/core/net/mac/csma.c
index e6f79b066..eea86b4e8 100644
--- a/core/net/mac/csma.c
+++ b/core/net/mac/csma.c
@@ -63,26 +63,35 @@
 #define PRINTF(...)
 #endif /* DEBUG */
 
-#ifndef CSMA_MAX_BACKOFF_EXPONENT
-#ifdef CSMA_CONF_MAX_BACKOFF_EXPONENT
-#define CSMA_MAX_BACKOFF_EXPONENT CSMA_CONF_MAX_BACKOFF_EXPONENT
-#else
-#define CSMA_MAX_BACKOFF_EXPONENT 3
-#endif /* CSMA_CONF_MAX_BACKOFF_EXPONENT */
-#endif /* CSMA_MAX_BACKOFF_EXPONENT */
+/* Constants of the IEEE 802.15.4 standard */
 
-#ifndef CSMA_MAX_MAC_TRANSMISSIONS
-#ifdef CSMA_CONF_MAX_MAC_TRANSMISSIONS
-#define CSMA_MAX_MAC_TRANSMISSIONS CSMA_CONF_MAX_MAC_TRANSMISSIONS
+/* macMinBE: Initial backoff exponent. Range 0--CSMA_MAX_BE */
+#ifdef CSMA_CONF_MIN_BE
+#define CSMA_MIN_BE CSMA_CONF_MIN_BE
 #else
-#define CSMA_MAX_MAC_TRANSMISSIONS 3
-#endif /* CSMA_CONF_MAX_MAC_TRANSMISSIONS */
-#endif /* CSMA_MAX_MAC_TRANSMISSIONS */
+#define CSMA_MIN_BE 0
+#endif
 
-#if CSMA_MAX_MAC_TRANSMISSIONS < 1
-#error CSMA_CONF_MAX_MAC_TRANSMISSIONS must be at least 1.
-#error Change CSMA_CONF_MAX_MAC_TRANSMISSIONS in contiki-conf.h or in your Makefile.
-#endif /* CSMA_CONF_MAX_MAC_TRANSMISSIONS < 1 */
+/* macMaxBE: Maximum backoff exponent. Range 3--8 */
+#ifdef CSMA_CONF_MAX_BE
+#define CSMA_MAX_BE CSMA_CONF_MAX_BE
+#else
+#define CSMA_MAX_BE 4
+#endif
+
+/* macMaxCSMABackoffs: Maximum number of backoffs in case of channel busy/collision. Range 0--5 */
+#ifdef CSMA_CONF_MAX_BACKOFF
+#define CSMA_MAX_BACKOFF CSMA_CONF_MAX_BACKOFF
+#else
+#define CSMA_MAX_BACKOFF 5
+#endif
+
+/* macMaxFrameRetries: Maximum number of re-transmissions attampts. Range 0--7 */
+#ifdef CSMA_CONF_MAX_FRAME_RETRIES
+#define CSMA_MAX_MAX_FRAME_RETRIES CSMA_CONF_MAX_FRAME_RETRIES
+#else
+#define CSMA_MAX_MAX_FRAME_RETRIES 7
+#endif
 
 /* Packet metadata */
 struct qbuf_metadata {
@@ -97,7 +106,7 @@ struct neighbor_queue {
   linkaddr_t addr;
   struct ctimer transmit_timer;
   uint8_t transmissions;
-  uint8_t collisions, deferrals;
+  uint8_t collisions;
   LIST_STRUCT(queued_packet_list);
 };
 
@@ -138,18 +147,18 @@ neighbor_queue_from_addr(const linkaddr_t *addr)
 }
 /*---------------------------------------------------------------------------*/
 static clock_time_t
-default_timebase(void)
+backoff_period(void)
 {
   clock_time_t time;
   /* The retransmission time must be proportional to the channel
      check interval of the underlying radio duty cycling layer. */
   time = NETSTACK_RDC.channel_check_interval();
 
-  /* If the radio duty cycle has no channel check interval (i.e., it
-     does not turn the radio off), we make the retransmission time
-     proportional to the configured MAC channel check rate. */
+  /* If the radio duty cycle has no channel check interval, we use
+   * the default in IEEE 802.15.4: aUnitBackoffPeriod which is
+   * 20 symbols i.e. 320 usec. That is, 1/3125 second. */
   if(time == 0) {
-    time = (CLOCK_SECOND / 3125) ? (CLOCK_SECOND / 3125) : 1;
+    time = MAX(CLOCK_SECOND / 3125, 1);
   }
   return time;
 }
@@ -170,10 +179,28 @@ transmit_packet_list(void *ptr)
 }
 /*---------------------------------------------------------------------------*/
 static void
+schedule_transmission(struct neighbor_queue *n)
+{
+  clock_time_t delay;
+  int backoff_exponent; /* BE in IEEE 802.15.4 */
+
+  backoff_exponent = MIN(n->collisions, CSMA_MAX_BE);
+
+  /* Compute max delay as per IEEE 802.15.4: 2^BE-1 backoff periods  */
+  delay = ((1 << backoff_exponent) - 1) * backoff_period();
+  if(delay > 0) {
+    /* Pick a time for next transmission */
+    delay = random_rand() % delay;
+  }
+
+  PRINTF("csma: scheduling transmission in %u ticks, NB=%u, BE=%u\n",
+      (unsigned)delay, n->collisions, backoff_exponent);
+  ctimer_set(&n->transmit_timer, delay, transmit_packet_list, n);
+}
+/*---------------------------------------------------------------------------*/
+static void
 free_packet(struct neighbor_queue *n, struct rdc_buf_list *p, int status)
 {
-  clock_time_t tx_delay;
-
   if(p != NULL) {
     /* Remove packet from list and deallocate */
     list_remove(n->queued_packet_list, p);
@@ -186,11 +213,9 @@ free_packet(struct neighbor_queue *n, struct rdc_buf_list *p, int status)
     if(list_head(n->queued_packet_list) != NULL) {
       /* There is a next packet. We reset current tx information */
       n->transmissions = 0;
-      n->collisions = 0;
-      n->deferrals = 0;
-      /* Set a timer for next transmissions */
-      tx_delay = (status == MAC_TX_OK) ? 0 : default_timebase();
-      ctimer_set(&n->transmit_timer, tx_delay, transmit_packet_list, n);
+      n->collisions = CSMA_MIN_BE;
+      /* Schedule next transmissions */
+      schedule_transmission(n);
     } else {
       /* This was the last packet in the queue, we free the neighbor */
       ctimer_stop(&n->transmit_timer);
@@ -232,22 +257,7 @@ tx_done(int status, struct rdc_buf_list *q, struct neighbor_queue *n)
 static void
 rexmit(struct rdc_buf_list *q, struct neighbor_queue *n)
 {
-  clock_time_t time;
-  int backoff_exponent;
-  int backoff_transmissions;
-
-  time = default_timebase();
-  backoff_exponent = n->collisions;
-
-  /* Proceed to exponentiation. */
-  backoff_transmissions = 1 << backoff_exponent;
-
-  /* Pick a time for next transmission, within the interval:
-         * [time, time + 2^backoff_exponent * time[ */
-  time = time + (random_rand() % (backoff_transmissions * time));
-
-  PRINTF("csma: retransmitting with time %lu %p\n", time, q);
-  ctimer_set(&n->transmit_timer, time, transmit_packet_list, n);
+  schedule_transmission(n);
   /* This is needed to correctly attribute energy that we spent
      transmitting this packet. */
   queuebuf_update_attr_from_packetbuf(q->buf);
@@ -263,9 +273,10 @@ collision(struct rdc_buf_list *q, struct neighbor_queue *n,
 
   n->collisions += num_transmissions;
 
-  if(n->collisions > CSMA_MAX_BACKOFF_EXPONENT) {
-    n->collisions = 0;
-    n->transmissions += num_transmissions;
+  if(n->collisions > CSMA_MAX_BACKOFF) {
+    n->collisions = CSMA_MIN_BE;
+    /* Increment to indicate a next retry */
+    n->transmissions++;
   }
 
   if(n->transmissions >= metadata->max_transmissions) {
@@ -283,8 +294,8 @@ noack(struct rdc_buf_list *q, struct neighbor_queue *n, int num_transmissions)
 
   metadata = (struct qbuf_metadata *)q->ptr;
 
+  n->collisions = CSMA_MIN_BE;
   n->transmissions += num_transmissions;
-  n->collisions = 0;
 
   if(n->transmissions >= metadata->max_transmissions) {
     tx_done(MAC_TX_NOACK, q, n);
@@ -297,6 +308,7 @@ noack(struct rdc_buf_list *q, struct neighbor_queue *n, int num_transmissions)
 static void
 tx_ok(struct rdc_buf_list *q, struct neighbor_queue *n, int num_transmissions)
 {
+  n->collisions = CSMA_MIN_BE;
   n->transmissions += num_transmissions;
   tx_done(MAC_TX_OK, q, n);
 }
@@ -341,7 +353,6 @@ packet_sent(void *ptr, int status, int num_transmissions)
     collision(q, n, num_transmissions);
     break;
   case MAC_TX_DEFERRED:
-    n->deferrals += num_transmissions;
     break;
   default:
     tx_done(status, q, n);
@@ -380,8 +391,7 @@ send_packet(mac_callback_t sent, void *ptr)
       /* Init neighbor entry */
       linkaddr_copy(&n->addr, addr);
       n->transmissions = 0;
-      n->collisions = 0;
-      n->deferrals = 0;
+      n->collisions = CSMA_MIN_BE;
       /* Init packet list for this neighbor */
       LIST_STRUCT_INIT(n, queued_packet_list);
       /* Add neighbor to the list */
@@ -402,7 +412,7 @@ send_packet(mac_callback_t sent, void *ptr)
             /* Neighbor and packet successfully allocated */
             if(packetbuf_attr(PACKETBUF_ATTR_MAX_MAC_TRANSMISSIONS) == 0) {
               /* Use default configuration for max transmissions */
-              metadata->max_transmissions = CSMA_MAX_MAC_TRANSMISSIONS;
+              metadata->max_transmissions = CSMA_MAX_MAX_FRAME_RETRIES + 1;
             } else {
               metadata->max_transmissions =
                 packetbuf_attr(PACKETBUF_ATTR_MAX_MAC_TRANSMISSIONS);
@@ -423,7 +433,7 @@ send_packet(mac_callback_t sent, void *ptr)
                    list_length(n->queued_packet_list), memb_numfree(&packet_memb));
             /* If q is the first packet in the neighbor's queue, send asap */
             if(list_head(n->queued_packet_list) == q) {
-              ctimer_set(&n->transmit_timer, 0, transmit_packet_list, n);
+              schedule_transmission(n);
             }
             return;
           }
diff --git a/platform/cooja/contiki-conf.h b/platform/cooja/contiki-conf.h
index 04f1c4d43..dba7e9553 100644
--- a/platform/cooja/contiki-conf.h
+++ b/platform/cooja/contiki-conf.h
@@ -168,9 +168,6 @@
 #define SICSLOWPAN_CONF_MAXAGE                  8
 #endif /* SICSLOWPAN_CONF_FRAG */
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS       2
-#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
-#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS   8
-#endif /* SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS */
 
 #endif /* NETSTACK_CONF_WITH_IPV6 */
 
diff --git a/platform/exp5438/contiki-conf.h b/platform/exp5438/contiki-conf.h
index bb7a5fcdd..9220ba890 100644
--- a/platform/exp5438/contiki-conf.h
+++ b/platform/exp5438/contiki-conf.h
@@ -174,9 +174,6 @@
 #define SICSLOWPAN_CONF_MAXAGE                  8
 #endif /* SICSLOWPAN_CONF_FRAG */
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS       2
-#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
-#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS   5
-#endif /* SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS */
 #else /* NETSTACK_CONF_WITH_IPV6 */
 #define UIP_CONF_IP_FORWARD      1
 #define UIP_CONF_BUFFER_SIZE     108
diff --git a/platform/jn516x/contiki-conf.h b/platform/jn516x/contiki-conf.h
index 8b702a56e..1a326f62b 100644
--- a/platform/jn516x/contiki-conf.h
+++ b/platform/jn516x/contiki-conf.h
@@ -154,9 +154,6 @@
 #define SICSLOWPAN_CONF_MAXAGE                  8
 #endif /* SICSLOWPAN_CONF_FRAG */
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS       2
-#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
-#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS   5
-#endif /* SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS */
 #define UIP_CONF_ICMP_DEST_UNREACH 1
 
 #define UIP_CONF_DHCP_LIGHT
diff --git a/platform/native/contiki-conf.h b/platform/native/contiki-conf.h
index e011bff96..03eacbbde 100644
--- a/platform/native/contiki-conf.h
+++ b/platform/native/contiki-conf.h
@@ -110,9 +110,6 @@ typedef unsigned short uip_stats_t;
 #define SICSLOWPAN_CONF_MAXAGE                  8
 #endif /* SICSLOWPAN_CONF_FRAG */
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS       2
-#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
-#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS   5
-#endif /* SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS */
 
 #define UIP_CONF_IPV6_CHECKS     1
 #define UIP_CONF_IPV6_QUEUE_PKT  1
diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h
index ff4ad8578..39d8bc882 100644
--- a/platform/sky/contiki-conf.h
+++ b/platform/sky/contiki-conf.h
@@ -179,9 +179,6 @@
 #define SICSLOWPAN_CONF_MAXAGE                  8
 #endif /* SICSLOWPAN_CONF_FRAG */
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS       2
-#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
-#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS   5
-#endif /* SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS */
 #else /* NETSTACK_CONF_WITH_IPV6 */
 #define UIP_CONF_IP_FORWARD      1
 #define UIP_CONF_BUFFER_SIZE     108
diff --git a/platform/stm32nucleo-spirit1/contiki-conf.h b/platform/stm32nucleo-spirit1/contiki-conf.h
index 14baa8d97..9a97ab355 100644
--- a/platform/stm32nucleo-spirit1/contiki-conf.h
+++ b/platform/stm32nucleo-spirit1/contiki-conf.h
@@ -106,10 +106,6 @@
 #define SICSLOWPAN_CONF_MAXAGE                  4
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS       2
 
-#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
-#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS   5
-#endif /* SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS */
-
 #define UIP_CONF_ICMP_DEST_UNREACH 1
 
 #define UIP_CONF_DHCP_LIGHT
diff --git a/platform/wismote/contiki-conf.h b/platform/wismote/contiki-conf.h
index bcc6c10ca..f7150c5ff 100644
--- a/platform/wismote/contiki-conf.h
+++ b/platform/wismote/contiki-conf.h
@@ -157,9 +157,6 @@
 #define SICSLOWPAN_CONF_MAXAGE                  8
 #endif /* SICSLOWPAN_CONF_FRAG */
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS       2
-#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
-#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS   5
-#endif /* SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS */
 #else /* NETSTACK_CONF_WITH_IPV6 */
 #define UIP_CONF_IP_FORWARD      1
 #define UIP_CONF_BUFFER_SIZE     108

From abf08a71676f2f2935dfb3515db2246a9483b07e Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Wed, 20 Apr 2016 11:45:54 +0200
Subject: [PATCH 205/393] Added net-debug.[ch] to provide debug functions even
 in the non-IP case

---
 core/net/ip/uip-debug.c                 | 18 +-----
 core/net/ip/uip-debug.h                 | 38 ++---------
 core/net/mac/frame802154e-ie.c          |  2 +-
 core/net/mac/tsch/tsch-log.c            |  2 +-
 core/net/mac/tsch/tsch-packet.c         |  2 +-
 core/net/mac/tsch/tsch-queue.c          |  2 +-
 core/net/mac/tsch/tsch-rpl.c            |  2 +-
 core/net/mac/tsch/tsch-schedule.c       |  2 +-
 core/net/mac/tsch/tsch-security.c       |  2 +-
 core/net/mac/tsch/tsch-slot-operation.c |  2 +-
 core/net/mac/tsch/tsch.c                |  2 +-
 core/net/net-debug.c                    | 65 +++++++++++++++++++
 core/net/net-debug.h                    | 86 +++++++++++++++++++++++++
 platform/cc2530dk/uip-debug.c           | 12 ----
 platform/mbxxx/contiki-main.c           |  2 +-
 15 files changed, 166 insertions(+), 73 deletions(-)
 create mode 100644 core/net/net-debug.c
 create mode 100644 core/net/net-debug.h

diff --git a/core/net/ip/uip-debug.c b/core/net/ip/uip-debug.c
index ab3ba0765..7804ba4db 100644
--- a/core/net/ip/uip-debug.c
+++ b/core/net/ip/uip-debug.c
@@ -30,7 +30,7 @@
 
 /**
  * \file
- *         A set of debugging tools
+ *         A set of debugging tools for the IP stack
  * \author
  *         Nicolas Tsiftes <nvt@sics.se>
  *         Niclas Finne <nfi@sics.se>
@@ -92,19 +92,3 @@ uip_debug_ipaddr_print(const uip_ipaddr_t *addr)
 #endif /* NETSTACK_CONF_WITH_IPV6 */
 }
 /*---------------------------------------------------------------------------*/
-void
-uip_debug_lladdr_print(const uip_lladdr_t *addr)
-{
-  unsigned int i;
-  if(addr == NULL) {
-    PRINTA("(NULL LL addr)");
-    return;
-  }
-  for(i = 0; i < sizeof(uip_lladdr_t); i++) {
-    if(i > 0) {
-      PRINTA(":");
-    }
-    PRINTA("%02x", addr->addr[i]);
-  }
-}
-/*---------------------------------------------------------------------------*/
diff --git a/core/net/ip/uip-debug.h b/core/net/ip/uip-debug.h
index 6ffc1e638..d8e238fe4 100644
--- a/core/net/ip/uip-debug.h
+++ b/core/net/ip/uip-debug.h
@@ -31,57 +31,27 @@
  */
 /**
  * \file
- *         A set of debugging macros.
+ *         A set of debugging macros for the IP stack
  *
  * \author Nicolas Tsiftes <nvt@sics.se>
  *         Niclas Finne <nfi@sics.se>
  *         Joakim Eriksson <joakime@sics.se>
+ *         Simon Duquennoy <simon.duquennoy@inria.fr>
  */
 
 #ifndef UIP_DEBUG_H
 #define UIP_DEBUG_H
 
+#include "net/net-debug.h"
 #include "net/ip/uip.h"
 #include <stdio.h>
 
 void uip_debug_ipaddr_print(const uip_ipaddr_t *addr);
-void uip_debug_lladdr_print(const uip_lladdr_t *addr);
-
-#define DEBUG_NONE      0
-#define DEBUG_PRINT     1
-#define DEBUG_ANNOTATE  2
-#define DEBUG_FULL      DEBUG_ANNOTATE | DEBUG_PRINT
-
-/* PRINTA will always print if the debug routines are called directly */
-#ifdef __AVR__
-#include <avr/pgmspace.h>
-#define PRINTA(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
-#else
-#define PRINTA(...) printf(__VA_ARGS__)
-#endif
-
-#if (DEBUG) & DEBUG_ANNOTATE
-#ifdef __AVR__
-#define ANNOTATE(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
-#else
-#define ANNOTATE(...) printf(__VA_ARGS__)
-#endif
-#else
-#define ANNOTATE(...)
-#endif /* (DEBUG) & DEBUG_ANNOTATE */
 
 #if (DEBUG) & DEBUG_PRINT
-#ifdef __AVR__
-#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
-#else
-#define PRINTF(...) printf(__VA_ARGS__)
-#endif
 #define PRINT6ADDR(addr) uip_debug_ipaddr_print(addr)
-#define PRINTLLADDR(lladdr) uip_debug_lladdr_print(lladdr)
 #else
-#define PRINTF(...)
 #define PRINT6ADDR(addr)
-#define PRINTLLADDR(lladdr)
 #endif /* (DEBUG) & DEBUG_PRINT */
 
-#endif
+#endif /* UIP_DEBUG_H */
diff --git a/core/net/mac/frame802154e-ie.c b/core/net/mac/frame802154e-ie.c
index 55c397631..db0118889 100644
--- a/core/net/mac/frame802154e-ie.c
+++ b/core/net/mac/frame802154e-ie.c
@@ -41,7 +41,7 @@
 #include "net/mac/frame802154e-ie.h"
 
 #define DEBUG DEBUG_NONE
-#include "net/ip/uip-debug.h"
+#include "net/net-debug.h"
 
 /* c.f. IEEE 802.15.4e Table 4b */
 enum ieee802154e_header_ie_id {
diff --git a/core/net/mac/tsch/tsch-log.c b/core/net/mac/tsch/tsch-log.c
index bfb033e9d..8473648a6 100644
--- a/core/net/mac/tsch/tsch-log.c
+++ b/core/net/mac/tsch/tsch-log.c
@@ -56,7 +56,7 @@
 #else /* TSCH_LOG_LEVEL */
 #define DEBUG DEBUG_NONE
 #endif /* TSCH_LOG_LEVEL */
-#include "net/ip/uip-debug.h"
+#include "net/net-debug.h"
 
 #if TSCH_LOG_LEVEL >= 2 /* Skip this file for log levels 0 or 1 */
 
diff --git a/core/net/mac/tsch/tsch-packet.c b/core/net/mac/tsch/tsch-packet.c
index 9f9a8e107..17601d054 100644
--- a/core/net/mac/tsch/tsch-packet.c
+++ b/core/net/mac/tsch/tsch-packet.c
@@ -60,7 +60,7 @@
 #else /* TSCH_LOG_LEVEL */
 #define DEBUG DEBUG_NONE
 #endif /* TSCH_LOG_LEVEL */
-#include "net/ip/uip-debug.h"
+#include "net/net-debug.h"
 
 /*---------------------------------------------------------------------------*/
 /* Construct enhanced ACK packet and return ACK length */
diff --git a/core/net/mac/tsch/tsch-queue.c b/core/net/mac/tsch/tsch-queue.c
index 1fdf04232..e3f60f45c 100644
--- a/core/net/mac/tsch/tsch-queue.c
+++ b/core/net/mac/tsch/tsch-queue.c
@@ -61,7 +61,7 @@
 #else /* TSCH_LOG_LEVEL */
 #define DEBUG DEBUG_NONE
 #endif /* TSCH_LOG_LEVEL */
-#include "net/ip/uip-debug.h"
+#include "net/net-debug.h"
 
 /* Check if TSCH_QUEUE_NUM_PER_NEIGHBOR is power of two */
 #if (TSCH_QUEUE_NUM_PER_NEIGHBOR & (TSCH_QUEUE_NUM_PER_NEIGHBOR - 1)) != 0
diff --git a/core/net/mac/tsch/tsch-rpl.c b/core/net/mac/tsch/tsch-rpl.c
index 772c886b3..960f757f6 100644
--- a/core/net/mac/tsch/tsch-rpl.c
+++ b/core/net/mac/tsch/tsch-rpl.c
@@ -51,7 +51,7 @@
 #else /* TSCH_LOG_LEVEL */
 #define DEBUG DEBUG_NONE
 #endif /* TSCH_LOG_LEVEL */
-#include "net/ip/uip-debug.h"
+#include "net/net-debug.h"
 
 /*---------------------------------------------------------------------------*/
 /* To use, set #define TSCH_CALLBACK_JOINING_NETWORK tsch_rpl_callback_joining_network */
diff --git a/core/net/mac/tsch/tsch-schedule.c b/core/net/mac/tsch/tsch-schedule.c
index e0028c492..0a61b5f12 100644
--- a/core/net/mac/tsch/tsch-schedule.c
+++ b/core/net/mac/tsch/tsch-schedule.c
@@ -60,7 +60,7 @@
 #else /* TSCH_LOG_LEVEL */
 #define DEBUG DEBUG_NONE
 #endif /* TSCH_LOG_LEVEL */
-#include "net/ip/uip-debug.h"
+#include "net/net-debug.h"
 
 /* Pre-allocated space for links */
 MEMB(link_memb, struct tsch_link, TSCH_SCHEDULE_MAX_LINKS);
diff --git a/core/net/mac/tsch/tsch-security.c b/core/net/mac/tsch/tsch-security.c
index e7439c519..6d862e19e 100644
--- a/core/net/mac/tsch/tsch-security.c
+++ b/core/net/mac/tsch/tsch-security.c
@@ -58,7 +58,7 @@
 #else /* TSCH_LOG_LEVEL */
 #define DEBUG DEBUG_NONE
 #endif /* TSCH_LOG_LEVEL */
-#include "net/ip/uip-debug.h"
+#include "net/net-debug.h"
 
 /* The two keys K1 and K2 from 6TiSCH minimal configuration
  * K1: well-known, used for EBs
diff --git a/core/net/mac/tsch/tsch-slot-operation.c b/core/net/mac/tsch/tsch-slot-operation.c
index 03905617e..e7100c0ed 100644
--- a/core/net/mac/tsch/tsch-slot-operation.c
+++ b/core/net/mac/tsch/tsch-slot-operation.c
@@ -59,7 +59,7 @@
 #else /* TSCH_LOG_LEVEL */
 #define DEBUG DEBUG_NONE
 #endif /* TSCH_LOG_LEVEL */
-#include "net/ip/uip-debug.h"
+#include "net/net-debug.h"
 
 /* TSCH debug macros, i.e. to set LEDs or GPIOs on various TSCH
  * timeslot events */
diff --git a/core/net/mac/tsch/tsch.c b/core/net/mac/tsch/tsch.c
index 442323abc..2085f39ff 100644
--- a/core/net/mac/tsch/tsch.c
+++ b/core/net/mac/tsch/tsch.c
@@ -64,7 +64,7 @@
 #else /* TSCH_LOG_LEVEL */
 #define DEBUG DEBUG_NONE
 #endif /* TSCH_LOG_LEVEL */
-#include "net/ip/uip-debug.h"
+#include "net/net-debug.h"
 
 /* Use to collect link statistics even on Keep-Alive, even though they were
  * not sent from an upper layer and don't have a valid packet_sent callback */
diff --git a/core/net/net-debug.c b/core/net/net-debug.c
new file mode 100644
index 000000000..8dd630666
--- /dev/null
+++ b/core/net/net-debug.c
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ *
+ */
+
+/**
+ * \file
+ *         A set of debugging tools for the IP stack
+ * \author
+ *         Nicolas Tsiftes <nvt@sics.se>
+ *         Niclas Finne <nfi@sics.se>
+ *         Joakim Eriksson <joakime@sics.se>
+ *         Simon Duquennoy <simon.duquennoy@inria.fr>
+ */
+
+#include "net/net-debug.h"
+
+/*---------------------------------------------------------------------------*/
+void
+net_debug_lladdr_print(const uip_lladdr_t *addr)
+{
+  if(addr == NULL) {
+    PRINTA("(NULL LL addr)");
+    return;
+  } else {
+#if NETSTACK_CONF_WITH_RIME
+    /* Rime uses traditionally a %u.%u format */
+    PRINTA("%u.%u", addr->addr[0], addr->addr[1]);
+#else /* NETSTACK_CONF_WITH_RIME */
+    unsigned int i;
+    for(i = 0; i < LINKADDR_SIZE; i++) {
+      if(i > 0) {
+        PRINTA(":");
+      }
+      PRINTA("%02x", addr->addr[i]);
+    }
+#endif /* NETSTACK_CONF_WITH_RIME */
+  }
+}
+/*---------------------------------------------------------------------------*/
diff --git a/core/net/net-debug.h b/core/net/net-debug.h
new file mode 100644
index 000000000..a4c6a3313
--- /dev/null
+++ b/core/net/net-debug.h
@@ -0,0 +1,86 @@
+/*
+ * 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.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ */
+/**
+ * \file
+ *         A set of debugging macros for the netstack
+ *
+ * \author Nicolas Tsiftes <nvt@sics.se>
+ *         Niclas Finne <nfi@sics.se>
+ *         Joakim Eriksson <joakime@sics.se>
+ *         Simon Duquennoy <simon.duquennoy@inria.fr>
+ */
+
+#ifndef NET_DEBUG_H
+#define NET_DEBUG_H
+
+#include "net/ip/uip.h"
+#include "net/linkaddr.h"
+#include <stdio.h>
+
+void net_debug_lladdr_print(const uip_lladdr_t *addr);
+
+#define DEBUG_NONE      0
+#define DEBUG_PRINT     1
+#define DEBUG_ANNOTATE  2
+#define DEBUG_FULL      DEBUG_ANNOTATE | DEBUG_PRINT
+
+/* PRINTA will always print if the debug routines are called directly */
+#ifdef __AVR__
+#include <avr/pgmspace.h>
+#define PRINTA(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
+#else
+#define PRINTA(...) printf(__VA_ARGS__)
+#endif
+
+#if (DEBUG) & DEBUG_ANNOTATE
+#ifdef __AVR__
+#define ANNOTATE(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
+#else
+#define ANNOTATE(...) printf(__VA_ARGS__)
+#endif
+#else
+#define ANNOTATE(...)
+#endif /* (DEBUG) & DEBUG_ANNOTATE */
+
+#if (DEBUG) & DEBUG_PRINT
+#ifdef __AVR__
+#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
+#else
+#define PRINTF(...) printf(__VA_ARGS__)
+#endif
+#define PRINTLLADDR(lladdr) net_debug_lladdr_print(lladdr)
+#else
+#define PRINTF(...)
+#define PRINTLLADDR(lladdr)
+#endif /* (DEBUG) & DEBUG_PRINT */
+
+#endif /* NET_DEBUG_H */
diff --git a/platform/cc2530dk/uip-debug.c b/platform/cc2530dk/uip-debug.c
index 5f5b23ca8..1a1660e65 100644
--- a/platform/cc2530dk/uip-debug.c
+++ b/platform/cc2530dk/uip-debug.c
@@ -68,15 +68,3 @@ uip_debug_ipaddr_print(const uip_ipaddr_t *addr)
 #endif /* NETSTACK_CONF_WITH_IPV6 */
 }
 /*---------------------------------------------------------------------------*/
-void
-uip_debug_lladdr_print(const uip_lladdr_t *addr)
-{
-  unsigned int i;
-  for(i = 0; i < sizeof(uip_lladdr_t); i++) {
-    if(i > 0) {
-      putstring(":");
-    }
-    puthex(addr->addr[i]);
-  }
-}
-/*---------------------------------------------------------------------------*/
diff --git a/platform/mbxxx/contiki-main.c b/platform/mbxxx/contiki-main.c
index 700fbb5cc..f1ad1d8d4 100644
--- a/platform/mbxxx/contiki-main.c
+++ b/platform/mbxxx/contiki-main.c
@@ -179,7 +179,7 @@ main(void)
                                   NETSTACK_RDC.channel_check_interval()));
   printf("802.15.4 PAN ID 0x%x, EUI-%d:",
       IEEE802154_CONF_PANID, UIP_CONF_LL_802154?64:16);
-  uip_debug_lladdr_print((const uip_lladdr_t *)&linkaddr_node_addr);
+  net_debug_lladdr_print((const uip_lladdr_t *)&linkaddr_node_addr);
   printf(", radio channel %u\n", RF_CHANNEL);
 
   procinit_init();

From 7ba5b0d15017189df9ec3743a5295611f0dc30fd Mon Sep 17 00:00:00 2001
From: Frank Freihube <frank.freihube@rmcan.com>
Date: Wed, 27 Apr 2016 10:39:05 +0200
Subject: [PATCH 206/393] Trailing zeros in file leading to unexpected file
 length get set in destination buffer

---
 core/cfs/cfs-coffee.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/cfs/cfs-coffee.c b/core/cfs/cfs-coffee.c
index 6391e173c..07df6121b 100644
--- a/core/cfs/cfs-coffee.c
+++ b/core/cfs/cfs-coffee.c
@@ -1098,8 +1098,8 @@ cfs_read(int fd, void *buf, unsigned size)
 
   fdp = &coffee_fd_set[fd];
   file = fdp->file;
-  if(fdp->offset + size > file->end) {
-    size = file->end - fdp->offset;
+  while(fdp->offset + size > file->end) {
+    ((char*)buf)[--size] = 0;
   }
 
   /* If the file is not modified, read directly from the file extent. */

From f47c0f579d3d9b597e9a2cb743c1b92852920039 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Wed, 27 Apr 2016 14:00:55 +0200
Subject: [PATCH 207/393] RPL DAO ACK: improve logging

---
 core/net/rpl/rpl-icmp6.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 0f20ddb67..32338e456 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -936,7 +936,7 @@ handle_dao_retransmission(void *ptr)
     return;
   }
 
-  PRINTF("Should retransmit DAO - seq:%d trans:%d\n", instance->my_dao_seqno,
+  PRINTF("RPL: will retransmit DAO - seq:%d trans:%d\n", instance->my_dao_seqno,
 	 instance->my_dao_transmissions);
 
   if(get_global_addr(&prefix) == 0) {
@@ -1172,7 +1172,7 @@ dao_ack_input(void)
         uip_ds6_route_rm(re);
       }
     } else {
-      PRINTF("RPL: No route entry to fwd DAO ACK to\n");
+      PRINTF("RPL: No route entry found to forward DAO ACK (seqno %u)\n", sequence);
     }
   }
 #endif /* RPL_WITH_DAO_ACK */

From 0379398d7cc92093ed89f57c4873424aa9b13146 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Wed, 27 Apr 2016 14:01:44 +0200
Subject: [PATCH 208/393] RPL DAO ACK: increment DAO seqno before storing it to
 my_dao_seqno

---
 core/net/rpl/rpl-icmp6.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 32338e456..406b1b6c4 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -969,6 +969,7 @@ dao_output(rpl_parent_t *parent, uint8_t lifetime)
     return;
   }
 
+  RPL_LOLLIPOP_INCREMENT(dao_sequence);
 #if RPL_WITH_DAO_ACK
   /* set up the state since this will be the first transmission of DAO */
   /* retransmissions will call directly to dao_output_target_seq */
@@ -995,7 +996,6 @@ dao_output(rpl_parent_t *parent, uint8_t lifetime)
 void
 dao_output_target(rpl_parent_t *parent, uip_ipaddr_t *prefix, uint8_t lifetime)
 {
-  RPL_LOLLIPOP_INCREMENT(dao_sequence);
   dao_output_target_seq(parent, prefix, lifetime, dao_sequence);
 }
 /*---------------------------------------------------------------------------*/

From bb5e5d5c6bdb23c7baf28e981bcdf140f57d0447 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Sat, 23 Apr 2016 00:19:21 +0200
Subject: [PATCH 209/393] TSCH: use RTIMER_CLOCK_DIFF to compute estimated
 drift, fixing a bug that would occur on 16-bit rtimer platforms

---
 core/net/mac/tsch/tsch-slot-operation.c      | 2 +-
 core/sys/rtimer.h                            | 8 +++++---
 cpu/arm/aducrf101/aducrf101-contiki.h        | 2 +-
 cpu/mc1322x/contiki-mc1322x-conf.h           | 4 ++--
 platform/cc2538dk/contiki-conf.h             | 4 ++--
 platform/cooja/contiki-conf.h                | 2 +-
 platform/galileo/contiki-conf.h              | 2 +-
 platform/jn516x/platform-conf.h              | 4 ++--
 platform/mbxxx/platform-conf.h               | 2 +-
 platform/openmote-cc2538/contiki-conf.h      | 4 ++--
 platform/seedeye/contiki-conf.h              | 2 +-
 platform/srf06-cc26xx/contiki-conf.h         | 4 ++--
 platform/stm32nucleo-spirit1/platform-conf.h | 2 +-
 platform/zoul/contiki-conf.h                 | 4 ++--
 14 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/core/net/mac/tsch/tsch-slot-operation.c b/core/net/mac/tsch/tsch-slot-operation.c
index 03905617e..55fc06a24 100644
--- a/core/net/mac/tsch/tsch-slot-operation.c
+++ b/core/net/mac/tsch/tsch-slot-operation.c
@@ -737,7 +737,7 @@ PT_THREAD(tsch_rx_slot(struct pt *pt, struct rtimer *t))
           if(linkaddr_cmp(&destination_address, &linkaddr_node_addr)
              || linkaddr_cmp(&destination_address, &linkaddr_null)) {
             int do_nack = 0;
-            estimated_drift = ((int32_t)expected_rx_time - (int32_t)rx_start_time);
+            estimated_drift = RTIMER_CLOCK_DIFF(expected_rx_time, rx_start_time);
 
 #if TSCH_TIMESYNC_REMOVE_JITTER
             /* remove jitter due to measurement errors */
diff --git a/core/sys/rtimer.h b/core/sys/rtimer.h
index 91c23b932..a89ed8299 100644
--- a/core/sys/rtimer.h
+++ b/core/sys/rtimer.h
@@ -55,10 +55,12 @@
 
 #include "contiki-conf.h"
 
-#ifndef RTIMER_CLOCK_LT
+#ifndef RTIMER_CLOCK_DIFF
 typedef unsigned short rtimer_clock_t;
-#define RTIMER_CLOCK_LT(a,b)     ((signed short)((a)-(b)) < 0)
-#endif /* RTIMER_CLOCK_LT */
+#define RTIMER_CLOCK_DIFF(a,b)     ((signed short)((a)-(b)))
+#endif /* RTIMER_CLOCK_DIFF */
+
+#define RTIMER_CLOCK_LT(a, b)      (RTIMER_CLOCK_DIFF((a),(b)) < 0)
 
 #include "rtimer-arch.h"
 
diff --git a/cpu/arm/aducrf101/aducrf101-contiki.h b/cpu/arm/aducrf101/aducrf101-contiki.h
index 00fd8765d..4610c49d6 100644
--- a/cpu/arm/aducrf101/aducrf101-contiki.h
+++ b/cpu/arm/aducrf101/aducrf101-contiki.h
@@ -46,7 +46,7 @@ typedef uint32_t clock_time_t;
 typedef uint16_t uip_stats_t;
 
 typedef uint32_t rtimer_clock_t;
-#define RTIMER_CLOCK_LT(a, b)  ((int32_t)((a) - (b)) < 0)
+#define RTIMER_CLOCK_DIFF(a, b)  ((int32_t)((a) - (b)))
 rtimer_clock_t rtimer_arch_now(void);
 
 #endif
diff --git a/cpu/mc1322x/contiki-mc1322x-conf.h b/cpu/mc1322x/contiki-mc1322x-conf.h
index e6c65df56..2dfb7e0f1 100644
--- a/cpu/mc1322x/contiki-mc1322x-conf.h
+++ b/cpu/mc1322x/contiki-mc1322x-conf.h
@@ -55,8 +55,8 @@ typedef unsigned short uip_stats_t;
 
 typedef uint32_t clock_time_t;
 
-/* Core rtimer.h defaults to 16 bit timer unless RTIMER_CLOCK_LT is defined */
+/* Core rtimer.h defaults to 16 bit timer unless RTIMER_CLOCK_DIFF is defined */
 typedef unsigned long rtimer_clock_t;
-#define RTIMER_CLOCK_LT(a,b)     ((signed long)((a)-(b)) < 0)
+#define RTIMER_CLOCK_DIFF(a,b)     ((signed long)((a)-(b)))
 
 #endif
diff --git a/platform/cc2538dk/contiki-conf.h b/platform/cc2538dk/contiki-conf.h
index ad9aafeeb..9d18ec344 100644
--- a/platform/cc2538dk/contiki-conf.h
+++ b/platform/cc2538dk/contiki-conf.h
@@ -34,10 +34,10 @@ typedef uint32_t uip_stats_t;
 
 /*
  * rtimer.h typedefs rtimer_clock_t as unsigned short. We need to define
- * RTIMER_CLOCK_LT to override this
+ * RTIMER_CLOCK_DIFF to override this
  */
 typedef uint32_t rtimer_clock_t;
-#define RTIMER_CLOCK_LT(a,b)     ((int32_t)((a)-(b)) < 0)
+#define RTIMER_CLOCK_DIFF(a,b)     ((int32_t)((a)-(b)))
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/cooja/contiki-conf.h b/platform/cooja/contiki-conf.h
index 04f1c4d43..d021ff547 100644
--- a/platform/cooja/contiki-conf.h
+++ b/platform/cooja/contiki-conf.h
@@ -201,7 +201,7 @@ typedef unsigned short uip_stats_t;
 #define CLOCK_CONF_SECOND 1000L
 typedef unsigned long clock_time_t;
 typedef unsigned long rtimer_clock_t;
-#define RTIMER_CLOCK_LT(a,b)     ((signed long)((a)-(b)) < 0)
+#define RTIMER_CLOCK_DIFF(a,b)     ((signed long)((a)-(b)))
 
 #define AODV_COMPLIANCE
 #define AODV_NUM_RT_ENTRIES 32
diff --git a/platform/galileo/contiki-conf.h b/platform/galileo/contiki-conf.h
index dca42b8de..2d64c440f 100644
--- a/platform/galileo/contiki-conf.h
+++ b/platform/galileo/contiki-conf.h
@@ -46,7 +46,7 @@ typedef unsigned long clock_time_t;
 
 typedef uint64_t rtimer_clock_t;
 #define RTIMER_ARCH_SECOND 1024
-#define RTIMER_CLOCK_LT(a, b)     ((int64_t)((a) - (b)) < 0)
+#define RTIMER_CLOCK_DIFF(a, b)     ((int64_t)((a) - (b)))
 
 /* We define the following macros and types otherwise Contiki does not
  * compile.
diff --git a/platform/jn516x/platform-conf.h b/platform/jn516x/platform-conf.h
index c1c372b64..408b4957e 100644
--- a/platform/jn516x/platform-conf.h
+++ b/platform/jn516x/platform-conf.h
@@ -80,9 +80,9 @@
 #define JN516X_EXTERNAL_CRYSTAL_OSCILLATOR (RTIMER_USE_32KHZ || JN516X_SLEEP_ENABLED)
 #endif /* JN516X_EXTERNAL_CRYSTAL_OSCILLATOR */
 
-/* Core rtimer.h defaults to 16 bit timer unless RTIMER_CLOCK_LT is defined */
+/* Core rtimer.h defaults to 16 bit timer unless RTIMER_CLOCK_DIFF is defined */
 typedef uint32_t rtimer_clock_t;
-#define RTIMER_CLOCK_LT(a, b)     ((int32_t)((a) - (b)) < 0)
+#define RTIMER_CLOCK_DIFF(a, b)     ((int32_t)((a) - (b)))
 
 /* 8ms timer tick */
 #define CLOCK_CONF_SECOND 125
diff --git a/platform/mbxxx/platform-conf.h b/platform/mbxxx/platform-conf.h
index 6b811ec96..98870980d 100644
--- a/platform/mbxxx/platform-conf.h
+++ b/platform/mbxxx/platform-conf.h
@@ -87,7 +87,7 @@ typedef unsigned long clock_time_t;
 
 typedef unsigned long rtimer_clock_t;
 
-#define RTIMER_CLOCK_LT(a,b)     ((signed long)((a)-(b)) < 0)
+#define RTIMER_CLOCK_DIFF(a,b)     ((signed long)((a)-(b)))
 
 #define LEDS_CONF_RED_PIN     boardDescription->io->leds[1].gpioPin
 #define LEDS_CONF_GREEN_PIN   boardDescription->io->leds[0].gpioPin
diff --git a/platform/openmote-cc2538/contiki-conf.h b/platform/openmote-cc2538/contiki-conf.h
index 6c0349025..87b58f299 100644
--- a/platform/openmote-cc2538/contiki-conf.h
+++ b/platform/openmote-cc2538/contiki-conf.h
@@ -73,10 +73,10 @@ typedef uint32_t uip_stats_t;
 
 /*
  * rtimer.h typedefs rtimer_clock_t as unsigned short. We need to define
- * RTIMER_CLOCK_LT to override this
+ * RTIMER_CLOCK_DIFF to override this
  */
 typedef uint32_t rtimer_clock_t;
-#define RTIMER_CLOCK_LT(a, b)     ((int32_t)((a) - (b)) < 0)
+#define RTIMER_CLOCK_DIFF(a, b)     ((int32_t)((a) - (b)))
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/platform/seedeye/contiki-conf.h b/platform/seedeye/contiki-conf.h
index 69c788381..d58ff686d 100644
--- a/platform/seedeye/contiki-conf.h
+++ b/platform/seedeye/contiki-conf.h
@@ -60,7 +60,7 @@ typedef uint16_t uip_stats_t;
 typedef uint32_t clock_time_t;
 
 typedef uint32_t rtimer_clock_t;
-#define RTIMER_CLOCK_LT(a,b) ((int32_t)((a)-(b)) < 0)
+#define RTIMER_CLOCK_DIFF(a,b) ((int32_t)((a)-(b)))
 
 #define RF_CHANNEL                              13
 
diff --git a/platform/srf06-cc26xx/contiki-conf.h b/platform/srf06-cc26xx/contiki-conf.h
index 79c1d479a..6e52b5c0c 100644
--- a/platform/srf06-cc26xx/contiki-conf.h
+++ b/platform/srf06-cc26xx/contiki-conf.h
@@ -325,10 +325,10 @@ typedef uint32_t uip_stats_t;
 
 /*
  * rtimer.h typedefs rtimer_clock_t as unsigned short. We need to define
- * RTIMER_CLOCK_LT to override this
+ * RTIMER_CLOCK_DIFF to override this
  */
 typedef uint32_t rtimer_clock_t;
-#define RTIMER_CLOCK_LT(a, b)     ((int32_t)((a) - (b)) < 0)
+#define RTIMER_CLOCK_DIFF(a, b)     ((int32_t)((a) - (b)))
 /** @} */
 /*---------------------------------------------------------------------------*/
 /* board.h assumes that basic configuration is done */
diff --git a/platform/stm32nucleo-spirit1/platform-conf.h b/platform/stm32nucleo-spirit1/platform-conf.h
index dede0bdeb..0f2a0077b 100644
--- a/platform/stm32nucleo-spirit1/platform-conf.h
+++ b/platform/stm32nucleo-spirit1/platform-conf.h
@@ -78,7 +78,7 @@
 #define CLOCK_CONF_SECOND             128
 /* One tick: 62.5 ms */
 
-#define RTIMER_CLOCK_LT(a, b)     ((signed short)((a) - (b)) < 0)
+#define RTIMER_CLOCK_DIFF(a, b)     ((signed short)((a) - (b)))
 /*---------------------------------------------------------------------------*/
 typedef unsigned long clock_time_t;
 typedef unsigned long long rtimer_clock_t;
diff --git a/platform/zoul/contiki-conf.h b/platform/zoul/contiki-conf.h
index 52cd22dfd..50d781832 100644
--- a/platform/zoul/contiki-conf.h
+++ b/platform/zoul/contiki-conf.h
@@ -71,10 +71,10 @@ typedef uint32_t uip_stats_t;
 
 /*
  * rtimer.h typedefs rtimer_clock_t as unsigned short. We need to define
- * RTIMER_CLOCK_LT to override this
+ * RTIMER_CLOCK_DIFF to override this
  */
 typedef uint32_t rtimer_clock_t;
-#define RTIMER_CLOCK_LT(a, b)     ((int32_t)((a) - (b)) < 0)
+#define RTIMER_CLOCK_DIFF(a, b)     ((int32_t)((a) - (b)))
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**

From 439250701949f9fd85b326125efa9ba2dd673cdb Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Wed, 27 Apr 2016 14:19:26 +0200
Subject: [PATCH 210/393] RPL: do not add K flag to no-path DAO as we discard
 the ACK anyway

---
 core/net/rpl/rpl-icmp6.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 0f20ddb67..c6f9e160d 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -1050,7 +1050,9 @@ dao_output_target_seq(rpl_parent_t *parent, uip_ipaddr_t *prefix,
   buffer[pos] |= RPL_DAO_D_FLAG;
 #endif /* RPL_DAO_SPECIFY_DAG */
 #if RPL_WITH_DAO_ACK
-  buffer[pos] |= RPL_DAO_K_FLAG;
+  if(lifetime != RPL_ZERO_LIFETIME) {
+    buffer[pos] |= RPL_DAO_K_FLAG;
+  }
 #endif /* RPL_WITH_DAO_ACK */
   ++pos;
   buffer[pos++] = 0; /* reserved */

From ace607a32daadc14f7d0a549f138870119cf45ed Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Wed, 27 Apr 2016 17:04:29 +0200
Subject: [PATCH 211/393] Fix RPL default lifetime

---
 core/net/rpl/rpl-conf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h
index b86a36a85..073186071 100644
--- a/core/net/rpl/rpl-conf.h
+++ b/core/net/rpl/rpl-conf.h
@@ -200,7 +200,7 @@
  * used in RPL lifetime values, in seconds.
  */
 #ifndef RPL_CONF_DEFAULT_LIFETIME_UNIT
-#define RPL_DEFAULT_LIFETIME_UNIT       0x60
+#define RPL_DEFAULT_LIFETIME_UNIT       60
 #else
 #define RPL_DEFAULT_LIFETIME_UNIT       RPL_CONF_DEFAULT_LIFETIME_UNIT
 #endif
@@ -209,7 +209,7 @@
  * Default route lifetime as a multiple of the lifetime unit.
  */
 #ifndef RPL_CONF_DEFAULT_LIFETIME
-#define RPL_DEFAULT_LIFETIME            0x30
+#define RPL_DEFAULT_LIFETIME            30
 #else
 #define RPL_DEFAULT_LIFETIME            RPL_CONF_DEFAULT_LIFETIME
 #endif

From 19120788c0bed2226f2da3b278b904250faa89d5 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Tue, 26 Apr 2016 20:00:21 +0200
Subject: [PATCH 212/393] made a text-based version of the MessageList for
 headless execution

---
 .../cooja/avrmote/MicaZMoteType.java          |   6 +-
 .../cooja/mspmote/AbstractMspMoteType.java    |   3 +-
 .../cooja/mspmote/CC430MoteType.java          |   6 +-
 .../contikios/cooja/mspmote/ESBMoteType.java  |   6 +-
 .../cooja/mspmote/Eth1120MoteType.java        |   6 +-
 .../cooja/mspmote/Exp1101MoteType.java        |   6 +-
 .../cooja/mspmote/Exp1120MoteType.java        |   6 +-
 .../cooja/mspmote/Exp2420MoteType.java        |   6 +-
 .../cooja/mspmote/Exp5438MoteType.java        |   6 +-
 .../contikios/cooja/mspmote/SkyMoteType.java  |   6 +-
 .../cooja/mspmote/Trxeb1120MoteType.java      |   6 +-
 .../cooja/mspmote/Trxeb2520MoteType.java      |   6 +-
 .../cooja/mspmote/TyndallMoteType.java        |   6 +-
 .../cooja/mspmote/plugins/MspCodeWatcher.java |   3 +-
 .../cooja/java/org/contikios/cooja/Cooja.java |  19 +-
 .../java/org/contikios/cooja/CoreComm.java    |   5 +-
 .../java/org/contikios/cooja/MoteType.java    |   1 +
 .../cooja/contikimote/ContikiMoteType.java    |   8 +-
 .../cooja/dialogs/AbstractCompileDialog.java  |   4 +-
 .../cooja/dialogs/CompileContiki.java         |  18 +-
 .../cooja/dialogs/ConfigurationWizard.java    |  22 +-
 .../cooja/dialogs/MessageContainer.java       |  17 +
 .../contikios/cooja/dialogs/MessageList.java  | 362 +-----------------
 .../cooja/dialogs/MessageListText.java        |  27 ++
 .../cooja/dialogs/MessageListUI.java          | 334 ++++++++++++++++
 .../contikios/cooja/plugins/ScriptRunner.java |  13 +-
 .../plugins/skins/AddressVisualizerSkin.java  |   1 -
 .../org/contikios/cooja/util/ExecuteJAR.java  |   6 +-
 28 files changed, 488 insertions(+), 427 deletions(-)
 create mode 100644 tools/cooja/java/org/contikios/cooja/dialogs/MessageContainer.java
 create mode 100644 tools/cooja/java/org/contikios/cooja/dialogs/MessageListText.java
 create mode 100644 tools/cooja/java/org/contikios/cooja/dialogs/MessageListUI.java

diff --git a/tools/cooja/apps/avrora/src/org/contikios/cooja/avrmote/MicaZMoteType.java b/tools/cooja/apps/avrora/src/org/contikios/cooja/avrmote/MicaZMoteType.java
index c1a33b625..9499aafe9 100644
--- a/tools/cooja/apps/avrora/src/org/contikios/cooja/avrmote/MicaZMoteType.java
+++ b/tools/cooja/apps/avrora/src/org/contikios/cooja/avrmote/MicaZMoteType.java
@@ -63,7 +63,9 @@ import org.contikios.cooja.avrmote.interfaces.MicaZLED;
 import org.contikios.cooja.avrmote.interfaces.MicaZRadio;
 import org.contikios.cooja.dialogs.CompileContiki;
 import org.contikios.cooja.dialogs.MessageList;
-import org.contikios.cooja.dialogs.MessageList.MessageContainer;
+import org.contikios.cooja.dialogs.MessageListText;
+import org.contikios.cooja.dialogs.MessageListUI;
+import org.contikios.cooja.dialogs.MessageContainer;
 import org.contikios.cooja.interfaces.Mote2MoteRelations;
 import org.contikios.cooja.interfaces.MoteAttributes;
 import org.contikios.cooja.interfaces.Position;
@@ -364,7 +366,7 @@ public class MicaZMoteType implements MoteType {
       throw new MoteTypeCreationException("No identifier");
     }
 
-    final MessageList compilationOutput = new MessageList();
+    final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
 
     if (getCompileCommands() != null) {
       /* Handle multiple compilation commands one by one */
diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/AbstractMspMoteType.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/AbstractMspMoteType.java
index ec7feffd3..d03c0dfa1 100644
--- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/AbstractMspMoteType.java
+++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/AbstractMspMoteType.java
@@ -45,7 +45,6 @@ import org.apache.log4j.Logger;
 
 import org.contikios.cooja.*;
 import org.contikios.cooja.dialogs.*;
-import org.contikios.cooja.dialogs.MessageList.MessageContainer;
 
 /**
  *
@@ -119,7 +118,7 @@ public abstract class AbstractMspMoteType extends MspMoteType {
             throw new MoteTypeCreationException("No identifier");
         }
 
-        final MessageList compilationOutput = new MessageList();
+        final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
 
         if (getCompileCommands() != null) {
             /* Handle multiple compilation commands one by one */
diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/CC430MoteType.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/CC430MoteType.java
index 8be39971f..3a5144197 100644
--- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/CC430MoteType.java
+++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/CC430MoteType.java
@@ -50,8 +50,10 @@ import org.contikios.cooja.MoteInterface;
 import org.contikios.cooja.MoteType;
 import org.contikios.cooja.Simulation;
 import org.contikios.cooja.dialogs.CompileContiki;
+import org.contikios.cooja.dialogs.MessageContainer;
 import org.contikios.cooja.dialogs.MessageList;
-import org.contikios.cooja.dialogs.MessageList.MessageContainer;
+import org.contikios.cooja.dialogs.MessageListText;
+import org.contikios.cooja.dialogs.MessageListUI;
 import org.contikios.cooja.interfaces.IPAddress;
 import org.contikios.cooja.interfaces.Mote2MoteRelations;
 import org.contikios.cooja.interfaces.MoteAttributes;
@@ -113,7 +115,7 @@ public class CC430MoteType extends MspMoteType {
       throw new MoteTypeCreationException("No identifier");
     }
 
-    final MessageList compilationOutput = new MessageList();
+    final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
 
     if (getCompileCommands() != null) {
       /* Handle multiple compilation commands one by one */
diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/ESBMoteType.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/ESBMoteType.java
index 41bf80384..13ad2025a 100644
--- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/ESBMoteType.java
+++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/ESBMoteType.java
@@ -51,7 +51,9 @@ import org.contikios.cooja.MoteType;
 import org.contikios.cooja.Simulation;
 import org.contikios.cooja.dialogs.CompileContiki;
 import org.contikios.cooja.dialogs.MessageList;
-import org.contikios.cooja.dialogs.MessageList.MessageContainer;
+import org.contikios.cooja.dialogs.MessageListText;
+import org.contikios.cooja.dialogs.MessageListUI;
+import org.contikios.cooja.dialogs.MessageContainer;
 import org.contikios.cooja.interfaces.IPAddress;
 import org.contikios.cooja.interfaces.Mote2MoteRelations;
 import org.contikios.cooja.interfaces.MoteAttributes;
@@ -149,7 +151,7 @@ public class ESBMoteType extends MspMoteType {
       throw new MoteTypeCreationException("No identifier");
     }
 
-    final MessageList compilationOutput = new MessageList();
+    final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
 
     if (getCompileCommands() != null) {
       /* Handle multiple compilation commands one by one */
diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Eth1120MoteType.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Eth1120MoteType.java
index 84483d047..c51c29384 100644
--- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Eth1120MoteType.java
+++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Eth1120MoteType.java
@@ -11,7 +11,9 @@ import org.contikios.cooja.MoteType;
 import org.contikios.cooja.Simulation;
 import org.contikios.cooja.dialogs.CompileContiki;
 import org.contikios.cooja.dialogs.MessageList;
-import org.contikios.cooja.dialogs.MessageList.MessageContainer;
+import org.contikios.cooja.dialogs.MessageListText;
+import org.contikios.cooja.dialogs.MessageListUI;
+import org.contikios.cooja.dialogs.MessageContainer;
 import org.contikios.cooja.interfaces.IPAddress;
 import org.contikios.cooja.interfaces.Mote2MoteRelations;
 import org.contikios.cooja.interfaces.MoteAttributes;
@@ -71,7 +73,7 @@ public class Eth1120MoteType extends Exp5438MoteType {
       throw new MoteTypeCreationException("No identifier");
     }
 
-    final MessageList compilationOutput = new MessageList();
+    final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
 
     if (getCompileCommands() != null) {
       /* Handle multiple compilation commands one by one */
diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp1101MoteType.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp1101MoteType.java
index b46f1c1f0..b36fb30e9 100644
--- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp1101MoteType.java
+++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp1101MoteType.java
@@ -11,7 +11,9 @@ import org.contikios.cooja.MoteType;
 import org.contikios.cooja.Simulation;
 import org.contikios.cooja.dialogs.CompileContiki;
 import org.contikios.cooja.dialogs.MessageList;
-import org.contikios.cooja.dialogs.MessageList.MessageContainer;
+import org.contikios.cooja.dialogs.MessageListText;
+import org.contikios.cooja.dialogs.MessageListUI;
+import org.contikios.cooja.dialogs.MessageContainer;
 import org.contikios.cooja.interfaces.IPAddress;
 import org.contikios.cooja.interfaces.Mote2MoteRelations;
 import org.contikios.cooja.interfaces.MoteAttributes;
@@ -71,7 +73,7 @@ public class Exp1101MoteType extends Exp5438MoteType {
       throw new MoteTypeCreationException("No identifier");
     }
 
-    final MessageList compilationOutput = new MessageList();
+    final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
 
     if (getCompileCommands() != null) {
       /* Handle multiple compilation commands one by one */
diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp1120MoteType.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp1120MoteType.java
index d745097df..46ad50713 100644
--- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp1120MoteType.java
+++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp1120MoteType.java
@@ -11,7 +11,9 @@ import org.contikios.cooja.MoteType;
 import org.contikios.cooja.Simulation;
 import org.contikios.cooja.dialogs.CompileContiki;
 import org.contikios.cooja.dialogs.MessageList;
-import org.contikios.cooja.dialogs.MessageList.MessageContainer;
+import org.contikios.cooja.dialogs.MessageListText;
+import org.contikios.cooja.dialogs.MessageListUI;
+import org.contikios.cooja.dialogs.MessageContainer;
 import org.contikios.cooja.interfaces.IPAddress;
 import org.contikios.cooja.interfaces.Mote2MoteRelations;
 import org.contikios.cooja.interfaces.MoteAttributes;
@@ -72,7 +74,7 @@ public class Exp1120MoteType extends Exp5438MoteType {
       throw new MoteTypeCreationException("No identifier");
     }
 
-    final MessageList compilationOutput = new MessageList();
+    final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
 
     if (getCompileCommands() != null) {
       /* Handle multiple compilation commands one by one */
diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp2420MoteType.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp2420MoteType.java
index 8e24ef145..8a63bf527 100644
--- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp2420MoteType.java
+++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp2420MoteType.java
@@ -11,7 +11,9 @@ import org.contikios.cooja.MoteType;
 import org.contikios.cooja.Simulation;
 import org.contikios.cooja.dialogs.CompileContiki;
 import org.contikios.cooja.dialogs.MessageList;
-import org.contikios.cooja.dialogs.MessageList.MessageContainer;
+import org.contikios.cooja.dialogs.MessageListText;
+import org.contikios.cooja.dialogs.MessageListUI;
+import org.contikios.cooja.dialogs.MessageContainer;
 import org.contikios.cooja.interfaces.IPAddress;
 import org.contikios.cooja.interfaces.Mote2MoteRelations;
 import org.contikios.cooja.interfaces.MoteAttributes;
@@ -72,7 +74,7 @@ public class Exp2420MoteType extends Exp5438MoteType {
       throw new MoteTypeCreationException("No identifier");
     }
 
-    final MessageList compilationOutput = new MessageList();
+    final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
 
     if (getCompileCommands() != null) {
       /* Handle multiple compilation commands one by one */
diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp5438MoteType.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp5438MoteType.java
index f9fc4d813..c5b9b8436 100644
--- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp5438MoteType.java
+++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp5438MoteType.java
@@ -48,7 +48,9 @@ import org.contikios.cooja.MoteType;
 import org.contikios.cooja.Simulation;
 import org.contikios.cooja.dialogs.CompileContiki;
 import org.contikios.cooja.dialogs.MessageList;
-import org.contikios.cooja.dialogs.MessageList.MessageContainer;
+import org.contikios.cooja.dialogs.MessageListText;
+import org.contikios.cooja.dialogs.MessageListUI;
+import org.contikios.cooja.dialogs.MessageContainer;
 import org.contikios.cooja.interfaces.IPAddress;
 import org.contikios.cooja.interfaces.Mote2MoteRelations;
 import org.contikios.cooja.interfaces.MoteAttributes;
@@ -113,7 +115,7 @@ public class Exp5438MoteType extends MspMoteType {
       throw new MoteTypeCreationException("No identifier");
     }
 
-    final MessageList compilationOutput = new MessageList();
+    final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
 
     if (getCompileCommands() != null) {
       /* Handle multiple compilation commands one by one */
diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/SkyMoteType.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/SkyMoteType.java
index 793418969..3ab5854b3 100644
--- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/SkyMoteType.java
+++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/SkyMoteType.java
@@ -51,7 +51,9 @@ import org.contikios.cooja.MoteType;
 import org.contikios.cooja.Simulation;
 import org.contikios.cooja.dialogs.CompileContiki;
 import org.contikios.cooja.dialogs.MessageList;
-import org.contikios.cooja.dialogs.MessageList.MessageContainer;
+import org.contikios.cooja.dialogs.MessageListText;
+import org.contikios.cooja.dialogs.MessageListUI;
+import org.contikios.cooja.dialogs.MessageContainer;
 import org.contikios.cooja.interfaces.IPAddress;
 import org.contikios.cooja.interfaces.Mote2MoteRelations;
 import org.contikios.cooja.interfaces.MoteAttributes;
@@ -135,7 +137,7 @@ public class SkyMoteType extends MspMoteType {
       throw new MoteTypeCreationException("No identifier");
     }
 
-    final MessageList compilationOutput = new MessageList();
+    final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
 
     if (getCompileCommands() != null) {
       /* Handle multiple compilation commands one by one */
diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Trxeb1120MoteType.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Trxeb1120MoteType.java
index e69daf55f..eac27e122 100644
--- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Trxeb1120MoteType.java
+++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Trxeb1120MoteType.java
@@ -11,7 +11,9 @@ import org.contikios.cooja.MoteType;
 import org.contikios.cooja.Simulation;
 import org.contikios.cooja.dialogs.CompileContiki;
 import org.contikios.cooja.dialogs.MessageList;
-import org.contikios.cooja.dialogs.MessageList.MessageContainer;
+import org.contikios.cooja.dialogs.MessageListText;
+import org.contikios.cooja.dialogs.MessageListUI;
+import org.contikios.cooja.dialogs.MessageContainer;
 import org.contikios.cooja.interfaces.IPAddress;
 import org.contikios.cooja.interfaces.Mote2MoteRelations;
 import org.contikios.cooja.interfaces.MoteAttributes;
@@ -71,7 +73,7 @@ public class Trxeb1120MoteType extends Exp5438MoteType {
       throw new MoteTypeCreationException("No identifier");
     }
 
-    final MessageList compilationOutput = new MessageList();
+    final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
 
     if (getCompileCommands() != null) {
       /* Handle multiple compilation commands one by one */
diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Trxeb2520MoteType.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Trxeb2520MoteType.java
index bd3190770..939e60fcd 100644
--- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Trxeb2520MoteType.java
+++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Trxeb2520MoteType.java
@@ -11,7 +11,9 @@ import org.contikios.cooja.MoteType;
 import org.contikios.cooja.Simulation;
 import org.contikios.cooja.dialogs.CompileContiki;
 import org.contikios.cooja.dialogs.MessageList;
-import org.contikios.cooja.dialogs.MessageList.MessageContainer;
+import org.contikios.cooja.dialogs.MessageListText;
+import org.contikios.cooja.dialogs.MessageListUI;
+import org.contikios.cooja.dialogs.MessageContainer;
 import org.contikios.cooja.interfaces.IPAddress;
 import org.contikios.cooja.interfaces.Mote2MoteRelations;
 import org.contikios.cooja.interfaces.MoteAttributes;
@@ -71,7 +73,7 @@ public class Trxeb2520MoteType extends Exp5438MoteType {
       throw new MoteTypeCreationException("No identifier");
     }
 
-    final MessageList compilationOutput = new MessageList();
+    final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
 
     if (getCompileCommands() != null) {
       /* Handle multiple compilation commands one by one */
diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/TyndallMoteType.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/TyndallMoteType.java
index 4298a67aa..4e6472b11 100644
--- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/TyndallMoteType.java
+++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/TyndallMoteType.java
@@ -49,7 +49,9 @@ import org.contikios.cooja.MoteType;
 import org.contikios.cooja.Simulation;
 import org.contikios.cooja.dialogs.CompileContiki;
 import org.contikios.cooja.dialogs.MessageList;
-import org.contikios.cooja.dialogs.MessageList.MessageContainer;
+import org.contikios.cooja.dialogs.MessageListText;
+import org.contikios.cooja.dialogs.MessageListUI;
+import org.contikios.cooja.dialogs.MessageContainer;
 import org.contikios.cooja.interfaces.IPAddress;
 import org.contikios.cooja.interfaces.Mote2MoteRelations;
 import org.contikios.cooja.interfaces.MoteAttributes;
@@ -112,7 +114,7 @@ public class TyndallMoteType extends MspMoteType {
       throw new MoteTypeCreationException("No identifier");
     }
 
-    final MessageList compilationOutput = new MessageList();
+    final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
 
     if (getCompileCommands() != null) {
       /* Handle multiple compilation commands one by one */
diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/plugins/MspCodeWatcher.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/plugins/MspCodeWatcher.java
index 76f57c326..422c08381 100644
--- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/plugins/MspCodeWatcher.java
+++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/plugins/MspCodeWatcher.java
@@ -77,6 +77,7 @@ import org.contikios.cooja.Watchpoint;
 import org.contikios.cooja.WatchpointMote;
 import org.contikios.cooja.WatchpointMote.WatchpointListener;
 import org.contikios.cooja.dialogs.MessageList;
+import org.contikios.cooja.dialogs.MessageListUI;
 import org.contikios.cooja.mspmote.MspMote;
 import org.contikios.cooja.mspmote.MspMoteType;
 import se.sics.mspsim.core.EmulationException;
@@ -468,7 +469,7 @@ public class MspCodeWatcher extends VisPlugin implements MotePlugin {
     }
   }
 
-  private MessageList rulesDebuggingOutput = new MessageList();
+  private MessageListUI rulesDebuggingOutput = new MessageListUI();
   private boolean rulesWithDebuggingOutput = false;
   private int[] rulesMatched = null;
   private int[] rulesOK = null;
diff --git a/tools/cooja/java/org/contikios/cooja/Cooja.java b/tools/cooja/java/org/contikios/cooja/Cooja.java
index a4c1be53d..4f0814249 100644
--- a/tools/cooja/java/org/contikios/cooja/Cooja.java
+++ b/tools/cooja/java/org/contikios/cooja/Cooja.java
@@ -133,6 +133,7 @@ import org.contikios.cooja.dialogs.ConfigurationWizard;
 import org.contikios.cooja.dialogs.CreateSimDialog;
 import org.contikios.cooja.dialogs.ExternalToolsDialog;
 import org.contikios.cooja.dialogs.MessageList;
+import org.contikios.cooja.dialogs.MessageListUI;
 import org.contikios.cooja.dialogs.ProjectDirectoriesDialog;
 import org.contikios.cooja.plugins.MoteTypeInformation;
 import org.contikios.cooja.plugins.ScriptRunner;
@@ -3834,7 +3835,7 @@ public class Cooja extends Observable {
           /* Contiki error */
           if (exception instanceof ContikiError) {
             String contikiError = ((ContikiError) exception).getContikiError();
-            MessageList list = new MessageList();
+            MessageListUI list = new MessageListUI();
             for (String l: contikiError.split("\n")) {
               list.addMessage(l);
             }
@@ -3843,14 +3844,14 @@ public class Cooja extends Observable {
           }
 
           /* Compilation output */
-          MessageList compilationOutput = null;
+          MessageListUI compilationOutput = null;
           if (exception instanceof MoteTypeCreationException
               && ((MoteTypeCreationException) exception).hasCompilationOutput()) {
-            compilationOutput = ((MoteTypeCreationException) exception).getCompilationOutput();
+            compilationOutput = (MessageListUI) ((MoteTypeCreationException) exception).getCompilationOutput();
           } else if (exception.getCause() != null
               && exception.getCause() instanceof MoteTypeCreationException
               && ((MoteTypeCreationException) exception.getCause()).hasCompilationOutput()) {
-            compilationOutput = ((MoteTypeCreationException) exception.getCause()).getCompilationOutput();
+            compilationOutput = (MessageListUI) ((MoteTypeCreationException) exception.getCause()).getCompilationOutput();
           }
           if (compilationOutput != null) {
             compilationOutput.addPopupMenuItem(null, true);
@@ -3858,8 +3859,8 @@ public class Cooja extends Observable {
           }
 
           /* Stack trace */
-          MessageList stackTrace = new MessageList();
-          PrintStream printStream = stackTrace.getInputStream(MessageList.NORMAL);
+          MessageListUI stackTrace = new MessageListUI();
+          PrintStream printStream = stackTrace.getInputStream(MessageListUI.NORMAL);
           exception.printStackTrace(printStream);
           stackTrace.addPopupMenuItem(null, true);
           tabbedPane.addTab("Java stack trace", new JScrollPane(stackTrace));
@@ -3931,7 +3932,7 @@ public class Cooja extends Observable {
         Box buttonBox = Box.createHorizontalBox();
 
         /* Warnings message list */
-        MessageList compilationOutput = new MessageList();
+        MessageListUI compilationOutput = new MessageListUI();
         for (String w: warnings) {
           compilationOutput.addMessage(w, MessageList.ERROR);
         }
@@ -4354,14 +4355,14 @@ public class Cooja extends Observable {
   private static JProgressBar PROGRESS_BAR = null;
   private static ArrayList<String> PROGRESS_WARNINGS = new ArrayList<String>();
   public static void setProgressMessage(String msg) {
-    setProgressMessage(msg, MessageList.NORMAL);
+    setProgressMessage(msg, MessageListUI.NORMAL);
   }
   public static void setProgressMessage(String msg, int type) {
     if (PROGRESS_BAR != null && PROGRESS_BAR.isShowing()) {
       PROGRESS_BAR.setString(msg);
       PROGRESS_BAR.setStringPainted(true);
     }
-    if (type != MessageList.NORMAL) {
+    if (type != MessageListUI.NORMAL) {
       PROGRESS_WARNINGS.add(msg);
     }
   }
diff --git a/tools/cooja/java/org/contikios/cooja/CoreComm.java b/tools/cooja/java/org/contikios/cooja/CoreComm.java
index ca124ad5b..a714eac23 100644
--- a/tools/cooja/java/org/contikios/cooja/CoreComm.java
+++ b/tools/cooja/java/org/contikios/cooja/CoreComm.java
@@ -36,6 +36,7 @@ import java.util.Vector;
 import org.contikios.cooja.MoteType.MoteTypeCreationException;
 import org.contikios.cooja.contikimote.ContikiMoteType;
 import org.contikios.cooja.dialogs.MessageList;
+import org.contikios.cooja.dialogs.MessageListUI;
 
 /**
  * The purpose of corecomm's is communicating with a compiled Contiki system
@@ -203,9 +204,9 @@ public abstract class CoreComm {
    */
   public static void compileSourceFile(String className)
       throws MoteTypeCreationException {
-    MessageList compilationOutput = new MessageList();
+    MessageListUI compilationOutput = new MessageListUI();
     OutputStream compilationStandardStream = compilationOutput
-        .getInputStream(MessageList.NORMAL);
+        .getInputStream(MessageListUI.NORMAL);
     OutputStream compilationErrorStream = compilationOutput
         .getInputStream(MessageList.ERROR);
 
diff --git a/tools/cooja/java/org/contikios/cooja/MoteType.java b/tools/cooja/java/org/contikios/cooja/MoteType.java
index c5acb6880..60d9016be 100644
--- a/tools/cooja/java/org/contikios/cooja/MoteType.java
+++ b/tools/cooja/java/org/contikios/cooja/MoteType.java
@@ -37,6 +37,7 @@ import org.jdom.Element;
 
 import org.contikios.cooja.contikimote.ContikiMoteType;
 import org.contikios.cooja.dialogs.MessageList;
+import org.contikios.cooja.dialogs.MessageListUI;
 
 /**
  * The mote type defines properties common for several motes. These properties
diff --git a/tools/cooja/java/org/contikios/cooja/contikimote/ContikiMoteType.java b/tools/cooja/java/org/contikios/cooja/contikimote/ContikiMoteType.java
index eef80bbc8..42205b94f 100644
--- a/tools/cooja/java/org/contikios/cooja/contikimote/ContikiMoteType.java
+++ b/tools/cooja/java/org/contikios/cooja/contikimote/ContikiMoteType.java
@@ -45,13 +45,11 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
-import java.util.Vector;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.swing.JComponent;
 import javax.swing.JLabel;
-import org.apache.log4j.Level;
 
 import org.apache.log4j.Logger;
 import org.jdom.Element;
@@ -68,8 +66,8 @@ import org.contikios.cooja.mote.memory.SectionMoteMemory;
 import org.contikios.cooja.Simulation;
 import org.contikios.cooja.dialogs.CompileContiki;
 import org.contikios.cooja.dialogs.ContikiMoteCompileDialog;
-import org.contikios.cooja.dialogs.MessageList;
-import org.contikios.cooja.dialogs.MessageList.MessageContainer;
+import org.contikios.cooja.dialogs.MessageListUI;
+import org.contikios.cooja.dialogs.MessageContainer;
 import org.contikios.cooja.mote.memory.ArrayMemory;
 import org.contikios.cooja.mote.memory.MemoryInterface;
 import org.contikios.cooja.mote.memory.MemoryInterface.Symbol;
@@ -319,7 +317,7 @@ public class ContikiMoteType implements MoteType {
       if (getCompileCommands() == null) {
         throw new MoteTypeCreationException("No compile commands specified");
       }
-      final MessageList compilationOutput = new MessageList();
+      final MessageListUI compilationOutput = new MessageListUI();
       String[] arr = getCompileCommands().split("\n");
       for (String cmd : arr) {
         if (cmd.trim().isEmpty()) {
diff --git a/tools/cooja/java/org/contikios/cooja/dialogs/AbstractCompileDialog.java b/tools/cooja/java/org/contikios/cooja/dialogs/AbstractCompileDialog.java
index ee4cf486e..7210cb174 100644
--- a/tools/cooja/java/org/contikios/cooja/dialogs/AbstractCompileDialog.java
+++ b/tools/cooja/java/org/contikios/cooja/dialogs/AbstractCompileDialog.java
@@ -468,7 +468,7 @@ public abstract class AbstractCompileDialog extends JDialog {
 
   protected String[] compilationEnvironment = null; /* Default environment: inherit from current process */
   public void compileContiki() throws Exception {
-    final MessageList taskOutput = new MessageList();
+    final MessageListUI taskOutput = new MessageListUI();
 
     if (contikiFirmware.exists()) {
       contikiFirmware.delete();
@@ -861,7 +861,7 @@ public abstract class AbstractCompileDialog extends JDialog {
     currentCompilationProcess = null;
   }
 
-  private boolean createNewCompilationTab(MessageList output) {
+  private boolean createNewCompilationTab(MessageListUI output) {
     abortAnyCompilation();
     tabbedPane.remove(currentCompilationOutput);
 
diff --git a/tools/cooja/java/org/contikios/cooja/dialogs/CompileContiki.java b/tools/cooja/java/org/contikios/cooja/dialogs/CompileContiki.java
index 8a0deaee8..702024d13 100644
--- a/tools/cooja/java/org/contikios/cooja/dialogs/CompileContiki.java
+++ b/tools/cooja/java/org/contikios/cooja/dialogs/CompileContiki.java
@@ -127,7 +127,7 @@ public class CompileContiki {
   	/* TODO Fix me */
     final MessageList messageDialog;
   	if (compilationOutput == null) {
-  		messageDialog = new MessageList();
+  		messageDialog = new MessageListUI();
   	} else {
   		messageDialog = compilationOutput;
   	}
@@ -138,8 +138,8 @@ public class CompileContiki {
       	cmd += c + " ";
       }
       logger.info("> " + cmd);
-      messageDialog.addMessage("", MessageList.NORMAL);
-      messageDialog.addMessage("> " + cmd, MessageList.NORMAL);
+      messageDialog.addMessage("", MessageListUI.NORMAL);
+      messageDialog.addMessage("> " + cmd, MessageListUI.NORMAL);
     }
 
     final Process compileProcess;
@@ -170,7 +170,7 @@ public class CompileContiki {
             String readLine;
             while ((readLine = processNormal.readLine()) != null) {
               if (messageDialog != null) {
-                messageDialog.addMessage(readLine, MessageList.NORMAL);
+                messageDialog.addMessage(readLine, MessageListUI.NORMAL);
               }
             }
           } catch (IOException e) {
@@ -203,7 +203,7 @@ public class CompileContiki {
             compileProcess.waitFor();
           } catch (Exception e) {
             messageDialog.addMessage(e.getMessage(), MessageList.ERROR);
-            syncException.setCompilationOutput(new MessageList());
+            syncException.setCompilationOutput(new MessageListUI());
             syncException.fillInStackTrace();
             return;
           }
@@ -214,7 +214,7 @@ public class CompileContiki {
             if (onFailure != null) {
               onFailure.actionPerformed(null);
             }
-            syncException.setCompilationOutput(new MessageList());
+            syncException.setCompilationOutput(new MessageListUI());
             syncException.fillInStackTrace();
             return;
           }
@@ -232,13 +232,13 @@ public class CompileContiki {
             if (onFailure != null) {
               onFailure.actionPerformed(null);
             }
-            syncException.setCompilationOutput(new MessageList());
+            syncException.setCompilationOutput(new MessageListUI());
             syncException.fillInStackTrace();
             return;
           }
 
-          messageDialog.addMessage("", MessageList.NORMAL);
-          messageDialog.addMessage("Compilation succeded", MessageList.NORMAL);
+          messageDialog.addMessage("", MessageListUI.NORMAL);
+          messageDialog.addMessage("Compilation succeded", MessageListUI.NORMAL);
           if (onSuccess != null) {
             onSuccess.actionPerformed(null);
           }
diff --git a/tools/cooja/java/org/contikios/cooja/dialogs/ConfigurationWizard.java b/tools/cooja/java/org/contikios/cooja/dialogs/ConfigurationWizard.java
index a677c07a9..cfea6820a 100644
--- a/tools/cooja/java/org/contikios/cooja/dialogs/ConfigurationWizard.java
+++ b/tools/cooja/java/org/contikios/cooja/dialogs/ConfigurationWizard.java
@@ -150,7 +150,7 @@ public class ConfigurationWizard extends JDialog {
   private static int relBssSectionAddr;
   private static int bssSectionSize;
 
-  private static MessageList output;
+  private static MessageListUI output;
   private static JDialog progressDialog;
   private static JButton button;
   private static JProgressBar progressBar;
@@ -430,7 +430,7 @@ public class ConfigurationWizard extends JDialog {
   }
 
   private static void prepareShowTestProgress(JFrame parent, String desc) {
-    output = new MessageList();
+    output = new MessageListUI();
     output.addPopupMenuItem(null, true);
     progressDialog = new JDialog(parent, desc);
     button = new JButton("Close");
@@ -542,7 +542,7 @@ public class ConfigurationWizard extends JDialog {
     return (String) optionPane.getValue();
   }
 
-  public static boolean performCompileCTest(MessageList testOutput, PrintStream normalStream, PrintStream errorStream) {
+  public static boolean performCompileCTest(MessageListUI testOutput, PrintStream normalStream, PrintStream errorStream) {
     javaLibraryName = "LibTest" + testCounter;
     cLibraryName = "libtest" + testCounter;
     cLibrarySourceFile = new File(ContikiMoteType.tempOutputDirectory, cLibraryName + ".c");
@@ -642,8 +642,8 @@ public class ConfigurationWizard extends JDialog {
     return true;
   }
 
-  public static boolean performLoadTest(MessageList testOutput, PrintStream normalStream, PrintStream errorStream) {
-    MessageList dummy = new MessageList();
+  public static boolean performLoadTest(MessageListUI testOutput, PrintStream normalStream, PrintStream errorStream) {
+    MessageListUI dummy = new MessageListUI();
     PrintStream dummyStream = dummy.getInputStream(MessageList.NORMAL);
     if (!performCompileCTest(dummy, dummyStream, errorStream)) {
       return false;
@@ -696,8 +696,8 @@ public class ConfigurationWizard extends JDialog {
     return true;
   }
 
-  public static boolean performAddressTest(MessageList testOutput, PrintStream normalStream, PrintStream errorStream) {
-    MessageList dummy = new MessageList();
+  public static boolean performAddressTest(MessageListUI testOutput, PrintStream normalStream, PrintStream errorStream) {
+    MessageListUI dummy = new MessageListUI();
     PrintStream dummyStream = dummy.getInputStream(MessageList.NORMAL);
     if (!performCompileCTest(dummy, dummyStream, errorStream)) {
       return false;
@@ -743,7 +743,7 @@ public class ConfigurationWizard extends JDialog {
     return false;
   }
 
-  private static boolean performMapAddressTest(MessageList testOutput, PrintStream normalStream, PrintStream errorStream) {
+  private static boolean performMapAddressTest(MessageListUI testOutput, PrintStream normalStream, PrintStream errorStream) {
     testOutput.addMessage("### Testing map file based address parsing");
 
     File mapFile = new File(ContikiMoteType.tempOutputDirectory, cLibraryName + ContikiMoteType.mapSuffix);
@@ -839,7 +839,7 @@ public class ConfigurationWizard extends JDialog {
     return true;
   }
 
-  private static boolean performCommandAddressTest(MessageList testOutput, PrintStream normalStream, PrintStream errorStream) {
+  private static boolean performCommandAddressTest(MessageListUI testOutput, PrintStream normalStream, PrintStream errorStream) {
     testOutput.addMessage("### Testing command based address parsing");
 
     testOutput.addMessage("### Executing command");
@@ -933,8 +933,8 @@ public class ConfigurationWizard extends JDialog {
   }
 
 
-  public static boolean performMemoryReplacementTest(MessageList testOutput, PrintStream normalStream, PrintStream errorStream) {
-    MessageList dummy = new MessageList();
+  public static boolean performMemoryReplacementTest(MessageListUI testOutput, PrintStream normalStream, PrintStream errorStream) {
+    MessageListUI dummy = new MessageListUI();
     PrintStream dummyStream = dummy.getInputStream(MessageList.NORMAL);
     if (!performCompileCTest(dummy, dummyStream, errorStream)) {
       return false;
diff --git a/tools/cooja/java/org/contikios/cooja/dialogs/MessageContainer.java b/tools/cooja/java/org/contikios/cooja/dialogs/MessageContainer.java
new file mode 100644
index 000000000..89fea5593
--- /dev/null
+++ b/tools/cooja/java/org/contikios/cooja/dialogs/MessageContainer.java
@@ -0,0 +1,17 @@
+package org.contikios.cooja.dialogs;
+
+public class MessageContainer {
+
+    public final int type;
+    public final String message;
+
+    public MessageContainer(String message, int type) {
+        this.message = message;
+        this.type = type;
+    }
+
+    @Override
+    public String toString() {
+        return message;
+    }
+}
diff --git a/tools/cooja/java/org/contikios/cooja/dialogs/MessageList.java b/tools/cooja/java/org/contikios/cooja/dialogs/MessageList.java
index 1921a68ce..f0af5f405 100644
--- a/tools/cooja/java/org/contikios/cooja/dialogs/MessageList.java
+++ b/tools/cooja/java/org/contikios/cooja/dialogs/MessageList.java
@@ -1,359 +1,17 @@
-/*
- * Copyright (c) 2006, 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.
- *
- */
-
 package org.contikios.cooja.dialogs;
 
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Toolkit;
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.StringSelection;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.io.PrintStream;
-import java.util.ArrayList;
+public interface MessageList {
 
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.DefaultListModel;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JList;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-import javax.swing.JSeparator;
-import javax.swing.ListModel;
-import javax.swing.ListSelectionModel;
-import org.apache.log4j.Logger;
+    public static final int NORMAL = 0;
+    public static final int WARNING = 1;
+    public static final int ERROR = 2;
+    
+    public void addMessage(String string, int normal);
 
-import org.contikios.cooja.Cooja;
+    public MessageContainer[] getMessages();
 
-/**
- *
- * @author Adam Dunkels
- * @author Joakim Eriksson
- * @author Niclas Finne
- * @author Fredrik Osterlind
- */
-public class MessageList extends JList {
+    public void clearMessages();
 
-  private static final Logger logger = Logger.getLogger(MessageList.class);
+    public void addMessage(String string);
 
-  public static final int NORMAL = 0;
-  public static final int WARNING = 1;
-  public static final int ERROR = 2;
-
-  private Color[] foregrounds = new Color[] { null, Color.red };
-  private Color[] backgrounds = new Color[] { null, null };
-
-  private JPopupMenu popup = null;
-  private boolean hideNormal = false;
-
-  private int max = -1;
-  
-  public MessageList() {
-    super.setModel(new MessageModel());
-    setCellRenderer(new MessageRenderer());
-    setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-  }
-
-  /**
-   * @param max Maximum number of messages
-   */
-  public MessageList(int max) {
-    this();
-    this.max = max;
-  }
-
-  public Color getForeground(int type) {
-    Color c = type > 0 && type <= foregrounds.length
-      ? foregrounds[type - 1] : null;
-    return c == null ? getForeground() : c;
-  }
-
-  public void setForeground(int type, Color color) {
-    if (type > 0 && type <= foregrounds.length) {
-      foregrounds[type - 1] = color;
-    } else if (type == NORMAL) {
-      setForeground(color);
-    }
-  }
-
-  public Color getBackground(int type) {
-    Color c = type > 0 && type <= backgrounds.length
-      ? backgrounds[type - 1] : null;
-    return c == null ? getBackground() : c;
-  }
-
-  public void setBackground(int type, Color color) {
-    if (type > 0 && type <= backgrounds.length) {
-      backgrounds[type - 1] = color;
-    } else if (type == NORMAL) {
-      setBackground(color);
-    }
-  }
-
-  public PrintStream getInputStream(final int type) {
-    try {
-      PipedInputStream input = new PipedInputStream();
-      PipedOutputStream output = new PipedOutputStream(input);
-      final BufferedReader stringInput = new BufferedReader(new InputStreamReader(input));
-
-      Thread readThread = new Thread(new Runnable() {
-        @Override
-        public void run() {
-          String readLine;
-          try {
-            while ((readLine = stringInput.readLine()) != null) {
-              addMessage(readLine, type);
-            }
-          } catch (IOException e) {
-            // Occurs when write end closes pipe - die quietly
-          }
-        }
-
-      });
-      readThread.start();
-
-      return new PrintStream(output);
-    } catch (IOException e) {
-      logger.error(messages);
-      return null;
-    }
-  }
-
-  public void addMessage(String message) {
-    addMessage(message, NORMAL);
-  }
-
-  private ArrayList<MessageContainer> messages = new ArrayList<MessageContainer>();
-
-  public MessageContainer[] getMessages() {
-    return messages.toArray(new MessageContainer[0]);
-  }
-
-  private void updateModel() {
-    boolean scroll = getLastVisibleIndex() >= getModel().getSize() - 2;
-
-    while (messages.size() > getModel().getSize()) {
-      ((DefaultListModel) getModel()).addElement(messages.get(getModel().getSize()));
-    }
-    while (max > 0 && getModel().getSize() > max) {
-      ((DefaultListModel) getModel()).removeElementAt(0);
-      messages.remove(0);
-    }
-
-    if (scroll) {
-      ensureIndexIsVisible(getModel().getSize() - 1);
-    }
-  }
-
-  public void addMessage(final String message, final int type) {
-    Cooja.setProgressMessage(message, type);
-
-    MessageContainer msg = new MessageContainer(message, type);
-    messages.add(msg);
-
-    java.awt.EventQueue.invokeLater(new Runnable() {
-      @Override
-      public void run() {
-        updateModel();
-      }
-    });
-  }
-
-  public void clearMessages() {
-    messages.clear();
-    ((DefaultListModel) getModel()).clear();
-  }
-
-  @Override
-  public void setModel(ListModel model) {
-    throw new IllegalArgumentException("changing model not permitted");
-  }
-
-  public void addPopupMenuItem(JMenuItem item, boolean withDefaults) {
-    if (popup == null) {
-      popup = new JPopupMenu();
-      addMouseListener(new MouseAdapter() {
-        @Override
-        public void mouseClicked(MouseEvent e) {
-          if (e.isPopupTrigger()) {
-            popup.show(MessageList.this, e.getX(), e.getY());
-          }
-        }
-        @Override
-        public void mousePressed(MouseEvent e) {
-          if (e.isPopupTrigger()) {
-            popup.show(MessageList.this, e.getX(), e.getY());
-          }
-        }
-        @Override
-        public void mouseReleased(MouseEvent e) {
-          if (e.isPopupTrigger()) {
-            popup.show(MessageList.this, e.getX(), e.getY());
-          }
-        }
-      });
-
-      JMenuItem headerMenuItem = new JMenuItem("Output:");
-      headerMenuItem.setEnabled(false);
-      popup.add(headerMenuItem);
-      popup.add(new JSeparator());
-
-      if (withDefaults) {
-        /* Create default menu items */
-        final JMenuItem hideNormalMenuItem = new JCheckBoxMenuItem("Hide normal output");
-        hideNormalMenuItem.setEnabled(true);
-        hideNormalMenuItem.addActionListener(new ActionListener() {
-          @Override
-          public void actionPerformed(ActionEvent e) {
-            MessageList.this.hideNormal = hideNormalMenuItem.isSelected();
-            ((MessageModel)getModel()).updateList();
-          }
-        });
-        popup.add(hideNormalMenuItem);
-
-        JMenuItem consoleOutputMenuItem = new JMenuItem("Output to console");
-        consoleOutputMenuItem.setEnabled(true);
-        consoleOutputMenuItem.addActionListener(new ActionListener() {
-          @Override
-          public void actionPerformed(ActionEvent e) {
-            MessageContainer[] messages = getMessages();
-            logger.info("\nCOMPILATION OUTPUT:\n");
-            for (MessageContainer msg: messages) {
-              if (hideNormal && msg.type == NORMAL) {
-                continue;
-              }
-              logger.info(msg);
-            }
-            logger.info("\n");
-          }
-        });
-        popup.add(consoleOutputMenuItem);
-
-        JMenuItem clipboardMenuItem = new JMenuItem("Copy to clipboard");
-        clipboardMenuItem.setEnabled(true);
-        clipboardMenuItem.addActionListener(new ActionListener() {
-          @Override
-          public void actionPerformed(ActionEvent e) {
-            Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
-
-            StringBuilder sb = new StringBuilder();
-            MessageContainer[] messages = getMessages();
-            for (MessageContainer msg: messages) {
-              if (hideNormal && msg.type == NORMAL) {
-                continue;
-              }
-              sb.append(msg + "\n");
-            }
-
-            StringSelection stringSelection = new StringSelection(sb.toString());
-            clipboard.setContents(stringSelection, null);
-          }
-        });
-        popup.add(clipboardMenuItem);
-
-        popup.add(new JSeparator());
-      }
-    }
-
-    if (item == null) {
-      return;
-    }
-
-    popup.add(item);
-  }
-
-  // -------------------------------------------------------------------
-  // MessageContainer
-  // -------------------------------------------------------------------
-
-  public static class MessageContainer {
-    public final int type;
-    public final String message;
-
-    public MessageContainer(String message, int type) {
-      this.message = message;
-      this.type = type;
-    }
-
-    @Override
-    public String toString() {
-      return message;
-    }
-
-  } // end of inner class MessageContainer
-
-
-  // -------------------------------------------------------------------
-  // Renderer for messages
-  // -------------------------------------------------------------------
-
-  private class MessageModel extends DefaultListModel {
-    public void updateList() {
-      fireContentsChanged(this, 0, getSize());
-    }
-  }
-
-  private class MessageRenderer extends DefaultListCellRenderer {
-    private Dimension nullDimension = new Dimension(0,0);
-    @Override
-    public Component getListCellRendererComponent(
-        JList list,
-	Object value,
-        int index,
-        boolean isSelected,
-        boolean cellHasFocus)
-    {
-      super.getListCellRendererComponent(list, value, index, isSelected,
-					 cellHasFocus);
-      MessageContainer msg = (MessageContainer) value;
-
-      if (hideNormal && msg.type == NORMAL && index != MessageList.this.getModel().getSize()-1) {
-        setPreferredSize(nullDimension);
-        return this;
-      }
-
-      setPreferredSize(null);
-      setForeground(((MessageList) list).getForeground(msg.type));
-      setBackground(((MessageList) list).getBackground(msg.type));
-      return this;
-    }
-
-  } // end of inner class MessageRenderer
-
-} // end of MessagList
+}
diff --git a/tools/cooja/java/org/contikios/cooja/dialogs/MessageListText.java b/tools/cooja/java/org/contikios/cooja/dialogs/MessageListText.java
new file mode 100644
index 000000000..bd24c3485
--- /dev/null
+++ b/tools/cooja/java/org/contikios/cooja/dialogs/MessageListText.java
@@ -0,0 +1,27 @@
+package org.contikios.cooja.dialogs;
+
+public class MessageListText implements MessageList {
+
+    @Override
+    public void addMessage(String string, int type) {
+        System.out.println("Message:" + string);
+    }
+
+    @Override
+    public MessageContainer[] getMessages() {
+        // TODO Auto-generated method stub
+        return new MessageContainer[0];
+    }
+
+    @Override
+    public void clearMessages() {
+        // TODO Auto-generated method stub
+    }
+
+    @Override
+    public void addMessage(String string) {
+        // TODO Auto-generated method stub
+        addMessage(string, MessageList.NORMAL);
+    }
+
+}
diff --git a/tools/cooja/java/org/contikios/cooja/dialogs/MessageListUI.java b/tools/cooja/java/org/contikios/cooja/dialogs/MessageListUI.java
new file mode 100644
index 000000000..11449b7ef
--- /dev/null
+++ b/tools/cooja/java/org/contikios/cooja/dialogs/MessageListUI.java
@@ -0,0 +1,334 @@
+/*
+ * Copyright (c) 2006, 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.
+ *
+ */
+
+package org.contikios.cooja.dialogs;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.PrintStream;
+import java.util.ArrayList;
+
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.DefaultListModel;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JList;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.JSeparator;
+import javax.swing.ListModel;
+import javax.swing.ListSelectionModel;
+import org.apache.log4j.Logger;
+
+import org.contikios.cooja.Cooja;
+
+/**
+ *
+ * @author Adam Dunkels
+ * @author Joakim Eriksson
+ * @author Niclas Finne
+ * @author Fredrik Osterlind
+ */
+public class MessageListUI extends JList implements MessageList {
+
+  private static final Logger logger = Logger.getLogger(MessageListUI.class);
+
+  private Color[] foregrounds = new Color[] { null, Color.red };
+  private Color[] backgrounds = new Color[] { null, null };
+
+  private JPopupMenu popup = null;
+  private boolean hideNormal = false;
+
+  private int max = -1;
+  
+  public MessageListUI() {
+    super.setModel(new MessageModel());
+    setCellRenderer(new MessageRenderer());
+    setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+  }
+
+  /**
+   * @param max Maximum number of messages
+   */
+  public MessageListUI(int max) {
+    this();
+    this.max = max;
+  }
+
+  public Color getForeground(int type) {
+    Color c = type > 0 && type <= foregrounds.length
+      ? foregrounds[type - 1] : null;
+    return c == null ? getForeground() : c;
+  }
+
+  public void setForeground(int type, Color color) {
+    if (type > 0 && type <= foregrounds.length) {
+      foregrounds[type - 1] = color;
+    } else if (type == NORMAL) {
+      setForeground(color);
+    }
+  }
+
+  public Color getBackground(int type) {
+    Color c = type > 0 && type <= backgrounds.length
+      ? backgrounds[type - 1] : null;
+    return c == null ? getBackground() : c;
+  }
+
+  public void setBackground(int type, Color color) {
+    if (type > 0 && type <= backgrounds.length) {
+      backgrounds[type - 1] = color;
+    } else if (type == NORMAL) {
+      setBackground(color);
+    }
+  }
+
+  public PrintStream getInputStream(final int type) {
+    try {
+      PipedInputStream input = new PipedInputStream();
+      PipedOutputStream output = new PipedOutputStream(input);
+      final BufferedReader stringInput = new BufferedReader(new InputStreamReader(input));
+
+      Thread readThread = new Thread(new Runnable() {
+        @Override
+        public void run() {
+          String readLine;
+          try {
+            while ((readLine = stringInput.readLine()) != null) {
+              addMessage(readLine, type);
+            }
+          } catch (IOException e) {
+            // Occurs when write end closes pipe - die quietly
+          }
+        }
+
+      });
+      readThread.start();
+
+      return new PrintStream(output);
+    } catch (IOException e) {
+      logger.error(messages);
+      return null;
+    }
+  }
+
+  public void addMessage(String message) {
+    addMessage(message, NORMAL);
+  }
+
+  private ArrayList<MessageContainer> messages = new ArrayList<MessageContainer>();
+
+  public MessageContainer[] getMessages() {
+    return messages.toArray(new MessageContainer[0]);
+  }
+
+  private void updateModel() {
+    boolean scroll = getLastVisibleIndex() >= getModel().getSize() - 2;
+
+    while (messages.size() > getModel().getSize()) {
+      ((DefaultListModel<MessageContainer>) getModel()).addElement(messages.get(getModel().getSize()));
+    }
+    while (max > 0 && getModel().getSize() > max) {
+      ((DefaultListModel) getModel()).removeElementAt(0);
+      messages.remove(0);
+    }
+
+    if (scroll) {
+      ensureIndexIsVisible(getModel().getSize() - 1);
+    }
+  }
+
+  public void addMessage(final String message, final int type) {
+    Cooja.setProgressMessage(message, type);
+
+    MessageContainer msg = new MessageContainer(message, type);
+    messages.add(msg);
+
+    java.awt.EventQueue.invokeLater(new Runnable() {
+      @Override
+      public void run() {
+        updateModel();
+      }
+    });
+  }
+
+  public void clearMessages() {
+    messages.clear();
+    ((DefaultListModel) getModel()).clear();
+  }
+
+  @Override
+  public void setModel(ListModel model) {
+    throw new IllegalArgumentException("changing model not permitted");
+  }
+
+  public void addPopupMenuItem(JMenuItem item, boolean withDefaults) {
+    if (popup == null) {
+      popup = new JPopupMenu();
+      addMouseListener(new MouseAdapter() {
+        @Override
+        public void mouseClicked(MouseEvent e) {
+          if (e.isPopupTrigger()) {
+            popup.show(MessageListUI.this, e.getX(), e.getY());
+          }
+        }
+        @Override
+        public void mousePressed(MouseEvent e) {
+          if (e.isPopupTrigger()) {
+            popup.show(MessageListUI.this, e.getX(), e.getY());
+          }
+        }
+        @Override
+        public void mouseReleased(MouseEvent e) {
+          if (e.isPopupTrigger()) {
+            popup.show(MessageListUI.this, e.getX(), e.getY());
+          }
+        }
+      });
+
+      JMenuItem headerMenuItem = new JMenuItem("Output:");
+      headerMenuItem.setEnabled(false);
+      popup.add(headerMenuItem);
+      popup.add(new JSeparator());
+
+      if (withDefaults) {
+        /* Create default menu items */
+        final JMenuItem hideNormalMenuItem = new JCheckBoxMenuItem("Hide normal output");
+        hideNormalMenuItem.setEnabled(true);
+        hideNormalMenuItem.addActionListener(new ActionListener() {
+          @Override
+          public void actionPerformed(ActionEvent e) {
+            MessageListUI.this.hideNormal = hideNormalMenuItem.isSelected();
+            ((MessageModel)getModel()).updateList();
+          }
+        });
+        popup.add(hideNormalMenuItem);
+
+        JMenuItem consoleOutputMenuItem = new JMenuItem("Output to console");
+        consoleOutputMenuItem.setEnabled(true);
+        consoleOutputMenuItem.addActionListener(new ActionListener() {
+          @Override
+          public void actionPerformed(ActionEvent e) {
+            MessageContainer[] messages = getMessages();
+            logger.info("\nCOMPILATION OUTPUT:\n");
+            for (MessageContainer msg: messages) {
+              if (hideNormal && msg.type == NORMAL) {
+                continue;
+              }
+              logger.info(msg);
+            }
+            logger.info("\n");
+          }
+        });
+        popup.add(consoleOutputMenuItem);
+
+        JMenuItem clipboardMenuItem = new JMenuItem("Copy to clipboard");
+        clipboardMenuItem.setEnabled(true);
+        clipboardMenuItem.addActionListener(new ActionListener() {
+          @Override
+          public void actionPerformed(ActionEvent e) {
+            Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+
+            StringBuilder sb = new StringBuilder();
+            MessageContainer[] messages = getMessages();
+            for (MessageContainer msg: messages) {
+              if (hideNormal && msg.type == NORMAL) {
+                continue;
+              }
+              sb.append(msg + "\n");
+            }
+
+            StringSelection stringSelection = new StringSelection(sb.toString());
+            clipboard.setContents(stringSelection, null);
+          }
+        });
+        popup.add(clipboardMenuItem);
+
+        popup.add(new JSeparator());
+      }
+    }
+
+    if (item == null) {
+      return;
+    }
+
+    popup.add(item);
+  }
+
+  // -------------------------------------------------------------------
+  // Renderer for messages
+  // -------------------------------------------------------------------
+
+  private class MessageModel extends DefaultListModel {
+    public void updateList() {
+      fireContentsChanged(this, 0, getSize());
+    }
+  }
+
+  private class MessageRenderer extends DefaultListCellRenderer {
+    private Dimension nullDimension = new Dimension(0,0);
+    @Override
+    public Component getListCellRendererComponent(
+        JList list,
+	Object value,
+        int index,
+        boolean isSelected,
+        boolean cellHasFocus)
+    {
+      super.getListCellRendererComponent(list, value, index, isSelected,
+					 cellHasFocus);
+      MessageContainer msg = (MessageContainer) value;
+
+      if (hideNormal && msg.type == NORMAL && index != MessageListUI.this.getModel().getSize()-1) {
+        setPreferredSize(nullDimension);
+        return this;
+      }
+
+      setPreferredSize(null);
+      setForeground(((MessageListUI) list).getForeground(msg.type));
+      setBackground(((MessageListUI) list).getBackground(msg.type));
+      return this;
+    }
+
+  } // end of inner class MessageRenderer
+
+} // end of MessagList
diff --git a/tools/cooja/java/org/contikios/cooja/plugins/ScriptRunner.java b/tools/cooja/java/org/contikios/cooja/plugins/ScriptRunner.java
index bce5764e6..2df863a25 100644
--- a/tools/cooja/java/org/contikios/cooja/plugins/ScriptRunner.java
+++ b/tools/cooja/java/org/contikios/cooja/plugins/ScriptRunner.java
@@ -85,6 +85,7 @@ import org.contikios.cooja.PluginType;
 import org.contikios.cooja.Simulation;
 import org.contikios.cooja.VisPlugin;
 import org.contikios.cooja.dialogs.MessageList;
+import org.contikios.cooja.dialogs.MessageListUI;
 import org.contikios.cooja.util.StringUtils;
 
 @ClassDescription("Simulation script editor")
@@ -503,7 +504,7 @@ public class ScriptRunner extends VisPlugin {
       final BufferedReader err = new BufferedReader(new InputStreamReader(process.getErrorStream()));
 
       /* GUI components */
-      final MessageList testOutput = new MessageList();
+      final MessageListUI testOutput = new MessageListUI();
       final AbstractAction abort = new AbstractAction() {
         public void actionPerformed(ActionEvent e) {
           process.destroy();
@@ -538,14 +539,14 @@ public class ScriptRunner extends VisPlugin {
           String line;
           try {
             while ((line = input.readLine()) != null) {
-              testOutput.addMessage(line, MessageList.NORMAL);
+              testOutput.addMessage(line, MessageListUI.NORMAL);
             }
           } catch (IOException e) {
           }
 
-          testOutput.addMessage("", MessageList.NORMAL);
-          testOutput.addMessage("", MessageList.NORMAL);
-          testOutput.addMessage("", MessageList.NORMAL);
+          testOutput.addMessage("", MessageListUI.NORMAL);
+          testOutput.addMessage("", MessageListUI.NORMAL);
+          testOutput.addMessage("", MessageListUI.NORMAL);
 
           /* Parse log file, check if test succeeded  */
           try {
@@ -559,7 +560,7 @@ public class ScriptRunner extends VisPlugin {
               if (l == null) {
                 line = "";
               }
-              testOutput.addMessage(l, MessageList.NORMAL);
+              testOutput.addMessage(l, MessageListUI.NORMAL);
               if (l.contains("TEST OK")) {
                 testSucceeded = true;
                 break;
diff --git a/tools/cooja/java/org/contikios/cooja/plugins/skins/AddressVisualizerSkin.java b/tools/cooja/java/org/contikios/cooja/plugins/skins/AddressVisualizerSkin.java
index 44a77fc6a..609b2e771 100644
--- a/tools/cooja/java/org/contikios/cooja/plugins/skins/AddressVisualizerSkin.java
+++ b/tools/cooja/java/org/contikios/cooja/plugins/skins/AddressVisualizerSkin.java
@@ -46,7 +46,6 @@ import org.contikios.cooja.ClassDescription;
 import org.contikios.cooja.Mote;
 import org.contikios.cooja.Simulation;
 import org.contikios.cooja.SimEventCentral.MoteCountListener;
-import org.contikios.cooja.dialogs.MessageList.MessageContainer;
 import org.contikios.cooja.interfaces.IPAddress;
 import org.contikios.cooja.interfaces.Position;
 import org.contikios.cooja.interfaces.RimeAddress;
diff --git a/tools/cooja/java/org/contikios/cooja/util/ExecuteJAR.java b/tools/cooja/java/org/contikios/cooja/util/ExecuteJAR.java
index 66bbbd193..57d1fb4f6 100644
--- a/tools/cooja/java/org/contikios/cooja/util/ExecuteJAR.java
+++ b/tools/cooja/java/org/contikios/cooja/util/ExecuteJAR.java
@@ -54,8 +54,8 @@ import org.contikios.cooja.Plugin;
 import org.contikios.cooja.ProjectConfig;
 import org.contikios.cooja.Simulation;
 import org.contikios.cooja.dialogs.CompileContiki;
-import org.contikios.cooja.dialogs.MessageList;
-import org.contikios.cooja.dialogs.MessageList.MessageContainer;
+import org.contikios.cooja.dialogs.MessageContainer;
+import org.contikios.cooja.dialogs.MessageListUI;
 import org.contikios.cooja.plugins.ScriptRunner;
 import org.contikios.cooja.PluginType;
 
@@ -415,7 +415,7 @@ public class ExecuteJAR {
     }
 
     logger.info("Building executable JAR: " + outputFile);
-    MessageList errors = new MessageList();
+    MessageListUI errors = new MessageListUI();
     try {
       CompileContiki.compile(
           "jar cfm " + outputFile.getAbsolutePath() + " manifest.tmp .",

From 763c63f428a62b98a71736cd5d08ca9cf77264ce Mon Sep 17 00:00:00 2001
From: Yasuyuki Tanaka <yasuyuki.tanaka@inf.ethz.ch>
Date: Wed, 27 Apr 2016 20:35:05 +0200
Subject: [PATCH 213/393] Handle the case when log->link is NULL in
 tsch_log_process_pending

---
 core/net/mac/tsch/tsch-log.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/net/mac/tsch/tsch-log.c b/core/net/mac/tsch/tsch-log.c
index bfb033e9d..23794a5dd 100644
--- a/core/net/mac/tsch/tsch-log.c
+++ b/core/net/mac/tsch/tsch-log.c
@@ -84,11 +84,15 @@ tsch_log_process_pending(void)
   }
   while((log_index = ringbufindex_peek_get(&log_ringbuf)) != -1) {
     struct tsch_log_t *log = &log_array[log_index];
-    struct tsch_slotframe *sf = tsch_schedule_get_slotframe_by_handle(log->link->slotframe_handle);
-    printf("TSCH: {asn-%x.%lx link-%u-%u-%u-%u ch-%u} ",
-        log->asn.ms1b, log->asn.ls4b,
-        log->link->slotframe_handle, sf ? sf->size.val : 0, log->link->timeslot, log->link->channel_offset,
-        tsch_calculate_channel(&log->asn, log->link->channel_offset));
+    if(log->link == NULL) {
+      printf("TSCH: {asn-%x.%lx link-NULL} ", log->asn.ms1b, log->asn.ls4b);
+    } else {
+      struct tsch_slotframe *sf = tsch_schedule_get_slotframe_by_handle(log->link->slotframe_handle);
+      printf("TSCH: {asn-%x.%lx link-%u-%u-%u-%u ch-%u} ",
+             log->asn.ms1b, log->asn.ls4b,
+             log->link->slotframe_handle, sf ? sf->size.val : 0, log->link->timeslot, log->link->channel_offset,
+             tsch_calculate_channel(&log->asn, log->link->channel_offset));
+    }
     switch(log->type) {
       case tsch_log_tx:
         printf("%s-%u-%u %u tx %d, st %d-%d",

From 5bd7fc86c307756b0969cfeafa70c8aef41ad63b Mon Sep 17 00:00:00 2001
From: Frank Freihube <frank.freihube@rmcan.com>
Date: Fri, 29 Apr 2016 07:56:35 +0200
Subject: [PATCH 214/393] make changes configurable through io_semantics()

---
 core/cfs/cfs-coffee.c | 15 +++++++++++++--
 core/cfs/cfs-coffee.h |  9 +++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/core/cfs/cfs-coffee.c b/core/cfs/cfs-coffee.c
index 07df6121b..d4d988ae8 100644
--- a/core/cfs/cfs-coffee.c
+++ b/core/cfs/cfs-coffee.c
@@ -1098,9 +1098,20 @@ cfs_read(int fd, void *buf, unsigned size)
 
   fdp = &coffee_fd_set[fd];
   file = fdp->file;
-  while(fdp->offset + size > file->end) {
-    ((char*)buf)[--size] = 0;
+  
+#if COFFEE_IO_SEMANTICS
+  if(fdp->io_flags & CFS_COFFEE_IO_FIRM_SIZE) {
+    while(fdp->offset + size > file->end) {
+      ((char*)buf)[--size] = 0;
+    }
+  } else {
+#endif
+    if(fdp->offset + size > file->end) {
+      size = file->end - fdp->offset;
+    }
+#if COFFEE_IO_SEMANTICS
   }
+#endif
 
   /* If the file is not modified, read directly from the file extent. */
   if(!FILE_MODIFIED(file)) {
diff --git a/core/cfs/cfs-coffee.h b/core/cfs/cfs-coffee.h
index 2c62f2512..96d382980 100644
--- a/core/cfs/cfs-coffee.h
+++ b/core/cfs/cfs-coffee.h
@@ -63,6 +63,15 @@
  */
 #define CFS_COFFEE_IO_FIRM_SIZE		0x2
 
+/**
+ * Instruct Coffee to set unused bytes in the destination buffer to zero.
+ * Trailing zeros may cause a wrong file size, this option ensures that
+ * the corresponding bytes get set, so Coffee does not read unexpected data.
+ *
+ * \sa cfs_coffee_set_io_semantics()
+ */
+#define CFS_COFFEE_IO_ENSURE_READ_LENGTH		0x4
+
 /**
  * \file
  *	Header for the Coffee file system.

From 59727ede70ea4f997a525d55664316e3b058e435 Mon Sep 17 00:00:00 2001
From: Frank Freihube <frank.freihube@rmcan.com>
Date: Fri, 29 Apr 2016 08:12:55 +0200
Subject: [PATCH 215/393] fixup! make changes configurable through
 io_semantics()

---
 core/cfs/cfs-coffee.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/cfs/cfs-coffee.c b/core/cfs/cfs-coffee.c
index d4d988ae8..79eb18d94 100644
--- a/core/cfs/cfs-coffee.c
+++ b/core/cfs/cfs-coffee.c
@@ -1100,7 +1100,7 @@ cfs_read(int fd, void *buf, unsigned size)
   file = fdp->file;
   
 #if COFFEE_IO_SEMANTICS
-  if(fdp->io_flags & CFS_COFFEE_IO_FIRM_SIZE) {
+  if(fdp->io_flags & CFS_COFFEE_IO_ENSURE_READ_LENGTH) {
     while(fdp->offset + size > file->end) {
       ((char*)buf)[--size] = 0;
     }

From 37b2d9f6008384d6712c44baa6d82f9d6accfdfc Mon Sep 17 00:00:00 2001
From: Yasuyuki Tanaka <yasuyuki.tanaka@inf.ethz.ch>
Date: Mon, 2 May 2016 18:18:12 +0200
Subject: [PATCH 216/393] Replace the '+' operator with
 String.prototype.concat()

---
 regression-tests/12-rpl/01-rpl-up-route.csc            | 4 ++--
 regression-tests/12-rpl/02-rpl-root-reboot.csc         | 4 ++--
 regression-tests/12-rpl/03-rpl-28-hours.csc            | 4 ++--
 regression-tests/12-rpl/04-rpl-large-network.csc       | 4 ++--
 regression-tests/12-rpl/05-rpl-up-and-down-routes.csc  | 4 ++--
 regression-tests/12-rpl/06-rpl-temporary-root-loss.csc | 4 ++--
 regression-tests/12-rpl/08-rpl-dao-route-loss-0.csc    | 4 ++--
 regression-tests/12-rpl/08-rpl-dao-route-loss-1.csc    | 4 ++--
 regression-tests/12-rpl/08-rpl-dao-route-loss-2.csc    | 4 ++--
 regression-tests/12-rpl/08-rpl-dao-route-loss-3.csc    | 4 ++--
 regression-tests/12-rpl/08-rpl-dao-route-loss-4.csc    | 4 ++--
 regression-tests/12-rpl/08-rpl-dao-route-loss-5.csc    | 4 ++--
 regression-tests/12-rpl/09-rpl-probing.csc             | 4 ++--
 regression-tests/12-rpl/10-rpl-multi-dodag.csc         | 4 ++--
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/regression-tests/12-rpl/01-rpl-up-route.csc b/regression-tests/12-rpl/01-rpl-up-route.csc
index fc79cfc27..da4743d44 100644
--- a/regression-tests/12-rpl/01-rpl-up-route.csc
+++ b/regression-tests/12-rpl/01-rpl-up-route.csc
@@ -323,11 +323,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/12-rpl/02-rpl-root-reboot.csc b/regression-tests/12-rpl/02-rpl-root-reboot.csc
index 14f87c7a9..6c4ce9d28 100644
--- a/regression-tests/12-rpl/02-rpl-root-reboot.csc
+++ b/regression-tests/12-rpl/02-rpl-root-reboot.csc
@@ -323,11 +323,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/12-rpl/03-rpl-28-hours.csc b/regression-tests/12-rpl/03-rpl-28-hours.csc
index 1cf2c5e43..3ebc7adda 100644
--- a/regression-tests/12-rpl/03-rpl-28-hours.csc
+++ b/regression-tests/12-rpl/03-rpl-28-hours.csc
@@ -272,11 +272,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/12-rpl/04-rpl-large-network.csc b/regression-tests/12-rpl/04-rpl-large-network.csc
index e40b7a339..f4ea0fda8 100644
--- a/regression-tests/12-rpl/04-rpl-large-network.csc
+++ b/regression-tests/12-rpl/04-rpl-large-network.csc
@@ -7038,11 +7038,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/12-rpl/05-rpl-up-and-down-routes.csc b/regression-tests/12-rpl/05-rpl-up-and-down-routes.csc
index c2b3cb506..0dd110738 100644
--- a/regression-tests/12-rpl/05-rpl-up-and-down-routes.csc
+++ b/regression-tests/12-rpl/05-rpl-up-and-down-routes.csc
@@ -321,11 +321,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/12-rpl/06-rpl-temporary-root-loss.csc b/regression-tests/12-rpl/06-rpl-temporary-root-loss.csc
index 08126f22b..096713102 100644
--- a/regression-tests/12-rpl/06-rpl-temporary-root-loss.csc
+++ b/regression-tests/12-rpl/06-rpl-temporary-root-loss.csc
@@ -327,11 +327,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/12-rpl/08-rpl-dao-route-loss-0.csc b/regression-tests/12-rpl/08-rpl-dao-route-loss-0.csc
index b5aeac9b2..0fc6e032d 100644
--- a/regression-tests/12-rpl/08-rpl-dao-route-loss-0.csc
+++ b/regression-tests/12-rpl/08-rpl-dao-route-loss-0.csc
@@ -339,11 +339,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/12-rpl/08-rpl-dao-route-loss-1.csc b/regression-tests/12-rpl/08-rpl-dao-route-loss-1.csc
index d17bc193c..2c0ce41ff 100644
--- a/regression-tests/12-rpl/08-rpl-dao-route-loss-1.csc
+++ b/regression-tests/12-rpl/08-rpl-dao-route-loss-1.csc
@@ -339,11 +339,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/12-rpl/08-rpl-dao-route-loss-2.csc b/regression-tests/12-rpl/08-rpl-dao-route-loss-2.csc
index fe3db3dc3..cdb2bd748 100644
--- a/regression-tests/12-rpl/08-rpl-dao-route-loss-2.csc
+++ b/regression-tests/12-rpl/08-rpl-dao-route-loss-2.csc
@@ -339,11 +339,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/12-rpl/08-rpl-dao-route-loss-3.csc b/regression-tests/12-rpl/08-rpl-dao-route-loss-3.csc
index 7ee838b2c..34b930c0d 100644
--- a/regression-tests/12-rpl/08-rpl-dao-route-loss-3.csc
+++ b/regression-tests/12-rpl/08-rpl-dao-route-loss-3.csc
@@ -339,11 +339,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/12-rpl/08-rpl-dao-route-loss-4.csc b/regression-tests/12-rpl/08-rpl-dao-route-loss-4.csc
index 35c5bd753..ff9a400c1 100644
--- a/regression-tests/12-rpl/08-rpl-dao-route-loss-4.csc
+++ b/regression-tests/12-rpl/08-rpl-dao-route-loss-4.csc
@@ -339,11 +339,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/12-rpl/08-rpl-dao-route-loss-5.csc b/regression-tests/12-rpl/08-rpl-dao-route-loss-5.csc
index 4dc5038bc..e491b666f 100644
--- a/regression-tests/12-rpl/08-rpl-dao-route-loss-5.csc
+++ b/regression-tests/12-rpl/08-rpl-dao-route-loss-5.csc
@@ -339,11 +339,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/12-rpl/09-rpl-probing.csc b/regression-tests/12-rpl/09-rpl-probing.csc
index 5206f1cfd..66a156e9c 100644
--- a/regression-tests/12-rpl/09-rpl-probing.csc
+++ b/regression-tests/12-rpl/09-rpl-probing.csc
@@ -234,12 +234,12 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
         lastMsgHops = hops;&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/12-rpl/10-rpl-multi-dodag.csc b/regression-tests/12-rpl/10-rpl-multi-dodag.csc
index fa015e8d9..0f446cc65 100644
--- a/regression-tests/12-rpl/10-rpl-multi-dodag.csc
+++ b/regression-tests/12-rpl/10-rpl-multi-dodag.csc
@@ -368,11 +368,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;

From cd7885ae766de1ba4998c11f15f7c8d55b8e7775 Mon Sep 17 00:00:00 2001
From: Jens Dede <jd@comnets.uni-bremen.de>
Date: Mon, 2 May 2016 18:48:16 +0200
Subject: [PATCH 217/393] do not use setBaudrate

---
 tools/sky/msp430-bsl-linux  | 3 ++-
 tools/zolertia/z1-bsl       | 3 ++-
 tools/zolertia/z1-bsl-nopic | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/sky/msp430-bsl-linux b/tools/sky/msp430-bsl-linux
index 133f1bd35..c78e18640 100755
--- a/tools/sky/msp430-bsl-linux
+++ b/tools/sky/msp430-bsl-linux
@@ -1162,8 +1162,9 @@ class BootStrapLoader(LowLevel):
         sys.stderr.flush()
         self.bslTxRx(self.BSL_CHANGEBAUD,   #Command: change baudrate
                     a, l)                   #args are coded in adr and len
+        self.serialport.flush()
         time.sleep(0.010)                   #recomended delay
-        self.serialport.setBaudrate(baudrate)
+        self.serialport.baudrate = baudrate
 
     def actionReadBSLVersion(self):
         """informational output of BSL version number.
diff --git a/tools/zolertia/z1-bsl b/tools/zolertia/z1-bsl
index 7c0584337..31d58d1df 100755
--- a/tools/zolertia/z1-bsl
+++ b/tools/zolertia/z1-bsl
@@ -1350,8 +1350,9 @@ class BootStrapLoader(LowLevel):
         sys.stderr.flush()
         self.bslTxRx(self.BSL_CHANGEBAUD,   #Command: change baudrate
                     a, l)                   #args are coded in adr and len
+        self.serialport.flush()
         time.sleep(0.010)                   #recomended delay
-        self.serialport.setBaudrate(baudrate)
+        self.serialport.baudrate = baudrate
 
     def actionReadBSLVersion(self):
         """informational output of BSL version number.
diff --git a/tools/zolertia/z1-bsl-nopic b/tools/zolertia/z1-bsl-nopic
index 802c84642..8b5edd8f5 100755
--- a/tools/zolertia/z1-bsl-nopic
+++ b/tools/zolertia/z1-bsl-nopic
@@ -1364,8 +1364,9 @@ class BootStrapLoader(LowLevel):
         sys.stderr.flush()
         self.bslTxRx(self.BSL_CHANGEBAUD,   #Command: change baudrate
                     a, l)                   #args are coded in adr and len
+        self.serialport.flush()
         time.sleep(0.010)                   #recomended delay
-        self.serialport.setBaudrate(baudrate)
+        self.serialport.baudrate = baudrate
 
     def actionReadBSLVersion(self):
         """informational output of BSL version number.

From 43fb479c9d67d14820f0f493f4825d84c0a31945 Mon Sep 17 00:00:00 2001
From: Jens Dede <jd@comnets.uni-bremen.de>
Date: Mon, 2 May 2016 18:57:48 +0200
Subject: [PATCH 218/393] Fix broken include

---
 platform/z1/contiki-z1-main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/z1/contiki-z1-main.c b/platform/z1/contiki-z1-main.c
index 477bab975..92a7b5bd7 100644
--- a/platform/z1/contiki-z1-main.c
+++ b/platform/z1/contiki-z1-main.c
@@ -77,7 +77,7 @@ static struct timer mgt_timer;
 #if NETSTACK_CONF_WITH_IPV4
 #include "net/ip/uip.h"
 #include "net/ipv4/uip-fw.h"
-#include "net/uip-fw-drv.h"
+#include "net/ipv4/uip-fw-drv.h"
 #include "net/ipv4/uip-over-mesh.h"
 static struct uip_fw_netif slipif =
 { UIP_FW_NETIF(192, 168, 1, 2, 255, 255, 255, 255, slip_send) };

From 119291d083deb73e9bc053e38ff6d6482b5f38ab Mon Sep 17 00:00:00 2001
From: Jens Dede <jd@comnets.uni-bremen.de>
Date: Mon, 2 May 2016 19:13:26 +0200
Subject: [PATCH 219/393] Fix putchar include when using IPv4

---
 cpu/msp430/dev/uart0-putchar.c | 5 ++++-
 cpu/msp430/dev/uart1-putchar.c | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cpu/msp430/dev/uart0-putchar.c b/cpu/msp430/dev/uart0-putchar.c
index 819f627d2..c9fa974a6 100644
--- a/cpu/msp430/dev/uart0-putchar.c
+++ b/cpu/msp430/dev/uart0-putchar.c
@@ -1,9 +1,12 @@
-#include "dev/uart0.h"
 #include <stdio.h>
+#include "dev/uart0.h"
 
+#ifndef NETSTACK_CONF_WITH_IPV4
+/* In case of IPv4: putchar() is defined by the SLIP driver */
 int
 putchar(int c)
 {
   uart0_writeb((char)c);
   return c;
 }
+#endif /* NETSTACK_CONF_WITH_IPV4 */
diff --git a/cpu/msp430/dev/uart1-putchar.c b/cpu/msp430/dev/uart1-putchar.c
index 3d7f65c7b..c966b920d 100644
--- a/cpu/msp430/dev/uart1-putchar.c
+++ b/cpu/msp430/dev/uart1-putchar.c
@@ -1,9 +1,12 @@
 #include <stdio.h>
 #include "dev/uart1.h"
 
+#ifndef NETSTACK_CONF_WITH_IPV4
+/* In case of IPv4: putchar() is defined by the SLIP driver */
 int
 putchar(int c)
 {
   uart1_writeb((char)c);
   return c;
 }
+#endif /* NETSTACK_CONF_WITH_IPV4 */

From 59afae85e201701f5450a83bd0ceb4b191665203 Mon Sep 17 00:00:00 2001
From: Jens Dede <jd@comnets.uni-bremen.de>
Date: Mon, 2 May 2016 22:34:58 +0200
Subject: [PATCH 220/393] Use if instead of ifdef. Is more contiki
 standard-compliant

---
 cpu/msp430/dev/uart0-putchar.c | 4 ++--
 cpu/msp430/dev/uart1-putchar.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cpu/msp430/dev/uart0-putchar.c b/cpu/msp430/dev/uart0-putchar.c
index c9fa974a6..e797e8b28 100644
--- a/cpu/msp430/dev/uart0-putchar.c
+++ b/cpu/msp430/dev/uart0-putchar.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include "dev/uart0.h"
 
-#ifndef NETSTACK_CONF_WITH_IPV4
+#if !NETSTACK_CONF_WITH_IPV4
 /* In case of IPv4: putchar() is defined by the SLIP driver */
 int
 putchar(int c)
@@ -9,4 +9,4 @@ putchar(int c)
   uart0_writeb((char)c);
   return c;
 }
-#endif /* NETSTACK_CONF_WITH_IPV4 */
+#endif /* ! NETSTACK_CONF_WITH_IPV4 */
diff --git a/cpu/msp430/dev/uart1-putchar.c b/cpu/msp430/dev/uart1-putchar.c
index c966b920d..e005ff255 100644
--- a/cpu/msp430/dev/uart1-putchar.c
+++ b/cpu/msp430/dev/uart1-putchar.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include "dev/uart1.h"
 
-#ifndef NETSTACK_CONF_WITH_IPV4
+#if !NETSTACK_CONF_WITH_IPV4
 /* In case of IPv4: putchar() is defined by the SLIP driver */
 int
 putchar(int c)
@@ -9,4 +9,4 @@ putchar(int c)
   uart1_writeb((char)c);
   return c;
 }
-#endif /* NETSTACK_CONF_WITH_IPV4 */
+#endif /* ! NETSTACK_CONF_WITH_IPV4 */

From 19550f9f7f63d6fe2dab191f2044f4e4f5d59df6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Sat, 23 Apr 2016 10:03:09 +0200
Subject: [PATCH 221/393] core/cfs: Disallow seeking past the end of a file if
 it is not writable

---
 core/cfs/cfs-coffee.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/cfs/cfs-coffee.c b/core/cfs/cfs-coffee.c
index 79eb18d94..37b1a707e 100644
--- a/core/cfs/cfs-coffee.c
+++ b/core/cfs/cfs-coffee.c
@@ -1055,7 +1055,12 @@ cfs_seek(int fd, cfs_offset_t offset, int whence)
   }
 
   if(fdp->file->end < new_offset) {
-    fdp->file->end = new_offset;
+    if(FD_WRITABLE(fd)) {
+      fdp->file->end = new_offset;
+    } else {
+      /* Disallow seeking past the end of the file for read only FDs */
+      return (cfs_offset_t)-1;
+    }
   }
 
   return fdp->offset = new_offset;

From 7f80b1ad5718ce3615efbe5458e67d8b9d355608 Mon Sep 17 00:00:00 2001
From: Jens Dede <jd@comnets.uni-bremen.de>
Date: Wed, 4 May 2016 11:12:37 +0200
Subject: [PATCH 222/393] Remove include of stdio.h

---
 cpu/msp430/dev/uart0-putchar.c | 1 -
 cpu/msp430/dev/uart1-putchar.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/cpu/msp430/dev/uart0-putchar.c b/cpu/msp430/dev/uart0-putchar.c
index e797e8b28..96f24abf0 100644
--- a/cpu/msp430/dev/uart0-putchar.c
+++ b/cpu/msp430/dev/uart0-putchar.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #include "dev/uart0.h"
 
 #if !NETSTACK_CONF_WITH_IPV4
diff --git a/cpu/msp430/dev/uart1-putchar.c b/cpu/msp430/dev/uart1-putchar.c
index e005ff255..5cb631190 100644
--- a/cpu/msp430/dev/uart1-putchar.c
+++ b/cpu/msp430/dev/uart1-putchar.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #include "dev/uart1.h"
 
 #if !NETSTACK_CONF_WITH_IPV4

From cb729b0785ca41cda501c4a1e8dfa67f32ca6aeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Wed, 4 May 2016 19:12:58 +0200
Subject: [PATCH 223/393] oma-lwm2m: Use sv for string value, bv for boolean

Like the OMA docs specify
---
 apps/oma-lwm2m/lwm2m-engine.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/oma-lwm2m/lwm2m-engine.c b/apps/oma-lwm2m/lwm2m-engine.c
index 62f549db4..e2f6bba7c 100644
--- a/apps/oma-lwm2m/lwm2m-engine.c
+++ b/apps/oma-lwm2m/lwm2m-engine.c
@@ -639,10 +639,10 @@ write_rd_json_data(const lwm2m_context_t *context,
       value = lwm2m_object_get_resource_string(resource, context);
       slen = lwm2m_object_get_resource_strlen(resource, context);
       if(value != NULL) {
-        PRINTF("%s{\"n\":\"%u\",\"vs\":\"%.*s\"}", s,
+        PRINTF("%s{\"n\":\"%u\",\"sv\":\"%.*s\"}", s,
                resource->id, slen, value);
         len = snprintf(&buffer[rdlen], size - rdlen,
-                       "%s{\"n\":\"%u\",\"vs\":\"%.*s\"}", s,
+                       "%s{\"n\":\"%u\",\"sv\":\"%.*s\"}", s,
                        resource->id, slen, value);
       }
     } else if(lwm2m_object_is_resource_int(resource)) {
@@ -682,10 +682,10 @@ write_rd_json_data(const lwm2m_context_t *context,
     } else if(lwm2m_object_is_resource_boolean(resource)) {
       int value;
       if(lwm2m_object_get_resource_boolean(resource, context, &value)) {
-        PRINTF("%s{\"n\":\"%u\",\"v\":%s}", s, resource->id,
+        PRINTF("%s{\"n\":\"%u\",\"bv\":%s}", s, resource->id,
                value ? "true" : "false");
         len = snprintf(&buffer[rdlen], size - rdlen,
-                       "%s{\"n\":\"%u\",\"v\":%s}", s, resource->id,
+                       "%s{\"n\":\"%u\",\"bv\":%s}", s, resource->id,
                        value ? "true" : "false");
       }
     }

From 22e9ccadf78ef0c74f9671f67bcc50f42648c631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Wed, 4 May 2016 19:10:12 +0200
Subject: [PATCH 224/393] ipso-temperature: Use "Cel" for degrees celsius

Like the IPSO documentation says
---
 apps/ipso-objects/ipso-temperature.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ipso-objects/ipso-temperature.c b/apps/ipso-objects/ipso-temperature.c
index 61c87554a..457dfe0f8 100644
--- a/apps/ipso-objects/ipso-temperature.c
+++ b/apps/ipso-objects/ipso-temperature.c
@@ -79,7 +79,7 @@ LWM2M_RESOURCES(temperature_resources,
                 /* Temperature (Current) */
                 LWM2M_RESOURCE_CALLBACK(5700, { temp, NULL, NULL }),
                 /* Units */
-                LWM2M_RESOURCE_STRING(5701, "Celcius"),
+                LWM2M_RESOURCE_STRING(5701, "Cel"),
                 /* Min Range Value */
                 LWM2M_RESOURCE_FLOATFIX(5603, IPSO_TEMPERATURE_MIN),
                 /* Max Range Value */

From d9fd19eb2fb86c6695384e7e76b6e6c43d80536d Mon Sep 17 00:00:00 2001
From: Marco Grella <marco.grella@st.com>
Date: Thu, 5 May 2016 16:44:07 +0200
Subject: [PATCH 225/393] Update to stm32nucleo-spirit1 platform README file.

---
 platform/stm32nucleo-spirit1/README.md | 51 +++++++++++---------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/platform/stm32nucleo-spirit1/README.md b/platform/stm32nucleo-spirit1/README.md
index 80d178dfa..dcb29caf4 100644
--- a/platform/stm32nucleo-spirit1/README.md
+++ b/platform/stm32nucleo-spirit1/README.md
@@ -7,13 +7,13 @@ Maintainers and Contacts
 ========================
 
 Long-term maintainers:
-* Marco Grella, marco.grella@st.com, github user: [STclab](https://github.com/STclab)
-* Alok Mittal, alok.mittal@st.com, github user: [STclab](https://github.com/STclab)
-* Indar Prakash Singhal, indar.singhal@st.com, github user: [STclab](https://github.com/STclab)
+* Marco Grella, marco.grella@st.com, github user: [mgrella](https://github.com/mgrella)
+* Alok Mittal, alok.mittal@st.com, github user: [alokclab](https://github.com/alokclab)
+* Indar Prakash Singhal, indar.singhal@st.com, github user: [indars](https://github.com/indars)
 
 Contributors:
 * David Siorpaes, david.siorpaes@st.com, github user: [siorpaes](https://github.com/siorpaes)
-* Luca Celetto, luca.celetto@st.com
+* Luca Celetto, luca.celetto@st.com, github user: [luckyluke72](https://github.com/luckyluke72)
 
 Port Feature
 ============
@@ -25,11 +25,18 @@ The port supports the following boards from ST:
 -   X-NUCLEO-IKS01A1 featuring motion MEMS and environmental sensors (optional)
 
 The following drivers are included:
-- LEDs and buttons (user, reset)
+- LEDs and user button
 - USB
 - SPIRIT1 sub-1GHz transceiver  
 - HTS221, LIS3MDL, LPS25HB, LSM6DS0 sensors
 
+Documentation
+=============
+
+- User Manual: UM2000 "Getting started with the Contiki OS/6LoWPAN on STM32 Nucleo with SPIRIT1 and sensors expansion boards"
+- Quick Start Guide (presentation): "Contiki 6LoWPAN Quick Guide"
+
+To access this documentation and other collaterals, please go to http://www.st.com and search for "STSW-CONTIKI6LP" part number.
 
 Hardware Requirements
 =====================
@@ -38,8 +45,7 @@ Hardware Requirements
 
  >The NUCLEO-L152RE board belongs to the STM32 Nucleo family.
 It features an STM32L152RET6 ultra-low power microcontroller based on ARM Cortex M3 MCU.
-Detailed information on the NUCLEO-L152RE development board can be found at:
-http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1847/PF260002
+For detailed information on the NUCLEO-L152RE development board, please go to http://www.st.com and search for the "NUCLEO-L152RE" part number.
 
 
 * X-NUCLEO-IDS01Ax sub-1GHz expansion board
@@ -49,22 +55,15 @@ the module SPSGRF-868 or SPSGRF-915 based on SPIRIT1 low data rate, low power su
 
  >The user can select the X-NUCLEO-IDS01A4 board to operate the SPIRIT1 transceiver at 868MHz or the X-NUCLEO-IDS01A5 board to operate the SPIRIT1 transceiver at 915MHz.
 
- >Detailed information on the X-NUCLEO-IDS01A4 expansion board can be found at:
-http://www.st.com/web/catalog/tools/FM146/CL2167/SC2006/PF261982
-
- >Detailed information on the X-NUCLEO-IDS01A5 expansion board can be found at:
-http://www.st.com/web/catalog/tools/FM146/CL2167/SC2006/PF261983 
-
- >Detailed information on the SPIRIT1 sub-1GHz transceiver can be found at:
-http://www.st.com/web/catalog/sense_power/FM2185/SC1845/PF253167
+>For detailed information on the X-NUCLEO-IDS01A4 or X-NUCLEO-IDS01A5 expansion board, or the SPIRIT1 transceiver please go to http://www.st.com and search for the specific part number.
+ 
 
 * X-NUCLEO-IKS01A1, motion MEMS and environmental sensors expansion board (OPTIONAL)
 
  >The X-NUCLEO-IKS01A1 is a motion MEMS and environmental sensor evaluation board.
 The use of this board is optional in the stm32nucleo-spirit1 Contiki platform. 
 
- >Detailed information on the X-NUCLEO-IKS01A1 expansion board can be found at:
-http://www.st.com/web/catalog/tools/FM146/CL2167/SC2006/PF261191
+ >For detailed information on the X-NUCLEO-IKS01A1 expansion board, please go to http://www.st.com and search for the "X-NUCLEO-IKS01A1" part number.
 
 
 * USB type A to Mini-B USB cable, to connect the STM32 Nucleo board to the PC
@@ -76,17 +75,16 @@ The following software are needed:
 
 * ST port of Contiki for STM32 Nucleo and expansion boards. 
  
- >The port is automatically installed when both the Contiki and the submodule repository are cloned: the former hosts the Contiki distribution and the ST platform interface, the latter hosts the actual library. The following commands are needed to download the full porting: 
+ >The port is automatically installed when both the Contiki and the submodule repository are cloned: the former hosts the Contiki distribution and the ST platform interface, the latter hosts the actual library. The following command downloads the full porting: 
+
+	git clone --recursive https://github.com/contiki-os/contiki
+
+Alternatively, if you cloned the contiki repository without the "--recursive" option, you can simply download the submodule repository with the following commands:
 
-	git clone https://github.com/STclab/contiki.git
 	cd contiki/
-	git checkout stm32nucleo-spirit1
 	git submodule init
 	git submodule update
 
-
-Note: the first and third steps are required only if using the STclab GitHub repository, they won't be needed any more once the Pull Request is accepted.
-
 The platform name is: stm32nucleo-spirit1
 
 * A toolchain to build the firmware: The port has been developed and tested with GNU Tools 
@@ -158,10 +156,3 @@ automatically created when plugging the STM32 Nucleo board to the PC.
 6. Reset the MCU by using the reset button on the STM32 Nucleo board
 
 
-
-
-
-
-
-
-

From 4870f9e8f33251bead63230a6917c8ddce37eae2 Mon Sep 17 00:00:00 2001
From: Thomas <Thomas@aprikado.fritz.box>
Date: Mon, 9 May 2016 18:18:28 +0200
Subject: [PATCH 226/393] Fix for IPv6 compilation and linkage errors

Two errors have been spotted, when IPv6 is enabled in the ravenusb
Project-Makefile:
#CONTIKI_NO_NET=1
CONTIKI_WITH_IPV6=1

The compile error results from a variable name mismatch in cdc_task.c
The variable 'r' is undeclared and should be renamed to 'route'

The linker also fails with 'undefined references'
This has been mediated by adding 'core/net' to Modules in the
Project-Makefile.
---
 examples/ravenusbstick/Makefile.ravenusbstick | 2 +-
 platform/avr-ravenusb/cdc_task.c              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/ravenusbstick/Makefile.ravenusbstick b/examples/ravenusbstick/Makefile.ravenusbstick
index d00ba6cba..27b244b11 100644
--- a/examples/ravenusbstick/Makefile.ravenusbstick
+++ b/examples/ravenusbstick/Makefile.ravenusbstick
@@ -8,7 +8,7 @@ CONTIKI_WITH_IPV6=0
 
 CONTIKI = ../..
 
-MODULES+=core/net/mac/sicslowmac core/net/mac core/net/llsec
+MODULES+=core/net/mac/sicslowmac core/net core/net/mac core/net/llsec
 
 PROJECT_SOURCEFILES += fakeuip.c
 
diff --git a/platform/avr-ravenusb/cdc_task.c b/platform/avr-ravenusb/cdc_task.c
index 8caabc772..de30d8d65 100644
--- a/platform/avr-ravenusb/cdc_task.c
+++ b/platform/avr-ravenusb/cdc_task.c
@@ -611,7 +611,7 @@ extern uip_ds6_netif_t uip_ds6_if;
 				uip_ds6_route_t *route;
 		    for(route = uip_ds6_route_head();
 		        route != NULL;
-		        route = uip_ds6_route_next(r)) {
+		        route = uip_ds6_route_next(route)) {
 					ipaddr_add(&route->ipaddr);
 					PRINTF_P(PSTR("/%u (via "), route->length);
 					ipaddr_add(uip_ds6_route_nexthop(route));

From 633bf09f6db22fb307ec310625344724fa35bfc7 Mon Sep 17 00:00:00 2001
From: Yasuyuki Tanaka <yasuyuki.tanaka@inf.ethz.ch>
Date: Thu, 12 May 2016 21:13:41 +0200
Subject: [PATCH 227/393] Fix the path for wpcapslip in testscript for Instant
 Contiki

---
 regression-tests/20-ip64/01-cooja-ip64-http-socket.csc | 2 +-
 regression-tests/21-large-rpl/testscript.js            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/regression-tests/20-ip64/01-cooja-ip64-http-socket.csc b/regression-tests/20-ip64/01-cooja-ip64-http-socket.csc
index bc075971b..cec228b5e 100644
--- a/regression-tests/20-ip64/01-cooja-ip64-http-socket.csc
+++ b/regression-tests/20-ip64/01-cooja-ip64-http-socket.csc
@@ -151,7 +151,7 @@ if (travis == null) {&#xD;
     /* Instant Contiki */&#xD;
     CMD_TUNNEL = "echo '-vj' &gt; ~/.slirprc &amp;&amp; make Connect.class &amp;&amp; java Connect 'nc localhost 60001' 'script -t -f -c slirp'";&#xD;
     CMD_PING = "ping -c 5 8.8.8.8";&#xD;
-    CMD_DIR = "../../wpcapslip";&#xD;
+    CMD_DIR = "../../tools/wpcapslip";&#xD;
 } else {&#xD;
     /* Travis */&#xD;
     CMD_TUNNEL = "cd $TRAVIS_BUILD_DIR/tools/wpcapslip &amp;&amp; sudo apt-get install slirp &amp;&amp; echo '-vj' &gt; ~/.slirprc &amp;&amp; make Connect.class &amp;&amp; java Connect 'nc localhost 60001' 'script -t -f -c slirp'";&#xD;
diff --git a/regression-tests/21-large-rpl/testscript.js b/regression-tests/21-large-rpl/testscript.js
index 0c23bceef..4c4c8a56b 100644
--- a/regression-tests/21-large-rpl/testscript.js
+++ b/regression-tests/21-large-rpl/testscript.js
@@ -9,7 +9,7 @@ if (travis == null) {
     /* Instant Contiki */
     CMD_TUNNEL = "echo '-vj' > ~/.slirprc && make Connect.class && java Connect 'nc localhost 60001' 'script -t -f -c slirp'";
     CMD_PING = "ping -c 5 8.8.8.8";
-    CMD_DIR = "../../wpcapslip";
+    CMD_DIR = "../../tools/wpcapslip";
 } else {
     /* Travis */
     CMD_TUNNEL = "cd $TRAVIS_BUILD_DIR/tools/wpcapslip && sudo apt-get install slirp && echo '-vj' > ~/.slirprc && make Connect.class && java Connect 'nc localhost 60001' 'script -t -f -c slirp'";

From 5bc158fa75e691b552efaf477c9dced27018fdc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Corbal=C3=A1n?= <paul.corbalan@gmail.com>
Date: Fri, 13 May 2016 17:56:49 +0100
Subject: [PATCH 228/393] Add upload script to Makefile.launchpad

---
 .../srf06-cc26xx/launchpad/Makefile.launchpad    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/platform/srf06-cc26xx/launchpad/Makefile.launchpad b/platform/srf06-cc26xx/launchpad/Makefile.launchpad
index deefeed81..853450142 100644
--- a/platform/srf06-cc26xx/launchpad/Makefile.launchpad
+++ b/platform/srf06-cc26xx/launchpad/Makefile.launchpad
@@ -4,3 +4,19 @@ CONTIKI_TARGET_DIRS += launchpad common
 
 BOARD_SOURCEFILES += board.c launchpad-sensors.c leds-arch.c button-sensor.c
 BOARD_SOURCEFILES += ext-flash.c board-spi.c
+
+PYTHON = python
+BSL_FLAGS += -e -w -v
+
+ifdef PORT
+  BSL_FLAGS += -p $(PORT)
+endif
+
+BSL = $(CONTIKI)/tools/cc2538-bsl/cc2538-bsl.py
+
+%.upload: %.bin
+ifeq ($(wildcard $(BSL)), )
+	@echo "ERROR: Could not find the cc2538-bsl script. Did you run 'git submodule update --init' ?"
+else
+	$(PYTHON) $(BSL) $(BSL_FLAGS) $<
+endif

From 3c19e870f1f264f725a3686ba70350d1f338e353 Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Sat, 14 May 2016 12:05:19 +0200
Subject: [PATCH 229/393] Moving the avr-rss2 platform examples to the global
 examples location as suggested by the maintainers.

---
 .../avr-rss2}/avr_radio_power/AtMega256RFR2-summary-power.dat     | 0
 .../examples => examples/avr-rss2}/avr_radio_power/Makefile       | 0
 .../examples => examples/avr-rss2}/avr_radio_power/README.md      | 0
 .../avr-rss2}/avr_radio_power/avr_radio_power.c                   | 0
 .../examples => examples/avr-rss2}/avr_radio_power/project-conf.h | 0
 .../examples => examples/avr-rss2}/hello-sensors/Makefile         | 0
 .../examples => examples/avr-rss2}/hello-sensors/README.md        | 0
 .../examples => examples/avr-rss2}/hello-sensors/hello-sensors.c  | 0
 .../examples => examples/avr-rss2}/hello-sensors/project-conf.h   | 0
 .../examples => examples/avr-rss2}/ipv6/dc-rpl-coap/Makefile      | 0
 .../examples => examples/avr-rss2}/ipv6/dc-rpl-coap/README.md     | 0
 .../examples => examples/avr-rss2}/ipv6/dc-rpl-coap/coap-client.c | 0
 .../examples => examples/avr-rss2}/ipv6/dc-rpl-coap/coap-server.c | 0
 .../avr-rss2}/ipv6/dc-rpl-coap/dc-rpl-coap.csc                    | 0
 .../avr-rss2}/ipv6/dc-rpl-coap/dev/dc-hw-sensor.c                 | 0
 .../avr-rss2}/ipv6/dc-rpl-coap/dev/dc-hw-sensor.h                 | 0
 .../avr-rss2}/ipv6/dc-rpl-coap/dev/dc-status-sensor.c             | 0
 .../avr-rss2}/ipv6/dc-rpl-coap/dev/dc-status-sensor.h             | 0
 .../avr-rss2}/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.c                | 0
 .../avr-rss2}/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.h                | 0
 .../examples => examples/avr-rss2}/ipv6/dc-rpl-coap/er-dc-test.h  | 0
 .../avr-rss2}/ipv6/dc-rpl-coap/project-conf.h                     | 0
 .../avr-rss2}/ipv6/dc-rpl-coap/resources/res-dc-co2.c             | 0
 .../avr-rss2}/ipv6/dc-rpl-coap/resources/res-dc-hwcfg.c           | 0
 .../avr-rss2}/ipv6/dc-rpl-coap/resources/res-dc-status-obs.c      | 0
 .../avr-rss2}/ipv6/dc-rpl-coap/resources/res-dc-vdc.c             | 0
 .../avr-rss2}/ipv6/rpl-border-router/Makefile                     | 0
 .../avr-rss2}/ipv6/rpl-border-router/README.ETHERNET.md           | 0
 .../avr-rss2}/ipv6/rpl-border-router/README.md                    | 0
 .../avr-rss2}/ipv6/rpl-border-router/border-router.c              | 0
 .../avr-rss2}/ipv6/rpl-border-router/enc28j60-ip64-driver.c       | 0
 .../avr-rss2}/ipv6/rpl-border-router/enc28j60-ip64-driver.h       | 0
 .../avr-rss2}/ipv6/rpl-border-router/eth-bridge.c                 | 0
 .../avr-rss2}/ipv6/rpl-border-router/httpd-simple.c               | 0
 .../avr-rss2}/ipv6/rpl-border-router/httpd-simple.h               | 0
 .../avr-rss2}/ipv6/rpl-border-router/project-conf.h               | 0
 .../examples => examples/avr-rss2}/ipv6/rpl-udp-report/Makefile   | 0
 .../examples => examples/avr-rss2}/ipv6/rpl-udp-report/README.md  | 0
 .../avr-rss2}/ipv6/rpl-udp-report/project-conf.h                  | 0
 .../examples => examples/avr-rss2}/ipv6/rpl-udp-report/report.c   | 0
 .../avr-rss2}/ipv6/rpl-udp-report/rss2-rpl-udp.csc                | 0
 .../examples => examples/avr-rss2}/ipv6/rpl-udp-report/sink.c     | 0
 .../examples => examples/avr-rss2}/ipv6/sensd_client/Makefile     | 0
 .../examples => examples/avr-rss2}/ipv6/sensd_client/README.md    | 0
 .../avr-rss2}/ipv6/sensd_client/project-conf.h                    | 0
 .../avr-rss2}/ipv6/sensd_client/sensd_client.c                    | 0
 .../examples => examples/avr-rss2}/ipv6/sensd_client/server.c     | 0
 47 files changed, 0 insertions(+), 0 deletions(-)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/avr_radio_power/AtMega256RFR2-summary-power.dat (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/avr_radio_power/Makefile (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/avr_radio_power/README.md (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/avr_radio_power/avr_radio_power.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/avr_radio_power/project-conf.h (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/hello-sensors/Makefile (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/hello-sensors/README.md (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/hello-sensors/hello-sensors.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/hello-sensors/project-conf.h (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/Makefile (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/README.md (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/coap-client.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/coap-server.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/dc-rpl-coap.csc (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/dev/dc-hw-sensor.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/dev/dc-hw-sensor.h (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/dev/dc-status-sensor.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/dev/dc-status-sensor.h (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.h (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/er-dc-test.h (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/project-conf.h (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/resources/res-dc-co2.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/resources/res-dc-hwcfg.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/resources/res-dc-status-obs.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/dc-rpl-coap/resources/res-dc-vdc.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/rpl-border-router/Makefile (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/rpl-border-router/README.ETHERNET.md (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/rpl-border-router/README.md (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/rpl-border-router/border-router.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/rpl-border-router/enc28j60-ip64-driver.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/rpl-border-router/enc28j60-ip64-driver.h (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/rpl-border-router/eth-bridge.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/rpl-border-router/httpd-simple.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/rpl-border-router/httpd-simple.h (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/rpl-border-router/project-conf.h (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/rpl-udp-report/Makefile (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/rpl-udp-report/README.md (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/rpl-udp-report/project-conf.h (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/rpl-udp-report/report.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/rpl-udp-report/rss2-rpl-udp.csc (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/rpl-udp-report/sink.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/sensd_client/Makefile (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/sensd_client/README.md (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/sensd_client/project-conf.h (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/sensd_client/sensd_client.c (100%)
 rename {platform/avr-rss2/examples => examples/avr-rss2}/ipv6/sensd_client/server.c (100%)

diff --git a/platform/avr-rss2/examples/avr_radio_power/AtMega256RFR2-summary-power.dat b/examples/avr-rss2/avr_radio_power/AtMega256RFR2-summary-power.dat
similarity index 100%
rename from platform/avr-rss2/examples/avr_radio_power/AtMega256RFR2-summary-power.dat
rename to examples/avr-rss2/avr_radio_power/AtMega256RFR2-summary-power.dat
diff --git a/platform/avr-rss2/examples/avr_radio_power/Makefile b/examples/avr-rss2/avr_radio_power/Makefile
similarity index 100%
rename from platform/avr-rss2/examples/avr_radio_power/Makefile
rename to examples/avr-rss2/avr_radio_power/Makefile
diff --git a/platform/avr-rss2/examples/avr_radio_power/README.md b/examples/avr-rss2/avr_radio_power/README.md
similarity index 100%
rename from platform/avr-rss2/examples/avr_radio_power/README.md
rename to examples/avr-rss2/avr_radio_power/README.md
diff --git a/platform/avr-rss2/examples/avr_radio_power/avr_radio_power.c b/examples/avr-rss2/avr_radio_power/avr_radio_power.c
similarity index 100%
rename from platform/avr-rss2/examples/avr_radio_power/avr_radio_power.c
rename to examples/avr-rss2/avr_radio_power/avr_radio_power.c
diff --git a/platform/avr-rss2/examples/avr_radio_power/project-conf.h b/examples/avr-rss2/avr_radio_power/project-conf.h
similarity index 100%
rename from platform/avr-rss2/examples/avr_radio_power/project-conf.h
rename to examples/avr-rss2/avr_radio_power/project-conf.h
diff --git a/platform/avr-rss2/examples/hello-sensors/Makefile b/examples/avr-rss2/hello-sensors/Makefile
similarity index 100%
rename from platform/avr-rss2/examples/hello-sensors/Makefile
rename to examples/avr-rss2/hello-sensors/Makefile
diff --git a/platform/avr-rss2/examples/hello-sensors/README.md b/examples/avr-rss2/hello-sensors/README.md
similarity index 100%
rename from platform/avr-rss2/examples/hello-sensors/README.md
rename to examples/avr-rss2/hello-sensors/README.md
diff --git a/platform/avr-rss2/examples/hello-sensors/hello-sensors.c b/examples/avr-rss2/hello-sensors/hello-sensors.c
similarity index 100%
rename from platform/avr-rss2/examples/hello-sensors/hello-sensors.c
rename to examples/avr-rss2/hello-sensors/hello-sensors.c
diff --git a/platform/avr-rss2/examples/hello-sensors/project-conf.h b/examples/avr-rss2/hello-sensors/project-conf.h
similarity index 100%
rename from platform/avr-rss2/examples/hello-sensors/project-conf.h
rename to examples/avr-rss2/hello-sensors/project-conf.h
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/Makefile b/examples/avr-rss2/ipv6/dc-rpl-coap/Makefile
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/Makefile
rename to examples/avr-rss2/ipv6/dc-rpl-coap/Makefile
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/README.md b/examples/avr-rss2/ipv6/dc-rpl-coap/README.md
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/README.md
rename to examples/avr-rss2/ipv6/dc-rpl-coap/README.md
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-client.c b/examples/avr-rss2/ipv6/dc-rpl-coap/coap-client.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-client.c
rename to examples/avr-rss2/ipv6/dc-rpl-coap/coap-client.c
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-server.c b/examples/avr-rss2/ipv6/dc-rpl-coap/coap-server.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/coap-server.c
rename to examples/avr-rss2/ipv6/dc-rpl-coap/coap-server.c
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dc-rpl-coap.csc b/examples/avr-rss2/ipv6/dc-rpl-coap/dc-rpl-coap.csc
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/dc-rpl-coap.csc
rename to examples/avr-rss2/ipv6/dc-rpl-coap/dc-rpl-coap.csc
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-hw-sensor.c b/examples/avr-rss2/ipv6/dc-rpl-coap/dev/dc-hw-sensor.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-hw-sensor.c
rename to examples/avr-rss2/ipv6/dc-rpl-coap/dev/dc-hw-sensor.c
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-hw-sensor.h b/examples/avr-rss2/ipv6/dc-rpl-coap/dev/dc-hw-sensor.h
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-hw-sensor.h
rename to examples/avr-rss2/ipv6/dc-rpl-coap/dev/dc-hw-sensor.h
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-status-sensor.c b/examples/avr-rss2/ipv6/dc-rpl-coap/dev/dc-status-sensor.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-status-sensor.c
rename to examples/avr-rss2/ipv6/dc-rpl-coap/dev/dc-status-sensor.c
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-status-sensor.h b/examples/avr-rss2/ipv6/dc-rpl-coap/dev/dc-status-sensor.h
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-status-sensor.h
rename to examples/avr-rss2/ipv6/dc-rpl-coap/dev/dc-status-sensor.h
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.c b/examples/avr-rss2/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.c
rename to examples/avr-rss2/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.c
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.h b/examples/avr-rss2/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.h
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.h
rename to examples/avr-rss2/ipv6/dc-rpl-coap/dev/dc-vdc-sensor.h
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/er-dc-test.h b/examples/avr-rss2/ipv6/dc-rpl-coap/er-dc-test.h
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/er-dc-test.h
rename to examples/avr-rss2/ipv6/dc-rpl-coap/er-dc-test.h
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/project-conf.h b/examples/avr-rss2/ipv6/dc-rpl-coap/project-conf.h
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/project-conf.h
rename to examples/avr-rss2/ipv6/dc-rpl-coap/project-conf.h
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-co2.c b/examples/avr-rss2/ipv6/dc-rpl-coap/resources/res-dc-co2.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-co2.c
rename to examples/avr-rss2/ipv6/dc-rpl-coap/resources/res-dc-co2.c
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-hwcfg.c b/examples/avr-rss2/ipv6/dc-rpl-coap/resources/res-dc-hwcfg.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-hwcfg.c
rename to examples/avr-rss2/ipv6/dc-rpl-coap/resources/res-dc-hwcfg.c
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-status-obs.c b/examples/avr-rss2/ipv6/dc-rpl-coap/resources/res-dc-status-obs.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-status-obs.c
rename to examples/avr-rss2/ipv6/dc-rpl-coap/resources/res-dc-status-obs.c
diff --git a/platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-vdc.c b/examples/avr-rss2/ipv6/dc-rpl-coap/resources/res-dc-vdc.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/dc-rpl-coap/resources/res-dc-vdc.c
rename to examples/avr-rss2/ipv6/dc-rpl-coap/resources/res-dc-vdc.c
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/Makefile b/examples/avr-rss2/ipv6/rpl-border-router/Makefile
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/rpl-border-router/Makefile
rename to examples/avr-rss2/ipv6/rpl-border-router/Makefile
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/README.ETHERNET.md b/examples/avr-rss2/ipv6/rpl-border-router/README.ETHERNET.md
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/rpl-border-router/README.ETHERNET.md
rename to examples/avr-rss2/ipv6/rpl-border-router/README.ETHERNET.md
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/README.md b/examples/avr-rss2/ipv6/rpl-border-router/README.md
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/rpl-border-router/README.md
rename to examples/avr-rss2/ipv6/rpl-border-router/README.md
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/border-router.c b/examples/avr-rss2/ipv6/rpl-border-router/border-router.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/rpl-border-router/border-router.c
rename to examples/avr-rss2/ipv6/rpl-border-router/border-router.c
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/enc28j60-ip64-driver.c b/examples/avr-rss2/ipv6/rpl-border-router/enc28j60-ip64-driver.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/rpl-border-router/enc28j60-ip64-driver.c
rename to examples/avr-rss2/ipv6/rpl-border-router/enc28j60-ip64-driver.c
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/enc28j60-ip64-driver.h b/examples/avr-rss2/ipv6/rpl-border-router/enc28j60-ip64-driver.h
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/rpl-border-router/enc28j60-ip64-driver.h
rename to examples/avr-rss2/ipv6/rpl-border-router/enc28j60-ip64-driver.h
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/eth-bridge.c b/examples/avr-rss2/ipv6/rpl-border-router/eth-bridge.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/rpl-border-router/eth-bridge.c
rename to examples/avr-rss2/ipv6/rpl-border-router/eth-bridge.c
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/httpd-simple.c b/examples/avr-rss2/ipv6/rpl-border-router/httpd-simple.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/rpl-border-router/httpd-simple.c
rename to examples/avr-rss2/ipv6/rpl-border-router/httpd-simple.c
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/httpd-simple.h b/examples/avr-rss2/ipv6/rpl-border-router/httpd-simple.h
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/rpl-border-router/httpd-simple.h
rename to examples/avr-rss2/ipv6/rpl-border-router/httpd-simple.h
diff --git a/platform/avr-rss2/examples/ipv6/rpl-border-router/project-conf.h b/examples/avr-rss2/ipv6/rpl-border-router/project-conf.h
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/rpl-border-router/project-conf.h
rename to examples/avr-rss2/ipv6/rpl-border-router/project-conf.h
diff --git a/platform/avr-rss2/examples/ipv6/rpl-udp-report/Makefile b/examples/avr-rss2/ipv6/rpl-udp-report/Makefile
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/rpl-udp-report/Makefile
rename to examples/avr-rss2/ipv6/rpl-udp-report/Makefile
diff --git a/platform/avr-rss2/examples/ipv6/rpl-udp-report/README.md b/examples/avr-rss2/ipv6/rpl-udp-report/README.md
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/rpl-udp-report/README.md
rename to examples/avr-rss2/ipv6/rpl-udp-report/README.md
diff --git a/platform/avr-rss2/examples/ipv6/rpl-udp-report/project-conf.h b/examples/avr-rss2/ipv6/rpl-udp-report/project-conf.h
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/rpl-udp-report/project-conf.h
rename to examples/avr-rss2/ipv6/rpl-udp-report/project-conf.h
diff --git a/platform/avr-rss2/examples/ipv6/rpl-udp-report/report.c b/examples/avr-rss2/ipv6/rpl-udp-report/report.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/rpl-udp-report/report.c
rename to examples/avr-rss2/ipv6/rpl-udp-report/report.c
diff --git a/platform/avr-rss2/examples/ipv6/rpl-udp-report/rss2-rpl-udp.csc b/examples/avr-rss2/ipv6/rpl-udp-report/rss2-rpl-udp.csc
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/rpl-udp-report/rss2-rpl-udp.csc
rename to examples/avr-rss2/ipv6/rpl-udp-report/rss2-rpl-udp.csc
diff --git a/platform/avr-rss2/examples/ipv6/rpl-udp-report/sink.c b/examples/avr-rss2/ipv6/rpl-udp-report/sink.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/rpl-udp-report/sink.c
rename to examples/avr-rss2/ipv6/rpl-udp-report/sink.c
diff --git a/platform/avr-rss2/examples/ipv6/sensd_client/Makefile b/examples/avr-rss2/ipv6/sensd_client/Makefile
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/sensd_client/Makefile
rename to examples/avr-rss2/ipv6/sensd_client/Makefile
diff --git a/platform/avr-rss2/examples/ipv6/sensd_client/README.md b/examples/avr-rss2/ipv6/sensd_client/README.md
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/sensd_client/README.md
rename to examples/avr-rss2/ipv6/sensd_client/README.md
diff --git a/platform/avr-rss2/examples/ipv6/sensd_client/project-conf.h b/examples/avr-rss2/ipv6/sensd_client/project-conf.h
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/sensd_client/project-conf.h
rename to examples/avr-rss2/ipv6/sensd_client/project-conf.h
diff --git a/platform/avr-rss2/examples/ipv6/sensd_client/sensd_client.c b/examples/avr-rss2/ipv6/sensd_client/sensd_client.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/sensd_client/sensd_client.c
rename to examples/avr-rss2/ipv6/sensd_client/sensd_client.c
diff --git a/platform/avr-rss2/examples/ipv6/sensd_client/server.c b/examples/avr-rss2/ipv6/sensd_client/server.c
similarity index 100%
rename from platform/avr-rss2/examples/ipv6/sensd_client/server.c
rename to examples/avr-rss2/ipv6/sensd_client/server.c

From cd5a0ef29156e959f0124edbfe225721f85ec468 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Sat, 14 May 2016 19:16:43 +0100
Subject: [PATCH 230/393] Consolidate .upload for all CC26xx/CC13xx boards

The block that controls the `.upload` target is unnecessarily replicated in multiple sub-board Makefiles. This was originally done because the SmartRF and the Launchpad can be programmed with the c2538-bsl script, whereas the sensortag cannot.

This commit moves the `cc2538-bsl` / `.upload` target logic to the top level cpu Makefile (`cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx`). Board makefiles simply set the make variable `BOARD_SUPPORTS_BSL` to 1 to signal that they can be programmed by the BSL script. If `BOARD_SUPPORTS_BSL` is not equal to 1, trying to use the `.upload` target will return an error message.

For example:

```
$ make BOARD=sensortag/cc2650 cc26xx-demo.upload
using saved target 'srf06-cc26xx'
This board cannot be programmed with the ROM bootloader and therefore does not support the .upload target.
```
---
 cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx      | 20 +++++++++++++++++++
 .../srf06-cc26xx/launchpad/Makefile.launchpad | 17 ++--------------
 platform/srf06-cc26xx/srf06/Makefile.srf06    | 17 ++--------------
 3 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx b/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
index f6ac275da..d0cf1cf31 100644
--- a/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
+++ b/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
@@ -81,6 +81,15 @@ CONTIKI_SOURCEFILES += $(CONTIKI_CPU_SOURCEFILES) $(DEBUG_IO_SOURCEFILES)
 TARGET_START_SOURCEFILES += fault-handlers.c $(TI_XXWARE_STARTUP_SRCS)
 TARGET_STARTFILES = $(addprefix $(OBJECTDIR)/,$(call oname, $(TARGET_START_SOURCEFILES)))
 
+PYTHON = python
+BSL_FLAGS += -e -w -v
+
+ifdef PORT
+  BSL_FLAGS += -p $(PORT)
+endif
+
+BSL = $(CONTIKI)/tools/cc2538-bsl/cc2538-bsl.py
+
 ### Don't treat the .elf as intermediate
 .PRECIOUS: %.elf %.hex %.bin
 
@@ -125,3 +134,14 @@ STACK_SIZE = 0
 	@$(SIZE) -A $< | egrep "data|bss" | awk '{s+=$$2} END {s=s+$(STACK_SIZE); f=$(RAM_SIZE)-s; printf "[RAM]   used %6d, free %6d\n",s,f;}'
 	@$(SIZE) -A $< | egrep "text|isr_vector" | awk '{s+=$$2} END {f=$(FLASH_SIZE)-s; printf "[Flash] used %6d, free %6d\n",s,f;}'
 
+ifeq ($(BOARD_SUPPORTS_BSL),1)
+%.upload: %.bin
+ifeq ($(wildcard $(BSL)), )
+	@echo "ERROR: Could not find the cc2538-bsl script. Did you run 'git submodule update --init' ?"
+else
+	$(PYTHON) $(BSL) $(BSL_FLAGS) $<
+endif
+else
+%.upload:
+	@echo "This board cannot be programmed through the ROM bootloader and therefore does not support the .upload target."
+endif
diff --git a/platform/srf06-cc26xx/launchpad/Makefile.launchpad b/platform/srf06-cc26xx/launchpad/Makefile.launchpad
index 853450142..54bd81ced 100644
--- a/platform/srf06-cc26xx/launchpad/Makefile.launchpad
+++ b/platform/srf06-cc26xx/launchpad/Makefile.launchpad
@@ -5,18 +5,5 @@ CONTIKI_TARGET_DIRS += launchpad common
 BOARD_SOURCEFILES += board.c launchpad-sensors.c leds-arch.c button-sensor.c
 BOARD_SOURCEFILES += ext-flash.c board-spi.c
 
-PYTHON = python
-BSL_FLAGS += -e -w -v
-
-ifdef PORT
-  BSL_FLAGS += -p $(PORT)
-endif
-
-BSL = $(CONTIKI)/tools/cc2538-bsl/cc2538-bsl.py
-
-%.upload: %.bin
-ifeq ($(wildcard $(BSL)), )
-	@echo "ERROR: Could not find the cc2538-bsl script. Did you run 'git submodule update --init' ?"
-else
-	$(PYTHON) $(BSL) $(BSL_FLAGS) $<
-endif
+### Signal that we can be programmed with cc2538-bsl
+BOARD_SUPPORTS_BSL=1
diff --git a/platform/srf06-cc26xx/srf06/Makefile.srf06 b/platform/srf06-cc26xx/srf06/Makefile.srf06
index 3459cbadc..afdeeddec 100644
--- a/platform/srf06-cc26xx/srf06/Makefile.srf06
+++ b/platform/srf06-cc26xx/srf06/Makefile.srf06
@@ -4,18 +4,5 @@ CONTIKI_TARGET_DIRS += srf06
 
 BOARD_SOURCEFILES += leds-arch.c srf06-sensors.c button-sensor.c board.c
 
-PYTHON = python
-BSL_FLAGS += -e -w -v
-
-ifdef PORT
-  BSL_FLAGS += -p $(PORT)
-endif
-
-BSL = $(CONTIKI)/tools/cc2538-bsl/cc2538-bsl.py
-
-%.upload: %.bin
-ifeq ($(wildcard $(BSL)), )
-	@echo "ERROR: Could not find the cc2538-bsl script. Did you run 'git submodule update --init' ?"
-else
-	$(PYTHON) $(BSL) $(BSL_FLAGS) $<
-endif
+### Signal that we can be programmed with cc2538-bsl
+BOARD_SUPPORTS_BSL=1

From 099a933c90c27f3b533692db8c3c860a6f393a48 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Sun, 13 Mar 2016 13:02:41 +0000
Subject: [PATCH 231/393] Add support for the CC1310 LaunchPad

---
 .../launchpad/cc1310/Makefile.cc1310          |   8 +
 .../srf06-cc26xx/launchpad/cc1310/board.h     | 189 ++++++++++++++++++
 2 files changed, 197 insertions(+)
 create mode 100644 platform/srf06-cc26xx/launchpad/cc1310/Makefile.cc1310
 create mode 100644 platform/srf06-cc26xx/launchpad/cc1310/board.h

diff --git a/platform/srf06-cc26xx/launchpad/cc1310/Makefile.cc1310 b/platform/srf06-cc26xx/launchpad/cc1310/Makefile.cc1310
new file mode 100644
index 000000000..8d3d2abd4
--- /dev/null
+++ b/platform/srf06-cc26xx/launchpad/cc1310/Makefile.cc1310
@@ -0,0 +1,8 @@
+### Will allow the inclusion of the correct CPU makefile
+CPU_FAMILY = cc13xx
+
+### Add to the source dirs
+CONTIKI_TARGET_DIRS += launchpad/cc1310
+
+### Include the common launchpad makefile
+include $(PLATFORM_ROOT_DIR)/launchpad/Makefile.launchpad
diff --git a/platform/srf06-cc26xx/launchpad/cc1310/board.h b/platform/srf06-cc26xx/launchpad/cc1310/board.h
new file mode 100644
index 000000000..d6cfeeedb
--- /dev/null
+++ b/platform/srf06-cc26xx/launchpad/cc1310/board.h
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2016, Texas Instruments Incorporated - http://www.ti.com/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/** \addtogroup launchpad-peripherals
+ * @{
+ *
+ * \defgroup launchpad-cc1310-specific CC1310 LaunchPad Peripherals
+ *
+ * Defines related to the CC1310 LaunchPad
+ *
+ * This file provides connectivity information on LEDs, Buttons, UART and
+ * other peripherals
+ *
+ * This file is not meant to be modified by the user.
+ * @{
+ *
+ * \file
+ * Header file with definitions related to the I/O connections on the TI
+ * CC1310 LaunchPad
+ *
+ * \note   Do not include this file directly. It gets included by contiki-conf
+ *         after all relevant directives have been set.
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef BOARD_H_
+#define BOARD_H_
+/*---------------------------------------------------------------------------*/
+#include "ioc.h"
+/*---------------------------------------------------------------------------*/
+/**
+ * \name LED configurations
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+/* Some files include leds.h before us, so we need to get rid of defaults in
+ * leds.h before we provide correct definitions */
+#undef LEDS_GREEN
+#undef LEDS_YELLOW
+#undef LEDS_RED
+#undef LEDS_CONF_ALL
+
+#define LEDS_RED       1
+#define LEDS_GREEN     2
+#define LEDS_YELLOW    LEDS_GREEN
+#define LEDS_ORANGE    LEDS_RED
+
+#define LEDS_CONF_ALL  3
+
+/* Notify various examples that we have LEDs */
+#define PLATFORM_HAS_LEDS        1
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name LED IOID mappings
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#define BOARD_IOID_LED_1          IOID_6
+#define BOARD_IOID_LED_2          IOID_7
+#define BOARD_LED_1               (1 << BOARD_IOID_LED_1)
+#define BOARD_LED_2               (1 << BOARD_IOID_LED_2)
+#define BOARD_LED_ALL             (BOARD_LED_1 | BOARD_LED_2)
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name UART IOID mapping
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#define BOARD_IOID_UART_RX        IOID_2
+#define BOARD_IOID_UART_TX        IOID_3
+#define BOARD_IOID_UART_RTS       IOID_18
+#define BOARD_IOID_UART_CTS       IOID_19
+#define BOARD_UART_RX             (1 << BOARD_IOID_UART_RX)
+#define BOARD_UART_TX             (1 << BOARD_IOID_UART_TX)
+#define BOARD_UART_RTS            (1 << BOARD_IOID_UART_RTS)
+#define BOARD_UART_CTS            (1 << BOARD_IOID_UART_CTS)
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name Button IOID mapping
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#define BOARD_IOID_KEY_LEFT       IOID_13
+#define BOARD_IOID_KEY_RIGHT      IOID_14
+#define BOARD_KEY_LEFT            (1 << BOARD_IOID_KEY_LEFT)
+#define BOARD_KEY_RIGHT           (1 << BOARD_IOID_KEY_RIGHT)
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief SPI IOID mappings
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#define BOARD_IOID_SPI_MOSI       IOID_9
+#define BOARD_IOID_SPI_MISO       IOID_8
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name External flash IOID mapping
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#define BOARD_IOID_FLASH_CS       IOID_20
+#define BOARD_FLASH_CS            (1 << BOARD_IOID_FLASH_CS)
+#define BOARD_IOID_SPI_CLK_FLASH  IOID_10
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief I2C IOID mappings
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#define BOARD_IOID_SCL            IOID_4
+#define BOARD_IOID_SDA            IOID_5
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Remaining pins
+ *
+ * Those values are not meant to be modified by the user
+ * @{
+ */
+#define BOARD_IOID_CS             IOID_11
+#define BOARD_IOID_TDO            IOID_16
+#define BOARD_IOID_TDI            IOID_17
+#define BOARD_IOID_DIO12          IOID_12
+#define BOARD_IOID_DIO15          IOID_15
+#define BOARD_IOID_DIO21          IOID_21
+#define BOARD_IOID_DIO22          IOID_22
+#define BOARD_IOID_DIO23          IOID_23
+#define BOARD_IOID_DIO24          IOID_24
+#define BOARD_IOID_DIO25          IOID_25
+#define BOARD_IOID_DIO26          IOID_26
+#define BOARD_IOID_DIO27          IOID_27
+#define BOARD_IOID_DIO28          IOID_28
+#define BOARD_IOID_DIO29          IOID_29
+#define BOARD_IOID_DIO30          IOID_30
+/** @} */
+/*---------------------------------------------------------------------------*/
+/**
+ * \name Device string used on startup
+ * @{
+ */
+#define BOARD_STRING "TI CC1310 LaunchPad"
+
+/** @} */
+/*---------------------------------------------------------------------------*/
+#endif /* BOARD_H_ */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */

From 06f446399634219bc90199ad219025efa73bbcba Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Sun, 13 Mar 2016 13:03:02 +0000
Subject: [PATCH 232/393] Extend documentation to include the CC1310 LaunchPad

---
 platform/srf06-cc26xx/README.md      | 4 +++-
 platform/srf06-cc26xx/contiki-main.c | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform/srf06-cc26xx/README.md b/platform/srf06-cc26xx/README.md
index 4e709ca7d..04d66a0d4 100644
--- a/platform/srf06-cc26xx/README.md
+++ b/platform/srf06-cc26xx/README.md
@@ -8,6 +8,7 @@ platform supports two different boards:
   (relevant files and drivers are under `srf06/`)
 * CC2650 SensorTag 2.0 (relevant drivers under `sensortag/cc2650`)
 * CC2650 LaunchPad (relevant drivers under `launchpad/cc2650`)
+* CC1310 LaunchPad (relevant drivers under `launchpad/cc1310`)
 
 The CPU code, common for both platforms, can be found under `$(CONTIKI)/cpu/cc26xx-cc13xx`.
 The port was developed and tested with CC2650s, but the intention is for it to
@@ -45,7 +46,7 @@ In terms of hardware support, the following drivers have been implemented:
   * OPT3001 sensor
   * Buzzer
   * External SPI flash
-* Launchpad
+* LaunchPads
   * LEDs
   * Buttons
   * External SPI flash
@@ -99,6 +100,7 @@ Other options for the `BOARD` make variable are:
 * Srf06+CC13xxEM: Set `BOARD=srf06/cc13xx`
 * CC2650 tag: Set `BOARD=sensortag/cc2650`
 * CC2650 Launchpad: Set `BOARD=launchpad/cc2650`
+* CC1310 Launchpad: Set `BOARD=launchpad/cc1310`
 
 If the `BOARD` variable is unspecified, an image for the Srf06 CC26XXEM will be built.
 
diff --git a/platform/srf06-cc26xx/contiki-main.c b/platform/srf06-cc26xx/contiki-main.c
index b103918e7..9e91cec5d 100644
--- a/platform/srf06-cc26xx/contiki-main.c
+++ b/platform/srf06-cc26xx/contiki-main.c
@@ -32,13 +32,14 @@
  * \addtogroup cc26xx-platforms
  * @{
  *
- * \defgroup cc26xx-srf-tag SmartRF+CC13xx/CC26xx EM, CC2650 SensorTag and LaunchPad
+ * \defgroup cc26xx-srf-tag SmartRF+CC13xx/CC26xx EM, CC2650 SensorTag and LaunchPads
  *
  * This platform supports a number of different boards:
  * - A standard TI SmartRF06EB with a CC26xx EM mounted on it
  * - A standard TI SmartRF06EB with a CC1310 EM mounted on it
  * - The new TI SensorTag2.0
  * - The TI CC2650 LaunchPad
+ * - The TI CC1310 LaunchPad
  * @{
  */
 #include "ti-lib.h"

From 18f67dade263b9d4c7e9c89258199d3e32888275 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Sun, 13 Mar 2016 13:03:17 +0000
Subject: [PATCH 233/393] Compile-test CC1310 LaunchPad sources

---
 regression-tests/18-compile-arm-ports/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/regression-tests/18-compile-arm-ports/Makefile b/regression-tests/18-compile-arm-ports/Makefile
index 4222eb7f6..55924037d 100644
--- a/regression-tests/18-compile-arm-ports/Makefile
+++ b/regression-tests/18-compile-arm-ports/Makefile
@@ -12,6 +12,7 @@ cc26xx/very-sleepy-demo/srf06-cc26xx:BOARD=sensortag/cc2650 \
 cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=sensortag/cc2650 \
 cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=srf06/cc13xx \
 cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc2650 \
+cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1310 \
 cc26xx/very-sleepy-demo/srf06-cc26xx \
 hello-world/cc2538dk \
 ipv6/rpl-border-router/cc2538dk \

From 80efd730ae889b0911df1b8097634ae7eb9bf12c Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Sat, 14 May 2016 20:22:11 +0100
Subject: [PATCH 234/393] Extend the flash driver to support the MX25R1635F

According to the CC1310LP design files, the flash on it is the same as the flash on the CC2650 LP (MX25R8035F 8Mbit). However, the flash on some CC1310 LPs reportedly identifies itself as the 16Mbit one (MX25R1635F). Instruction sets are identical, we simply need to tell the driver to recognise this part's Device ID.
---
 platform/srf06-cc26xx/common/ext-flash.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/platform/srf06-cc26xx/common/ext-flash.c b/platform/srf06-cc26xx/common/ext-flash.c
index 721a36424..62fea2288 100644
--- a/platform/srf06-cc26xx/common/ext-flash.c
+++ b/platform/srf06-cc26xx/common/ext-flash.c
@@ -40,6 +40,9 @@
 #include "ext-flash.h"
 #include "ti-lib.h"
 #include "board-spi.h"
+
+#include <stdint.h>
+#include <stdbool.h>
 /*---------------------------------------------------------------------------*/
 /* Instruction codes */
 
@@ -73,6 +76,7 @@
 #define BLS_DEVICE_ID_W25X20CL    0x11
 #define BLS_DEVICE_ID_W25X40CL    0x12
 #define BLS_DEVICE_ID_MX25R8035F  0x14
+#define BLS_DEVICE_ID_MX25R1635F  0x15
 
 #define BLS_WINBOND_MID           0xEF
 #define BLS_MACRONIX_MID          0xC2
@@ -179,7 +183,8 @@ verify_part(void)
 
   if((rbuf[0] != BLS_WINBOND_MID && rbuf[0] != BLS_MACRONIX_MID) ||
      (rbuf[1] != BLS_DEVICE_ID_W25X20CL && rbuf[1] != BLS_DEVICE_ID_W25X40CL
-      && rbuf[1] != BLS_DEVICE_ID_MX25R8035F)) {
+      && rbuf[1] != BLS_DEVICE_ID_MX25R8035F
+      && rbuf[1] != BLS_DEVICE_ID_MX25R1635F)) {
     return VERIFY_PART_POWERED_DOWN;
   }
   return VERIFY_PART_OK;

From d331d39e93ed7696c5c31a1dbe2287c2e80936d5 Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Sat, 14 May 2016 22:48:09 +0200
Subject: [PATCH 235/393] Correct paths when moving examples for regession
 tests

---
 examples/avr-rss2/avr_radio_power/Makefile        | 2 +-
 examples/avr-rss2/hello-sensors/Makefile          | 2 +-
 examples/avr-rss2/ipv6/dc-rpl-coap/Makefile       | 2 +-
 examples/avr-rss2/ipv6/rpl-border-router/Makefile | 2 +-
 examples/avr-rss2/ipv6/rpl-udp-report/Makefile    | 2 +-
 examples/avr-rss2/ipv6/sensd_client/Makefile      | 2 +-
 regression-tests/23-compile-avr/Makefile          | 6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/avr-rss2/avr_radio_power/Makefile b/examples/avr-rss2/avr_radio_power/Makefile
index fb9b062a1..abaab89f1 100644
--- a/examples/avr-rss2/avr_radio_power/Makefile
+++ b/examples/avr-rss2/avr_radio_power/Makefile
@@ -4,6 +4,6 @@ CONTIKI_PROJECT = avr_radio_power
 APPS+=powertrace
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../../../..
+CONTIKI = ../../..
 CONTIKI_WITH_RIME = 1
 include $(CONTIKI)/Makefile.include
diff --git a/examples/avr-rss2/hello-sensors/Makefile b/examples/avr-rss2/hello-sensors/Makefile
index c6e0da805..0d1d41b9f 100644
--- a/examples/avr-rss2/hello-sensors/Makefile
+++ b/examples/avr-rss2/hello-sensors/Makefile
@@ -15,5 +15,5 @@ CUSTOM_RULE_LINK = 1
 
 
 
-CONTIKI = ../../../..
+CONTIKI = ../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/avr-rss2/ipv6/dc-rpl-coap/Makefile b/examples/avr-rss2/ipv6/dc-rpl-coap/Makefile
index 9d8bccece..46a7e9c3f 100644
--- a/examples/avr-rss2/ipv6/dc-rpl-coap/Makefile
+++ b/examples/avr-rss2/ipv6/dc-rpl-coap/Makefile
@@ -2,7 +2,7 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
 all: coap-client coap-server
 APPS=servreg-hack
-CONTIKI=../../../../..
+CONTIKI=../../../..
 
 ifdef WITH_COMPOWER
 APPS+=powertrace
diff --git a/examples/avr-rss2/ipv6/rpl-border-router/Makefile b/examples/avr-rss2/ipv6/rpl-border-router/Makefile
index ba3f16af6..630d9dd53 100644
--- a/examples/avr-rss2/ipv6/rpl-border-router/Makefile
+++ b/examples/avr-rss2/ipv6/rpl-border-router/Makefile
@@ -1,7 +1,7 @@
 CONTIKI_PROJECT=border-router
 all: $(CONTIKI_PROJECT) 
 
-CONTIKI=../../../../..
+CONTIKI=../../../..
 
 #linker optimizations
 SMALL=1
diff --git a/examples/avr-rss2/ipv6/rpl-udp-report/Makefile b/examples/avr-rss2/ipv6/rpl-udp-report/Makefile
index 770ad3749..f4c90317e 100644
--- a/examples/avr-rss2/ipv6/rpl-udp-report/Makefile
+++ b/examples/avr-rss2/ipv6/rpl-udp-report/Makefile
@@ -3,7 +3,7 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
 all: report sink
 APPS=servreg-hack
-CONTIKI=../../../../..
+CONTIKI=../../../..
 
 ifdef WITH_COMPOWER
 APPS+=powertrace
diff --git a/examples/avr-rss2/ipv6/sensd_client/Makefile b/examples/avr-rss2/ipv6/sensd_client/Makefile
index c0eabf9b0..f1b0d7d48 100644
--- a/examples/avr-rss2/ipv6/sensd_client/Makefile
+++ b/examples/avr-rss2/ipv6/sensd_client/Makefile
@@ -2,7 +2,7 @@
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
 all: sensd_client server
-CONTIKI=../../../../..
+CONTIKI=../../../..
 
 ifdef PERIOD
 CFLAGS+=-DPERIOD=$(PERIOD)
diff --git a/regression-tests/23-compile-avr/Makefile b/regression-tests/23-compile-avr/Makefile
index 0904e2f37..56cef07d3 100644
--- a/regression-tests/23-compile-avr/Makefile
+++ b/regression-tests/23-compile-avr/Makefile
@@ -4,9 +4,9 @@ TOOLSDIR=../../tools
 # build avr-rss2 examples, covering IPv6, RPL, Rime, Nullrdc, Contikimac
 
 EXAMPLES = \
-platform/avr-rss2/examples/hello-sensors/avr-rss2 \
-platform/avr-rss2/examples/ipv6/rpl-udp-report/avr-rss2 \
-platform/avr-rss2/examples/ipv6/rpl-border-router/avr-rss2 \
+examples/avr-rss2/hello-sensors/avr-rss2 \
+examples/avr-rss2/ipv6/rpl-udp-report/avr-rss2 \
+examples/avr-rss2/ipv6/rpl-border-router/avr-rss2 \
 examples/ipv6/rpl-udp/avr-rss2 \
 examples/powertrace/avr-rss2 \
 examples/rime/avr-rss2

From 2b30370b42fc641510b541c4370a3473b92099cc Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Sun, 15 May 2016 11:20:23 +0200
Subject: [PATCH 236/393] AT driver (master) and example

---
 apps/at-master/Makefile.at-master             |   1 +
 apps/at-master/at-master.c                    | 148 ++++++
 apps/at-master/at-master.h                    | 123 +++++
 examples/zolertia/zoul/at-test/Makefile       |   7 +
 .../zolertia/zoul/at-test/at-master-test.c    | 487 ++++++++++++++++++
 examples/zolertia/zoul/at-test/project-conf.h |  67 +++
 6 files changed, 833 insertions(+)
 create mode 100644 apps/at-master/Makefile.at-master
 create mode 100644 apps/at-master/at-master.c
 create mode 100644 apps/at-master/at-master.h
 create mode 100644 examples/zolertia/zoul/at-test/Makefile
 create mode 100644 examples/zolertia/zoul/at-test/at-master-test.c
 create mode 100644 examples/zolertia/zoul/at-test/project-conf.h

diff --git a/apps/at-master/Makefile.at-master b/apps/at-master/Makefile.at-master
new file mode 100644
index 000000000..9ab561a16
--- /dev/null
+++ b/apps/at-master/Makefile.at-master
@@ -0,0 +1 @@
+at-master_src = at-master.c
diff --git a/apps/at-master/at-master.c b/apps/at-master/at-master.c
new file mode 100644
index 000000000..c9e0597b6
--- /dev/null
+++ b/apps/at-master/at-master.c
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2015, Zolertia - http://www.zolertia.com
+ * 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.
+ *
+ */
+#include "contiki.h"
+#include "contiki-lib.h"
+#include "at-master.h"
+#include "cpu.h"
+#include "dev/uart.h"
+#include "dev/serial-line.h"
+#include "dev/sys-ctrl.h"
+#include "lib/list.h"
+#include "sys/cc.h"
+
+#include <ctype.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdint.h>
+/*---------------------------------------------------------------------------*/
+#define DEBUG 0
+#if DEBUG
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+/*---------------------------------------------------------------------------*/
+LIST(at_cmd_list);
+process_event_t at_cmd_received_event;
+/*---------------------------------------------------------------------------*/
+static uint8_t at_uart = 0;
+/*---------------------------------------------------------------------------*/
+PROCESS(at_process, "AT process");
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(at_process, ev, data)
+{
+  uint8_t plen;
+  char *pch, *buf;
+  struct at_cmd *a;
+  PROCESS_BEGIN();
+
+  while(1) {
+    PROCESS_WAIT_EVENT_UNTIL(ev == serial_line_event_message && data != NULL);
+    buf = (char *)data;
+    plen = strlen(buf);
+    for(a = list_head(at_cmd_list); a != NULL; a = list_item_next(a)) {
+      pch = strstr(buf, a->cmd_header);
+      if((plen <= a->cmd_max_len) && (pch != NULL)) {
+        if(strncmp(a->cmd_header, pch, a->cmd_hdr_len) == 0) {
+          if((a->cmd_hdr_len == plen) || (a->cmd_max_len > a->cmd_hdr_len)) {
+            a->event_callback(a, plen, (char *)pch);
+            process_post(a->app_process, at_cmd_received_event, NULL);
+            break;
+          }
+        }
+      }
+    }
+  }
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+struct at_cmd *
+at_list(void)
+{
+  return list_head(at_cmd_list);
+}
+/*---------------------------------------------------------------------------*/
+uint8_t
+at_send(char *s, uint8_t len)
+{
+  uint8_t i = 0;
+  while(s && *s != 0) {
+    if(i >= len) {
+      break;
+    }
+    uart_write_byte(at_uart, *s++);
+    i++;
+  }
+  return i;
+}
+/*---------------------------------------------------------------------------*/
+void
+at_init(uint8_t uart_sel)
+{
+  static uint8_t inited = 0;
+  if(!inited) {
+    list_init(at_cmd_list);
+    at_cmd_received_event = process_alloc_event();
+    inited = 1;
+
+    at_uart = uart_sel;
+    uart_init(at_uart);
+    uart_set_input(at_uart, serial_line_input_byte);
+    serial_line_init();
+
+    process_start(&at_process, NULL);
+    PRINTF("AT: Started (%u)\n", at_uart);
+  }
+}
+/*---------------------------------------------------------------------------*/
+at_status_t
+at_register(struct at_cmd *cmd, struct process *app_process,
+            const char *cmd_hdr, const uint8_t hdr_len,
+            const uint8_t cmd_max_len, at_event_callback_t event_callback)
+{
+  if((hdr_len < 1) || (cmd_max_len < 1) || (!strncmp(cmd_hdr, "AT", 2) == 0) ||
+     (event_callback == NULL)) {
+    PRINTF("AT: Invalid argument\n");
+    return AT_STATUS_INVALID_ARGS_ERROR;
+  }
+
+  memset(cmd, 0, sizeof(struct at_cmd));
+  cmd->event_callback = event_callback;
+  cmd->cmd_header = cmd_hdr;
+  cmd->cmd_hdr_len = hdr_len;
+  cmd->cmd_max_len = cmd_max_len;
+  cmd->app_process = app_process;
+  list_add(at_cmd_list, cmd);
+  PRINTF("AT: registered HDR %s LEN %u MAX %u\n", cmd->cmd_header,
+                                                  cmd->cmd_hdr_len,
+                                                  cmd->cmd_max_len);
+  return AT_STATUS_OK;
+}
+/*---------------------------------------------------------------------------*/
diff --git a/apps/at-master/at-master.h b/apps/at-master/at-master.h
new file mode 100644
index 000000000..ad625c0dc
--- /dev/null
+++ b/apps/at-master/at-master.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2015, Zolertia - http://www.zolertia.com
+ * 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 AT_MASTER_H_
+#define AT_MASTER_H_
+#include "contiki.h"
+/*---------------------------------------------------------------------------*/
+#define AT_DEFAULT_RESPONSE_OK    "\r\nOK\r\n"
+#define AT_DEFAULT_RESPONSE_ERROR "\r\nERROR\r\n"
+/*---------------------------------------------------------------------------*/
+#define AT_RESPONSE(x) at_send((x), (strlen(x)))
+/*---------------------------------------------------------------------------*/
+extern process_event_t at_cmd_received_event;
+struct at_cmd;
+/*---------------------------------------------------------------------------*/
+typedef enum {
+  AT_STATUS_OK,
+  AT_STATUS_ERROR,
+  AT_STATUS_INVALID_ARGS_ERROR,
+} at_status_t;
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief AT    initialization
+ * \param uart  selects which UART to use
+ *
+ * The AT driver invokes this function upon registering a command, this will
+ * wait for the serial_line_event_message event
+ */
+void at_init(uint8_t uart);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief AT    initialization
+ * \param uart  selects which UART to use
+ *
+ * The AT driver invokes this function upon registering a command, this will
+ * wait for the serial_line_event_message event
+ */
+uint8_t at_send(char *s, uint8_t len);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief          AT event callback
+ * \param cmd      A pointer to the AT command placeholder
+ * \param len      Lenght of the received data (including the AT command header)
+ * \param data     A user-defined pointer
+ *
+ * The AT event callback function gets called whenever there is an
+ * event on an incoming AT command
+ */
+typedef void (*at_event_callback_t)(struct at_cmd *cmd,
+                                    uint8_t len,
+                                    char *data);
+/*---------------------------------------------------------------------------*/
+struct at_cmd {
+  struct at_cmd *next;
+  const char *cmd_header;
+  uint8_t cmd_hdr_len;
+  uint8_t cmd_max_len;
+  at_event_callback_t event_callback;
+  struct process *app_process;
+};
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief                 Registers the callback to return an AT command
+ * \param cmd             A pointer to the CMD placeholder
+ * \param cmd_hdr         String to compare when an AT command is received
+ * \param cmd_len         Lenght of cmd_hdr
+ * \param event_callback  Callback function to handle the AT command
+ * \return                AT_STATUS_OK or AT_STATUS_INVALID_ARGS_ERROR
+ *
+ * Register the commands to search for when a valid AT frame has been received
+ */
+at_status_t at_register(struct at_cmd *cmd,
+                        struct process *app_process,
+                        const char *cmd_hdr,
+                        const uint8_t cmd_hdr_len,
+                        const uint8_t cmd_max_len,
+                        at_event_callback_t event_callback);
+/*---------------------------------------------------------------------------*/
+struct at_cmd *at_list(void);
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief                 Registers the callback to return an AT command
+ * \param cmd             A pointer to the CMD placeholder
+ * \param cmd_hdr         String to compare when an AT command is received
+ * \param cmd_len         Lenght of cmd_hdr
+ * \param event_callback  Callback function to handle the AT command
+ * \return                AT_STATUS_OK or AT_STATUS_INVALID_ARGS_ERROR
+ *
+ * Register the commands to search for when a valid AT frame has been received
+ */
+at_status_t at_register(struct at_cmd *cmd,
+                        struct process *app_process,
+                        const char *cmd_hdr,
+                        const uint8_t cmd_hdr_len,
+                        const uint8_t cmd_max_len,
+                        at_event_callback_t event_callback);
+#endif /* AT_MASTER_H_ */
diff --git a/examples/zolertia/zoul/at-test/Makefile b/examples/zolertia/zoul/at-test/Makefile
new file mode 100644
index 000000000..14ab8b54b
--- /dev/null
+++ b/examples/zolertia/zoul/at-test/Makefile
@@ -0,0 +1,7 @@
+DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
+CONTIKI_PROJECT = at-master-test
+APPS = at-master
+all: $(CONTIKI_PROJECT)
+
+CONTIKI = ../../../..
+include $(CONTIKI)/Makefile.include
diff --git a/examples/zolertia/zoul/at-test/at-master-test.c b/examples/zolertia/zoul/at-test/at-master-test.c
new file mode 100644
index 000000000..520c28bdb
--- /dev/null
+++ b/examples/zolertia/zoul/at-test/at-master-test.c
@@ -0,0 +1,487 @@
+/*
+ * Copyright (c) 2016, Zolertia - http://www.zolertia.com
+ * 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.
+ *
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup zoul-AT-master-test
+ * @{
+ *
+ * Test the Zoul hardware using AT commands
+ * @{
+ *
+ * \author
+ *         Antonio Lignan <alinan@zolertia.com>
+ */
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+#include "cpu.h"
+#include "at-master.h"
+#include "sys/ctimer.h"
+#include "sys/process.h"
+#include "dev/adc.h"
+#include "dev/leds.h"
+#include "dev/watchdog.h"
+#include "dev/sys-ctrl.h"
+#include "dev/gpio.h"
+#include "dev/ioc.h"
+#include "net/rime/rime.h"
+#include "lib/list.h"
+#include "dev/sha256.h"
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+/*---------------------------------------------------------------------------*/
+PROCESS(at_test_process, "AT test process");
+AUTOSTART_PROCESSES(&at_test_process);
+/*---------------------------------------------------------------------------*/
+#define DEBUG 0
+#if DEBUG
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+/*---------------------------------------------------------------------------*/
+static struct at_cmd at_cmd_test;
+static struct at_cmd at_cmd_board;
+static struct at_cmd at_cmd_led;
+static struct at_cmd at_cmd_addr;
+static struct at_cmd at_cmd_gpio;
+static struct at_cmd at_cmd_read;
+static struct at_cmd at_cmd_flop;
+static struct at_cmd at_cmd_reset;
+static struct at_cmd at_cmd_sha256;
+static struct at_cmd at_cmd_adc;
+/*---------------------------------------------------------------------------*/
+#define HWTEST_GPIO_INPUT            0
+#define HWTEST_GPIO_OUTPUT           1
+#define HWTEST_GPIO_OUTPUT_ODD       3
+#define HWTEST_GPIO_OUTPUT_LIST      4
+#define HWTEST_GPIO_OUTPUT_MASK      0x55
+#define HWTEST_GPIO_OUTPUT_ODD_MASK  0xAA
+/*---------------------------------------------------------------------------*/
+typedef struct {
+  char *name;
+  uint8_t port;
+  uint8_t pin;
+} gpio_list_t;
+/*---------------------------------------------------------------------------*/
+static struct ctimer ct;
+/*---------------------------------------------------------------------------*/
+static void
+floppin(uint8_t port, uint8_t pin)
+{
+  uint8_t i;
+  GPIO_CLR_PIN(GPIO_PORT_TO_BASE(port), GPIO_PIN_MASK(pin));
+  clock_delay_usec(500);
+  for(i = 0; i < 50; i++) {
+    GPIO_SET_PIN(GPIO_PORT_TO_BASE(port), GPIO_PIN_MASK(pin));
+    clock_delay_usec(500);
+    GPIO_CLR_PIN(GPIO_PORT_TO_BASE(port), GPIO_PIN_MASK(pin));
+    clock_delay_usec(500);
+  }
+}
+/*---------------------------------------------------------------------------*/
+#if DEBUG
+static char *
+pname(uint8_t num)
+{
+  if(num == GPIO_A_NUM) {
+    return "PA";
+  }
+  if(num == GPIO_B_NUM) {
+    return "PB";
+  }
+  if(num == GPIO_C_NUM) {
+    return "PC";
+  }
+  if(num == GPIO_D_NUM) {
+    return "PD";
+  }
+  return "INVALID";
+}
+#endif
+/*---------------------------------------------------------------------------*/
+static void
+config_gpio(uint8_t port, uint8_t pin, uint8_t type)
+{
+  GPIO_SOFTWARE_CONTROL(GPIO_PORT_TO_BASE(port), GPIO_PIN_MASK(pin));
+  if(type == HWTEST_GPIO_OUTPUT) {
+    GPIO_SET_OUTPUT(GPIO_PORT_TO_BASE(port), GPIO_PIN_MASK(pin));
+  } else if(type == HWTEST_GPIO_INPUT) {
+    GPIO_SET_INPUT(GPIO_PORT_TO_BASE(port), GPIO_PIN_MASK(pin));
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+at_cmd_test_callback(struct at_cmd *cmd, uint8_t len, char *data)
+{
+  AT_RESPONSE("Hello!");
+  AT_RESPONSE(AT_DEFAULT_RESPONSE_OK);
+}
+/*---------------------------------------------------------------------------*/
+static void
+at_cmd_board_callback(struct at_cmd *cmd, uint8_t len, char *data)
+{
+  AT_RESPONSE(BOARD_STRING);
+  AT_RESPONSE(AT_DEFAULT_RESPONSE_OK);
+}
+/*---------------------------------------------------------------------------*/
+static void
+at_cmd_flop_callback(struct at_cmd *cmd, uint8_t len, char *data)
+{
+  /* Format: AT&FLOP=PN where P(ort)N(number) */
+  uint8_t port;
+  uint8_t pin = atoi(&data[9]);
+
+  if((pin < 0) || (pin > 9)) {
+    AT_RESPONSE(AT_DEFAULT_RESPONSE_ERROR);
+    return;
+  }
+
+  if(strncmp(&data[8], "A", 1) == 0) {
+    port = GPIO_A_NUM;
+  } else if(strncmp(&data[8], "B", 1) == 0) {
+    port = GPIO_B_NUM;
+  } else if(strncmp(&data[8], "C", 1) == 0) {
+    port = GPIO_C_NUM;
+  } else if(strncmp(&data[8], "D", 1) == 0) {
+    port = GPIO_D_NUM;
+  } else {
+    AT_RESPONSE(AT_DEFAULT_RESPONSE_ERROR);
+    return;
+  }
+
+  config_gpio(port, pin, HWTEST_GPIO_OUTPUT);
+  floppin(port, pin);
+
+  AT_RESPONSE(AT_DEFAULT_RESPONSE_OK);
+}
+/*---------------------------------------------------------------------------*/
+static void
+at_cmd_address_callback(struct at_cmd *cmd, uint8_t len, char *data)
+{
+  static char _lladdr[17];
+  snprintf(_lladdr, 17, "%02x%02x%02x%02x%02x%02x%02x%02x",
+           linkaddr_node_addr.u8[0], linkaddr_node_addr.u8[1],
+           linkaddr_node_addr.u8[2], linkaddr_node_addr.u8[3],
+           linkaddr_node_addr.u8[4], linkaddr_node_addr.u8[5],
+           linkaddr_node_addr.u8[6], linkaddr_node_addr.u8[7]);
+
+  AT_RESPONSE(_lladdr);
+  AT_RESPONSE(AT_DEFAULT_RESPONSE_OK);
+}
+/*---------------------------------------------------------------------------*/
+static void
+at_cmd_reset_callback(struct at_cmd *cmd, uint8_t len, char *data)
+{
+  uint8_t reset_val = atoi(&data[9]);
+  /* AT&RESET=n, where n:
+   * 0 : CC2538 soft reset
+   */
+  if((reset_val != 0) && (reset_val != 1)) {
+    AT_RESPONSE(AT_DEFAULT_RESPONSE_ERROR);
+    return;
+  }
+
+  /* Send the response and wait a second until executing the command */
+  AT_RESPONSE(AT_DEFAULT_RESPONSE_OK);
+
+  if(reset_val == 0) {
+    ctimer_set(&ct, CLOCK_SECOND, sys_ctrl_reset, NULL);
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+at_cmd_leds_callback(struct at_cmd *cmd, uint8_t len, char *data)
+{
+  /* Format: AT&LED=L,s where L(ed)=R/G/B, s(tate)=1/0*/
+  uint8_t led;
+  uint8_t state = strncmp(&data[9], "1", 1) ? 0 : 1;
+
+  if(strncmp(&data[8], ",", 1) != 0) {
+    AT_RESPONSE(AT_DEFAULT_RESPONSE_ERROR);
+    return;
+  }
+
+  if(strncmp(&data[7], "R", 1) == 0) {
+    led = LEDS_RED;
+  } else if(strncmp(&data[7], "G", 1) == 0) {
+    led = LEDS_GREEN;
+  } else if(strncmp(&data[7], "B", 1) == 0) {
+    led = LEDS_BLUE;
+  } else {
+    AT_RESPONSE(AT_DEFAULT_RESPONSE_ERROR);
+    return;
+  }
+
+  if(state) {
+    leds_on(led);
+  } else {
+    leds_off(led);
+  }
+  AT_RESPONSE(AT_DEFAULT_RESPONSE_OK);
+}
+/*---------------------------------------------------------------------------*/
+static void
+at_cmd_gpio_callback(struct at_cmd *cmd, uint8_t len, char *data)
+{
+  /* Format: AT&GPIO=PN,s where P(ort)N(number), s(tate)=1/0 */
+  uint8_t port;
+  uint8_t state = strncmp(&data[11], "1", 1) ? 0 : 1;
+  uint8_t pin = atoi(&data[9]);
+
+  if(strncmp(&data[10], ",", 1) != 0) {
+    AT_RESPONSE(AT_DEFAULT_RESPONSE_ERROR);
+    return;
+  }
+
+  if((pin < 0) || (pin > 7)) {
+    AT_RESPONSE(AT_DEFAULT_RESPONSE_ERROR);
+    return;
+  }
+
+  if((state < 0) || (state > 1)) {
+    AT_RESPONSE(AT_DEFAULT_RESPONSE_ERROR);
+    return;
+  }
+
+  if(strncmp(&data[8], "A", 1) == 0) {
+    port = GPIO_A_NUM;
+  } else if(strncmp(&data[8], "B", 1) == 0) {
+    port = GPIO_B_NUM;
+  } else if(strncmp(&data[8], "C", 1) == 0) {
+    port = GPIO_C_NUM;
+  } else if(strncmp(&data[8], "D", 1) == 0) {
+    port = GPIO_D_NUM;
+  } else {
+    AT_RESPONSE(AT_DEFAULT_RESPONSE_ERROR);
+    return;
+  }
+
+  config_gpio(port, pin, HWTEST_GPIO_OUTPUT);
+
+  if(state) {
+    GPIO_SET_PIN(GPIO_PORT_TO_BASE(port), GPIO_PIN_MASK(pin));
+  } else {
+    GPIO_CLR_PIN(GPIO_PORT_TO_BASE(port), GPIO_PIN_MASK(pin));
+  }
+
+  AT_RESPONSE(AT_DEFAULT_RESPONSE_OK);
+}
+/*---------------------------------------------------------------------------*/
+static void
+at_cmd_adc_callback(struct at_cmd *cmd, uint8_t len, char *data)
+{
+  /* Format: AT&ADC=N where N is 4-7, it can be "*" to read all */
+  uint8_t i, pin;
+  uint16_t res[4];
+  char read_result[24];
+
+  if(strncmp(&data[7], "*", 1) == 0) {
+    pin = 8;
+  } else {
+    pin = atoi(&data[7]);
+  }
+
+  if((pin < 4) || (pin > 8)) {
+    AT_RESPONSE(AT_DEFAULT_RESPONSE_ERROR);
+    return;
+  }
+
+  if(pin < 8) {
+    config_gpio(GPIO_A_NUM, pin, HWTEST_GPIO_INPUT);
+    ioc_set_over(GPIO_A_NUM, pin, IOC_OVERRIDE_ANA);
+    res[pin - 4] = adc_get((SOC_ADC_ADCCON_CH_AIN0 + pin),
+                           SOC_ADC_ADCCON_REF_AVDD5,
+                           SOC_ADC_ADCCON_DIV_512);
+    res[pin - 4] = res[pin - 4] / 10;
+    PRINTF("ADC%u: %04d\n", pin, res[pin - 4]);
+    snprintf(read_result, 5, "%04d", res[pin - 4]);
+  } else {
+    for(i = 4; i < 8; i++) {
+      config_gpio(GPIO_A_NUM, i, HWTEST_GPIO_INPUT);
+      ioc_set_over(GPIO_A_NUM, i, IOC_OVERRIDE_ANA);
+      res[i - 4] = adc_get((SOC_ADC_ADCCON_CH_AIN0 + i),
+                           SOC_ADC_ADCCON_REF_AVDD5,
+                           SOC_ADC_ADCCON_DIV_512);
+      res[i - 4] = res[i - 4] / 10;
+    }
+    snprintf(read_result, 24, "%04d %04d %04d %04d", res[0], res[1],
+             res[2], res[3]);
+  }
+
+  AT_RESPONSE(read_result);
+  AT_RESPONSE(AT_DEFAULT_RESPONSE_OK);
+}
+/*---------------------------------------------------------------------------*/
+static void
+at_cmd_read_callback(struct at_cmd *cmd, uint8_t len, char *data)
+{
+  /* Format: AT&READ=PN where P(ort)N(number), N can be "*" to read all */
+  uint8_t port, pin;
+  char read_result[5];
+
+  if(strncmp(&data[9], "*", 1) == 0) {
+    pin = 0xFF;
+  } else {
+    pin = atoi(&data[9]);
+  }
+
+  if((pin < 0) || (pin > 7)) {
+    if(pin != 0xFF) {
+      AT_RESPONSE(AT_DEFAULT_RESPONSE_ERROR);
+      return;
+    }
+  }
+
+  if(pin < 8) {
+    pin = GPIO_PIN_MASK(pin);
+  }
+
+  /* Exclude PA0-PA3  */
+  if(strncmp(&data[8], "A", 1) == 0) {
+    port = GPIO_A_NUM;
+    if(pin < 0x1F) {
+      AT_RESPONSE(AT_DEFAULT_RESPONSE_ERROR);
+      return;
+    } else {
+      if(pin == 0xFF) {
+        pin = 0xF0;
+      }
+    }
+  } else if(strncmp(&data[8], "B", 1) == 0) {
+    port = GPIO_B_NUM;
+  } else if(strncmp(&data[8], "C", 1) == 0) {
+    port = GPIO_C_NUM;
+  } else if(strncmp(&data[8], "D", 1) == 0) {
+    port = GPIO_D_NUM;
+  } else {
+    AT_RESPONSE(AT_DEFAULT_RESPONSE_ERROR);
+    return;
+  }
+
+  config_gpio(port, pin, HWTEST_GPIO_INPUT);
+  snprintf(read_result, 5, "0x%02X",
+           (uint16_t)GPIO_READ_PIN(GPIO_PORT_TO_BASE(port), pin));
+  AT_RESPONSE(read_result);
+  AT_RESPONSE(AT_DEFAULT_RESPONSE_OK);
+}
+/*---------------------------------------------------------------------------*/
+static void
+at_cmd_sha256_callback(struct at_cmd *cmd, uint8_t len, char *data)
+{
+  /* Format: AT&SHA256=s, where s is a string up to 64 bytes */
+  uint8_t i;
+  char tmp[4], sha256[32], sha256_res[64];
+  static sha256_state_t state;
+
+  crypto_init();
+  if(sha256_init(&state) != CRYPTO_SUCCESS) {
+    AT_RESPONSE(AT_DEFAULT_RESPONSE_ERROR);
+    return;
+  }
+
+  if(sha256_process(&state, &data[10],
+                    len - (cmd->cmd_hdr_len)) != CRYPTO_SUCCESS) {
+    AT_RESPONSE(AT_DEFAULT_RESPONSE_ERROR);
+    return;
+  }
+
+  if(sha256_done(&state, sha256) != CRYPTO_SUCCESS) {
+    AT_RESPONSE(AT_DEFAULT_RESPONSE_ERROR);
+    return;
+  }
+
+  crypto_disable();
+
+  PRINTF("Input: %s:\n", &data[10]);
+  snprintf(tmp, 3, "%02X", sha256[0]);
+  strncpy(sha256_res, tmp, 3);
+  for(i = 1; i < 32; i++) {
+    PRINTF("0x%02X ", sha256[i]);
+    snprintf(tmp, 3, "%02X", sha256[i]);
+    strcat(sha256_res, tmp);
+  }
+  PRINTF("\nSHA256: %s\n", sha256_res);
+  AT_RESPONSE(sha256_res);
+  AT_RESPONSE(AT_DEFAULT_RESPONSE_OK);
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(at_test_process, ev, data)
+{
+  PROCESS_BEGIN();
+  struct at_cmd *a;
+
+  /* Initialize the driver, default is UART0 */
+  at_init(0);
+
+  /* Register a list of commands, is mandatory to start with "AT" */
+  at_register(&at_cmd_test, &at_test_process, "AT", 2, 2,
+              at_cmd_test_callback);
+  at_register(&at_cmd_board, &at_test_process, "AT&V", 4, 4,
+              at_cmd_board_callback);
+  at_register(&at_cmd_led, &at_test_process, "AT&LED", 6, 10,
+              at_cmd_leds_callback);
+  at_register(&at_cmd_addr, &at_test_process, "AT&A", 4, 4,
+              at_cmd_address_callback);
+  at_register(&at_cmd_gpio, &at_test_process, "AT&GPIO=", 8, 12,
+              at_cmd_gpio_callback);
+  at_register(&at_cmd_read, &at_test_process, "AT&READ=", 8, 10,
+              at_cmd_read_callback);
+  at_register(&at_cmd_adc, &at_test_process, "AT&ADC=", 7, 8,
+              at_cmd_adc_callback);
+  at_register(&at_cmd_flop, &at_test_process, "AT&FLOP=", 8, 10,
+              at_cmd_flop_callback);
+  at_register(&at_cmd_reset, &at_test_process, "AT&RESET=", 9, 10,
+              at_cmd_reset_callback);
+  at_register(&at_cmd_sha256, &at_test_process, "AT&SHA256=", 10, 64,
+              at_cmd_sha256_callback);
+
+  /* Print the command list */
+  PRINTF("AT command list:\n");
+  for(a = at_list(); a != NULL; a = list_item_next(a)) {
+    PRINTF("* HDR %s LEN %u MAX %u\n", a->cmd_header, a->cmd_hdr_len,
+           a->cmd_max_len);
+  }
+
+  /*
+   * When an AT command is received over the serial line, the registered
+   * callbacks will be invoked, let the process spin until then
+   */
+  while(1) {
+    PROCESS_YIELD();
+  }
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ * @}
+ */
diff --git a/examples/zolertia/zoul/at-test/project-conf.h b/examples/zolertia/zoul/at-test/project-conf.h
new file mode 100644
index 000000000..4a29f1d59
--- /dev/null
+++ b/examples/zolertia/zoul/at-test/project-conf.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2016, Zolertia - http://www.zolertia.com
+ * 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.
+ *
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup remote-examples
+ * @{
+ *
+ * \defgroup zoul-AT-master-test
+ *
+ * Test the Zoul hardware over AT API
+ * @{
+ *
+ * \file
+ *  Test the Zoul hardware over AT API
+ *
+ * \author
+ *         Antonio Lignan <alinan@zolertia.com>
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef PROJECT_CONF_H_
+#define PROJECT_CONF_H_
+
+/* Drop maximum to PM1 to have the UART on all the time */
+#define LPM_CONF_MAX_PM     1
+
+/* the radio is not used */
+#define CONTIKI_NO_NET      1
+
+/* Override serial-line defaults */
+#define SERIAL_LINE_CONF_BUFSIZE 128
+#undef IGNORE_CHAR
+#undef END
+#define IGNORE_CHAR(c) (c == 0x0d)
+#define END 0x0a
+
+#define NETSTACK_CONF_RDC     nullrdc_driver
+
+#endif /* PROJECT_CONF_H_ */
+
+/** @} */

From 18876a1fae22b302c1d951b6268627134d789157 Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Fri, 18 Mar 2016 10:55:54 +0100
Subject: [PATCH 237/393] Adding CRC valid check in rf230bb radios registermaps

---
 cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h | 1 +
 cpu/avr/radio/rf230bb/atmega256rfr2_registermap.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h b/cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h
index 7eeb068ab..b28ed0ec0 100644
--- a/cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h
+++ b/cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h
@@ -71,6 +71,7 @@
 #define RG_PHY_ED_LEVEL       PHY_ED_LEVEL
 #define RG_RX_SYN             RX_SYN
 #define SR_RSSI               0x146, 0x1f, 0
+#define SR_RX_CRC_VALID       0x146, 0x80, 7
 #define SR_PLL_CF_START       0x15a, 0x80, 7
 #define SR_PLL_DCU_START      0x15b, 0x80, 7
 #define SR_MAX_CSMA_RETRIES   0x16c, 0x0e, 1
diff --git a/cpu/avr/radio/rf230bb/atmega256rfr2_registermap.h b/cpu/avr/radio/rf230bb/atmega256rfr2_registermap.h
index bc737de9a..1baf1a3ac 100644
--- a/cpu/avr/radio/rf230bb/atmega256rfr2_registermap.h
+++ b/cpu/avr/radio/rf230bb/atmega256rfr2_registermap.h
@@ -71,6 +71,7 @@
 #define RG_PHY_ED_LEVEL       PHY_ED_LEVEL
 #define RG_RX_SYN             RX_SYN
 #define SR_RSSI               0x146, 0x1f, 0
+#define SR_RX_CRC_VALID       0x146, 0x80, 7
 #define SR_RX_SYN             0x155, 0xff, 0
 #define SR_TRX_RPC            0x156, 0xff, 0
 #define SR_XAH_CTRL_1         0x157, 0xf5, 2

From 868f100366f8fad5224e8bf362a4b3012f69581e Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Sun, 15 May 2016 16:23:29 +0200
Subject: [PATCH 238/393] Fix compilation warning in co2_sa_kxx-sensor.c

---
 platform/avr-rss2/dev/co2_sa_kxx-sensor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/avr-rss2/dev/co2_sa_kxx-sensor.c b/platform/avr-rss2/dev/co2_sa_kxx-sensor.c
index 1866c0f2f..564f8c011 100644
--- a/platform/avr-rss2/dev/co2_sa_kxx-sensor.c
+++ b/platform/avr-rss2/dev/co2_sa_kxx-sensor.c
@@ -112,7 +112,7 @@ value(int var)
 
   status = i2c_readAck();
 
-  if(status & 0x01 == 0) 
+  if((status & 0x01) == 0) 
     goto err;
 
   buf[0] = i2c_readAck();

From a11cfa10b44e5938977ae7f0af49d453c3214dd9 Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Sun, 15 May 2016 16:36:19 +0200
Subject: [PATCH 239/393] Removed unneeded file for avr-rss2 sniffer

---
 .../avr-rss2/apps/sniffer/rf230-promisc.pat   | 39 -------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 platform/avr-rss2/apps/sniffer/rf230-promisc.pat

diff --git a/platform/avr-rss2/apps/sniffer/rf230-promisc.pat b/platform/avr-rss2/apps/sniffer/rf230-promisc.pat
deleted file mode 100644
index 3e2c98e6f..000000000
--- a/platform/avr-rss2/apps/sniffer/rf230-promisc.pat
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/cpu/avr/radio/rf230bb/rf230bb.c b/cpu/avr/radio/rf230bb/rf230bb.c
-index 53959d1..b9f2262 100644
---- a/cpu/avr/radio/rf230bb/rf230bb.c
-+++ b/cpu/avr/radio/rf230bb/rf230bb.c
-@@ -544,7 +544,7 @@ rf230_set_promiscuous_mode(bool isPromiscuous) {
- #if RF230_CONF_AUTOACK
-     is_promiscuous = isPromiscuous;
- /* TODO: Figure out when to pass promisc state to 802.15.4 */
--//    radio_set_trx_state(is_promiscuous?RX_ON:RX_AACK_ON);
-+    radio_set_trx_state(is_promiscuous?RX_ON:RX_AACK_ON);
- #endif
- }
- 
-@@ -1392,6 +1392,25 @@ PROCESS_THREAD(rf230_process, ev, data)
-     /* Restore interrupts. */
-     HAL_LEAVE_CRITICAL_REGION();
-     PRINTF("rf230_read: %u bytes lqi %u\n",len,rf230_last_correlation);
-+
-+    if(is_promiscuous) {
-+      uint8_t i;
-+      unsigned const char * rxdata = packetbuf_dataptr();
-+      /* Print magic */
-+      putchar(0xC1);
-+      putchar(0x1F);
-+      putchar(0xFE);
-+      putchar(0x72);
-+      /* Print version */
-+      putchar(0x01);
-+      /* Print CMD == frame */
-+      putchar(0x00);
-+      putchar(len+3);
-+
-+      for (i=0;i<len;i++)  putchar(rxdata[i]);
-+      printf("\n");
-+    }
-+
- #if DEBUG>1
-      {
-         uint8_t i;

From 17eb0afbe2250380cd632f8cde234addfef9d541 Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Sun, 15 May 2016 16:38:52 +0200
Subject: [PATCH 240/393] Removed failing regression test for avr-rss2 platform

---
 regression-tests/23-compile-avr/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/regression-tests/23-compile-avr/Makefile b/regression-tests/23-compile-avr/Makefile
index 56cef07d3..e7d2dff77 100644
--- a/regression-tests/23-compile-avr/Makefile
+++ b/regression-tests/23-compile-avr/Makefile
@@ -7,7 +7,6 @@ EXAMPLES = \
 examples/avr-rss2/hello-sensors/avr-rss2 \
 examples/avr-rss2/ipv6/rpl-udp-report/avr-rss2 \
 examples/avr-rss2/ipv6/rpl-border-router/avr-rss2 \
-examples/ipv6/rpl-udp/avr-rss2 \
 examples/powertrace/avr-rss2 \
 examples/rime/avr-rss2
 TOOLS=

From 958dcf06f7d3b7086e580da9e47b57a7e29cb017 Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Sun, 15 May 2016 17:43:09 +0200
Subject: [PATCH 241/393] Remove wsnbridge. Let's focus sniffing efforts on
 sensniff.

---
 platform/avr-rss2/apps/sniffer/README.md      |   6 +-
 platform/avr-rss2/apps/sniffer/host/Makefile  |  17 -
 platform/avr-rss2/apps/sniffer/host/README.md |  38 --
 .../avr-rss2/apps/sniffer/host/wsbridge.c     | 459 ------------------
 4 files changed, 5 insertions(+), 515 deletions(-)
 delete mode 100644 platform/avr-rss2/apps/sniffer/host/Makefile
 delete mode 100644 platform/avr-rss2/apps/sniffer/host/README.md
 delete mode 100644 platform/avr-rss2/apps/sniffer/host/wsbridge.c

diff --git a/platform/avr-rss2/apps/sniffer/README.md b/platform/avr-rss2/apps/sniffer/README.md
index fa139878b..b9332893b 100644
--- a/platform/avr-rss2/apps/sniffer/README.md
+++ b/platform/avr-rss2/apps/sniffer/README.md
@@ -22,4 +22,8 @@ Look in the host directory
 Contiki support
 ---------------
 The code promisc for support is needed. This also adds the sensniff 
-format. See rf230-promisc.pat for the rf230bb radions.
+format. 
+
+References
+----------
+https://github.com/g-oikonomou/sensniff
diff --git a/platform/avr-rss2/apps/sniffer/host/Makefile b/platform/avr-rss2/apps/sniffer/host/Makefile
deleted file mode 100644
index 7308f66a5..000000000
--- a/platform/avr-rss2/apps/sniffer/host/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-
-CC = gcc
-CFLAGS = -c
-SOURCES = wsbridge.c
-OBJECTS = $(SOURCES:.c=.o)
-EXE = wsbridge
-
-all: $(SOURCES) $(EXE)
-
-$(EXE): $(OBJECTS)
-	$(CC) $(OBJECTS) -o $@
-
-%.o:%.c
-	$(CC) $(CFLAGS) $< -o $@
-
-clean:
-	rm *.o
diff --git a/platform/avr-rss2/apps/sniffer/host/README.md b/platform/avr-rss2/apps/sniffer/host/README.md
deleted file mode 100644
index cb7960d50..000000000
--- a/platform/avr-rss2/apps/sniffer/host/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Sniffer application host side
-=============================
-This a Unix application to link between the serial port having the
-sensor node connected and Wireshark or tcpdump. Enclosed is a modified 
-wsbridge (See copyright i file) code to use the format used by sensniff. 
-
-You can also use sensniff which is a Python script. Author of senssniff 
-is George Oikonomou (oikonomou@users.sf.net)
-
-See: 
-https://github.com/g-oikonomou/sensniff
-
-
-Function
---------
-The mote captures WSN data and formats according sensniff format sends
-over the serial line. The data is binary. The wsbridge reads reads serial 
-line (typically /dev/ttyUSB) on Linux systems decodes the sensnaiff and 
-create timestamp and adds the the PCAP farming and writes the result to 
-a FIFO or named pipe. /tmp/wireshark or /tmp/sensniff.
-
-Bulld
------
-Just use the Makefile. Put binary for convince in your path.
-
-Usage
------
-* wsbridge /dev/ttYUSB
-* wireshart -k -i /tmp/wireshark
-
-Default serial port speed
--------------------------
-38400 bps
-
-References
-----------
-http://www.freaklabs.org/index.php/wsbridge.html
-https://github.com/g-oikonomou/sensniff
diff --git a/platform/avr-rss2/apps/sniffer/host/wsbridge.c b/platform/avr-rss2/apps/sniffer/host/wsbridge.c
deleted file mode 100644
index 6809f36a8..000000000
--- a/platform/avr-rss2/apps/sniffer/host/wsbridge.c
+++ /dev/null
@@ -1,459 +0,0 @@
-/*******************************************************************
-    Copyright (C) 2009 FreakLabs
-    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 the copyright holder 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 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 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.
-
-    Originally written by Christopher Wang aka Akiba.
-    Please post support questions to the FreakLabs forum.
-
- *******************************************************************/
-/*!
-    FreakLabs Freakduino/Wireshark Bridge
-
-    This program allows data from the Freakduino to be piped into wireshark.
-    When the sniffer firmware is loaded into the Freakduino, then the Freakduino
-    will be in promiscuous mode and will just dump any frames it sees. This
-    program takes the frame dump and sends it into Wireshark for analysis. The
-    global header is already set up to inform wireshark that the link layer for
-    all frames will be in IEEE 802.15.4 format. After that, it is up to the user
-    to choose any higher layer protocols to decode above 802.15.4 via the
-    wireshark "enable protocols" menu.
- */
-
-/*
-
-   Modified for sensniff format. Magic[4] + Vers[1] + CMD[1] + len[1]
-   Robert Olsson <roolss@kth.se> 2015-11-10
-
- */
-
-/**************************************************************************/
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <time.h>
-#include <stdint.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <termios.h>
-
-#define PORTBUFSIZE     32
-#define BUFSIZE         1024
-#define PACKET_FCS      2
-#define DEBUG           1
-#define PIPENAME        "/tmp/wireshark"
-#define BAUDRATE        B38400
-
-enum FSM {
-  START_CAPTURE,
-  PACKET_CAPTURE
-};
-
-static int FD_pipe = -1;
-static int FD_com = -1;
-static uint8_t port_buf[PORTBUFSIZE];
-static uint8_t circ_buf[BUFSIZE];
-static uint16_t rd_idx = 0;
-static uint16_t wr_idx = 0;
-static uint8_t len;
-static uint8_t state = START_CAPTURE;
-static uint8_t file_write = 0;
-static fd_set fds;
-static const uint8_t magic[] = { 0xC1, 0x1F, 0xFE, 0x72 };
-
-/**************************************************************************/
-/*!
-    Open the serial port that we'll be communicating with the Freakduino (sniffer)
-    through.
- */
-/**************************************************************************/
-
-int
-serial_open(char *portname)
-{
-  int baud = B38400;
-  int fd; /* file descriptor for the serial port */
-  struct termios tc, tp;
-
-  fd = open(portname, O_RDONLY | O_NOCTTY | O_NDELAY);
-
-  if(fd == -1) { /* if open is unsucessful */
-    printf("serial_open: Unable to open %s.\n", portname);
-    exit(-1);
-  }
-
-  fcntl(fd, F_GETFL);
-  fcntl(fd, F_SETFL, O_RDWR);
-
-  tp.c_cflag = baud | CS8 | CLOCAL | CREAD;
-  tp.c_oflag = 0; /* Raw Input */
-  tp.c_lflag = 0; /* No conoical */
-  tp.c_oflag &= ~(OLCUC | OCRNL | ONOCR | ONLRET | OFILL | OFDEL | NLDLY | CRDLY);
-
-  /* ignore CR, ignore parity */
-  tp.c_iflag = ~(IGNBRK | PARMRK | INPCK | INLCR | IUCLC | IXOFF) |
-    BRKINT | IGNPAR | ICRNL | IXON | ISIG | ICANON;
-
-  tp.c_lflag &= ~(ECHO | ECHONL);
-  tp.c_oflag = 0; /* Raw Input */
-  tp.c_iflag &= ~ISTRIP;
-
-  tcflush(fd, TCIFLUSH);
-
-  cfsetospeed(&tp, baud);
-  cfsetispeed(&tp, baud);
-
-  if(tcsetattr(fd, TCSANOW, &tp) < 0) {
-    perror("Couldn't set term attributes");
-    return -1;
-  }
-  return fd;
-}
-/**************************************************************************/
-/*!
-    Create the named pipe that we will be communicating with wireshark through.
- */
-/**************************************************************************/
-static void
-named_pipe_create(char *name)
-{
-  int rv = 0;
-  rv = mkfifo(name, 0666);
-  if((rv == -1) && (errno != EEXIST)) {
-    perror("Error creating named pipe");
-    exit(1);
-  }
-
-  FD_pipe = open(name, O_WRONLY);
-
-  if(FD_pipe == -1) {
-    perror("Error connecting to named pipe");
-    exit(1);
-  }
-}
-/**************************************************************************/
-/*!
-    Write data to the pipe
- */
-/**************************************************************************/
-size_t
-data_write(const void *ptr, size_t size)
-{
-  ssize_t bytes = 0;
-  if(FD_pipe != -1) {
-    bytes = write(FD_pipe, ptr, size);
-  }
-}
-/**************************************************************************/
-/*!
-    Write the global header to wireshark. This is only done once at the
-    beginning of the capture.
- */
-/**************************************************************************/
-static void
-write_global_hdr()
-{
-  uint32_t magic_number = 0xa1b2c3d4;   /* magic number */
-  uint16_t version_major = 2;   /* major version number */
-  uint16_t version_minor = 4;   /* minor version number */
-  int32_t thiszone = 0;         /* GMT to local correction */
-  uint32_t sigfigs = 0;         /* accuracy of timestamps */
-  uint32_t snaplen = 65535;     /* max length of captured packets, in octets */
-  uint32_t network = 195;       /* data link type (DLT) - IEEE 802.15.4 */
-
-  data_write(&magic_number, sizeof(magic_number));
-  data_write(&version_major, sizeof(version_major));
-  data_write(&version_minor, sizeof(version_minor));
-  data_write(&thiszone, sizeof(thiszone));
-  data_write(&sigfigs, sizeof(sigfigs));
-  data_write(&snaplen, sizeof(snaplen));
-  data_write(&network, sizeof(network));
-}
-/**************************************************************************/
-/*!
-    Write the frame header into wireshark. This is required for the libpcap
-    format and informs wireshark that a new frame is coming.
- */
-/**************************************************************************/
-static void
-write_frame_hdr(uint8_t len)
-{
-  uint32_t ts_sec;      /* timestamp seconds */
-  uint32_t ts_usec;     /* timestamp microseconds */
-  uint32_t incl_len;    /* number of octets of packet saved in file */
-  uint32_t orig_len;    /* actual length of packet */
-  struct timeval tv;
-
-  gettimeofday(&tv, NULL);
-  ts_sec = tv.tv_sec;
-  ts_usec = tv.tv_usec;
-  incl_len = len;
-  orig_len = len + PACKET_FCS;
-
-  data_write(&ts_sec, sizeof(ts_sec));
-  data_write(&ts_usec, sizeof(ts_usec));
-  data_write(&incl_len, sizeof(incl_len));
-  data_write(&orig_len, sizeof(orig_len));
-}
-/**************************************************************************/
-/*!
-    Write one frame into wireshark (via the pipe).
- */
-/**************************************************************************/
-static void
-write_frame(uint8_t frame_len)
-{
-  uint8_t i;
-
-  /* actual frame length for wireshark should not include FCS */
-  frame_len -= PACKET_FCS;
-
-  /* write header to inform WS that new frame has arrived */
-  write_frame_hdr(frame_len);
-
-  /* bump rd_idx. we don't want to write the length byte */
-  rd_idx = (rd_idx + 1) % BUFSIZE;
-
-  /* write frame into wireshark */
-  for(i = 0; i < frame_len; i++) {
-    data_write(&circ_buf[rd_idx], 1);
-    rd_idx = (rd_idx + 1) % BUFSIZE;
-  }
-
-  /* bump rd_idx. we're not using the trailing FCS value */
-  rd_idx = (rd_idx + 1) % BUFSIZE;
-}
-/**************************************************************************/
-/*!
-    Calculate total number of bytes in buffer.
- */
-/**************************************************************************/
-static uint16_t
-calc_bytes_in_buf()
-{
-  if(rd_idx > wr_idx) {
-    /* read index is greater than write. we must have wrapped around */
-    return BUFSIZE - (rd_idx - wr_idx);
-  } else {
-    return wr_idx - rd_idx;
-  }
-}
-/**************************************************************************/
-/*!
-    Deal with any received signals. This includes ctrl-C to stop the program.
- */
-/**************************************************************************/
-static void
-sig_int(int signo)
-{
-  (void)signo;
-  if(FD_pipe != -1) {
-    printf("\nClosing pipe.\n");
-    close(FD_pipe);
-  }
-
-  if(FD_com != -1) {
-    printf("\nClosing serial port.\n");
-    close(FD_com);
-  }
-
-  printf("\nSignal captured and devices shut down.\n");
-
-  exit(0);
-}
-/**************************************************************************/
-/*!
-    Init the signals we'll be checking for.
- */
-/**************************************************************************/
-static void
-signal_init(void)
-{
-  signal(SIGINT, sig_int);
-  signal(SIGHUP, sig_int);
-  signal(SIGTERM, sig_int);
-}
-int got;
-int debug;
-
-/**************************************************************************/
-/*!
-    Here's the meat of the code.
- */
-/**************************************************************************/
-int
-main(int argc, char *argv[])
-{
-  int nbytes;
-  uint8_t i;
-
-  got = 0;
-
-  /* capture any signals that will terminate program */
-  signal_init();
-
-  /* make sure the COM port is specified */
-  if(argc == 2) {
-    /* open the COM port */
-    if((FD_com = serial_open(argv[1])) == -1) {
-      printf("Serial port not opened.\n");
-      return 0;
-    } else {
-      /* set up the select statement for the COM port. */
-      FD_ZERO(&fds);
-      FD_SET(FD_com, &fds);
-
-      printf("Serial port connected. Waiting for wireshark connection.\n");
-      printf("Open wireshark and connect to local interface: %s\n", PIPENAME);
-    }
-  } else {
-    printf("Usage: wsbridge <portname>.\n");
-    return 0;
-  }
-
-  /* create and open pipe for wireshark */
-  named_pipe_create(PIPENAME);
-
-  /* wait for wireshark to connect to pipe. Once wireshark */
-  /* connects, then the global header will be written to it. */
-  if(FD_pipe != -1) {
-    write_global_hdr();
-    printf("Client connected to pipe.\n");
-  }
-
-  for(;;) {
-    uint16_t bytes_in_buf;
-    uint8_t frame_len, byte_ctr;
-
-    /* block until there is data in the serial port */
-    select(FD_com + 1, &fds, NULL, NULL, NULL);
-    if(FD_ISSET(FD_com, &fds)) {
-      int ii;
-      /* wait for data to come in on the serial port */
-      if((nbytes = read(FD_com, port_buf, PORTBUFSIZE)) > 0) {
-
-        if(debug) {
-          uint8_t p;
-          printf("read nbytes=%d\n", nbytes);
-          for(i = 0; i < nbytes; i++) {
-            printf(" %02X", port_buf[i]);
-          }
-          printf("\n");
-        }
-        /* write data to circular buffer. loop through all received bytes */
-        for(i = 0; i < nbytes; i++) {
-          switch(state) {
-          case START_CAPTURE:
-            /* new frame starting */
-            if((got == 0) && (port_buf[i] == magic[0])) {
-              got = 1;
-            } else if((got == 1) && (port_buf[i] == magic[1])) {
-              got = 2;
-            } else if((got == 2) && (port_buf[i] == magic[2])) {
-              got = 3;
-            } else if((got == 3) && (port_buf[i] == magic[3])) {
-              got = 4;
-              if(debug) {
-                printf("GOT MAGIC i=%d\n", i);
-              }
-            } else if((got == 4) && (port_buf[i] == 1)) {
-              got = 5;
-              if(debug) {
-                printf("GOT VERSION i=%d\n", port_buf[i]);
-              }
-            } else if((got == 5) && (port_buf[i] == 0)) {
-              got = 6;
-              if(debug) {
-                printf("GOT COMMAND i=%d\n", port_buf[i]);
-              }
-            } else if(got == 6) {
-              len = port_buf[i];
-              byte_ctr = 0;
-              if(debug) {
-                printf("Len = %02X.\n", len);
-              }
-              circ_buf[wr_idx] = len;
-              wr_idx = (wr_idx + 1) % BUFSIZE;
-              state = PACKET_CAPTURE;
-            } else {
-              got = 0;
-            }
-            break;
-
-          case PACKET_CAPTURE:
-            /* continue capturing bytes until end of frame */
-            /* write data to circular buffer and increment index */
-
-            circ_buf[wr_idx] = port_buf[i];
-            /* ////printf("%02X ", circ_buf[wr_idx]); */
-
-            wr_idx = (wr_idx + 1) % BUFSIZE;
-            /* track number of received bytes. when received bytes */
-            /* equals frame length, then restart state machine and */
-            /* write bytes to wireshark */
-            byte_ctr++;
-            if(byte_ctr == (len - 1)) {
-              state = START_CAPTURE;
-              file_write = 1;
-              /* printf("\n"); */
-              got = 0;
-            }
-            break;
-          }
-          fflush(stdout);
-        }
-        /* at least one frame has been written. loop through circular buffer */
-        /* and write out all completed frames */
-        while(file_write) {
-          /* capture frame length and check buffer to see if one or more frames */
-          /* are available. */
-          frame_len = circ_buf[rd_idx];
-          bytes_in_buf = calc_bytes_in_buf();
-
-          if(bytes_in_buf > frame_len) {
-            /* if more than one frame is available, then write one frame to */
-            /* wireshark and then see if any more are available. */
-            write_frame(frame_len);
-          } else if(bytes_in_buf == frame_len) {
-            /* only one frame is available. write to wireshark and then quit */
-            /* the loop */
-            write_frame(frame_len);
-            file_write = 0;
-          } else {
-            /* less than one frame is available. quit the loop and collect more */
-            /* bytes. we normally should not get here. */
-            file_write = 0;
-          }
-        }
-      }
-    }
-  }
-}

From a95b0c9d466f2de5e18cbd51c1d70f090440f8bb Mon Sep 17 00:00:00 2001
From: harald42 <harald@20150300048NB.evva.com>
Date: Tue, 17 May 2016 16:43:11 +0200
Subject: [PATCH 242/393] add BH1750 sensor example

---
 .../BH1750FVI-master/.gitattributes           |  22 ++
 .../BH1750FVI-master/.gitignore               |  36 +++
 .../BH1750FVI-master/BH1750FVI.cpp            | 209 ++++++++++++++++++
 .../BH1750FVI-master/BH1750FVI.h              | 115 ++++++++++
 .../BH1750FVI-master/BasicDemo/BasicDemo.ino  |  23 ++
 .../BH1750FVI-master/LogGraph/LogGraph.ino    |  36 +++
 .../arduino-bh1750/BH1750FVI-master/README    |   2 +
 .../BH1750FVI-master/keywords.txt             |  47 ++++
 examples/osd/arduino-bh1750/BH1750FVI.cpp     | 209 ++++++++++++++++++
 examples/osd/arduino-bh1750/BH1750FVI.h       | 115 ++++++++++
 examples/osd/arduino-bh1750/Makefile          |  71 ++++++
 examples/osd/arduino-bh1750/README.md         |  11 +
 examples/osd/arduino-bh1750/arduino-example.c |   2 +
 examples/osd/arduino-bh1750/flash.sh          |   2 +
 examples/osd/arduino-bh1750/project-conf.h    | 106 +++++++++
 .../osd/arduino-bh1750/resources/res-bh1750.c |  80 +++++++
 examples/osd/arduino-bh1750/run.sh            |   5 +
 examples/osd/arduino-bh1750/sketch.pde        |  49 ++++
 18 files changed, 1140 insertions(+)
 create mode 100644 examples/osd/arduino-bh1750/BH1750FVI-master/.gitattributes
 create mode 100644 examples/osd/arduino-bh1750/BH1750FVI-master/.gitignore
 create mode 100644 examples/osd/arduino-bh1750/BH1750FVI-master/BH1750FVI.cpp
 create mode 100644 examples/osd/arduino-bh1750/BH1750FVI-master/BH1750FVI.h
 create mode 100644 examples/osd/arduino-bh1750/BH1750FVI-master/BasicDemo/BasicDemo.ino
 create mode 100644 examples/osd/arduino-bh1750/BH1750FVI-master/LogGraph/LogGraph.ino
 create mode 100644 examples/osd/arduino-bh1750/BH1750FVI-master/README
 create mode 100644 examples/osd/arduino-bh1750/BH1750FVI-master/keywords.txt
 create mode 100644 examples/osd/arduino-bh1750/BH1750FVI.cpp
 create mode 100644 examples/osd/arduino-bh1750/BH1750FVI.h
 create mode 100644 examples/osd/arduino-bh1750/Makefile
 create mode 100644 examples/osd/arduino-bh1750/README.md
 create mode 100644 examples/osd/arduino-bh1750/arduino-example.c
 create mode 100755 examples/osd/arduino-bh1750/flash.sh
 create mode 100644 examples/osd/arduino-bh1750/project-conf.h
 create mode 100644 examples/osd/arduino-bh1750/resources/res-bh1750.c
 create mode 100755 examples/osd/arduino-bh1750/run.sh
 create mode 100644 examples/osd/arduino-bh1750/sketch.pde

diff --git a/examples/osd/arduino-bh1750/BH1750FVI-master/.gitattributes b/examples/osd/arduino-bh1750/BH1750FVI-master/.gitattributes
new file mode 100644
index 000000000..412eeda78
--- /dev/null
+++ b/examples/osd/arduino-bh1750/BH1750FVI-master/.gitattributes
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/examples/osd/arduino-bh1750/BH1750FVI-master/.gitignore b/examples/osd/arduino-bh1750/BH1750FVI-master/.gitignore
new file mode 100644
index 000000000..6dae74742
--- /dev/null
+++ b/examples/osd/arduino-bh1750/BH1750FVI-master/.gitignore
@@ -0,0 +1,36 @@
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# =========================
+# Operating System Files
+# =========================
+
+# OSX
+# =========================
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must ends with two \r.
+Icon

+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
diff --git a/examples/osd/arduino-bh1750/BH1750FVI-master/BH1750FVI.cpp b/examples/osd/arduino-bh1750/BH1750FVI-master/BH1750FVI.cpp
new file mode 100644
index 000000000..600905394
--- /dev/null
+++ b/examples/osd/arduino-bh1750/BH1750FVI-master/BH1750FVI.cpp
@@ -0,0 +1,209 @@
+#include "BH1750FVI.h"
+#if ARDUINO >= 100
+ #include "Arduino.h"
+#else
+ #include "WProgram.h"
+#endif
+
+#include <Wire.h>
+
+void BH1750FVI::begin(byte mode, byte addr, double sens, int pin){
+  if(pin>=0 && pin<55){
+    pinMode(pin, OUTPUT);
+    if(addr==BH_AddrL) digitalWrite(pin, LOW);
+    if(addr==BH_AddrH) digitalWrite(pin, HIGH);
+  }
+  byte sensitivity;
+  if(sens<BH_MinSv){
+    sens = constrain(sens, ((double)BH_MinSv/(double)BH_DefSv), ((double)BH_MaxSv/(double)BH_DefSv));
+    sensitivity = (byte)round(sens*(double)BH_DefSv);
+  }
+  else{
+    sensitivity = constrain((byte)sens, BH_MinSv, BH_MaxSv);
+  }
+  address = addr;
+  currentSensitivity = sensitivity;
+  MTreg_hiByte = BH_MTrHb | (sensitivity >> 5);
+  MTreg_loByte = BH_MTrLb | (sensitivity & 0b00011111);
+  switch(mode){
+    case BH_ContL:
+    case BH_ContH:
+    case BH_Conth:
+      startOngoingSamples(mode);
+      break;
+    case BH_SingH:
+    case BH_Singh:
+    case BH_SingL:
+      startSingleSample(mode);
+      break;
+    default:
+      mode = BH_EasyH;
+      startOngoingSamples(mode);
+      break;
+  }
+  sampleUnseen = false;
+  lastSampleStart = 0;
+}
+
+word BH1750FVI::startOngoingSamples(char mode){
+  if(mode==BH_NoMod) mode=currentMode;
+  byte lowLevelMode = mode;
+  if(lowLevelMode==BH_EasyH) lowLevelMode=BH_ContH;
+  switch(mode){
+    case BH_EasyH:
+    case BH_ContH:
+    case BH_Conth:
+    case BH_ContL:
+      i2cWrite(BH_PowOn);
+      i2cWrite(MTreg_hiByte);
+      i2cWrite(MTreg_loByte);
+      i2cWrite(lowLevelMode);
+      lastSampleStart = millis();
+      currentMode = mode;
+      return setSensitivity(currentSensitivity);
+      break;
+    default:
+      return 0;
+  }
+}
+
+word BH1750FVI::startSingleSample(char mode){
+  if(mode==BH_NoMod){
+    mode=currentMode;
+  }
+  switch(mode){
+    case BH_SingH:
+    case BH_Singh:
+    case BH_SingL:
+      i2cWrite(BH_PowOn);
+      i2cWrite(MTreg_hiByte);
+      i2cWrite(MTreg_loByte);
+      i2cWrite(mode);
+      lastSampleStart = millis();
+      currentMode = mode;
+      return setSensitivity(currentSensitivity);
+      break;
+    default:
+      return 0;
+  }
+}
+
+bool BH1750FVI::sampleIsFresh(){
+  if(sampleUnseen) return true;
+  else if((millis() > (lastSampleStart+currentSamplingTime))){
+    sampleUnseen = true;
+    return true;
+  }
+  else return false;
+}
+
+word BH1750FVI::getLightLevel(char mode){
+  unsigned long int Intensity_value;
+  sampleUnseen = false;
+  Intensity_value = i2cRead();
+  if(mode!='r'){
+    Intensity_value = (Intensity_value*5)/6;
+    if(mode!='c'){
+      Intensity_value = (Intensity_value*69)/currentSensitivity;
+    }
+    /*this next adjustment is not useful in practice. if you're using
+      a half-scale mode, you want the extra sensitivity. I'm leaving it
+      here for reference.
+    switch(currentMode){
+      case BH_Singh:
+      case BH_Conth:
+        Intensity_value /= 2;
+    }*/
+    Intensity_value = constrain(Intensity_value, 0, 65535);
+  }
+  switch(currentMode){
+    case BH_ContH:
+    case BH_Conth:
+    case BH_ContL:
+    case BH_EasyH:
+      //this is a fake previous sample time that will keep pace with
+      //the actual BH1750FVI's sampling rate, but isn't necessarily
+      //synchronized to the earliest time each new sample is available.
+      //if you want true synchronized timing, use a single-sample mode.
+      lastSampleStart = millis();
+  }
+  return (word)Intensity_value;
+}
+
+word BH1750FVI::setSensitivity(double sens){
+  if(sens<((double)(BH_MinSv/2))){
+    sens = constrain(sens,
+                    ((double)BH_MinSv/(double)BH_DefSv),
+                    ((double)BH_MaxSv/(double)BH_DefSv)
+                    );
+    sens = sens*(double)BH_DefSv;
+  }
+  else{
+    sens = constrain(sens, (double)BH_MinSv, (double)BH_MaxSv);
+  }
+  return setSensitivity((byte)round(sens));
+}
+
+word BH1750FVI::setSensitivity(float sens){
+  return setSensitivity((double)sens);
+}
+
+word BH1750FVI::setSensitivity(int sens){
+  sens = constrain(sens, 1, BH_MaxSv);
+  return setSensitivity((byte)sens);
+}
+
+word BH1750FVI::setSensitivity(byte sens){
+  if(sens<(BH_MinSv/2)){  
+    sens = BH_DefSv*(constrain(sens, (byte)1, (byte)3));
+  }
+  else{
+    sens = constrain(sens, BH_MinSv, BH_MaxSv);
+  }
+  switch(currentMode){
+    case BH_ContL:
+    case BH_SingL:
+      currentSamplingTime = (word)((BH_FastD*(unsigned long int)sens)/BH_DefSv);
+      break;
+    default:
+      currentSamplingTime = (word)((((unsigned long int)BH_SlowD)*((unsigned long int)sens))/BH_DefSv);
+    break;
+  }
+  MTreg_hiByte = BH_MTrHb | (sens >> 5);
+  MTreg_loByte = BH_MTrLb | (sens & 0b00011111);
+  currentSensitivity = sens;
+  sampleUnseen = false;
+  return currentSamplingTime;
+}
+
+void BH1750FVI::powerDown(){
+  i2cWrite(BH_PowOf);
+}
+
+/*I2C INTERFACE
+  These two functions were originally based on code written by
+  https://github.com/claws/ and
+  https://github.com/Genotronex/
+*/
+void BH1750FVI::i2cWrite(byte dataToSend){
+  Wire.beginTransmission(address);
+  Wire.write(dataToSend);
+  Wire.endTransmission();
+}
+
+word BH1750FVI::i2cRead(){
+  word value;
+  Wire.beginTransmission(address);
+  Wire.requestFrom(address, (byte)2);
+  if(Wire.available()){
+    value = Wire.read();
+    if(Wire.available()){
+      value <<= 8;
+      value |= Wire.read();
+    }
+    else value=0;
+  }
+  else value=0;  
+  Wire.endTransmission();
+  return value;
+}
\ No newline at end of file
diff --git a/examples/osd/arduino-bh1750/BH1750FVI-master/BH1750FVI.h b/examples/osd/arduino-bh1750/BH1750FVI-master/BH1750FVI.h
new file mode 100644
index 000000000..4a7dc9866
--- /dev/null
+++ b/examples/osd/arduino-bh1750/BH1750FVI-master/BH1750FVI.h
@@ -0,0 +1,115 @@
+#ifndef BH1750FVI_h
+#define BH1750FVI_h
+
+#if ARDUINO >= 100
+ #include "Arduino.h"
+#else
+ #include "WProgram.h"
+#endif
+
+#include <Wire.h>
+
+//device address options
+#define BH_AddrL  0x23 // Device address when addr pin is LOW
+#define BH_AddrH  0x5C // Device address when addr pin is HIGH
+
+//power codes 
+#define BH_PowOf  0x00 // power-off code
+#define BH_PowOn  0x01 // power-on code
+#define BH_Reset  0x07 // code to reset the light reading register to zero
+
+//mode codes
+#define BH_NoMod  0x02 // No mode specified. Keeps mode the same as before.
+#define BH_EasyH  0x03 // 'easy' mode. basically the same as ContH
+#define BH_ContH  0x10 // continuous full-scale, high-resolution sampling
+#define BH_Conth  0x11 // continuous with twice the resolution but half the max value
+#define BH_ContL  0x13 // continuous full-scale, low-resolution sampling. faster.
+#define BH_SingH  0x20 // take one high-resolution, full-scale sample then turn off
+#define BH_Singh  0x21 // take one high-resolution, half-scale sample then turn off
+#define BH_SingL  0x23 // take one low-resolution, full-scale sample then turn off
+                       // (happens to be the same as the low address value)
+                       
+//sensitivity codes
+#define BH_MTrHb  0x40 // last 3 bits must be masked to 3 MSB of desired value
+#define BH_MTrLb  0x60 // last 5 bits must be masked to 5 LSB of desired value
+#define BH_MinSv    31 // minimum sensitivity register value, yields Lux * 0.45
+#define BH_MaxSv   254 // maximum sensitivity register value, yields Lux * 3.68
+#define BH_DefSv    69 // default sensitivity register value, yields Lux * 1.00
+
+//timing delays. they're actually longer than the datasheet says.
+#define BH_FastD    18 // basic delay in microseconds for a fast sample
+#define BH_SlowD   125 // basic delay in microseconds for a slow sample
+
+class BH1750FVI {
+  public:
+  /*BEGIN
+    this is intended to be as error-tolerant as possible. if you don't supply
+    a mode, the default mode will be 'easy'. the sensitivity obviously defaults
+    to 1.0 (byte value of 69). Default address selection is LOW, which is how
+    the BH1750FVI should default if you don't connect anything to its ADDR pin.
+  */void begin(byte mode=BH_EasyH, byte addr=BH_AddrL, double sens=BH_DefSv, int addrPin=-1);
+    
+  /*FRESH SAMPLE POLLING
+    Check whether you have already looked at the current sample.
+  */bool sampleIsFresh();
+
+  /*ACTUALLY GET A READING FROM THE SENSOR
+    This is probably all you wanted from this library. Return value is an
+    unsigned 16 bit integer with units of Lux. There are three possible modes:
+    'r' raw numerical reading, no units, you get what you get
+    'c' convert units to Lux or half-Lux, depending on the mode, but don't
+        compensate for the sensitivity setting. This allows sensitivity to
+        be used as enclosure optics calibration/compensation.
+    't' true Lux (or half-Lux) reading, regardless of sensitivity settings.
+  */word getLightLevel(char adjustments='c');
+
+    word retrieveSample();
+
+  /*CONTINUOUS SAMPLING
+    Return value of this start function is the delay time between refreshes of
+    the ambient light reading. After you call this function, you can use getLightLevel()
+    to read the most recent ambient light level. If you try to run this ongoing start
+    function with a one-time mode argument, it will do nothing and return 0.
+  */word startOngoingSamples(char mode=BH_NoMod);
+
+  /*ONE-TIME SAMPLE START
+    Return value of this start function is the delay time before the new ambient
+    light reading will be available. You can check whether the new sample is ready
+    yet using sampleIsFresh(). Retrieve that single sample with getLightLevel().
+    If you give this one-time start function a continuous mode argument, it will
+    do nothing and return 0.
+  */word startSingleSample(char mode=BH_NoMod);
+
+  /*SENSITIVITY SETTINGS
+    This function lets you change the 'sensitivity' of the BH1750FVI by changing
+    its sampling time up or down. The sensitivity is stored as a number between
+    31 and 254, with a default value of 69. This is intended to compensate for
+    having the chip installed in an enclosure that blocks some ambient light.
+    The floating point versions of the function allow the sensitivity to be
+    given as a ratio between ~0.45 and ~3.68. The return value is the number of
+    milliseconds that the chip will take to create a new light level reading.
+  */word setSensitivity(double sens);
+    word setSensitivity(float sens);
+    word setSensitivity(int sens);
+    word setSensitivity(byte sens=BH_DefSv);
+    
+  /*POWERDOWN FUNCTION
+    In case you want to turn off the BH1750FVI to save power. Other commands will wake
+    the chip back up. Single sample modes automatically turn off the chip after sampling,
+    but you can still read the value from it without waking it up.
+  */void powerDown();
+    
+  private:
+    void init(byte mode, byte addr, byte sens);
+    void i2cWrite(byte dataToSend);
+    word i2cRead();
+    byte address;
+    byte currentMode;
+    byte currentSensitivity;
+    bool sampleUnseen;
+    byte MTreg_hiByte;
+    byte MTreg_loByte;
+    unsigned long int lastSampleStart;
+    word currentSamplingTime;
+};
+#endif
\ No newline at end of file
diff --git a/examples/osd/arduino-bh1750/BH1750FVI-master/BasicDemo/BasicDemo.ino b/examples/osd/arduino-bh1750/BH1750FVI-master/BasicDemo/BasicDemo.ino
new file mode 100644
index 000000000..3625f5202
--- /dev/null
+++ b/examples/osd/arduino-bh1750/BH1750FVI-master/BasicDemo/BasicDemo.ino
@@ -0,0 +1,23 @@
+#include <Wire.h>
+#include <BH1750FVI.h>
+
+BH1750FVI eye;
+word maxLux = 0;
+
+void setup() {
+  Wire.begin();
+  Serial.begin(115200);
+  //most basic setup with all default options
+  eye.begin();
+}
+
+void loop() {
+  //take a sensor reading, with units of Lux
+  word value = eye.getLightLevel();
+  byte spaces;
+  if(value>maxLux) maxLux=value;
+  spaces=map(value, 0, maxLux, 0, 32);
+  for(int i=0; i<spaces; i++) Serial.print(' ');
+  Serial.println(value);
+  delay(100);
+}
diff --git a/examples/osd/arduino-bh1750/BH1750FVI-master/LogGraph/LogGraph.ino b/examples/osd/arduino-bh1750/BH1750FVI-master/LogGraph/LogGraph.ino
new file mode 100644
index 000000000..3b1a20662
--- /dev/null
+++ b/examples/osd/arduino-bh1750/BH1750FVI-master/LogGraph/LogGraph.ino
@@ -0,0 +1,36 @@
+#include <Wire.h>
+#include <BH1750FVI.h>
+
+BH1750FVI eye;
+
+void setup() {
+  Wire.begin();
+  Serial.begin(115200);
+  //setup with continuous sampling, using the low address and double sensitivity
+  eye.begin(BH_ContH, BH_AddrL, 2.0);
+}
+
+void loop() {
+  //test if the sensor has had time to produce a new reading
+  if(eye.sampleIsFresh()){
+    //read the calibration-adjusted value, according to the sensitivity setting
+    word value = eye.getLightLevel('c');
+    logarithmicGraphing(value);
+    Serial.println(value);
+  }
+}
+
+
+
+
+void logarithmicGraphing(word value){
+  int i=0;
+  while(value>>i){
+    i++;
+    Serial.print("  ");
+  }
+  if(i>=2){
+    i=i-2;
+    if(value&(1<<i))Serial.print(' ');
+  }
+}
diff --git a/examples/osd/arduino-bh1750/BH1750FVI-master/README b/examples/osd/arduino-bh1750/BH1750FVI-master/README
new file mode 100644
index 000000000..2f8cb1088
--- /dev/null
+++ b/examples/osd/arduino-bh1750/BH1750FVI-master/README
@@ -0,0 +1,2 @@
+This library interfaces with the BH1750FVI ambient light sensor.
+Written by Drew Morgan in September 2014 while I stayed at home with my first baby.
\ No newline at end of file
diff --git a/examples/osd/arduino-bh1750/BH1750FVI-master/keywords.txt b/examples/osd/arduino-bh1750/BH1750FVI-master/keywords.txt
new file mode 100644
index 000000000..362f306f7
--- /dev/null
+++ b/examples/osd/arduino-bh1750/BH1750FVI-master/keywords.txt
@@ -0,0 +1,47 @@
+#######################################
+# Syntax Coloring Map For BH1750FVI
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+BH1750FVI             KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+sampleIsFresh         KEYWORD2
+getLightLevel         KEYWORD2 
+retrieveSample        KEYWORD2
+startOngoingSamples   KEYWORD2 
+startSingleSample     KEYWORD2
+setSensitivity        KEYWORD2
+startSingleSample     KEYWORD2
+printDebug            KEYWORD2
+
+#######################################
+# Constants (LITERAL1)
+#######################################
+
+BH_AddrL      LITERAL1
+BH_AddrH      LITERAL1
+BH_PowOf      LITERAL1
+BH_PowOn      LITERAL1
+BH_Reset      LITERAL1
+BH_NoMod      LITERAL1
+BH_EasyH      LITERAL1
+BH_ContH      LITERAL1
+BH_Conth      LITERAL1
+BH_ContL      LITERAL1
+BH_SingH      LITERAL1
+BH_Singh      LITERAL1
+BH_SingL      LITERAL1
+BH_MTrHb      LITERAL1
+BH_MTrLb      LITERAL1
+BH_MinSv      LITERAL1
+BH_MaxSv      LITERAL1
+BH_DefSv      LITERAL1
+BH_FastD      LITERAL1
+BH_SlowD      LITERAL1
\ No newline at end of file
diff --git a/examples/osd/arduino-bh1750/BH1750FVI.cpp b/examples/osd/arduino-bh1750/BH1750FVI.cpp
new file mode 100644
index 000000000..fd871371a
--- /dev/null
+++ b/examples/osd/arduino-bh1750/BH1750FVI.cpp
@@ -0,0 +1,209 @@
+#include "BH1750FVI.h"
+//#if ARDUINO >= 100
+ #include "Arduino.h"
+//#else
+// #include "WProgram.h"
+//#endif
+
+#include <Wire.h>
+
+void BH1750FVI::begin(byte mode, byte addr, double sens, int pin){
+  if(pin>=0 && pin<55){
+    pinMode(pin, OUTPUT);
+    if(addr==BH_AddrL) digitalWrite(pin, LOW);
+    if(addr==BH_AddrH) digitalWrite(pin, HIGH);
+  }
+  byte sensitivity;
+  if(sens<BH_MinSv){
+    sens = constrain(sens, ((double)BH_MinSv/(double)BH_DefSv), ((double)BH_MaxSv/(double)BH_DefSv));
+    sensitivity = (byte)round(sens*(double)BH_DefSv);
+  }
+  else{
+    sensitivity = constrain((byte)sens, BH_MinSv, BH_MaxSv);
+  }
+  address = addr;
+  currentSensitivity = sensitivity;
+  MTreg_hiByte = BH_MTrHb | (sensitivity >> 5);
+  MTreg_loByte = BH_MTrLb | (sensitivity & 0b00011111);
+  switch(mode){
+    case BH_ContL:
+    case BH_ContH:
+    case BH_Conth:
+      startOngoingSamples(mode);
+      break;
+    case BH_SingH:
+    case BH_Singh:
+    case BH_SingL:
+      startSingleSample(mode);
+      break;
+    default:
+      mode = BH_EasyH;
+      startOngoingSamples(mode);
+      break;
+  }
+  sampleUnseen = false;
+  lastSampleStart = 0;
+}
+
+word BH1750FVI::startOngoingSamples(char mode){
+  if(mode==BH_NoMod) mode=currentMode;
+  byte lowLevelMode = mode;
+  if(lowLevelMode==BH_EasyH) lowLevelMode=BH_ContH;
+  switch(mode){
+    case BH_EasyH:
+    case BH_ContH:
+    case BH_Conth:
+    case BH_ContL:
+      i2cWrite(BH_PowOn);
+      i2cWrite(MTreg_hiByte);
+      i2cWrite(MTreg_loByte);
+      i2cWrite(lowLevelMode);
+      lastSampleStart = millis();
+      currentMode = mode;
+      return setSensitivity(currentSensitivity);
+      break;
+    default:
+      return 0;
+  }
+}
+
+word BH1750FVI::startSingleSample(char mode){
+  if(mode==BH_NoMod){
+    mode=currentMode;
+  }
+  switch(mode){
+    case BH_SingH:
+    case BH_Singh:
+    case BH_SingL:
+      i2cWrite(BH_PowOn);
+      i2cWrite(MTreg_hiByte);
+      i2cWrite(MTreg_loByte);
+      i2cWrite(mode);
+      lastSampleStart = millis();
+      currentMode = mode;
+      return setSensitivity(currentSensitivity);
+      break;
+    default:
+      return 0;
+  }
+}
+
+bool BH1750FVI::sampleIsFresh(){
+  if(sampleUnseen) return true;
+  else if((millis() > (lastSampleStart+currentSamplingTime))){
+    sampleUnseen = true;
+    return true;
+  }
+  else return false;
+}
+
+word BH1750FVI::getLightLevel(char mode){
+  unsigned long int Intensity_value;
+  sampleUnseen = false;
+  Intensity_value = i2cRead();
+  if(mode!='r'){
+    Intensity_value = (Intensity_value*5)/6;
+    if(mode!='c'){
+      Intensity_value = (Intensity_value*69)/currentSensitivity;
+    }
+    /*this next adjustment is not useful in practice. if you're using
+      a half-scale mode, you want the extra sensitivity. I'm leaving it
+      here for reference.
+    switch(currentMode){
+      case BH_Singh:
+      case BH_Conth:
+        Intensity_value /= 2;
+    }*/
+    Intensity_value = constrain(Intensity_value, 0, 65535);
+  }
+  switch(currentMode){
+    case BH_ContH:
+    case BH_Conth:
+    case BH_ContL:
+    case BH_EasyH:
+      //this is a fake previous sample time that will keep pace with
+      //the actual BH1750FVI's sampling rate, but isn't necessarily
+      //synchronized to the earliest time each new sample is available.
+      //if you want true synchronized timing, use a single-sample mode.
+      lastSampleStart = millis();
+  }
+  return (word)Intensity_value;
+}
+
+word BH1750FVI::setSensitivity(double sens){
+  if(sens<((double)(BH_MinSv/2))){
+    sens = constrain(sens,
+                    ((double)BH_MinSv/(double)BH_DefSv),
+                    ((double)BH_MaxSv/(double)BH_DefSv)
+                    );
+    sens = sens*(double)BH_DefSv;
+  }
+  else{
+    sens = constrain(sens, (double)BH_MinSv, (double)BH_MaxSv);
+  }
+  return setSensitivity((byte)round(sens));
+}
+
+word BH1750FVI::setSensitivity(float sens){
+  return setSensitivity((double)sens);
+}
+
+word BH1750FVI::setSensitivity(int sens){
+  sens = constrain(sens, 1, BH_MaxSv);
+  return setSensitivity((byte)sens);
+}
+
+word BH1750FVI::setSensitivity(byte sens){
+  if(sens<(BH_MinSv/2)){  
+    sens = BH_DefSv*(constrain(sens, (byte)1, (byte)3));
+  }
+  else{
+    sens = constrain(sens, BH_MinSv, BH_MaxSv);
+  }
+  switch(currentMode){
+    case BH_ContL:
+    case BH_SingL:
+      currentSamplingTime = (word)((BH_FastD*(unsigned long int)sens)/BH_DefSv);
+      break;
+    default:
+      currentSamplingTime = (word)((((unsigned long int)BH_SlowD)*((unsigned long int)sens))/BH_DefSv);
+    break;
+  }
+  MTreg_hiByte = BH_MTrHb | (sens >> 5);
+  MTreg_loByte = BH_MTrLb | (sens & 0b00011111);
+  currentSensitivity = sens;
+  sampleUnseen = false;
+  return currentSamplingTime;
+}
+
+void BH1750FVI::powerDown(){
+  i2cWrite(BH_PowOf);
+}
+
+/*I2C INTERFACE
+  These two functions were originally based on code written by
+  https://github.com/claws/ and
+  https://github.com/Genotronex/
+*/
+void BH1750FVI::i2cWrite(byte dataToSend){
+  Wire.beginTransmission(address);
+  Wire.write(dataToSend);
+  Wire.endTransmission();
+}
+
+word BH1750FVI::i2cRead(){
+  word value;
+  Wire.beginTransmission(address);
+  Wire.requestFrom(address, (byte)2);
+  if(Wire.available()){
+    value = Wire.read();
+    if(Wire.available()){
+      value <<= 8;
+      value |= Wire.read();
+    }
+    else value=0;
+  }
+  else value=0;  
+  Wire.endTransmission();
+  return value;
+}
diff --git a/examples/osd/arduino-bh1750/BH1750FVI.h b/examples/osd/arduino-bh1750/BH1750FVI.h
new file mode 100644
index 000000000..acdf62102
--- /dev/null
+++ b/examples/osd/arduino-bh1750/BH1750FVI.h
@@ -0,0 +1,115 @@
+#ifndef BH1750FVI_h
+#define BH1750FVI_h
+
+//#if ARDUINO >= 100
+ #include "Arduino.h"
+//#else
+// #include "WProgram.h"
+//#endif
+
+#include <Wire.h>
+
+//device address options
+#define BH_AddrL  0x23 // Device address when addr pin is LOW
+#define BH_AddrH  0x5C // Device address when addr pin is HIGH
+
+//power codes 
+#define BH_PowOf  0x00 // power-off code
+#define BH_PowOn  0x01 // power-on code
+#define BH_Reset  0x07 // code to reset the light reading register to zero
+
+//mode codes
+#define BH_NoMod  0x02 // No mode specified. Keeps mode the same as before.
+#define BH_EasyH  0x03 // 'easy' mode. basically the same as ContH
+#define BH_ContH  0x10 // continuous full-scale, high-resolution sampling
+#define BH_Conth  0x11 // continuous with twice the resolution but half the max value
+#define BH_ContL  0x13 // continuous full-scale, low-resolution sampling. faster.
+#define BH_SingH  0x20 // take one high-resolution, full-scale sample then turn off
+#define BH_Singh  0x21 // take one high-resolution, half-scale sample then turn off
+#define BH_SingL  0x23 // take one low-resolution, full-scale sample then turn off
+                       // (happens to be the same as the low address value)
+                       
+//sensitivity codes
+#define BH_MTrHb  0x40 // last 3 bits must be masked to 3 MSB of desired value
+#define BH_MTrLb  0x60 // last 5 bits must be masked to 5 LSB of desired value
+#define BH_MinSv    31 // minimum sensitivity register value, yields Lux * 0.45
+#define BH_MaxSv   254 // maximum sensitivity register value, yields Lux * 3.68
+#define BH_DefSv    69 // default sensitivity register value, yields Lux * 1.00
+
+//timing delays. they're actually longer than the datasheet says.
+#define BH_FastD    18 // basic delay in microseconds for a fast sample
+#define BH_SlowD   125 // basic delay in microseconds for a slow sample
+
+class BH1750FVI {
+  public:
+  /*BEGIN
+    this is intended to be as error-tolerant as possible. if you don't supply
+    a mode, the default mode will be 'easy'. the sensitivity obviously defaults
+    to 1.0 (byte value of 69). Default address selection is LOW, which is how
+    the BH1750FVI should default if you don't connect anything to its ADDR pin.
+  */void begin(byte mode=BH_EasyH, byte addr=BH_AddrL, double sens=BH_DefSv, int addrPin=-1);
+    
+  /*FRESH SAMPLE POLLING
+    Check whether you have already looked at the current sample.
+  */bool sampleIsFresh();
+
+  /*ACTUALLY GET A READING FROM THE SENSOR
+    This is probably all you wanted from this library. Return value is an
+    unsigned 16 bit integer with units of Lux. There are three possible modes:
+    'r' raw numerical reading, no units, you get what you get
+    'c' convert units to Lux or half-Lux, depending on the mode, but don't
+        compensate for the sensitivity setting. This allows sensitivity to
+        be used as enclosure optics calibration/compensation.
+    't' true Lux (or half-Lux) reading, regardless of sensitivity settings.
+  */word getLightLevel(char adjustments='c');
+
+    word retrieveSample();
+
+  /*CONTINUOUS SAMPLING
+    Return value of this start function is the delay time between refreshes of
+    the ambient light reading. After you call this function, you can use getLightLevel()
+    to read the most recent ambient light level. If you try to run this ongoing start
+    function with a one-time mode argument, it will do nothing and return 0.
+  */word startOngoingSamples(char mode=BH_NoMod);
+
+  /*ONE-TIME SAMPLE START
+    Return value of this start function is the delay time before the new ambient
+    light reading will be available. You can check whether the new sample is ready
+    yet using sampleIsFresh(). Retrieve that single sample with getLightLevel().
+    If you give this one-time start function a continuous mode argument, it will
+    do nothing and return 0.
+  */word startSingleSample(char mode=BH_NoMod);
+
+  /*SENSITIVITY SETTINGS
+    This function lets you change the 'sensitivity' of the BH1750FVI by changing
+    its sampling time up or down. The sensitivity is stored as a number between
+    31 and 254, with a default value of 69. This is intended to compensate for
+    having the chip installed in an enclosure that blocks some ambient light.
+    The floating point versions of the function allow the sensitivity to be
+    given as a ratio between ~0.45 and ~3.68. The return value is the number of
+    milliseconds that the chip will take to create a new light level reading.
+  */word setSensitivity(double sens);
+    word setSensitivity(float sens);
+    word setSensitivity(int sens);
+    word setSensitivity(byte sens=BH_DefSv);
+    
+  /*POWERDOWN FUNCTION
+    In case you want to turn off the BH1750FVI to save power. Other commands will wake
+    the chip back up. Single sample modes automatically turn off the chip after sampling,
+    but you can still read the value from it without waking it up.
+  */void powerDown();
+    
+  private:
+    void init(byte mode, byte addr, byte sens);
+    void i2cWrite(byte dataToSend);
+    word i2cRead();
+    byte address;
+    byte currentMode;
+    byte currentSensitivity;
+    bool sampleUnseen;
+    byte MTreg_hiByte;
+    byte MTreg_loByte;
+    unsigned long int lastSampleStart;
+    word currentSamplingTime;
+};
+#endif
diff --git a/examples/osd/arduino-bh1750/Makefile b/examples/osd/arduino-bh1750/Makefile
new file mode 100644
index 000000000..201eeac72
--- /dev/null
+++ b/examples/osd/arduino-bh1750/Makefile
@@ -0,0 +1,71 @@
+# 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\"
+LFLAGS += -lm
+
+PROJECT_SOURCEFILES += ${SKETCH}.cpp BH1750FVI.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
diff --git a/examples/osd/arduino-bh1750/README.md b/examples/osd/arduino-bh1750/README.md
new file mode 100644
index 000000000..e1490ed05
--- /dev/null
+++ b/examples/osd/arduino-bh1750/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
diff --git a/examples/osd/arduino-bh1750/arduino-example.c b/examples/osd/arduino-bh1750/arduino-example.c
new file mode 100644
index 000000000..ea74dd8b8
--- /dev/null
+++ b/examples/osd/arduino-bh1750/arduino-example.c
@@ -0,0 +1,2 @@
+#include <arduino-process.h>
+AUTOSTART_PROCESSES(&arduino_sketch);
diff --git a/examples/osd/arduino-bh1750/flash.sh b/examples/osd/arduino-bh1750/flash.sh
new file mode 100755
index 000000000..e82962073
--- /dev/null
+++ b/examples/osd/arduino-bh1750/flash.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/arduino-bh1750/project-conf.h b/examples/osd/arduino-bh1750/project-conf.h
new file mode 100644
index 000000000..e25aed53c
--- /dev/null
+++ b/examples/osd/arduino-bh1750/project-conf.h
@@ -0,0 +1,106 @@
+/*
+ * 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 SICSLOWPAN_CONF_FRAG	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
+
+/* 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
+*/
+
+/* Save some memory for the sky platform. */
+/*
+#undef NBR_TABLE_CONF_MAX_NEIGHBORS
+#define NBR_TABLE_CONF_MAX_NEIGHBORS     10
+#undef UIP_CONF_MAX_ROUTES
+#define UIP_CONF_MAX_ROUTES   10
+*/
+
+/* Reduce 802.15.4 frame queue to save RAM. */
+/*
+#undef QUEUEBUF_CONF_NUM
+#define QUEUEBUF_CONF_NUM       4
+*/
+
+/*
+#undef SICSLOWPAN_CONF_FRAG
+#define SICSLOWPAN_CONF_FRAG	1
+*/
+
+#endif /* PROJECT_RPL_WEB_CONF_H_ */
diff --git a/examples/osd/arduino-bh1750/resources/res-bh1750.c b/examples/osd/arduino-bh1750/resources/res-bh1750.c
new file mode 100644
index 000000000..ae47f07a5
--- /dev/null
+++ b/examples/osd/arduino-bh1750/resources/res-bh1750.c
@@ -0,0 +1,80 @@
+/*
+ * 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_bh1750,
+         "title=\"Lux status\";rt=\"Lux\"",
+         res_get_handler,
+         NULL,
+         NULL,
+         NULL);
+
+extern  uint16_t lux;
+
+
+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", lux);
+
+    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, "{'lux':%d}", lux);
+
+    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));
+  }
+}
diff --git a/examples/osd/arduino-bh1750/run.sh b/examples/osd/arduino-bh1750/run.sh
new file mode 100755
index 000000000..5d5cbbbb4
--- /dev/null
+++ b/examples/osd/arduino-bh1750/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
diff --git a/examples/osd/arduino-bh1750/sketch.pde b/examples/osd/arduino-bh1750/sketch.pde
new file mode 100644
index 000000000..30b259b02
--- /dev/null
+++ b/examples/osd/arduino-bh1750/sketch.pde
@@ -0,0 +1,49 @@
+/*
+ * 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>
+#include "BH1750FVI.h"
+
+extern "C" {
+#include "arduino-process.h"
+#include "rest-engine.h"
+
+BH1750FVI lightMeter;
+
+extern resource_t res_bh1750, res_battery;
+uint16_t lux;
+
+#define LED_PIN 4
+}
+
+void setup (void)
+{
+    // switch off the led
+    pinMode(LED_PIN, OUTPUT);
+    digitalWrite(LED_PIN, HIGH);
+    // BH1750 sensor
+    lightMeter.begin();
+    // init coap resourcen
+    rest_init_engine ();
+    rest_activate_resource (&res_bh1750, "s/lux");
+    rest_activate_resource (&res_battery, "s/battery");
+}
+
+// at project-conf.h
+// LOOP_INTERVAL		(10 * CLOCK_SECOND)
+void loop (void)
+{
+	mcu_sleep_off();
+    lux = lightMeter.getLightLevel();
+  	mcu_sleep_on();    
+	printf("Lux: %d",lux);
+}

From abc5db04b2d98855a1a0868aa79d6ed9f0cedcfb Mon Sep 17 00:00:00 2001
From: harald42 <harald@20150300048NB.evva.com>
Date: Wed, 18 May 2016 08:17:47 +0200
Subject: [PATCH 243/393] bugfix start i2c and printf

---
 examples/osd/arduino-bh1750/sketch.pde | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/osd/arduino-bh1750/sketch.pde b/examples/osd/arduino-bh1750/sketch.pde
index 30b259b02..775b96bce 100644
--- a/examples/osd/arduino-bh1750/sketch.pde
+++ b/examples/osd/arduino-bh1750/sketch.pde
@@ -31,6 +31,7 @@ void setup (void)
     pinMode(LED_PIN, OUTPUT);
     digitalWrite(LED_PIN, HIGH);
     // BH1750 sensor
+    Wire.begin();
     lightMeter.begin();
     // init coap resourcen
     rest_init_engine ();
@@ -44,6 +45,6 @@ void loop (void)
 {
 	mcu_sleep_off();
     lux = lightMeter.getLightLevel();
+	printf("Lux: %d\n",lux);
   	mcu_sleep_on();    
-	printf("Lux: %d",lux);
 }

From b608b837c239cdc59e3adb4f4f4eb9a6645fc09a Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Wed, 18 May 2016 17:40:20 +0300
Subject: [PATCH 244/393] Add login target to Makefile.cc26xx-cc13xx

---
 cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx b/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
index d0cf1cf31..15d971004 100644
--- a/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
+++ b/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
@@ -145,3 +145,20 @@ else
 %.upload:
 	@echo "This board cannot be programmed through the ROM bootloader and therefore does not support the .upload target."
 endif
+
+# Check if we are running under Windows
+ifeq ($(HOST_OS),Windows)
+  SERIALDUMP ?= $(CONTIKI)/tools/sky/serialdump-windows
+else
+ifeq ($(HOST_OS),Darwin)
+  SERIALDUMP ?= $(CONTIKI)/tools/sky/serialdump-macos
+else
+  # Else assume Linux
+  SERIALDUMP ?= $(CONTIKI)/tools/sky/serialdump-linux
+endif
+endif
+
+UART_BAUDRATE = 115200
+
+login:
+	$(SERIALDUMP) -b$(UART_BAUDRATE) $(PORT)

From 9a2494583d9f849f2605186ad1b2c259d74c6e59 Mon Sep 17 00:00:00 2001
From: Harald Pichler <harald@the-develop.net>
Date: Fri, 20 May 2016 09:11:11 +0200
Subject: [PATCH 245/393] bugfix compile error tostrf

---
 examples/osd/arduino-htu21/sketch.pde | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/osd/arduino-htu21/sketch.pde b/examples/osd/arduino-htu21/sketch.pde
index 2336e111f..4ea3500ea 100644
--- a/examples/osd/arduino-htu21/sketch.pde
+++ b/examples/osd/arduino-htu21/sketch.pde
@@ -53,7 +53,7 @@ void loop (void)
     htu21d_hum = htu.readHumidity();
   	mcu_sleep_on();    
     dtostrf(htu21d_temp , 6, 2, htu21d_temp_s );   
-	tostrf(htu21d_hum , 6, 2, htu21d_hum_s );
+	dtostrf(htu21d_hum , 6, 2, htu21d_hum_s );
     // remove space
     if(htu21d_temp_s[0]==' '){
       memcpy (htu21d_temp_s,htu21d_temp_s+1,strlen(htu21d_temp_s)+1);

From dfd8fdec4ab7c27701801ce192d551f83ee354e9 Mon Sep 17 00:00:00 2001
From: Harald Pichler <harald@the-develop.net>
Date: Fri, 20 May 2016 11:18:19 +0200
Subject: [PATCH 246/393] initial upload

---
 examples/osd/arduino-bmp085/Barometer.cpp     | 175 +++++++++++++++
 examples/osd/arduino-bmp085/Barometer.h       |  58 +++++
 .../Barometer_Sensor/Barometer.cpp            | 175 +++++++++++++++
 .../Barometer_Sensor/Barometer.h              |  58 +++++
 .../Barometer_Sensor/Barometer_Sensor.ino     |  49 ++++
 examples/osd/arduino-bmp085/Makefile          |  71 ++++++
 examples/osd/arduino-bmp085/README.md         |  11 +
 examples/osd/arduino-bmp085/arduino-example.c |   2 +
 examples/osd/arduino-bmp085/flash.sh          |   2 +
 examples/osd/arduino-bmp085/project-conf.h    | 106 +++++++++
 .../arduino-bmp085/resources/res-bmp085alt.c  |  79 +++++++
 .../arduino-bmp085/resources/res-bmp085atm.c  |  79 +++++++
 .../resources/res-bmp085press.c               |  79 +++++++
 .../arduino-bmp085/resources/res-bmp085temp.c |  79 +++++++
 examples/osd/arduino-bmp085/run.sh            |   5 +
 examples/osd/arduino-bmp085/sketch.pde        |  86 +++++++
 .../osd/arduino-weather/Adafruit_HTU21DF.cpp  | 100 +++++++++
 .../osd/arduino-weather/Adafruit_HTU21DF.h    |  44 ++++
 examples/osd/arduino-weather/BH1750FVI.cpp    | 209 ++++++++++++++++++
 examples/osd/arduino-weather/BH1750FVI.h      | 115 ++++++++++
 examples/osd/arduino-weather/Barometer.cpp    | 175 +++++++++++++++
 examples/osd/arduino-weather/Barometer.h      |  58 +++++
 examples/osd/arduino-weather/Makefile         |  71 ++++++
 examples/osd/arduino-weather/README.md        |  11 +
 .../osd/arduino-weather/arduino-example.c     |   2 +
 examples/osd/arduino-weather/flash.sh         |   2 +
 examples/osd/arduino-weather/project-conf.h   | 106 +++++++++
 .../arduino-weather/resources/res-bh1750.c    |  80 +++++++
 .../arduino-weather/resources/res-bmp085alt.c |  79 +++++++
 .../arduino-weather/resources/res-bmp085atm.c |  79 +++++++
 .../resources/res-bmp085press.c               |  79 +++++++
 .../arduino-weather/resources/res-htu21dhum.c |  80 +++++++
 .../resources/res-htu21dtemp.c                |  79 +++++++
 examples/osd/arduino-weather/run.sh           |   5 +
 examples/osd/arduino-weather/sketch.pde       | 128 +++++++++++
 35 files changed, 2616 insertions(+)
 create mode 100644 examples/osd/arduino-bmp085/Barometer.cpp
 create mode 100644 examples/osd/arduino-bmp085/Barometer.h
 create mode 100644 examples/osd/arduino-bmp085/Barometer_Sensor/Barometer.cpp
 create mode 100644 examples/osd/arduino-bmp085/Barometer_Sensor/Barometer.h
 create mode 100644 examples/osd/arduino-bmp085/Barometer_Sensor/examples/Barometer_Sensor/Barometer_Sensor.ino
 create mode 100644 examples/osd/arduino-bmp085/Makefile
 create mode 100644 examples/osd/arduino-bmp085/README.md
 create mode 100644 examples/osd/arduino-bmp085/arduino-example.c
 create mode 100755 examples/osd/arduino-bmp085/flash.sh
 create mode 100644 examples/osd/arduino-bmp085/project-conf.h
 create mode 100644 examples/osd/arduino-bmp085/resources/res-bmp085alt.c
 create mode 100644 examples/osd/arduino-bmp085/resources/res-bmp085atm.c
 create mode 100644 examples/osd/arduino-bmp085/resources/res-bmp085press.c
 create mode 100644 examples/osd/arduino-bmp085/resources/res-bmp085temp.c
 create mode 100755 examples/osd/arduino-bmp085/run.sh
 create mode 100644 examples/osd/arduino-bmp085/sketch.pde
 create mode 100644 examples/osd/arduino-weather/Adafruit_HTU21DF.cpp
 create mode 100644 examples/osd/arduino-weather/Adafruit_HTU21DF.h
 create mode 100644 examples/osd/arduino-weather/BH1750FVI.cpp
 create mode 100644 examples/osd/arduino-weather/BH1750FVI.h
 create mode 100644 examples/osd/arduino-weather/Barometer.cpp
 create mode 100644 examples/osd/arduino-weather/Barometer.h
 create mode 100644 examples/osd/arduino-weather/Makefile
 create mode 100644 examples/osd/arduino-weather/README.md
 create mode 100644 examples/osd/arduino-weather/arduino-example.c
 create mode 100755 examples/osd/arduino-weather/flash.sh
 create mode 100644 examples/osd/arduino-weather/project-conf.h
 create mode 100644 examples/osd/arduino-weather/resources/res-bh1750.c
 create mode 100644 examples/osd/arduino-weather/resources/res-bmp085alt.c
 create mode 100644 examples/osd/arduino-weather/resources/res-bmp085atm.c
 create mode 100644 examples/osd/arduino-weather/resources/res-bmp085press.c
 create mode 100644 examples/osd/arduino-weather/resources/res-htu21dhum.c
 create mode 100644 examples/osd/arduino-weather/resources/res-htu21dtemp.c
 create mode 100755 examples/osd/arduino-weather/run.sh
 create mode 100644 examples/osd/arduino-weather/sketch.pde

diff --git a/examples/osd/arduino-bmp085/Barometer.cpp b/examples/osd/arduino-bmp085/Barometer.cpp
new file mode 100644
index 000000000..ec8b294a8
--- /dev/null
+++ b/examples/osd/arduino-bmp085/Barometer.cpp
@@ -0,0 +1,175 @@
+/*
+  Barometer library V1.0
+  2010 Copyright (c) Seeed Technology Inc.  All right reserved.
+ 
+  Original Author: LG
+  
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "Barometer.h"
+#include <Wire.h>
+#include <Arduino.h>
+
+void Barometer::init(void)
+{
+    Wire.begin();
+//    Serial.print("Temperaturet: ");
+    ac1 = bmp085ReadInt(0xAA);
+    ac2 = bmp085ReadInt(0xAC);
+    ac3 = bmp085ReadInt(0xAE);
+    ac4 = bmp085ReadInt(0xB0);
+    ac5 = bmp085ReadInt(0xB2);
+    ac6 = bmp085ReadInt(0xB4);
+    b1 = bmp085ReadInt(0xB6);
+    b2 = bmp085ReadInt(0xB8);
+    mb = bmp085ReadInt(0xBA);
+    mc = bmp085ReadInt(0xBC);
+    md = bmp085ReadInt(0xBE);
+//    Serial.print("Temperaturet2: ");
+}
+// Read 1 byte from the BMP085 at 'address'
+// Return: the read byte;
+char Barometer::bmp085Read(unsigned char address)
+{
+    //Wire.begin();
+    //unsigned char data;
+    Wire.beginTransmission(BMP085_ADDRESS);
+    Wire.write(address);
+    Wire.endTransmission();
+
+    Wire.requestFrom(BMP085_ADDRESS, 1);
+    while(!Wire.available());
+    return Wire.read();
+}
+// Read 2 bytes from the BMP085
+// First byte will be from 'address'
+// Second byte will be from 'address'+1
+int Barometer::bmp085ReadInt(unsigned char address)
+{
+    unsigned char msb, lsb;
+    Wire.beginTransmission(BMP085_ADDRESS);
+    Wire.write(address);
+    Wire.endTransmission();
+    Wire.requestFrom(BMP085_ADDRESS, 2);
+    while(Wire.available()<2);
+    msb = Wire.read();
+    lsb = Wire.read();
+    return (int) msb<<8 | lsb;
+}
+// Read the uncompensated temperature value
+unsigned int Barometer::bmp085ReadUT()
+{
+  unsigned int ut;
+  Wire.beginTransmission(BMP085_ADDRESS);
+  Wire.write(0xF4);
+  Wire.write(0x2E);
+  Wire.endTransmission();
+  delay(5);
+  ut = bmp085ReadInt(0xF6);
+  return ut;
+}
+// Read the uncompensated pressure value
+unsigned long Barometer::bmp085ReadUP()
+{
+    unsigned char msb, lsb, xlsb;
+    unsigned long up = 0;
+    Wire.beginTransmission(BMP085_ADDRESS);
+    Wire.write(0xF4);
+    Wire.write(0x34 + (OSS<<6));
+    Wire.endTransmission();
+    delay(2 + (3<<OSS));
+
+    // Read register 0xF6 (MSB), 0xF7 (LSB), and 0xF8 (XLSB)
+    msb = bmp085Read(0xF6);
+    lsb = bmp085Read(0xF7);
+    xlsb = bmp085Read(0xF8);
+    up = (((unsigned long) msb << 16) | ((unsigned long) lsb << 8) | (unsigned long) xlsb) >> (8-OSS);
+    return up;
+}
+void Barometer::writeRegister(int deviceAddress, byte address, byte val)
+{
+    Wire.beginTransmission(deviceAddress); // start transmission to device 
+    Wire.write(address);       // send register address
+    Wire.write(val);         // send value to write
+    Wire.endTransmission();     // end transmission
+}
+int Barometer::readRegister(int deviceAddress, byte address)
+{
+    int v;
+    Wire.beginTransmission(deviceAddress);
+    Wire.write(address); // register to read
+    Wire.endTransmission();
+
+    Wire.requestFrom(deviceAddress, 1); // read a byte
+
+    while(!Wire.available()) {
+    // waiting
+    }
+
+    v = Wire.read();
+    return v;
+}
+float Barometer::calcAltitude(float pressure)
+{
+    float A = pressure/101325;
+    float B = 1/5.25588;
+    float C = pow(A,B);
+    C = 1 - C;
+    C = C /0.0000225577;
+    return C;
+}
+float Barometer::bmp085GetTemperature(unsigned int ut)
+{
+    long x1, x2;
+
+    x1 = (((long)ut - (long)ac6)*(long)ac5) >> 15;
+    x2 = ((long)mc << 11)/(x1 + md);
+    PressureCompensate = x1 + x2;
+
+    float temp = ((PressureCompensate + 8)>>4);
+    temp = temp /10;
+
+    return temp;
+}
+long Barometer::bmp085GetPressure(unsigned long up)
+{
+    long x1, x2, x3, b3, b6, p;
+    unsigned long b4, b7;
+    b6 = PressureCompensate - 4000;
+    x1 = (b2 * (b6 * b6)>>12)>>11;
+    x2 = (ac2 * b6)>>11;
+    x3 = x1 + x2;
+    b3 = (((((long)ac1)*4 + x3)<<OSS) + 2)>>2;
+
+    // Calculate B4
+    x1 = (ac3 * b6)>>13;
+    x2 = (b1 * ((b6 * b6)>>12))>>16;
+    x3 = ((x1 + x2) + 2)>>2;
+    b4 = (ac4 * (unsigned long)(x3 + 32768))>>15;
+
+    b7 = ((unsigned long)(up - b3) * (50000>>OSS));
+    if (b7 < 0x80000000)
+    p = (b7<<1)/b4;
+    else
+    p = (b7/b4)<<1;
+
+    x1 = (p>>8) * (p>>8);
+    x1 = (x1 * 3038)>>16;
+    x2 = (-7357 * p)>>16;
+    p += (x1 + x2 + 3791)>>4;
+
+    long temp = p;
+    return temp;
+}
diff --git a/examples/osd/arduino-bmp085/Barometer.h b/examples/osd/arduino-bmp085/Barometer.h
new file mode 100644
index 000000000..161702718
--- /dev/null
+++ b/examples/osd/arduino-bmp085/Barometer.h
@@ -0,0 +1,58 @@
+/*
+  Barometer library V1.0
+  2010 Copyright (c) Seeed Technology Inc.  All right reserved.
+ 
+  Original Author: LG
+  
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#ifndef __BAROMETER_H__
+#define __BAROMETER_H__
+
+#include <Arduino.h>
+#include <Wire.h>
+
+const unsigned char OSS = 0;
+#define BMP085_ADDRESS 0x77
+class Barometer
+{
+public: 
+  void init(void);
+  long PressureCompensate;
+  float bmp085GetTemperature(unsigned int ut);
+  long bmp085GetPressure(unsigned long up);
+  float calcAltitude(float pressure);
+  unsigned int bmp085ReadUT(void);
+  unsigned long bmp085ReadUP(void);
+ 
+private:
+  int ac1;
+  int ac2;
+  int ac3;
+  unsigned int ac4;
+  unsigned int ac5;
+  unsigned int ac6;
+  int b1;
+  int b2;
+  int mb;
+  int mc;
+  int md;
+  char bmp085Read(unsigned char address);
+  int bmp085ReadInt(unsigned char address);
+  void writeRegister(int deviceAddress, byte address, byte val);
+  int readRegister(int deviceAddress, byte address);
+};
+
+#endif
diff --git a/examples/osd/arduino-bmp085/Barometer_Sensor/Barometer.cpp b/examples/osd/arduino-bmp085/Barometer_Sensor/Barometer.cpp
new file mode 100644
index 000000000..208f8b5a5
--- /dev/null
+++ b/examples/osd/arduino-bmp085/Barometer_Sensor/Barometer.cpp
@@ -0,0 +1,175 @@
+/*
+  Barometer library V1.0
+  2010 Copyright (c) Seeed Technology Inc.  All right reserved.
+ 
+  Original Author: LG
+  
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "Barometer.h"
+#include <Wire.h>
+#include <Arduino.h>
+
+void Barometer::init(void)
+{
+    Wire.begin();
+    Serial.print("Temperaturet: ");
+    ac1 = bmp085ReadInt(0xAA);
+    ac2 = bmp085ReadInt(0xAC);
+    ac3 = bmp085ReadInt(0xAE);
+    ac4 = bmp085ReadInt(0xB0);
+    ac5 = bmp085ReadInt(0xB2);
+    ac6 = bmp085ReadInt(0xB4);
+    b1 = bmp085ReadInt(0xB6);
+    b2 = bmp085ReadInt(0xB8);
+    mb = bmp085ReadInt(0xBA);
+    mc = bmp085ReadInt(0xBC);
+    md = bmp085ReadInt(0xBE);
+    Serial.print("Temperaturet2: ");
+}
+// Read 1 byte from the BMP085 at 'address'
+// Return: the read byte;
+char Barometer::bmp085Read(unsigned char address)
+{
+    //Wire.begin();
+    unsigned char data;
+    Wire.beginTransmission(BMP085_ADDRESS);
+    Wire.write(address);
+    Wire.endTransmission();
+
+    Wire.requestFrom(BMP085_ADDRESS, 1);
+    while(!Wire.available());
+    return Wire.read();
+}
+// Read 2 bytes from the BMP085
+// First byte will be from 'address'
+// Second byte will be from 'address'+1
+int Barometer::bmp085ReadInt(unsigned char address)
+{
+    unsigned char msb, lsb;
+    Wire.beginTransmission(BMP085_ADDRESS);
+    Wire.write(address);
+    Wire.endTransmission();
+    Wire.requestFrom(BMP085_ADDRESS, 2);
+    while(Wire.available()<2);
+    msb = Wire.read();
+    lsb = Wire.read();
+    return (int) msb<<8 | lsb;
+}
+// Read the uncompensated temperature value
+unsigned int Barometer::bmp085ReadUT()
+{
+  unsigned int ut;
+  Wire.beginTransmission(BMP085_ADDRESS);
+  Wire.write(0xF4);
+  Wire.write(0x2E);
+  Wire.endTransmission();
+  delay(5);
+  ut = bmp085ReadInt(0xF6);
+  return ut;
+}
+// Read the uncompensated pressure value
+unsigned long Barometer::bmp085ReadUP()
+{
+    unsigned char msb, lsb, xlsb;
+    unsigned long up = 0;
+    Wire.beginTransmission(BMP085_ADDRESS);
+    Wire.write(0xF4);
+    Wire.write(0x34 + (OSS<<6));
+    Wire.endTransmission();
+    delay(2 + (3<<OSS));
+
+    // Read register 0xF6 (MSB), 0xF7 (LSB), and 0xF8 (XLSB)
+    msb = bmp085Read(0xF6);
+    lsb = bmp085Read(0xF7);
+    xlsb = bmp085Read(0xF8);
+    up = (((unsigned long) msb << 16) | ((unsigned long) lsb << 8) | (unsigned long) xlsb) >> (8-OSS);
+    return up;
+}
+void Barometer::writeRegister(int deviceAddress, byte address, byte val)
+{
+    Wire.beginTransmission(deviceAddress); // start transmission to device 
+    Wire.write(address);       // send register address
+    Wire.write(val);         // send value to write
+    Wire.endTransmission();     // end transmission
+}
+int Barometer::readRegister(int deviceAddress, byte address)
+{
+    int v;
+    Wire.beginTransmission(deviceAddress);
+    Wire.write(address); // register to read
+    Wire.endTransmission();
+
+    Wire.requestFrom(deviceAddress, 1); // read a byte
+
+    while(!Wire.available()) {
+    // waiting
+    }
+
+    v = Wire.read();
+    return v;
+}
+float Barometer::calcAltitude(float pressure)
+{
+    float A = pressure/101325;
+    float B = 1/5.25588;
+    float C = pow(A,B);
+    C = 1 - C;
+    C = C /0.0000225577;
+    return C;
+}
+float Barometer::bmp085GetTemperature(unsigned int ut)
+{
+    long x1, x2;
+
+    x1 = (((long)ut - (long)ac6)*(long)ac5) >> 15;
+    x2 = ((long)mc << 11)/(x1 + md);
+    PressureCompensate = x1 + x2;
+
+    float temp = ((PressureCompensate + 8)>>4);
+    temp = temp /10;
+
+    return temp;
+}
+long Barometer::bmp085GetPressure(unsigned long up)
+{
+    long x1, x2, x3, b3, b6, p;
+    unsigned long b4, b7;
+    b6 = PressureCompensate - 4000;
+    x1 = (b2 * (b6 * b6)>>12)>>11;
+    x2 = (ac2 * b6)>>11;
+    x3 = x1 + x2;
+    b3 = (((((long)ac1)*4 + x3)<<OSS) + 2)>>2;
+
+    // Calculate B4
+    x1 = (ac3 * b6)>>13;
+    x2 = (b1 * ((b6 * b6)>>12))>>16;
+    x3 = ((x1 + x2) + 2)>>2;
+    b4 = (ac4 * (unsigned long)(x3 + 32768))>>15;
+
+    b7 = ((unsigned long)(up - b3) * (50000>>OSS));
+    if (b7 < 0x80000000)
+    p = (b7<<1)/b4;
+    else
+    p = (b7/b4)<<1;
+
+    x1 = (p>>8) * (p>>8);
+    x1 = (x1 * 3038)>>16;
+    x2 = (-7357 * p)>>16;
+    p += (x1 + x2 + 3791)>>4;
+
+    long temp = p;
+    return temp;
+}
diff --git a/examples/osd/arduino-bmp085/Barometer_Sensor/Barometer.h b/examples/osd/arduino-bmp085/Barometer_Sensor/Barometer.h
new file mode 100644
index 000000000..161702718
--- /dev/null
+++ b/examples/osd/arduino-bmp085/Barometer_Sensor/Barometer.h
@@ -0,0 +1,58 @@
+/*
+  Barometer library V1.0
+  2010 Copyright (c) Seeed Technology Inc.  All right reserved.
+ 
+  Original Author: LG
+  
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#ifndef __BAROMETER_H__
+#define __BAROMETER_H__
+
+#include <Arduino.h>
+#include <Wire.h>
+
+const unsigned char OSS = 0;
+#define BMP085_ADDRESS 0x77
+class Barometer
+{
+public: 
+  void init(void);
+  long PressureCompensate;
+  float bmp085GetTemperature(unsigned int ut);
+  long bmp085GetPressure(unsigned long up);
+  float calcAltitude(float pressure);
+  unsigned int bmp085ReadUT(void);
+  unsigned long bmp085ReadUP(void);
+ 
+private:
+  int ac1;
+  int ac2;
+  int ac3;
+  unsigned int ac4;
+  unsigned int ac5;
+  unsigned int ac6;
+  int b1;
+  int b2;
+  int mb;
+  int mc;
+  int md;
+  char bmp085Read(unsigned char address);
+  int bmp085ReadInt(unsigned char address);
+  void writeRegister(int deviceAddress, byte address, byte val);
+  int readRegister(int deviceAddress, byte address);
+};
+
+#endif
diff --git a/examples/osd/arduino-bmp085/Barometer_Sensor/examples/Barometer_Sensor/Barometer_Sensor.ino b/examples/osd/arduino-bmp085/Barometer_Sensor/examples/Barometer_Sensor/Barometer_Sensor.ino
new file mode 100644
index 000000000..7fe3b3ec5
--- /dev/null
+++ b/examples/osd/arduino-bmp085/Barometer_Sensor/examples/Barometer_Sensor/Barometer_Sensor.ino
@@ -0,0 +1,49 @@
+/* Barometer demo V1.0
+* Based largely on code by  Jim Lindblom
+* Get pressure, altitude, and temperature from the BMP085.
+* Serial.print it out at 9600 baud to serial monitor.
+*
+* By:http://www.seeedstudio.com
+*/
+#include "Barometer.h"
+#include <Wire.h>
+float temperature;
+float pressure;
+float atm;
+float altitude;
+Barometer myBarometer;
+void setup(){
+  Serial.begin(9600);
+  myBarometer.init();
+  
+}
+
+void loop()
+{
+   temperature = myBarometer.bmp085GetTemperature(myBarometer.bmp085ReadUT()); //Get the temperature, bmp085ReadUT MUST be called first
+   pressure = myBarometer.bmp085GetPressure(myBarometer.bmp085ReadUP());//Get the temperature
+   altitude = myBarometer.calcAltitude(pressure); //Uncompensated caculation - in Meters 
+   atm = pressure / 101325; 
+  
+  Serial.print("Temperature: ");
+  Serial.print(temperature, 2); //display 2 decimal places
+  Serial.println("deg C");
+
+  Serial.print("Pressure: ");
+  Serial.print(pressure, 0); //whole number only.
+  Serial.println(" Pa");
+
+  Serial.print("Ralated Atmosphere: ");
+  Serial.println(atm, 4); //display 4 decimal places
+
+  Serial.print("Altitude: ");
+  Serial.print(altitude, 2); //display 2 decimal places
+  Serial.println(" m");
+
+  Serial.println();
+
+  delay(1000); //wait a second and get values again.
+}
+
+
+
diff --git a/examples/osd/arduino-bmp085/Makefile b/examples/osd/arduino-bmp085/Makefile
new file mode 100644
index 000000000..b74569ff2
--- /dev/null
+++ b/examples/osd/arduino-bmp085/Makefile
@@ -0,0 +1,71 @@
+# 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\"
+LFLAGS += -lm
+
+PROJECT_SOURCEFILES += ${SKETCH}.cpp Barometer.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
diff --git a/examples/osd/arduino-bmp085/README.md b/examples/osd/arduino-bmp085/README.md
new file mode 100644
index 000000000..e1490ed05
--- /dev/null
+++ b/examples/osd/arduino-bmp085/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
diff --git a/examples/osd/arduino-bmp085/arduino-example.c b/examples/osd/arduino-bmp085/arduino-example.c
new file mode 100644
index 000000000..ea74dd8b8
--- /dev/null
+++ b/examples/osd/arduino-bmp085/arduino-example.c
@@ -0,0 +1,2 @@
+#include <arduino-process.h>
+AUTOSTART_PROCESSES(&arduino_sketch);
diff --git a/examples/osd/arduino-bmp085/flash.sh b/examples/osd/arduino-bmp085/flash.sh
new file mode 100755
index 000000000..e82962073
--- /dev/null
+++ b/examples/osd/arduino-bmp085/flash.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/arduino-bmp085/project-conf.h b/examples/osd/arduino-bmp085/project-conf.h
new file mode 100644
index 000000000..e25aed53c
--- /dev/null
+++ b/examples/osd/arduino-bmp085/project-conf.h
@@ -0,0 +1,106 @@
+/*
+ * 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 SICSLOWPAN_CONF_FRAG	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
+
+/* 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
+*/
+
+/* Save some memory for the sky platform. */
+/*
+#undef NBR_TABLE_CONF_MAX_NEIGHBORS
+#define NBR_TABLE_CONF_MAX_NEIGHBORS     10
+#undef UIP_CONF_MAX_ROUTES
+#define UIP_CONF_MAX_ROUTES   10
+*/
+
+/* Reduce 802.15.4 frame queue to save RAM. */
+/*
+#undef QUEUEBUF_CONF_NUM
+#define QUEUEBUF_CONF_NUM       4
+*/
+
+/*
+#undef SICSLOWPAN_CONF_FRAG
+#define SICSLOWPAN_CONF_FRAG	1
+*/
+
+#endif /* PROJECT_RPL_WEB_CONF_H_ */
diff --git a/examples/osd/arduino-bmp085/resources/res-bmp085alt.c b/examples/osd/arduino-bmp085/resources/res-bmp085alt.c
new file mode 100644
index 000000000..de90eae4f
--- /dev/null
+++ b/examples/osd/arduino-bmp085/resources/res-bmp085alt.c
@@ -0,0 +1,79 @@
+/*
+ * 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
+ *      Barometer 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_bmp085alt,
+         "title=\"alt status\";rt=\"alt\"",
+         res_get_handler,
+         NULL,
+         NULL,
+         NULL);
+
+extern  char bmp085alt_s[8];
+
+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, "%s", bmp085alt_s);
+
+    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, "{'temperature':%s}", bmp085alt_s);
+
+    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));
+  }
+}
diff --git a/examples/osd/arduino-bmp085/resources/res-bmp085atm.c b/examples/osd/arduino-bmp085/resources/res-bmp085atm.c
new file mode 100644
index 000000000..b97cffe6e
--- /dev/null
+++ b/examples/osd/arduino-bmp085/resources/res-bmp085atm.c
@@ -0,0 +1,79 @@
+/*
+ * 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
+ *      Barometer 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_bmp085atm,
+         "title=\"atm status\";rt=\"atm\"",
+         res_get_handler,
+         NULL,
+         NULL,
+         NULL);
+
+extern  char bmp085atm_s[8];
+
+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, "%s", bmp085atm_s);
+
+    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, "{'temperature':%s}", bmp085atm_s);
+
+    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));
+  }
+}
diff --git a/examples/osd/arduino-bmp085/resources/res-bmp085press.c b/examples/osd/arduino-bmp085/resources/res-bmp085press.c
new file mode 100644
index 000000000..6a02f4bf0
--- /dev/null
+++ b/examples/osd/arduino-bmp085/resources/res-bmp085press.c
@@ -0,0 +1,79 @@
+/*
+ * 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
+ *      Barometer 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_bmp085press,
+         "title=\"pressure status\";rt=\"pressure\"",
+         res_get_handler,
+         NULL,
+         NULL,
+         NULL);
+
+extern  char bmp085press_s[8];
+
+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, "%s", bmp085press_s);
+
+    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, "{'pressure':%s}", bmp085press_s);
+
+    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));
+  }
+}
diff --git a/examples/osd/arduino-bmp085/resources/res-bmp085temp.c b/examples/osd/arduino-bmp085/resources/res-bmp085temp.c
new file mode 100644
index 000000000..f0e45f810
--- /dev/null
+++ b/examples/osd/arduino-bmp085/resources/res-bmp085temp.c
@@ -0,0 +1,79 @@
+/*
+ * 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
+ *      Barometer 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_bmp085temp,
+         "title=\"Temperature status\";rt=\"Temperatur\"",
+         res_get_handler,
+         NULL,
+         NULL,
+         NULL);
+
+extern  char bmp085temp_s[8];
+
+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, "%s", bmp085temp_s);
+
+    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, "{'temperature':%s}", bmp085temp_s);
+
+    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));
+  }
+}
diff --git a/examples/osd/arduino-bmp085/run.sh b/examples/osd/arduino-bmp085/run.sh
new file mode 100755
index 000000000..5d5cbbbb4
--- /dev/null
+++ b/examples/osd/arduino-bmp085/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
diff --git a/examples/osd/arduino-bmp085/sketch.pde b/examples/osd/arduino-bmp085/sketch.pde
new file mode 100644
index 000000000..c84a488a9
--- /dev/null
+++ b/examples/osd/arduino-bmp085/sketch.pde
@@ -0,0 +1,86 @@
+/*
+ * 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>
+#include "Barometer.h"
+
+extern "C" {
+#include "arduino-process.h"
+#include "rest-engine.h"
+
+extern resource_t res_bmp085temp,res_bmp085press,res_bmp085atm,res_bmp085alt, res_battery;
+
+float bmp085temp;
+float bmp085press;
+float bmp085atm;
+float bmp085alt;
+char  bmp085temp_s[8];
+char  bmp085press_s[8];
+char  bmp085atm_s[8];
+char  bmp085alt_s[8];
+
+Barometer myBarometer;
+
+#define LED_PIN 4
+}
+
+void setup (void)
+{
+    // switch off the led
+    pinMode(LED_PIN, OUTPUT);
+    digitalWrite(LED_PIN, HIGH);
+    // BMP085 sensor
+    myBarometer.init();
+    // init coap resourcen
+    rest_init_engine ();
+    rest_activate_resource (&res_bmp085temp, "s/temp");
+    rest_activate_resource (&res_bmp085press, "s/press");
+    rest_activate_resource (&res_bmp085atm, "s/atm");
+    rest_activate_resource (&res_bmp085alt, "s/alt");
+    rest_activate_resource (&res_battery, "s/battery");
+}
+
+// at project-conf.h
+// LOOP_INTERVAL		(10 * CLOCK_SECOND)
+void loop (void)
+{
+	mcu_sleep_off();
+    bmp085temp = myBarometer.bmp085GetTemperature(myBarometer.bmp085ReadUT()); //Get the temperature, bmp085ReadUT MUST be called first
+    bmp085press = myBarometer.bmp085GetPressure(myBarometer.bmp085ReadUP());//Get the temperature
+    bmp085alt = myBarometer.calcAltitude(bmp085press); //Uncompensated caculation - in Meters 
+    bmp085atm = bmp085press / 101325;
+    
+    dtostrf(bmp085temp , 6, 2, bmp085temp_s );   
+    dtostrf(bmp085press , 6, 2, bmp085press_s );
+    dtostrf(bmp085alt , 6, 2, bmp085alt_s );
+    dtostrf(bmp085atm , 6, 2, bmp085atm_s );
+    // remove space
+    if(bmp085temp_s[0]==' '){
+      memcpy (bmp085temp_s,bmp085temp_s+1,strlen(bmp085temp_s)+1);
+    }
+    if(bmp085press_s[0]==' '){
+      memcpy (bmp085press_s,bmp085press_s+1,strlen(bmp085press_s)+1);
+    }
+    if(bmp085alt_s[0]==' '){
+      memcpy (bmp085alt_s,bmp085alt_s+1,strlen(bmp085alt_s)+1);
+    }
+    if(bmp085atm_s[0]==' '){
+      memcpy (bmp085atm_s,bmp085atm_s+1,strlen(bmp085atm_s)+1);
+    }
+         
+// Debug Print
+	printf("Temp: %s",bmp085temp_s);
+    printf("\t\tPress: %s\n",bmp085press_s);
+    printf("\t\tAltitude: %s\n",bmp085alt_s);
+    printf("\t\tatm: %s\n",bmp085atm_s);
+  	mcu_sleep_on();    
+}
diff --git a/examples/osd/arduino-weather/Adafruit_HTU21DF.cpp b/examples/osd/arduino-weather/Adafruit_HTU21DF.cpp
new file mode 100644
index 000000000..84bbeb066
--- /dev/null
+++ b/examples/osd/arduino-weather/Adafruit_HTU21DF.cpp
@@ -0,0 +1,100 @@
+/*************************************************** 
+  This is a library for the HTU21DF Humidity & Temp Sensor
+
+  Designed specifically to work with the HTU21DF sensor from Adafruit
+  ----> https://www.adafruit.com/products/1899
+
+  These displays use I2C to communicate, 2 pins are required to  
+  interface
+  Adafruit invests time and resources providing this open source code, 
+  please support Adafruit and open-source hardware by purchasing 
+  products from Adafruit!
+
+  Written by Limor Fried/Ladyada for Adafruit Industries.  
+  BSD license, all text above must be included in any redistribution
+ ****************************************************/
+
+#include "Adafruit_HTU21DF.h"
+#if defined(__AVR__)
+#include <util/delay.h>
+#endif
+
+Adafruit_HTU21DF::Adafruit_HTU21DF() {
+}
+
+
+boolean Adafruit_HTU21DF::begin(void) {
+  Wire.begin();
+  
+  reset();
+
+  Wire.beginTransmission(HTU21DF_I2CADDR);
+  Wire.write(HTU21DF_READREG);
+  Wire.endTransmission();
+  Wire.requestFrom(HTU21DF_I2CADDR, 1);
+  return (Wire.read() == 0x2); // after reset should be 0x2
+}
+
+void Adafruit_HTU21DF::reset(void) {
+  Wire.beginTransmission(HTU21DF_I2CADDR);
+  Wire.write(HTU21DF_RESET);
+  Wire.endTransmission();
+  delay(15);
+}
+
+
+float Adafruit_HTU21DF::readTemperature(void) {
+  
+  // OK lets ready!
+  Wire.beginTransmission(HTU21DF_I2CADDR);
+  Wire.write(HTU21DF_READTEMP);
+  Wire.endTransmission();
+  
+  delay(50); // add delay between request and actual read!
+  
+  Wire.requestFrom(HTU21DF_I2CADDR, 3);
+  while (!Wire.available()) {}
+
+  uint16_t t = Wire.read();
+  t <<= 8;
+  t |= Wire.read();
+
+  uint8_t crc = Wire.read();
+
+  float temp = t;
+  temp *= 175.72;
+  temp /= 65536;
+  temp -= 46.85;
+
+  return temp;
+}
+  
+
+float Adafruit_HTU21DF::readHumidity(void) {
+  // OK lets ready!
+  Wire.beginTransmission(HTU21DF_I2CADDR);
+  Wire.write(HTU21DF_READHUM);
+  Wire.endTransmission();
+  
+  delay(50); // add delay between request and actual read!
+  
+  Wire.requestFrom(HTU21DF_I2CADDR, 3);
+  while (!Wire.available()) {}
+
+  uint16_t h = Wire.read();
+  h <<= 8;
+  h |= Wire.read();
+
+  uint8_t crc = Wire.read();
+
+  float hum = h;
+  hum *= 125;
+  hum /= 65536;
+  hum -= 6;
+
+  return hum;
+}
+
+
+
+/*********************************************************************/
diff --git a/examples/osd/arduino-weather/Adafruit_HTU21DF.h b/examples/osd/arduino-weather/Adafruit_HTU21DF.h
new file mode 100644
index 000000000..fe8870e39
--- /dev/null
+++ b/examples/osd/arduino-weather/Adafruit_HTU21DF.h
@@ -0,0 +1,44 @@
+/*************************************************** 
+  This is a library for the HTU21D-F Humidity & Temp Sensor
+
+  Designed specifically to work with the HTU21D-F sensor from Adafruit
+  ----> https://www.adafruit.com/products/1899
+
+  These displays use I2C to communicate, 2 pins are required to  
+  interface
+  Adafruit invests time and resources providing this open source code, 
+  please support Adafruit and open-source hardware by purchasing 
+  products from Adafruit!
+
+  Written by Limor Fried/Ladyada for Adafruit Industries.  
+  BSD license, all text above must be included in any redistribution
+ ****************************************************/
+
+//#if (ARDUINO >= 100)
+ #include "Arduino.h"
+//#else
+// #include "WProgram.h"
+//#endif
+#include "Wire.h"
+
+#define HTU21DF_I2CADDR       0x40
+#define HTU21DF_READTEMP      0xE3
+#define HTU21DF_READHUM       0xE5
+#define HTU21DF_WRITEREG       0xE6
+#define HTU21DF_READREG       0xE7
+#define HTU21DF_RESET       0xFE
+
+
+
+class Adafruit_HTU21DF {
+ public:
+  Adafruit_HTU21DF();
+  boolean begin(void);
+  float readTemperature(void);
+  float readHumidity(void);
+  void reset(void);
+ private:
+  boolean readData(void);
+  float humidity, temp;
+};
+
diff --git a/examples/osd/arduino-weather/BH1750FVI.cpp b/examples/osd/arduino-weather/BH1750FVI.cpp
new file mode 100644
index 000000000..fd871371a
--- /dev/null
+++ b/examples/osd/arduino-weather/BH1750FVI.cpp
@@ -0,0 +1,209 @@
+#include "BH1750FVI.h"
+//#if ARDUINO >= 100
+ #include "Arduino.h"
+//#else
+// #include "WProgram.h"
+//#endif
+
+#include <Wire.h>
+
+void BH1750FVI::begin(byte mode, byte addr, double sens, int pin){
+  if(pin>=0 && pin<55){
+    pinMode(pin, OUTPUT);
+    if(addr==BH_AddrL) digitalWrite(pin, LOW);
+    if(addr==BH_AddrH) digitalWrite(pin, HIGH);
+  }
+  byte sensitivity;
+  if(sens<BH_MinSv){
+    sens = constrain(sens, ((double)BH_MinSv/(double)BH_DefSv), ((double)BH_MaxSv/(double)BH_DefSv));
+    sensitivity = (byte)round(sens*(double)BH_DefSv);
+  }
+  else{
+    sensitivity = constrain((byte)sens, BH_MinSv, BH_MaxSv);
+  }
+  address = addr;
+  currentSensitivity = sensitivity;
+  MTreg_hiByte = BH_MTrHb | (sensitivity >> 5);
+  MTreg_loByte = BH_MTrLb | (sensitivity & 0b00011111);
+  switch(mode){
+    case BH_ContL:
+    case BH_ContH:
+    case BH_Conth:
+      startOngoingSamples(mode);
+      break;
+    case BH_SingH:
+    case BH_Singh:
+    case BH_SingL:
+      startSingleSample(mode);
+      break;
+    default:
+      mode = BH_EasyH;
+      startOngoingSamples(mode);
+      break;
+  }
+  sampleUnseen = false;
+  lastSampleStart = 0;
+}
+
+word BH1750FVI::startOngoingSamples(char mode){
+  if(mode==BH_NoMod) mode=currentMode;
+  byte lowLevelMode = mode;
+  if(lowLevelMode==BH_EasyH) lowLevelMode=BH_ContH;
+  switch(mode){
+    case BH_EasyH:
+    case BH_ContH:
+    case BH_Conth:
+    case BH_ContL:
+      i2cWrite(BH_PowOn);
+      i2cWrite(MTreg_hiByte);
+      i2cWrite(MTreg_loByte);
+      i2cWrite(lowLevelMode);
+      lastSampleStart = millis();
+      currentMode = mode;
+      return setSensitivity(currentSensitivity);
+      break;
+    default:
+      return 0;
+  }
+}
+
+word BH1750FVI::startSingleSample(char mode){
+  if(mode==BH_NoMod){
+    mode=currentMode;
+  }
+  switch(mode){
+    case BH_SingH:
+    case BH_Singh:
+    case BH_SingL:
+      i2cWrite(BH_PowOn);
+      i2cWrite(MTreg_hiByte);
+      i2cWrite(MTreg_loByte);
+      i2cWrite(mode);
+      lastSampleStart = millis();
+      currentMode = mode;
+      return setSensitivity(currentSensitivity);
+      break;
+    default:
+      return 0;
+  }
+}
+
+bool BH1750FVI::sampleIsFresh(){
+  if(sampleUnseen) return true;
+  else if((millis() > (lastSampleStart+currentSamplingTime))){
+    sampleUnseen = true;
+    return true;
+  }
+  else return false;
+}
+
+word BH1750FVI::getLightLevel(char mode){
+  unsigned long int Intensity_value;
+  sampleUnseen = false;
+  Intensity_value = i2cRead();
+  if(mode!='r'){
+    Intensity_value = (Intensity_value*5)/6;
+    if(mode!='c'){
+      Intensity_value = (Intensity_value*69)/currentSensitivity;
+    }
+    /*this next adjustment is not useful in practice. if you're using
+      a half-scale mode, you want the extra sensitivity. I'm leaving it
+      here for reference.
+    switch(currentMode){
+      case BH_Singh:
+      case BH_Conth:
+        Intensity_value /= 2;
+    }*/
+    Intensity_value = constrain(Intensity_value, 0, 65535);
+  }
+  switch(currentMode){
+    case BH_ContH:
+    case BH_Conth:
+    case BH_ContL:
+    case BH_EasyH:
+      //this is a fake previous sample time that will keep pace with
+      //the actual BH1750FVI's sampling rate, but isn't necessarily
+      //synchronized to the earliest time each new sample is available.
+      //if you want true synchronized timing, use a single-sample mode.
+      lastSampleStart = millis();
+  }
+  return (word)Intensity_value;
+}
+
+word BH1750FVI::setSensitivity(double sens){
+  if(sens<((double)(BH_MinSv/2))){
+    sens = constrain(sens,
+                    ((double)BH_MinSv/(double)BH_DefSv),
+                    ((double)BH_MaxSv/(double)BH_DefSv)
+                    );
+    sens = sens*(double)BH_DefSv;
+  }
+  else{
+    sens = constrain(sens, (double)BH_MinSv, (double)BH_MaxSv);
+  }
+  return setSensitivity((byte)round(sens));
+}
+
+word BH1750FVI::setSensitivity(float sens){
+  return setSensitivity((double)sens);
+}
+
+word BH1750FVI::setSensitivity(int sens){
+  sens = constrain(sens, 1, BH_MaxSv);
+  return setSensitivity((byte)sens);
+}
+
+word BH1750FVI::setSensitivity(byte sens){
+  if(sens<(BH_MinSv/2)){  
+    sens = BH_DefSv*(constrain(sens, (byte)1, (byte)3));
+  }
+  else{
+    sens = constrain(sens, BH_MinSv, BH_MaxSv);
+  }
+  switch(currentMode){
+    case BH_ContL:
+    case BH_SingL:
+      currentSamplingTime = (word)((BH_FastD*(unsigned long int)sens)/BH_DefSv);
+      break;
+    default:
+      currentSamplingTime = (word)((((unsigned long int)BH_SlowD)*((unsigned long int)sens))/BH_DefSv);
+    break;
+  }
+  MTreg_hiByte = BH_MTrHb | (sens >> 5);
+  MTreg_loByte = BH_MTrLb | (sens & 0b00011111);
+  currentSensitivity = sens;
+  sampleUnseen = false;
+  return currentSamplingTime;
+}
+
+void BH1750FVI::powerDown(){
+  i2cWrite(BH_PowOf);
+}
+
+/*I2C INTERFACE
+  These two functions were originally based on code written by
+  https://github.com/claws/ and
+  https://github.com/Genotronex/
+*/
+void BH1750FVI::i2cWrite(byte dataToSend){
+  Wire.beginTransmission(address);
+  Wire.write(dataToSend);
+  Wire.endTransmission();
+}
+
+word BH1750FVI::i2cRead(){
+  word value;
+  Wire.beginTransmission(address);
+  Wire.requestFrom(address, (byte)2);
+  if(Wire.available()){
+    value = Wire.read();
+    if(Wire.available()){
+      value <<= 8;
+      value |= Wire.read();
+    }
+    else value=0;
+  }
+  else value=0;  
+  Wire.endTransmission();
+  return value;
+}
diff --git a/examples/osd/arduino-weather/BH1750FVI.h b/examples/osd/arduino-weather/BH1750FVI.h
new file mode 100644
index 000000000..acdf62102
--- /dev/null
+++ b/examples/osd/arduino-weather/BH1750FVI.h
@@ -0,0 +1,115 @@
+#ifndef BH1750FVI_h
+#define BH1750FVI_h
+
+//#if ARDUINO >= 100
+ #include "Arduino.h"
+//#else
+// #include "WProgram.h"
+//#endif
+
+#include <Wire.h>
+
+//device address options
+#define BH_AddrL  0x23 // Device address when addr pin is LOW
+#define BH_AddrH  0x5C // Device address when addr pin is HIGH
+
+//power codes 
+#define BH_PowOf  0x00 // power-off code
+#define BH_PowOn  0x01 // power-on code
+#define BH_Reset  0x07 // code to reset the light reading register to zero
+
+//mode codes
+#define BH_NoMod  0x02 // No mode specified. Keeps mode the same as before.
+#define BH_EasyH  0x03 // 'easy' mode. basically the same as ContH
+#define BH_ContH  0x10 // continuous full-scale, high-resolution sampling
+#define BH_Conth  0x11 // continuous with twice the resolution but half the max value
+#define BH_ContL  0x13 // continuous full-scale, low-resolution sampling. faster.
+#define BH_SingH  0x20 // take one high-resolution, full-scale sample then turn off
+#define BH_Singh  0x21 // take one high-resolution, half-scale sample then turn off
+#define BH_SingL  0x23 // take one low-resolution, full-scale sample then turn off
+                       // (happens to be the same as the low address value)
+                       
+//sensitivity codes
+#define BH_MTrHb  0x40 // last 3 bits must be masked to 3 MSB of desired value
+#define BH_MTrLb  0x60 // last 5 bits must be masked to 5 LSB of desired value
+#define BH_MinSv    31 // minimum sensitivity register value, yields Lux * 0.45
+#define BH_MaxSv   254 // maximum sensitivity register value, yields Lux * 3.68
+#define BH_DefSv    69 // default sensitivity register value, yields Lux * 1.00
+
+//timing delays. they're actually longer than the datasheet says.
+#define BH_FastD    18 // basic delay in microseconds for a fast sample
+#define BH_SlowD   125 // basic delay in microseconds for a slow sample
+
+class BH1750FVI {
+  public:
+  /*BEGIN
+    this is intended to be as error-tolerant as possible. if you don't supply
+    a mode, the default mode will be 'easy'. the sensitivity obviously defaults
+    to 1.0 (byte value of 69). Default address selection is LOW, which is how
+    the BH1750FVI should default if you don't connect anything to its ADDR pin.
+  */void begin(byte mode=BH_EasyH, byte addr=BH_AddrL, double sens=BH_DefSv, int addrPin=-1);
+    
+  /*FRESH SAMPLE POLLING
+    Check whether you have already looked at the current sample.
+  */bool sampleIsFresh();
+
+  /*ACTUALLY GET A READING FROM THE SENSOR
+    This is probably all you wanted from this library. Return value is an
+    unsigned 16 bit integer with units of Lux. There are three possible modes:
+    'r' raw numerical reading, no units, you get what you get
+    'c' convert units to Lux or half-Lux, depending on the mode, but don't
+        compensate for the sensitivity setting. This allows sensitivity to
+        be used as enclosure optics calibration/compensation.
+    't' true Lux (or half-Lux) reading, regardless of sensitivity settings.
+  */word getLightLevel(char adjustments='c');
+
+    word retrieveSample();
+
+  /*CONTINUOUS SAMPLING
+    Return value of this start function is the delay time between refreshes of
+    the ambient light reading. After you call this function, you can use getLightLevel()
+    to read the most recent ambient light level. If you try to run this ongoing start
+    function with a one-time mode argument, it will do nothing and return 0.
+  */word startOngoingSamples(char mode=BH_NoMod);
+
+  /*ONE-TIME SAMPLE START
+    Return value of this start function is the delay time before the new ambient
+    light reading will be available. You can check whether the new sample is ready
+    yet using sampleIsFresh(). Retrieve that single sample with getLightLevel().
+    If you give this one-time start function a continuous mode argument, it will
+    do nothing and return 0.
+  */word startSingleSample(char mode=BH_NoMod);
+
+  /*SENSITIVITY SETTINGS
+    This function lets you change the 'sensitivity' of the BH1750FVI by changing
+    its sampling time up or down. The sensitivity is stored as a number between
+    31 and 254, with a default value of 69. This is intended to compensate for
+    having the chip installed in an enclosure that blocks some ambient light.
+    The floating point versions of the function allow the sensitivity to be
+    given as a ratio between ~0.45 and ~3.68. The return value is the number of
+    milliseconds that the chip will take to create a new light level reading.
+  */word setSensitivity(double sens);
+    word setSensitivity(float sens);
+    word setSensitivity(int sens);
+    word setSensitivity(byte sens=BH_DefSv);
+    
+  /*POWERDOWN FUNCTION
+    In case you want to turn off the BH1750FVI to save power. Other commands will wake
+    the chip back up. Single sample modes automatically turn off the chip after sampling,
+    but you can still read the value from it without waking it up.
+  */void powerDown();
+    
+  private:
+    void init(byte mode, byte addr, byte sens);
+    void i2cWrite(byte dataToSend);
+    word i2cRead();
+    byte address;
+    byte currentMode;
+    byte currentSensitivity;
+    bool sampleUnseen;
+    byte MTreg_hiByte;
+    byte MTreg_loByte;
+    unsigned long int lastSampleStart;
+    word currentSamplingTime;
+};
+#endif
diff --git a/examples/osd/arduino-weather/Barometer.cpp b/examples/osd/arduino-weather/Barometer.cpp
new file mode 100644
index 000000000..ec8b294a8
--- /dev/null
+++ b/examples/osd/arduino-weather/Barometer.cpp
@@ -0,0 +1,175 @@
+/*
+  Barometer library V1.0
+  2010 Copyright (c) Seeed Technology Inc.  All right reserved.
+ 
+  Original Author: LG
+  
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "Barometer.h"
+#include <Wire.h>
+#include <Arduino.h>
+
+void Barometer::init(void)
+{
+    Wire.begin();
+//    Serial.print("Temperaturet: ");
+    ac1 = bmp085ReadInt(0xAA);
+    ac2 = bmp085ReadInt(0xAC);
+    ac3 = bmp085ReadInt(0xAE);
+    ac4 = bmp085ReadInt(0xB0);
+    ac5 = bmp085ReadInt(0xB2);
+    ac6 = bmp085ReadInt(0xB4);
+    b1 = bmp085ReadInt(0xB6);
+    b2 = bmp085ReadInt(0xB8);
+    mb = bmp085ReadInt(0xBA);
+    mc = bmp085ReadInt(0xBC);
+    md = bmp085ReadInt(0xBE);
+//    Serial.print("Temperaturet2: ");
+}
+// Read 1 byte from the BMP085 at 'address'
+// Return: the read byte;
+char Barometer::bmp085Read(unsigned char address)
+{
+    //Wire.begin();
+    //unsigned char data;
+    Wire.beginTransmission(BMP085_ADDRESS);
+    Wire.write(address);
+    Wire.endTransmission();
+
+    Wire.requestFrom(BMP085_ADDRESS, 1);
+    while(!Wire.available());
+    return Wire.read();
+}
+// Read 2 bytes from the BMP085
+// First byte will be from 'address'
+// Second byte will be from 'address'+1
+int Barometer::bmp085ReadInt(unsigned char address)
+{
+    unsigned char msb, lsb;
+    Wire.beginTransmission(BMP085_ADDRESS);
+    Wire.write(address);
+    Wire.endTransmission();
+    Wire.requestFrom(BMP085_ADDRESS, 2);
+    while(Wire.available()<2);
+    msb = Wire.read();
+    lsb = Wire.read();
+    return (int) msb<<8 | lsb;
+}
+// Read the uncompensated temperature value
+unsigned int Barometer::bmp085ReadUT()
+{
+  unsigned int ut;
+  Wire.beginTransmission(BMP085_ADDRESS);
+  Wire.write(0xF4);
+  Wire.write(0x2E);
+  Wire.endTransmission();
+  delay(5);
+  ut = bmp085ReadInt(0xF6);
+  return ut;
+}
+// Read the uncompensated pressure value
+unsigned long Barometer::bmp085ReadUP()
+{
+    unsigned char msb, lsb, xlsb;
+    unsigned long up = 0;
+    Wire.beginTransmission(BMP085_ADDRESS);
+    Wire.write(0xF4);
+    Wire.write(0x34 + (OSS<<6));
+    Wire.endTransmission();
+    delay(2 + (3<<OSS));
+
+    // Read register 0xF6 (MSB), 0xF7 (LSB), and 0xF8 (XLSB)
+    msb = bmp085Read(0xF6);
+    lsb = bmp085Read(0xF7);
+    xlsb = bmp085Read(0xF8);
+    up = (((unsigned long) msb << 16) | ((unsigned long) lsb << 8) | (unsigned long) xlsb) >> (8-OSS);
+    return up;
+}
+void Barometer::writeRegister(int deviceAddress, byte address, byte val)
+{
+    Wire.beginTransmission(deviceAddress); // start transmission to device 
+    Wire.write(address);       // send register address
+    Wire.write(val);         // send value to write
+    Wire.endTransmission();     // end transmission
+}
+int Barometer::readRegister(int deviceAddress, byte address)
+{
+    int v;
+    Wire.beginTransmission(deviceAddress);
+    Wire.write(address); // register to read
+    Wire.endTransmission();
+
+    Wire.requestFrom(deviceAddress, 1); // read a byte
+
+    while(!Wire.available()) {
+    // waiting
+    }
+
+    v = Wire.read();
+    return v;
+}
+float Barometer::calcAltitude(float pressure)
+{
+    float A = pressure/101325;
+    float B = 1/5.25588;
+    float C = pow(A,B);
+    C = 1 - C;
+    C = C /0.0000225577;
+    return C;
+}
+float Barometer::bmp085GetTemperature(unsigned int ut)
+{
+    long x1, x2;
+
+    x1 = (((long)ut - (long)ac6)*(long)ac5) >> 15;
+    x2 = ((long)mc << 11)/(x1 + md);
+    PressureCompensate = x1 + x2;
+
+    float temp = ((PressureCompensate + 8)>>4);
+    temp = temp /10;
+
+    return temp;
+}
+long Barometer::bmp085GetPressure(unsigned long up)
+{
+    long x1, x2, x3, b3, b6, p;
+    unsigned long b4, b7;
+    b6 = PressureCompensate - 4000;
+    x1 = (b2 * (b6 * b6)>>12)>>11;
+    x2 = (ac2 * b6)>>11;
+    x3 = x1 + x2;
+    b3 = (((((long)ac1)*4 + x3)<<OSS) + 2)>>2;
+
+    // Calculate B4
+    x1 = (ac3 * b6)>>13;
+    x2 = (b1 * ((b6 * b6)>>12))>>16;
+    x3 = ((x1 + x2) + 2)>>2;
+    b4 = (ac4 * (unsigned long)(x3 + 32768))>>15;
+
+    b7 = ((unsigned long)(up - b3) * (50000>>OSS));
+    if (b7 < 0x80000000)
+    p = (b7<<1)/b4;
+    else
+    p = (b7/b4)<<1;
+
+    x1 = (p>>8) * (p>>8);
+    x1 = (x1 * 3038)>>16;
+    x2 = (-7357 * p)>>16;
+    p += (x1 + x2 + 3791)>>4;
+
+    long temp = p;
+    return temp;
+}
diff --git a/examples/osd/arduino-weather/Barometer.h b/examples/osd/arduino-weather/Barometer.h
new file mode 100644
index 000000000..161702718
--- /dev/null
+++ b/examples/osd/arduino-weather/Barometer.h
@@ -0,0 +1,58 @@
+/*
+  Barometer library V1.0
+  2010 Copyright (c) Seeed Technology Inc.  All right reserved.
+ 
+  Original Author: LG
+  
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#ifndef __BAROMETER_H__
+#define __BAROMETER_H__
+
+#include <Arduino.h>
+#include <Wire.h>
+
+const unsigned char OSS = 0;
+#define BMP085_ADDRESS 0x77
+class Barometer
+{
+public: 
+  void init(void);
+  long PressureCompensate;
+  float bmp085GetTemperature(unsigned int ut);
+  long bmp085GetPressure(unsigned long up);
+  float calcAltitude(float pressure);
+  unsigned int bmp085ReadUT(void);
+  unsigned long bmp085ReadUP(void);
+ 
+private:
+  int ac1;
+  int ac2;
+  int ac3;
+  unsigned int ac4;
+  unsigned int ac5;
+  unsigned int ac6;
+  int b1;
+  int b2;
+  int mb;
+  int mc;
+  int md;
+  char bmp085Read(unsigned char address);
+  int bmp085ReadInt(unsigned char address);
+  void writeRegister(int deviceAddress, byte address, byte val);
+  int readRegister(int deviceAddress, byte address);
+};
+
+#endif
diff --git a/examples/osd/arduino-weather/Makefile b/examples/osd/arduino-weather/Makefile
new file mode 100644
index 000000000..79a367a8c
--- /dev/null
+++ b/examples/osd/arduino-weather/Makefile
@@ -0,0 +1,71 @@
+# 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\"
+LFLAGS += -lm
+
+PROJECT_SOURCEFILES += ${SKETCH}.cpp Barometer.cpp BH1750FVI.cpp Adafruit_HTU21DF.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
diff --git a/examples/osd/arduino-weather/README.md b/examples/osd/arduino-weather/README.md
new file mode 100644
index 000000000..e1490ed05
--- /dev/null
+++ b/examples/osd/arduino-weather/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
diff --git a/examples/osd/arduino-weather/arduino-example.c b/examples/osd/arduino-weather/arduino-example.c
new file mode 100644
index 000000000..ea74dd8b8
--- /dev/null
+++ b/examples/osd/arduino-weather/arduino-example.c
@@ -0,0 +1,2 @@
+#include <arduino-process.h>
+AUTOSTART_PROCESSES(&arduino_sketch);
diff --git a/examples/osd/arduino-weather/flash.sh b/examples/osd/arduino-weather/flash.sh
new file mode 100755
index 000000000..e82962073
--- /dev/null
+++ b/examples/osd/arduino-weather/flash.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+make TARGET=osd-merkur-128 flash
diff --git a/examples/osd/arduino-weather/project-conf.h b/examples/osd/arduino-weather/project-conf.h
new file mode 100644
index 000000000..e25aed53c
--- /dev/null
+++ b/examples/osd/arduino-weather/project-conf.h
@@ -0,0 +1,106 @@
+/*
+ * 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 SICSLOWPAN_CONF_FRAG	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
+
+/* 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
+*/
+
+/* Save some memory for the sky platform. */
+/*
+#undef NBR_TABLE_CONF_MAX_NEIGHBORS
+#define NBR_TABLE_CONF_MAX_NEIGHBORS     10
+#undef UIP_CONF_MAX_ROUTES
+#define UIP_CONF_MAX_ROUTES   10
+*/
+
+/* Reduce 802.15.4 frame queue to save RAM. */
+/*
+#undef QUEUEBUF_CONF_NUM
+#define QUEUEBUF_CONF_NUM       4
+*/
+
+/*
+#undef SICSLOWPAN_CONF_FRAG
+#define SICSLOWPAN_CONF_FRAG	1
+*/
+
+#endif /* PROJECT_RPL_WEB_CONF_H_ */
diff --git a/examples/osd/arduino-weather/resources/res-bh1750.c b/examples/osd/arduino-weather/resources/res-bh1750.c
new file mode 100644
index 000000000..ae47f07a5
--- /dev/null
+++ b/examples/osd/arduino-weather/resources/res-bh1750.c
@@ -0,0 +1,80 @@
+/*
+ * 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_bh1750,
+         "title=\"Lux status\";rt=\"Lux\"",
+         res_get_handler,
+         NULL,
+         NULL,
+         NULL);
+
+extern  uint16_t lux;
+
+
+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", lux);
+
+    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, "{'lux':%d}", lux);
+
+    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));
+  }
+}
diff --git a/examples/osd/arduino-weather/resources/res-bmp085alt.c b/examples/osd/arduino-weather/resources/res-bmp085alt.c
new file mode 100644
index 000000000..de90eae4f
--- /dev/null
+++ b/examples/osd/arduino-weather/resources/res-bmp085alt.c
@@ -0,0 +1,79 @@
+/*
+ * 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
+ *      Barometer 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_bmp085alt,
+         "title=\"alt status\";rt=\"alt\"",
+         res_get_handler,
+         NULL,
+         NULL,
+         NULL);
+
+extern  char bmp085alt_s[8];
+
+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, "%s", bmp085alt_s);
+
+    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, "{'temperature':%s}", bmp085alt_s);
+
+    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));
+  }
+}
diff --git a/examples/osd/arduino-weather/resources/res-bmp085atm.c b/examples/osd/arduino-weather/resources/res-bmp085atm.c
new file mode 100644
index 000000000..b97cffe6e
--- /dev/null
+++ b/examples/osd/arduino-weather/resources/res-bmp085atm.c
@@ -0,0 +1,79 @@
+/*
+ * 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
+ *      Barometer 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_bmp085atm,
+         "title=\"atm status\";rt=\"atm\"",
+         res_get_handler,
+         NULL,
+         NULL,
+         NULL);
+
+extern  char bmp085atm_s[8];
+
+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, "%s", bmp085atm_s);
+
+    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, "{'temperature':%s}", bmp085atm_s);
+
+    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));
+  }
+}
diff --git a/examples/osd/arduino-weather/resources/res-bmp085press.c b/examples/osd/arduino-weather/resources/res-bmp085press.c
new file mode 100644
index 000000000..6a02f4bf0
--- /dev/null
+++ b/examples/osd/arduino-weather/resources/res-bmp085press.c
@@ -0,0 +1,79 @@
+/*
+ * 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
+ *      Barometer 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_bmp085press,
+         "title=\"pressure status\";rt=\"pressure\"",
+         res_get_handler,
+         NULL,
+         NULL,
+         NULL);
+
+extern  char bmp085press_s[8];
+
+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, "%s", bmp085press_s);
+
+    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, "{'pressure':%s}", bmp085press_s);
+
+    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));
+  }
+}
diff --git a/examples/osd/arduino-weather/resources/res-htu21dhum.c b/examples/osd/arduino-weather/resources/res-htu21dhum.c
new file mode 100644
index 000000000..f66c71c74
--- /dev/null
+++ b/examples/osd/arduino-weather/resources/res-htu21dhum.c
@@ -0,0 +1,80 @@
+/*
+ * 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_htu21dhum,
+         "title=\"Moisture status\";rt=\"Moisture\"",
+         res_get_handler,
+         NULL,
+         NULL,
+         NULL);
+
+extern  char htu21d_hum_s[8];
+
+
+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, "%s", htu21d_hum_s);
+
+    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, "{'moisture':%s}", htu21d_hum_s);
+
+    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));
+  }
+}
diff --git a/examples/osd/arduino-weather/resources/res-htu21dtemp.c b/examples/osd/arduino-weather/resources/res-htu21dtemp.c
new file mode 100644
index 000000000..cdc9a9a7d
--- /dev/null
+++ b/examples/osd/arduino-weather/resources/res-htu21dtemp.c
@@ -0,0 +1,79 @@
+/*
+ * 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_htu21dtemp,
+         "title=\"Temperature status\";rt=\"Temperatur\"",
+         res_get_handler,
+         NULL,
+         NULL,
+         NULL);
+
+extern  char htu21d_temp_s[8];
+
+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, "%s", htu21d_temp_s);
+
+    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, "{'temperature':%s}", htu21d_temp_s);
+
+    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));
+  }
+}
diff --git a/examples/osd/arduino-weather/run.sh b/examples/osd/arduino-weather/run.sh
new file mode 100755
index 000000000..5d5cbbbb4
--- /dev/null
+++ b/examples/osd/arduino-weather/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
diff --git a/examples/osd/arduino-weather/sketch.pde b/examples/osd/arduino-weather/sketch.pde
new file mode 100644
index 000000000..513557347
--- /dev/null
+++ b/examples/osd/arduino-weather/sketch.pde
@@ -0,0 +1,128 @@
+/*
+ * 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>
+#include "Barometer.h"
+#include "Adafruit_HTU21DF.h"
+#include "BH1750FVI.h"
+
+extern "C" {
+#include "arduino-process.h"
+#include "rest-engine.h"
+
+extern resource_t res_bh1750, res_htu21dtemp, res_htu21dhum, res_bmp085press,res_bmp085atm,res_bmp085alt, res_battery;
+
+float bmp085temp;
+float bmp085press;
+float bmp085atm;
+float bmp085alt;
+char  bmp085temp_s[8];
+char  bmp085press_s[8];
+char  bmp085atm_s[8];
+char  bmp085alt_s[8];
+
+Barometer myBarometer;
+
+float htu21d_hum;
+float htu21d_temp;
+char  htu21d_hum_s[8];
+char  htu21d_temp_s[8];
+
+Adafruit_HTU21DF htu = Adafruit_HTU21DF();
+
+uint16_t lux;
+
+BH1750FVI lightMeter;
+
+#define LED_PIN 4
+}
+
+void setup (void)
+{
+    // switch off the led
+    pinMode(LED_PIN, OUTPUT);
+    digitalWrite(LED_PIN, HIGH);
+    // BH1750 sensor
+    Wire.begin();
+    lightMeter.begin();
+    // BMP085 sensor
+    myBarometer.init();
+    // htu21d sensor
+    if (!htu.begin()) {
+      printf("Couldn't find sensor htu21d !");
+    }
+    // init coap resourcen
+    rest_init_engine ();
+    rest_activate_resource (&res_bmp085press, "s/press");
+    rest_activate_resource (&res_bmp085atm, "s/atm");
+    rest_activate_resource (&res_bmp085alt, "s/alt");
+    rest_activate_resource (&res_htu21dtemp, "s/temp");
+    rest_activate_resource (&res_htu21dhum, "s/hum");
+    rest_activate_resource (&res_bh1750, "s/lux");
+    rest_activate_resource (&res_battery, "s/battery");
+}
+
+// at project-conf.h
+// LOOP_INTERVAL		(10 * CLOCK_SECOND)
+void loop (void)
+{
+	mcu_sleep_off();
+	// BMP085 Sensor
+    bmp085temp = myBarometer.bmp085GetTemperature(myBarometer.bmp085ReadUT()); //Get the temperature, bmp085ReadUT MUST be called first
+    bmp085press = myBarometer.bmp085GetPressure(myBarometer.bmp085ReadUP());//Get the temperature
+    bmp085alt = myBarometer.calcAltitude(bmp085press); //Uncompensated caculation - in Meters 
+    bmp085atm = bmp085press / 101325;
+    
+    dtostrf(bmp085temp , 6, 2, bmp085temp_s );   
+    dtostrf(bmp085press , 6, 2, bmp085press_s );
+    dtostrf(bmp085alt , 6, 2, bmp085alt_s );
+    dtostrf(bmp085atm , 6, 2, bmp085atm_s );
+    // remove space
+    if(bmp085temp_s[0]==' '){
+      memcpy (bmp085temp_s,bmp085temp_s+1,strlen(bmp085temp_s)+1);
+    }
+    if(bmp085press_s[0]==' '){
+      memcpy (bmp085press_s,bmp085press_s+1,strlen(bmp085press_s)+1);
+    }
+    if(bmp085alt_s[0]==' '){
+      memcpy (bmp085alt_s,bmp085alt_s+1,strlen(bmp085alt_s)+1);
+    }
+    if(bmp085atm_s[0]==' '){
+      memcpy (bmp085atm_s,bmp085atm_s+1,strlen(bmp085atm_s)+1);
+    }
+    // HTU21d Sensor
+    htu21d_temp = htu.readTemperature();
+    htu21d_hum = htu.readHumidity();
+       dtostrf(htu21d_temp , 6, 2, htu21d_temp_s );   
+	dtostrf(htu21d_hum , 6, 2, htu21d_hum_s );
+    // remove space
+    if(htu21d_temp_s[0]==' '){
+      memcpy (htu21d_temp_s,htu21d_temp_s+1,strlen(htu21d_temp_s)+1);
+    }
+    if(htu21d_hum_s[0]==' '){
+        memcpy (htu21d_hum_s,htu21d_hum_s+1,strlen(htu21d_hum_s)+1);
+    }
+    // BH1750
+    lux = lightMeter.getLightLevel();     
+    
+// Debug Print
+	printf("BMP085");
+    printf("\t\tPress: %s\n",bmp085press_s);
+    printf("\t\tAltitude: %s\n",bmp085alt_s);
+    printf("\t\tatm: %s\n",bmp085atm_s);
+    printf("\t\tHTU21d");
+    printf("\t\tTemp: %s",htu21d_temp_s);
+    printf("\t\tHum: %s\n",htu21d_hum_s);
+    printf("\t\tBH1750");    
+    printf("Lux: %d\n",lux);
+  	mcu_sleep_on();    
+}

From 287b4767e39b6aff45eb0c8f93a73059e7f5de43 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Fri, 20 May 2016 13:40:20 +0200
Subject: [PATCH 247/393] Orchestra: handle case where ORCHESTRA_UNICAST_PERIOD
 is smaller than the network size

---
 .../orchestra-rule-unicast-per-neighbor.c     | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/apps/orchestra/orchestra-rule-unicast-per-neighbor.c b/apps/orchestra/orchestra-rule-unicast-per-neighbor.c
index b70a907d0..acba8e7be 100644
--- a/apps/orchestra/orchestra-rule-unicast-per-neighbor.c
+++ b/apps/orchestra/orchestra-rule-unicast-per-neighbor.c
@@ -85,10 +85,16 @@ add_uc_link(const linkaddr_t *linkaddr)
 {
   if(linkaddr != NULL) {
     uint16_t timeslot = get_node_timeslot(linkaddr);
-    tsch_schedule_add_link(sf_unicast,
-        ORCHESTRA_UNICAST_SENDER_BASED ? LINK_OPTION_RX : LINK_OPTION_TX | UNICAST_SLOT_SHARED_FLAG,
-        LINK_TYPE_NORMAL, &tsch_broadcast_address,
-        timeslot, channel_offset);
+    uint8_t link_options = ORCHESTRA_UNICAST_SENDER_BASED ? LINK_OPTION_RX : LINK_OPTION_TX | UNICAST_SLOT_SHARED_FLAG;
+
+    if(timeslot == get_node_timeslot(&linkaddr_node_addr)) {
+      /* This is also our timeslot, add necessary flags */
+      link_options |= ORCHESTRA_UNICAST_SENDER_BASED ? LINK_OPTION_TX | UNICAST_SLOT_SHARED_FLAG: LINK_OPTION_RX;
+    }
+
+    /* Add/update link */
+    tsch_schedule_add_link(sf_unicast, link_options, LINK_TYPE_NORMAL, &tsch_broadcast_address,
+          timeslot, channel_offset);
   }
 }
 /*---------------------------------------------------------------------------*/
@@ -123,7 +129,17 @@ remove_uc_link(const linkaddr_t *linkaddr)
     }
     item = nbr_table_next(nbr_routes, item);
   }
-  tsch_schedule_remove_link(sf_unicast, l);
+
+  /* Do we need this timeslot? */
+  if(timeslot == get_node_timeslot(&linkaddr_node_addr)) {
+    /* This is our link, keep it but update the link options */
+    uint8_t link_options = ORCHESTRA_UNICAST_SENDER_BASED ? LINK_OPTION_TX | UNICAST_SLOT_SHARED_FLAG: LINK_OPTION_RX;
+    tsch_schedule_add_link(sf_unicast, link_options, LINK_TYPE_NORMAL, &tsch_broadcast_address,
+              timeslot, channel_offset);
+  } else {
+    /* Remove link */
+    tsch_schedule_remove_link(sf_unicast, l);
+  }
 }
 /*---------------------------------------------------------------------------*/
 static void

From 7e8d042609a65e45f64ce11c23ada80875ab7474 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Fri, 20 May 2016 13:40:50 +0200
Subject: [PATCH 248/393] Orchestra: fix bug in new_time_source

---
 apps/orchestra/orchestra-rule-unicast-per-neighbor.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/orchestra/orchestra-rule-unicast-per-neighbor.c b/apps/orchestra/orchestra-rule-unicast-per-neighbor.c
index acba8e7be..58f5dcc42 100644
--- a/apps/orchestra/orchestra-rule-unicast-per-neighbor.c
+++ b/apps/orchestra/orchestra-rule-unicast-per-neighbor.c
@@ -176,13 +176,14 @@ static void
 new_time_source(const struct tsch_neighbor *old, const struct tsch_neighbor *new)
 {
   if(new != old) {
+    const linkaddr_t *old_addr = old != NULL ? &old->addr : NULL;
     const linkaddr_t *new_addr = new != NULL ? &new->addr : NULL;
     if(new_addr != NULL) {
       linkaddr_copy(&orchestra_parent_linkaddr, new_addr);
     } else {
       linkaddr_copy(&orchestra_parent_linkaddr, &linkaddr_null);
     }
-    remove_uc_link(new_addr);
+    remove_uc_link(old_addr);
     add_uc_link(new_addr);
   }
 }

From c7694e4dbdcfe831b29d8128f3845d9a9806ceac Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Fri, 20 May 2016 13:51:24 +0200
Subject: [PATCH 249/393] Orchestra: fix orchestra-rule-eb-per-time-source to
 handle hash collisions

---
 .../orchestra-rule-eb-per-time-source.c       | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/apps/orchestra/orchestra-rule-eb-per-time-source.c b/apps/orchestra/orchestra-rule-eb-per-time-source.c
index 0f774f531..b18617f0a 100644
--- a/apps/orchestra/orchestra-rule-eb-per-time-source.c
+++ b/apps/orchestra/orchestra-rule-eb-per-time-source.c
@@ -83,14 +83,24 @@ new_time_source(const struct tsch_neighbor *old, const struct tsch_neighbor *new
 
   if(old_ts != 0xffff) {
     /* Stop listening to the old time source's EBs */
-    tsch_schedule_remove_link_by_timeslot(sf_eb, old_ts);
+    if(old_ts == get_node_timeslot(&linkaddr_node_addr)) {
+      /* This was the same timeslot as slot. Reset original link options */
+      tsch_schedule_add_link(sf_eb, LINK_OPTION_TX, LINK_TYPE_ADVERTISING_ONLY,
+        &tsch_broadcast_address, old_ts, 0);
+    } else {
+      /* Remove slot */
+      tsch_schedule_remove_link_by_timeslot(sf_eb, old_ts);
+    }
   }
   if(new_ts != 0xffff) {
+    uint8_t link_options = LINK_OPTION_RX;
+    if(new_ts == get_node_timeslot(&linkaddr_node_addr)) {
+      /* This is also our timeslot, add necessary flags */
+      link_options |= LINK_OPTION_TX;
+    }
     /* Listen to the time source's EBs */
-    tsch_schedule_add_link(sf_eb,
-                           LINK_OPTION_RX,
-                           LINK_TYPE_ADVERTISING_ONLY, NULL,
-                           new_ts, 0);
+    tsch_schedule_add_link(sf_eb, link_options, LINK_TYPE_ADVERTISING_ONLY,
+      &tsch_broadcast_address, new_ts, 0);
   }
 }
 /*---------------------------------------------------------------------------*/

From 99c77bda8ce2c0dcc305f4389fa3fc6c22d601f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Thu, 19 May 2016 09:46:51 +0200
Subject: [PATCH 250/393] oma-lwm2m: Handle text/plain floatfix numbers without
 decimal point

Fixes bug: If no decimal point is present then the entire number is
treated as the decimal part instead of the integer part
---
 apps/oma-lwm2m/lwm2m-plain-text.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/oma-lwm2m/lwm2m-plain-text.c b/apps/oma-lwm2m/lwm2m-plain-text.c
index 34b7f2318..b2bc5dcbe 100644
--- a/apps/oma-lwm2m/lwm2m-plain-text.c
+++ b/apps/oma-lwm2m/lwm2m-plain-text.c
@@ -100,6 +100,11 @@ lwm2m_plain_text_read_float32fix(const uint8_t *inbuf, size_t len,
       break;
     }
   }
+  if(dot == 0) {
+    integerpart = counter;
+    counter = 0;
+    frac = 1;
+  }
   *value = integerpart << bits;
   if(frac > 1) {
     *value += ((counter << bits) / frac);

From bc54f8bac36bd8e97d36824146b11d3c72e1f8a1 Mon Sep 17 00:00:00 2001
From: Yasuyuki Tanaka <yasuyuki.tanaka@inf.ethz.ch>
Date: Sat, 21 May 2016 11:55:07 +0200
Subject: [PATCH 251/393] Orchestra: add NULL checks into new_time_source
 (eb-per-time-source)

---
 apps/orchestra/orchestra-rule-eb-per-time-source.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/orchestra/orchestra-rule-eb-per-time-source.c b/apps/orchestra/orchestra-rule-eb-per-time-source.c
index b18617f0a..ed037291b 100644
--- a/apps/orchestra/orchestra-rule-eb-per-time-source.c
+++ b/apps/orchestra/orchestra-rule-eb-per-time-source.c
@@ -74,8 +74,8 @@ select_packet(uint16_t *slotframe, uint16_t *timeslot)
 static void
 new_time_source(const struct tsch_neighbor *old, const struct tsch_neighbor *new)
 {
-  uint16_t old_ts = get_node_timeslot(&old->addr);
-  uint16_t new_ts = get_node_timeslot(&new->addr);
+  uint16_t old_ts = old != NULL ? get_node_timeslot(&old->addr) : 0xffff;
+  uint16_t new_ts = new != NULL ? get_node_timeslot(&new->addr) : 0xffff;
 
   if(new_ts == old_ts) {
     return;

From 65ff03537bcf637ecc5b8b3e89bd386f4fa6229d Mon Sep 17 00:00:00 2001
From: Nicholas Humfrey <njh@aelius.com>
Date: Mon, 23 May 2016 12:54:16 +0100
Subject: [PATCH 252/393] Changed read-only pointers to const in enc28j60

---
 dev/enc28j60/enc28j60.c | 6 +++---
 dev/enc28j60/enc28j60.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev/enc28j60/enc28j60.c b/dev/enc28j60/enc28j60.c
index 60dded31a..6d7704e7f 100644
--- a/dev/enc28j60/enc28j60.c
+++ b/dev/enc28j60/enc28j60.c
@@ -207,7 +207,7 @@ setregbank(uint8_t new_bank)
 }
 /*---------------------------------------------------------------------------*/
 static void
-writedata(uint8_t *data, int datalen)
+writedata(const uint8_t *data, int datalen)
 {
   int i;
   enc28j60_arch_spi_select();
@@ -477,7 +477,7 @@ reset(void)
 }
 /*---------------------------------------------------------------------------*/
 void
-enc28j60_init(uint8_t *mac_addr)
+enc28j60_init(const uint8_t *mac_addr)
 {
   if(initialized) {
     return;
@@ -496,7 +496,7 @@ enc28j60_init(uint8_t *mac_addr)
 }
 /*---------------------------------------------------------------------------*/
 int
-enc28j60_send(uint8_t *data, uint16_t datalen)
+enc28j60_send(const uint8_t *data, uint16_t datalen)
 {
   uint16_t dataend;
 
diff --git a/dev/enc28j60/enc28j60.h b/dev/enc28j60/enc28j60.h
index 059528816..473cceca4 100644
--- a/dev/enc28j60/enc28j60.h
+++ b/dev/enc28j60/enc28j60.h
@@ -32,9 +32,9 @@
 #ifndef ENC28J60_H
 #define ENC28J60_H
 
-void enc28j60_init(uint8_t *mac_addr);
+void enc28j60_init(const uint8_t *mac_addr);
 
-int enc28j60_send(uint8_t *data, uint16_t datalen);
+int enc28j60_send(const uint8_t *data, uint16_t datalen);
 
 int enc28j60_read(uint8_t *buffer, uint16_t bufsize);
 

From de64ed397531b47202d065f5179820a2733ef0ae Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Tue, 24 May 2016 10:50:20 +0200
Subject: [PATCH 253/393] Fixed typo

---
 platform/zoul/contiki-main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/zoul/contiki-main.c b/platform/zoul/contiki-main.c
index b577066fe..fc9ed91e9 100644
--- a/platform/zoul/contiki-main.c
+++ b/platform/zoul/contiki-main.c
@@ -218,7 +218,7 @@ main(void)
 #endif /* NETSTACK_CONF_WITH_IPV6 */
 
   process_start(&sensors_process, NULL);
-#if PLATFOM_HAS_BUTTON
+#if PLATFORM_HAS_BUTTON
   SENSORS_ACTIVATE(button_sensor);
 #endif
   energest_init();

From f5919a2a459a75b711d6295b0d0797a565c66970 Mon Sep 17 00:00:00 2001
From: "Kitty(chun hua) Jiang" <Kitty_Jiang@sigmadesigns.com>
Date: Wed, 25 May 2016 10:25:43 +0800
Subject: [PATCH 254/393] fix the bug about chalemeon raw hdrsize

---
 core/net/rime/chameleon-raw.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
 mode change 100644 => 100755 core/net/rime/chameleon-raw.c

diff --git a/core/net/rime/chameleon-raw.c b/core/net/rime/chameleon-raw.c
old mode 100644
new mode 100755
index 8efcf8a1f..16b17fb5d
--- a/core/net/rime/chameleon-raw.c
+++ b/core/net/rime/chameleon-raw.c
@@ -205,10 +205,7 @@ hdrsize(const struct packetbuf_attrlist *a)
       continue;
     }
 #endif /* CHAMELEON_WITH_MAC_LINK_ADDRESSES */
-    len = a->len;
-    if(len < 8) {
-      len = 8;
-    }
+    len = (a->len & 0xf8) + ((a->len & 7) ? 8: 0);
     size += len;
   }
   return size / 8;

From 2299a763d096ff874f866a939095b2ca7ce325a0 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Fri, 13 May 2016 14:05:26 +0200
Subject: [PATCH 255/393] Fix tsch-log bug

---
 core/net/mac/tsch/tsch-log.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/mac/tsch/tsch-log.c b/core/net/mac/tsch/tsch-log.c
index bfb033e9d..982924419 100644
--- a/core/net/mac/tsch/tsch-log.c
+++ b/core/net/mac/tsch/tsch-log.c
@@ -103,7 +103,7 @@ tsch_log_process_pending(void)
         break;
       case tsch_log_rx:
         printf("%s-%u-%u %u rx %d",
-            log->rx.is_unicast == 0 ? "bc" : "uc", log->rx.is_data, log->tx.sec_level,
+            log->rx.is_unicast == 0 ? "bc" : "uc", log->rx.is_data, log->rx.sec_level,
                 log->rx.datalen,
                 log->rx.src);
         if(log->rx.drift_used) {

From 65632cb086308777b3465169389775975a9869e1 Mon Sep 17 00:00:00 2001
From: Mark Solters <msolters@driblet.io>
Date: Thu, 26 May 2016 22:42:53 -0400
Subject: [PATCH 256/393] Fix IPv6 HTTP URL parsing

Currently, http-socket uses a `parse_url` method which only works correctly with IPv4 hosts (e.g. `http://192.168.1.1:3000`).  When using an IPv6 host (e.g. `http://[abcd::1]:3000`), the port number is not parsed due to a pointer increment error, which leads to the algorithm assuming a default port of 80 even when the user code has specified otherwise.  This fix provides full URL parsing for IPv6 hosts, and does not break IPv4 functionality.
---
 core/net/http-socket/http-socket.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/net/http-socket/http-socket.c b/core/net/http-socket/http-socket.c
index 758c1473e..3495b597b 100644
--- a/core/net/http-socket/http-socket.c
+++ b/core/net/http-socket/http-socket.c
@@ -324,6 +324,7 @@ parse_url(const char *url, char *host, uint16_t *portptr, char *path)
         if(host != NULL) {
           host[i] = 0;
         }
+        urlptr++;
         break;
       }
       if(host != NULL) {

From 9832b356ba1d1535a5f8463c6c7f0bdcd2e91cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Wed, 4 May 2016 19:13:51 +0200
Subject: [PATCH 257/393] oma-lwm2m: Use Accept header to determine the writer
 object for the content

---
 apps/oma-lwm2m/lwm2m-engine.c | 109 +++++++++++++++++++++++++---------
 1 file changed, 82 insertions(+), 27 deletions(-)

diff --git a/apps/oma-lwm2m/lwm2m-engine.c b/apps/oma-lwm2m/lwm2m-engine.c
index e2f6bba7c..3728e3505 100644
--- a/apps/oma-lwm2m/lwm2m-engine.c
+++ b/apps/oma-lwm2m/lwm2m-engine.c
@@ -50,6 +50,7 @@
 #include "er-coap-constants.h"
 #include "er-coap-engine.h"
 #include "oma-tlv.h"
+#include "oma-tlv-reader.h"
 #include "oma-tlv-writer.h"
 #include "net/ipv6/uip-ds6.h"
 #include <stdio.h>
@@ -707,6 +708,59 @@ write_rd_json_data(const lwm2m_context_t *context,
   return rdlen;
 }
 /*---------------------------------------------------------------------------*/
+/**
+ * @brief  Set the writer pointer to the proper writer based on the Accept: header
+ *
+ * @param[in] context  LWM2M context to operate on
+ * @param[in] accept   Accept type number from CoAP headers
+ *
+ * @return The content type of the response if the selected writer is used
+ */
+static unsigned int
+lwm2m_engine_select_writer(lwm2m_context_t *context, unsigned int accept)
+{
+  switch(accept) {
+    case LWM2M_TLV:
+      context->writer = &oma_tlv_writer;
+      break;
+    case LWM2M_TEXT_PLAIN:
+    case TEXT_PLAIN:
+      context->writer = &lwm2m_plain_text_writer;
+      break;
+    default:
+      PRINTF("Unknown Accept type %u, using LWM2M plain text\n", accept);
+      context->writer = &lwm2m_plain_text_writer;
+      /* Set the response type to plain text */
+      accept = LWM2M_TEXT_PLAIN;
+      break;
+  }
+  return accept;
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * @brief  Set the reader pointer to the proper reader based on the Content-format: header
+ *
+ * @param[in] context        LWM2M context to operate on
+ * @param[in] content_format Content-type type number from CoAP headers
+ */
+static void
+lwm2m_engine_select_reader(lwm2m_context_t *context, unsigned int content_format)
+{
+  switch(content_format) {
+    case LWM2M_TLV:
+      context->reader = &oma_tlv_reader;
+      break;
+    case LWM2M_TEXT_PLAIN:
+    case TEXT_PLAIN:
+      context->reader = &lwm2m_plain_text_reader;
+      break;
+    default:
+      PRINTF("Unknown content type %u, using LWM2M plain text\n", accept);
+      context->reader = &lwm2m_plain_text_reader;
+      break;
+  }
+}
+/*---------------------------------------------------------------------------*/
 void
 lwm2m_engine_handler(const lwm2m_object_t *object,
                      void *request, void *response,
@@ -716,6 +770,8 @@ lwm2m_engine_handler(const lwm2m_object_t *object,
   int len;
   const char *url;
   unsigned int format;
+  unsigned int accept;
+  unsigned int content_type;
   int depth;
   lwm2m_context_t context;
   rest_resource_flags_t method;
@@ -734,11 +790,19 @@ lwm2m_engine_handler(const lwm2m_object_t *object,
     /* CoAP content format text plain - assume LWM2M text plain */
     format = LWM2M_TEXT_PLAIN;
   }
+  if(!REST.get_header_accept(request, &accept)) {
+    PRINTF("No Accept header, using same as Content-format...\n");
+    accept = format;
+  }
 
   depth = lwm2m_engine_parse_context(object, url, len, &context);
   PRINTF("Context: %u/%u/%u  found: %d\n", context.object_id,
          context.object_instance_id, context.resource_id, depth);
 
+  /* Select reader and writer based on provided Content type and Accept headers */
+  lwm2m_engine_select_reader(&context, format);
+  content_type = lwm2m_engine_select_writer(&context, accept);
+
 #if (DEBUG) & DEBUG_PRINT
   /* for debugging */
   if(method == METHOD_GET) {
@@ -861,7 +925,7 @@ lwm2m_engine_handler(const lwm2m_object_t *object,
 
   if(depth == 3) {
     const lwm2m_resource_t *resource = get_resource(instance, &context);
-    size_t tlvlen = 0;
+    size_t content_len = 0;
     if(resource == NULL) {
       PRINTF("Error - do not have resource %d\n", context.resource_id);
       REST.set_response_status(response, NOT_FOUND_4_04);
@@ -879,9 +943,9 @@ lwm2m_engine_handler(const lwm2m_object_t *object,
             context.reader = &lwm2m_plain_text_reader;
             PRINTF("PUT Callback with data: '%.*s'\n", plen, data);
             /* no specific reader for plain text */
-            tlvlen = resource->value.callback.write(&context, data, plen,
+            content_len = resource->value.callback.write(&context, data, plen,
                                                     buffer, preferred_size);
-            PRINTF("tlvlen:%u\n", (unsigned int)tlvlen);
+            PRINTF("content_len:%u\n", (unsigned int)content_len);
             REST.set_response_status(response, CHANGED_2_04);
           } else {
             PRINTF("PUT callback with format %d\n", format);
@@ -899,48 +963,39 @@ lwm2m_engine_handler(const lwm2m_object_t *object,
     } else if(method == METHOD_GET) {
       if(lwm2m_object_is_resource_string(resource)) {
         const uint8_t *value;
-        uint16_t len;
         value = lwm2m_object_get_resource_string(resource, &context);
-        len = lwm2m_object_get_resource_strlen(resource, &context);
         if(value != NULL) {
+          uint16_t len = lwm2m_object_get_resource_strlen(resource, &context);
           PRINTF("Get string value: %.*s\n", (int)len, (char *)value);
-          /* TODO check format */
-          REST.set_response_payload(response, value, len);
-          REST.set_header_content_type(response, LWM2M_TEXT_PLAIN);
-          /* Done */
-          return;
+          content_len = context.writer->write_string(&context, buffer,
+            preferred_size, (const char *)value, len);
         }
       } else if(lwm2m_object_is_resource_int(resource)) {
         int32_t value;
         if(lwm2m_object_get_resource_int(resource, &context, &value)) {
-          /* export INT as TLV */
-          tlvlen = oma_tlv_write_int32(resource->id, value, buffer, preferred_size);
-          PRINTF("Exporting int as TLV: %" PRId32 ", len: %u\n",
-                 value, (unsigned int)tlvlen);
+          content_len = context.writer->write_int(&context, buffer, preferred_size, value);
         }
       } else if(lwm2m_object_is_resource_floatfix(resource)) {
         int32_t value;
         if(lwm2m_object_get_resource_floatfix(resource, &context, &value)) {
-          /* export FLOATFIX as TLV */
+          /* export FLOATFIX */
           PRINTF("Exporting %d-bit fix as float: %" PRId32 "\n",
                  LWM2M_FLOAT32_BITS, value);
-          tlvlen = oma_tlv_write_float32(resource->id,
-                                         value, LWM2M_FLOAT32_BITS,
-                                         buffer, preferred_size);
-          PRINTF("Exporting as TLV: len:%u\n", (unsigned int)tlvlen);
+          content_len = context.writer->write_float32fix(&context, buffer,
+            preferred_size, value, LWM2M_FLOAT32_BITS);
         }
       } else if(lwm2m_object_is_resource_callback(resource)) {
         if(resource->value.callback.read != NULL) {
-          tlvlen = resource->value.callback.read(&context,
+          content_len = resource->value.callback.read(&context,
                                                  buffer, preferred_size);
         } else {
           REST.set_response_status(response, METHOD_NOT_ALLOWED_4_05);
           return;
         }
       }
-      if(tlvlen > 0) {
-        REST.set_response_payload(response, buffer, tlvlen);
-        REST.set_header_content_type(response, LWM2M_TLV);
+      if(content_len > 0) {
+        REST.set_response_payload(response, buffer, content_len);
+        REST.set_header_content_type(response, content_type);
       } else {
         /* failed to produce output - it is an internal error */
         REST.set_response_status(response, INTERNAL_SERVER_ERROR_5_00);
@@ -952,7 +1007,7 @@ lwm2m_engine_handler(const lwm2m_object_t *object,
           const uint8_t *data;
           int plen = REST.get_request_payload(request, &data);
           PRINTF("Execute Callback with data: '%.*s'\n", plen, data);
-          tlvlen = resource->value.callback.exec(&context,
+          content_len = resource->value.callback.exec(&context,
                                                  data, plen,
                                                  buffer, preferred_size);
           REST.set_response_status(response, CHANGED_2_04);
@@ -973,7 +1028,7 @@ lwm2m_engine_handler(const lwm2m_object_t *object,
       REST.set_response_status(response, NOT_FOUND_4_04);
     } else {
       int rdlen;
-      if(format == APPLICATION_LINK_FORMAT) {
+      if(accept == APPLICATION_LINK_FORMAT) {
         rdlen = write_rd_link_data(object, instance,
                                    (char *)buffer, preferred_size);
       } else {
@@ -986,10 +1041,10 @@ lwm2m_engine_handler(const lwm2m_object_t *object,
         return;
       }
       REST.set_response_payload(response, buffer, rdlen);
-      if(format == APPLICATION_LINK_FORMAT) {
+      if(accept == APPLICATION_LINK_FORMAT) {
         REST.set_header_content_type(response, REST.type.APPLICATION_LINK_FORMAT);
       } else {
-        REST.set_header_content_type(response, REST.type.APPLICATION_JSON);
+        REST.set_header_content_type(response, LWM2M_JSON);
       }
     }
   }

From e8edb6b1a0914e5872053293c801ee2d43148e19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Wed, 4 May 2016 20:39:08 +0200
Subject: [PATCH 258/393] oma-lwm2m: Add JSON writer

---
 apps/oma-lwm2m/Makefile.oma-lwm2m |  16 ++-
 apps/oma-lwm2m/lwm2m-engine.c     |   5 +
 apps/oma-lwm2m/lwm2m-json.c       | 162 ++++++++++++++++++++++++++++++
 apps/oma-lwm2m/lwm2m-json.h       |  51 ++++++++++
 4 files changed, 230 insertions(+), 4 deletions(-)
 create mode 100644 apps/oma-lwm2m/lwm2m-json.c
 create mode 100644 apps/oma-lwm2m/lwm2m-json.h

diff --git a/apps/oma-lwm2m/Makefile.oma-lwm2m b/apps/oma-lwm2m/Makefile.oma-lwm2m
index 8445530ed..000147939 100644
--- a/apps/oma-lwm2m/Makefile.oma-lwm2m
+++ b/apps/oma-lwm2m/Makefile.oma-lwm2m
@@ -1,5 +1,13 @@
-oma-lwm2m_src = lwm2m-object.c lwm2m-engine.c \
-	lwm2m-device.c lwm2m-server.c lwm2m-security.c \
-	oma-tlv.c oma-tlv-reader.c oma-tlv-writer.c \
-	lwm2m-plain-text.c
+oma-lwm2m_src = \
+  lwm2m-object.c \
+  lwm2m-engine.c \
+  lwm2m-device.c \
+  lwm2m-server.c \
+  lwm2m-security.c \
+  oma-tlv.c \
+  oma-tlv-reader.c \
+  oma-tlv-writer.c \
+  lwm2m-plain-text.c \
+  lwm2m-json.c \
+  #
 CFLAGS += -DHAVE_OMA_LWM2M=1
diff --git a/apps/oma-lwm2m/lwm2m-engine.c b/apps/oma-lwm2m/lwm2m-engine.c
index 3728e3505..0fe86bbbb 100644
--- a/apps/oma-lwm2m/lwm2m-engine.c
+++ b/apps/oma-lwm2m/lwm2m-engine.c
@@ -46,6 +46,7 @@
 #include "lwm2m-object.h"
 #include "lwm2m-device.h"
 #include "lwm2m-plain-text.h"
+#include "lwm2m-json.h"
 #include "rest-engine.h"
 #include "er-coap-constants.h"
 #include "er-coap-engine.h"
@@ -727,6 +728,10 @@ lwm2m_engine_select_writer(lwm2m_context_t *context, unsigned int accept)
     case TEXT_PLAIN:
       context->writer = &lwm2m_plain_text_writer;
       break;
+    case LWM2M_JSON:
+    case APPLICATION_JSON:
+      context->writer = &lwm2m_json_writer;
+      break;
     default:
       PRINTF("Unknown Accept type %u, using LWM2M plain text\n", accept);
       context->writer = &lwm2m_plain_text_writer;
diff --git a/apps/oma-lwm2m/lwm2m-json.c b/apps/oma-lwm2m/lwm2m-json.c
new file mode 100644
index 000000000..8924ceb8c
--- /dev/null
+++ b/apps/oma-lwm2m/lwm2m-json.c
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2016, Eistec AB.
+ * 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 copyright holder 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 COPYRIGHT HOLDER 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 HOLDER 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.
+ */
+
+/**
+ * \addtogroup oma-lwm2m
+ * @{
+ */
+
+/**
+ * \file
+ *         Implementation of the Contiki OMA LWM2M JSON writer
+ * \author
+ *         Joakim Nohlgård <joakim.nohlgard@eistec.se>
+ */
+
+#include "lwm2m-object.h"
+#include "lwm2m-json.h"
+#include "lwm2m-plain-text.h"
+#include <stdio.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <inttypes.h>
+
+#define DEBUG 0
+#if DEBUG
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+
+/*---------------------------------------------------------------------------*/
+static size_t
+write_boolean(const lwm2m_context_t *ctx, uint8_t *outbuf, size_t outlen,
+              int value)
+{
+  int len = snprintf((char *)outbuf, outlen, "{\"e\":[{\"n\":\"%u\",\"bv\":%s}]}\n", ctx->resource_id, value ? "true" : "false");
+  if((len < 0) || (len >= outlen)) {
+    return 0;
+  }
+  return len;
+}
+/*---------------------------------------------------------------------------*/
+static size_t
+write_int(const lwm2m_context_t *ctx, uint8_t *outbuf, size_t outlen,
+          int32_t value)
+{
+  int len = snprintf((char *)outbuf, outlen, "{\"e\":[{\"n\":\"%u\",\"v\":%" PRId32 "}]}\n", ctx->resource_id, value);
+  if((len < 0) || (len >= outlen)) {
+    return 0;
+  }
+  return len;
+}
+/*---------------------------------------------------------------------------*/
+static size_t
+write_float32fix(const lwm2m_context_t *ctx, uint8_t *outbuf, size_t outlen,
+                 int32_t value, int bits)
+{
+  size_t len = 0;
+  int res;
+  res = snprintf((char *)outbuf, outlen, "{\"e\":[{\"n\":\"%u\",\"v\":", ctx->resource_id);
+  if(res <= 0 || res >= outlen) {
+    return 0;
+  }
+  len += res;
+  outlen -= res;
+  res = lwm2m_plain_text_write_float32fix(&outbuf[len], outlen, value, bits);
+  if((res <= 0) || (res >= outlen)) {
+    return 0;
+  }
+  len += res;
+  outlen -= res;
+  res = snprintf((char *)&outbuf[len], outlen, "}]}\n");
+  if((res <= 0) || (res >= outlen)) {
+    return 0;
+  }
+  len += res;
+  return len;
+}
+/*---------------------------------------------------------------------------*/
+static size_t
+write_string(const lwm2m_context_t *ctx, uint8_t *outbuf, size_t outlen,
+             const char *value, size_t stringlen)
+{
+  size_t i;
+  size_t len = 0;
+  int res;
+  PRINTF("{\"e\":[{\"n\":\"%u\",\"sv\":\"", ctx->resource_id);
+  res = snprintf((char *)outbuf, outlen, "{\"e\":[{\"n\":\"%u\",\"sv\":\"", ctx->resource_id);
+  if(res < 0 || res >= outlen) {
+    return 0;
+  }
+  len += res;
+  for (i = 0; i < stringlen && len < outlen; ++i) {
+    /* Escape special characters */
+    /* TODO: Handle UTF-8 strings */
+    if(value[i] < '\x20') {
+      PRINTF("\\x%x", value[i]);
+      res = snprintf((char *)&outbuf[len], outlen - len, "\\x%x", value[i]);
+      if((res < 0) || (res >= (outlen - len))) {
+        return 0;
+      }
+      len += res;
+      continue;
+    } else if(value[i] == '"' || value[i] == '\\') {
+      PRINTF("\\");
+      outbuf[len] = '\\';
+      ++len;
+      if(len >= outlen) {
+        return 0;
+      }
+    }
+    PRINTF("%c", value[i]);
+    outbuf[len] = value[i];
+    ++len;
+    if(len >= outlen) {
+      return 0;
+    }
+  }
+  PRINTF("\"}]}\n");
+  res = snprintf((char *)&outbuf[len], outlen - len, "\"}]}\n");
+  if((res < 0) || (res >= (outlen - len))) {
+    return 0;
+  }
+  len += res;
+  return len;
+}
+/*---------------------------------------------------------------------------*/
+const lwm2m_writer_t lwm2m_json_writer = {
+  write_int,
+  write_string,
+  write_float32fix,
+  write_boolean
+};
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/apps/oma-lwm2m/lwm2m-json.h b/apps/oma-lwm2m/lwm2m-json.h
new file mode 100644
index 000000000..bc1a1e32a
--- /dev/null
+++ b/apps/oma-lwm2m/lwm2m-json.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2016, Eistec AB.
+ * 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 copyright holder 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 COPYRIGHT HOLDER 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 HOLDER 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.
+ */
+
+/**
+ * \addtogroup oma-lwm2m
+ * @{
+ */
+
+/**
+ * \file
+ *         Header file for the Contiki OMA LWM2M JSON writer
+ * \author
+ *         Joakim Nohlgård <joakim.nohlgard@eistec.se>
+ */
+
+#ifndef LWM2M_JSON_H_
+#define LWM2M_JSON_H_
+
+#include "lwm2m-object.h"
+
+extern const lwm2m_writer_t lwm2m_json_writer;
+
+#endif /* LWM2M_JSON_H_ */
+/** @} */

From 08dc4b0b214f321e55ad10f5d2d89e21a0820996 Mon Sep 17 00:00:00 2001
From: George Oikonomou <g.oikonomou@bristol.ac.uk>
Date: Tue, 19 Apr 2016 22:16:56 +0100
Subject: [PATCH 259/393] Add controller for the AUX domain

---
 cpu/cc26xx-cc13xx/dev/aux-ctrl.c | 116 +++++++++++++++++++++++++
 cpu/cc26xx-cc13xx/dev/aux-ctrl.h | 143 +++++++++++++++++++++++++++++++
 2 files changed, 259 insertions(+)
 create mode 100644 cpu/cc26xx-cc13xx/dev/aux-ctrl.c
 create mode 100644 cpu/cc26xx-cc13xx/dev/aux-ctrl.h

diff --git a/cpu/cc26xx-cc13xx/dev/aux-ctrl.c b/cpu/cc26xx-cc13xx/dev/aux-ctrl.c
new file mode 100644
index 000000000..eb316d3df
--- /dev/null
+++ b/cpu/cc26xx-cc13xx/dev/aux-ctrl.c
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2016, University of Bristol - http://www.bris.ac.uk/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+#include "dev/aux-ctrl.h"
+#include "lib/list.h"
+
+#include "ti-lib.h"
+
+#include <stdint.h>
+#include <stdbool.h>
+/*---------------------------------------------------------------------------*/
+LIST(consumers_list);
+/*---------------------------------------------------------------------------*/
+void
+aux_ctrl_register_consumer(aux_consumer_module_t *consumer)
+{
+  bool interrupts_disabled = ti_lib_int_master_disable();
+
+  list_add(consumers_list, consumer);
+
+  aux_ctrl_power_up();
+
+  ti_lib_aux_wuc_clock_enable(consumer->clocks);
+  while(ti_lib_aux_wuc_clock_status(consumer->clocks) != AUX_WUC_CLOCK_READY);
+
+  if(!interrupts_disabled) {
+    ti_lib_int_master_enable();
+  }
+}
+/*---------------------------------------------------------------------------*/
+void
+aux_ctrl_unregister_consumer(aux_consumer_module_t *consumer)
+{
+  bool interrupts_disabled = ti_lib_int_master_disable();
+
+  list_remove(consumers_list, consumer);
+
+  aux_ctrl_power_down(false);
+
+  if(!interrupts_disabled) {
+    ti_lib_int_master_enable();
+  }
+}
+/*---------------------------------------------------------------------------*/
+void
+aux_ctrl_power_up()
+{
+  /* Don't if we have no consumers */
+  if(list_head(consumers_list) == NULL) {
+    return;
+  }
+
+  ti_lib_aon_wuc_aux_wakeup_event(AONWUC_AUX_WAKEUP);
+  while(!(ti_lib_aon_wuc_power_status_get() & AONWUC_AUX_POWER_ON));
+}
+/*---------------------------------------------------------------------------*/
+void
+aux_ctrl_power_down(bool force)
+{
+  aux_consumer_module_t *consumer;
+  uint32_t clocks_in_use = 0;
+
+  if(!force) {
+    /* Visit all modules and release clocks */
+    for(consumer = list_head(consumers_list); consumer != NULL;
+        consumer = consumer->next) {
+      clocks_in_use |= consumer->clocks;
+    }
+
+    /* If any clocks are still in use, AUX needs to stay powered and clocked */
+    if(clocks_in_use) {
+      ti_lib_aon_wuc_aux_power_down_config(AONWUC_CLOCK_SRC_LF);
+      return;
+    }
+  }
+
+  /* No clock for AUX in power down */
+  ti_lib_aon_wuc_aux_power_down_config(AONWUC_NO_CLOCK);
+
+  /* Disable retention */
+  ti_lib_aon_wuc_aux_sram_config(false);
+
+  /* Turn off AUX */
+  ti_lib_aon_wuc_aux_wakeup_event(AONWUC_AUX_ALLOW_SLEEP);
+  ti_lib_aux_wuc_power_ctrl(AUX_WUC_POWER_OFF);
+  while(ti_lib_aon_wuc_power_status_get() & AONWUC_AUX_POWER_ON);
+}
+/*---------------------------------------------------------------------------*/
diff --git a/cpu/cc26xx-cc13xx/dev/aux-ctrl.h b/cpu/cc26xx-cc13xx/dev/aux-ctrl.h
new file mode 100644
index 000000000..8e65a7844
--- /dev/null
+++ b/cpu/cc26xx-cc13xx/dev/aux-ctrl.h
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2016, University of Bristol - http://www.bris.ac.uk/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup cc26xx
+ * @{
+ *
+ * \defgroup cc26xx-aux-ctrl CC13xx/CC26xx AUX domain controller
+ *
+ * CC13xx/CC26xx AUX domain power management controller
+ *
+ * @{
+ *
+ * \file
+ * Header file for the management of the CC13xx/CC26xx AUX domain
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef AUX_CTRL_H_
+#define AUX_CTRL_H_
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+
+#include "ti-lib.h"
+
+#include <stdint.h>
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief The data structure to be used for modules that require access to AUX
+ *
+ * The clocks field should specify the clocks (within AUX) that your module
+ * requires in order to perform its functionality. Those clocks are an ORd
+ * value of AUX_WUC_xxxx_CLOCK. For instance, the oscillators module specifies
+ * AUX_WUC_OSCCTRL_CLOCK | AUX_WUC_SMPH_CLOCK
+ */
+typedef struct aux_consumer_module {
+  struct aux_consumer_module *next;
+  uint32_t clocks;
+} aux_consumer_module_t;
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief Register a module that no longer requires access to the AUX power domain
+ * \param consumer A pointer to the data structure of your AUX consumer
+ *
+ * Call this function if you are developing a module that requires access to
+ * hardware within the AUX PD. Calling this function will achieve a number of
+ * things:
+ *
+ * - It will power up the AUX PD
+ * - It will enable the AUX clocks that you require
+ *
+ * If you call this function, AUX will stay powered-on and clocked during deep
+ * sleep, and retention will be enabled (so that you can e.g. use the sensor
+ * controller to monitor peripherals while the main MCU in deep sleep). If you
+ * do not need AUX enabled during deep sleep, you must release it by calling
+ * aux_ctrl_unregister_consumer()
+ *
+ * \sa aux_ctrl_unregister_consumer
+ */
+void aux_ctrl_register_consumer(aux_consumer_module_t *consumer);
+
+/**
+ * \brief Deregister a module that no longer requires access to the AUX power domain
+ * \param consumer A pointer to the data structure of your AUX consumer
+ *
+ * When your module is finished using features provided from within the AUX
+ * domain, you should call this function to signal that AUX is no longer
+ * required, so that the LPM module can power it down in deep sleep. If there
+ * are no more registered consumers left, this function will also power down
+ * AUX.
+ *
+ * \sa aux_ctrl_register_consumer
+ * \sa aux_ctrl_power_down
+ */
+void aux_ctrl_unregister_consumer(aux_consumer_module_t *consumer);
+
+/**
+ * \brief Power-up the AUX power domain
+ *
+ * This function will power up the AUX power-domain, but only if there are
+ * registered consumers for it. If there are not, the PD will stay off.
+ *
+ * This function will automatically get called by the LPM module whenever the
+ * chip comes out of deep sleep.
+ *
+ * User applications will normally not need to call this function. if you are
+ * developing a user application that requires access, to AUX, you should
+ * normally call aux_ctrl_register_consumer(), which will automatically power
+ * up AUX for you, if it's not already powered.
+ */
+void aux_ctrl_power_up(void);
+
+/**
+ * \brief Power down the AUX power domain
+ * \param force Force the power down irrespective of registered consumers
+ *
+ * This function will shut down the AUX power-domain.
+ *
+ * The shutdown is unconditional if force is true. If force is false and there
+ * are registered consumers, the power-down will be suppressed.
+ *
+ * This function will automatically get called by the LPM module whenever the
+ * chip tries to enter deep sleep or shuts down.
+ *
+ * User applications will normally not need to call this function. if you are
+ * developing a user application that no longer requires access, to AUX, you
+ * should normally simply release it by calling aux_ctrl_unregister_consumer().
+ * If no other consumers are using AUX, then the lpm module will shut it down.
+ */
+void aux_ctrl_power_down(bool force);
+/*---------------------------------------------------------------------------*/
+#endif /* AUX_CTRL_H_ */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */

From 698ce3a8657fddfefdc552807ff348fb4e1916e8 Mon Sep 17 00:00:00 2001
From: George Oikonomou <g.oikonomou@bristol.ac.uk>
Date: Tue, 19 Apr 2016 22:17:16 +0100
Subject: [PATCH 260/393] Add the AUX controller to the build

---
 cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx b/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
index f6ac275da..40638e80e 100644
--- a/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
+++ b/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
@@ -68,7 +68,7 @@ CONTIKI_CPU_DIRS += ../arm/common/dbg-io
 
 ### CPU-dependent source files
 CONTIKI_CPU_SOURCEFILES += clock.c rtimer-arch.c soc-rtc.c uart.c
-CONTIKI_CPU_SOURCEFILES += contiki-watchdog.c
+CONTIKI_CPU_SOURCEFILES += contiki-watchdog.c aux-ctrl.c
 CONTIKI_CPU_SOURCEFILES += putchar.c ieee-addr.c batmon-sensor.c
 CONTIKI_CPU_SOURCEFILES += slip-arch.c slip.c cc26xx-uart.c lpm.c
 CONTIKI_CPU_SOURCEFILES += gpio-interrupt.c oscillators.c

From 812f1ada31f690dcd6aa77ba973b814eed4bf909 Mon Sep 17 00:00:00 2001
From: George Oikonomou <g.oikonomou@bristol.ac.uk>
Date: Tue, 19 Apr 2016 22:18:23 +0100
Subject: [PATCH 261/393] Manipulate OSC modules using the AUX controller

---
 cpu/cc26xx-cc13xx/dev/oscillators.c | 86 ++++++++++++-----------------
 1 file changed, 36 insertions(+), 50 deletions(-)

diff --git a/cpu/cc26xx-cc13xx/dev/oscillators.c b/cpu/cc26xx-cc13xx/dev/oscillators.c
index 99ba8f841..7890a8e55 100644
--- a/cpu/cc26xx-cc13xx/dev/oscillators.c
+++ b/cpu/cc26xx-cc13xx/dev/oscillators.c
@@ -37,44 +37,18 @@
  */
 /*---------------------------------------------------------------------------*/
 #include "ti-lib.h"
+#include "aux-ctrl.h"
 
 #include <stdint.h>
 /*---------------------------------------------------------------------------*/
-static uint32_t
-osc_interface_en(void)
-{
-  uint32_t smph_clk_state;
-
-  /* Enable OSC DIG interface to change clock sources */
-  ti_lib_osc_interface_enable();
-
-  /* Save the state of the SMPH clock within AUX */
-  smph_clk_state = ti_lib_aux_wuc_clock_status(AUX_WUC_SMPH_CLOCK);
-
-  /* Make sure the SMPH clock within AUX is enabled */
-  ti_lib_aux_wuc_clock_enable(AUX_WUC_SMPH_CLOCK);
-  while(ti_lib_aux_wuc_clock_status(AUX_WUC_SMPH_CLOCK) != AUX_WUC_CLOCK_READY);
-
-  return smph_clk_state;
-}
-/*---------------------------------------------------------------------------*/
-static void
-osc_interface_dis(uint32_t smph_clk_state)
-{
-  /* If the SMPH clock was off, turn it back off */
-  if(smph_clk_state == AUX_WUC_CLOCK_OFF) {
-    ti_lib_aux_wuc_clock_disable(AUX_WUC_SMPH_CLOCK);
-  }
-
-  /* Disable OSC DIG interface */
-  ti_lib_osc_interface_disable();
-}
-/*---------------------------------------------------------------------------*/
 void
 oscillators_select_lf_xosc(void)
 {
-  /* Enable the Osc interface and remember the state of the SMPH clock */
-  uint32_t smph_clk_state = osc_interface_en();
+  /* Request AUX access, with OSCCTRL and SMPH clocks */
+  aux_consumer_module_t osc = {
+    .clocks = AUX_WUC_OSCCTRL_CLOCK | AUX_WUC_SMPH_CLOCK
+  };
+  aux_ctrl_register_consumer(&osc);
 
   /* Switch LF clock source to the LF XOSC if required */
   if(ti_lib_osc_clock_source_get(OSC_SRC_CLK_LF) != OSC_XOSC_LF) {
@@ -91,15 +65,18 @@ oscillators_select_lf_xosc(void)
                                   0x3);
   }
 
-  /* Restore the SMPH clock and disable the OSC interface */
-  osc_interface_dis(smph_clk_state);
+  /* Release the OSC AUX consumer */
+  aux_ctrl_unregister_consumer(&osc);
 }
 /*---------------------------------------------------------------------------*/
 void
 oscillators_select_lf_rcosc(void)
 {
-  /* Enable the Osc interface and remember the state of the SMPH clock */
-  uint32_t smph_clk_state = osc_interface_en();
+  /* Request AUX access, with OSCCTRL and SMPH clocks */
+  aux_consumer_module_t osc = {
+    .clocks = AUX_WUC_OSCCTRL_CLOCK | AUX_WUC_SMPH_CLOCK
+  };
+  aux_ctrl_register_consumer(&osc);
 
   /* Switch LF clock source to the LF XOSC if required */
   if(ti_lib_osc_clock_source_get(OSC_SRC_CLK_LF) != OSC_RCOSC_LF) {
@@ -109,15 +86,18 @@ oscillators_select_lf_rcosc(void)
     while(ti_lib_osc_clock_source_get(OSC_SRC_CLK_LF) != OSC_RCOSC_LF);
   }
 
-  /* Restore the SMPH clock and disable the OSC interface */
-  osc_interface_dis(smph_clk_state);
+  /* Release the OSC AUX consumer */
+  aux_ctrl_unregister_consumer(&osc);
 }
 /*---------------------------------------------------------------------------*/
 void
 oscillators_request_hf_xosc(void)
 {
-  /* Enable the Osc interface and remember the state of the SMPH clock */
-  uint32_t smph_clk_state = osc_interface_en();
+  /* Request AUX access, with OSCCTRL and SMPH clocks */
+  aux_consumer_module_t osc = {
+    .clocks = AUX_WUC_OSCCTRL_CLOCK | AUX_WUC_SMPH_CLOCK
+  };
+  aux_ctrl_register_consumer(&osc);
 
   if(ti_lib_osc_clock_source_get(OSC_SRC_CLK_HF) != OSC_XOSC_HF) {
     /*
@@ -128,30 +108,36 @@ oscillators_request_hf_xosc(void)
     ti_lib_osc_clock_source_set(OSC_SRC_CLK_MF | OSC_SRC_CLK_HF, OSC_XOSC_HF);
   }
 
-  /* Restore the SMPH clock and disable the OSC interface */
-  osc_interface_dis(smph_clk_state);
+  /* Release the OSC AUX consumer */
+  aux_ctrl_unregister_consumer(&osc);
 }
 /*---------------------------------------------------------------------------*/
 void
 oscillators_switch_to_hf_xosc(void)
 {
-  /* Enable the Osc interface and remember the state of the SMPH clock */
-  uint32_t smph_clk_state = osc_interface_en();
+  /* Request AUX access, with OSCCTRL and SMPH clocks */
+  aux_consumer_module_t osc = {
+    .clocks = AUX_WUC_OSCCTRL_CLOCK | AUX_WUC_SMPH_CLOCK
+  };
+  aux_ctrl_register_consumer(&osc);
 
   if(ti_lib_osc_clock_source_get(OSC_SRC_CLK_HF) != OSC_XOSC_HF) {
     /* Switch the HF clock source (cc26xxware executes this from ROM) */
     ti_lib_osc_hf_source_switch();
   }
 
-  /* Restore the SMPH clock and disable the OSC interface */
-  osc_interface_dis(smph_clk_state);
+  /* Release the OSC AUX consumer */
+  aux_ctrl_unregister_consumer(&osc);
 }
 /*---------------------------------------------------------------------------*/
 void
 oscillators_switch_to_hf_rc(void)
 {
-  /* Enable the Osc interface and remember the state of the SMPH clock */
-  uint32_t smph_clk_state = osc_interface_en();
+  /* Request AUX access, with OSCCTRL and SMPH clocks */
+  aux_consumer_module_t osc = {
+    .clocks = AUX_WUC_OSCCTRL_CLOCK | AUX_WUC_SMPH_CLOCK
+  };
+  aux_ctrl_register_consumer(&osc);
 
   /* Set all clock sources to the HF RC Osc */
   ti_lib_osc_clock_source_set(OSC_SRC_CLK_MF | OSC_SRC_CLK_HF, OSC_RCOSC_HF);
@@ -162,8 +148,8 @@ oscillators_switch_to_hf_rc(void)
     ti_lib_osc_hf_source_switch();
   }
 
-  /* Restore the SMPH clock and disable the OSC interface */
-  osc_interface_dis(smph_clk_state);
+  /* Release the OSC AUX consumer */
+  aux_ctrl_unregister_consumer(&osc);
 }
 /*---------------------------------------------------------------------------*/
 /** @} */

From 6b40b1b9658aaa8d3cf5bdc27367245403fa1e13 Mon Sep 17 00:00:00 2001
From: George Oikonomou <g.oikonomou@bristol.ac.uk>
Date: Wed, 20 Apr 2016 16:19:54 +0100
Subject: [PATCH 262/393] Change LPM to power up/down AUX through the AUX
 controller

---
 cpu/cc26xx-cc13xx/lpm.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/cpu/cc26xx-cc13xx/lpm.c b/cpu/cc26xx-cc13xx/lpm.c
index eec8ed66d..686065c73 100644
--- a/cpu/cc26xx-cc13xx/lpm.c
+++ b/cpu/cc26xx-cc13xx/lpm.c
@@ -46,6 +46,7 @@
 #include "lpm.h"
 #include "sys/energest.h"
 #include "lib/list.h"
+#include "dev/aux-ctrl.h"
 #include "dev/leds.h"
 #include "dev/watchdog.h"
 #include "dev/soc-rtc.h"
@@ -53,6 +54,7 @@
 
 #include <stdint.h>
 #include <string.h>
+#include <stdbool.h>
 /*---------------------------------------------------------------------------*/
 #if ENERGEST_CONF_ON
 static unsigned long irq_energest = 0;
@@ -90,8 +92,8 @@ lpm_shutdown(uint32_t wakeup_pin, uint32_t io_pull, uint32_t wake_on)
 {
   lpm_registered_module_t *module;
   int i;
-  uint32_t io_cfg = (IOC_STD_INPUT & ~IOC_IOPULL_M) | io_pull |
-    wake_on;
+  uint32_t io_cfg = (IOC_STD_INPUT & ~IOC_IOPULL_M) | io_pull | wake_on;
+  aux_consumer_module_t aux = { .clocks = AUX_WUC_OSCCTRL_CLOCK };
 
   /* This procedure may not be interrupted */
   ti_lib_int_master_disable();
@@ -135,16 +137,16 @@ lpm_shutdown(uint32_t wakeup_pin, uint32_t io_pull, uint32_t wake_on)
   ti_lib_prcm_power_domain_off(PRCM_DOMAIN_RFCORE | PRCM_DOMAIN_SERIAL |
                                PRCM_DOMAIN_PERIPH);
 
+  /* Register an aux-ctrl consumer to avoid powercycling AUX twice in a row */
+  aux_ctrl_register_consumer(&aux);
   oscillators_switch_to_hf_rc();
   oscillators_select_lf_rcosc();
 
-  /* Configure clock sources for MCU and AUX: No clock */
+  /* Configure clock sources for MCU: No clock */
   ti_lib_aon_wuc_mcu_power_down_config(AONWUC_NO_CLOCK);
-  ti_lib_aon_wuc_aux_power_down_config(AONWUC_NO_CLOCK);
 
-  /* Disable SRAM and AUX retentions */
+  /* Disable SRAM retention */
   ti_lib_aon_wuc_mcu_sram_config(0);
-  ti_lib_aon_wuc_aux_sram_config(false);
 
   /*
    * Request CPU, SYSBYS and VIMS PD off.
@@ -157,9 +159,8 @@ lpm_shutdown(uint32_t wakeup_pin, uint32_t io_pull, uint32_t wake_on)
   ti_lib_aon_wuc_jtag_power_off();
 
   /* Turn off AUX */
-  ti_lib_aux_wuc_power_ctrl(AUX_WUC_POWER_OFF);
+  aux_ctrl_power_down(true);
   ti_lib_aon_wuc_domain_power_down_enable();
-  while(ti_lib_aon_wuc_power_status_get() & AONWUC_AUX_POWER_ON);
 
   /*
    * Request MCU VD power off.
@@ -222,6 +223,9 @@ wake_up(void)
   /* Check operating conditions, optimally choose DCDC versus GLDO */
   ti_lib_sys_ctrl_dcdc_voltage_conditional_control();
 
+  /* Fire up AUX is the user has requested this */
+  aux_ctrl_power_up();
+
   /*
    * We may or may not have been woken up by an AON RTC tick. If not, we need
    * to adjust our software tick counter
@@ -306,17 +310,16 @@ deep_sleep(void)
    */
   oscillators_switch_to_hf_rc();
 
-  /* Configure clock sources for MCU and AUX: No clock */
+  /* Shut Down the AUX if the user application is not using it */
+  aux_ctrl_power_down(false);
+
+  /* Configure clock sources for MCU: No clock */
   ti_lib_aon_wuc_mcu_power_down_config(AONWUC_NO_CLOCK);
-  ti_lib_aon_wuc_aux_power_down_config(AONWUC_NO_CLOCK);
 
   /* Full RAM retention. */
   ti_lib_aon_wuc_mcu_sram_config(MCU_RAM0_RETENTION | MCU_RAM1_RETENTION |
                                  MCU_RAM2_RETENTION | MCU_RAM3_RETENTION);
 
-  /* Disable retention of AUX RAM */
-  ti_lib_aon_wuc_aux_sram_config(false);
-
   /*
    * Always turn off RFCORE, CPU, SYSBUS and VIMS. RFCORE should be off
    * already
@@ -327,10 +330,8 @@ deep_sleep(void)
   /* Request JTAG domain power off */
   ti_lib_aon_wuc_jtag_power_off();
 
-  /* Turn off AUX */
-  ti_lib_aux_wuc_power_ctrl(AUX_WUC_POWER_OFF);
+  /* Allow MCU and AUX powerdown */
   ti_lib_aon_wuc_domain_power_down_enable();
-  while(ti_lib_aon_wuc_power_status_get() & AONWUC_AUX_POWER_ON);
 
   /* Configure the recharge controller */
   ti_lib_sys_ctrl_set_recharge_before_power_down(XOSC_IN_HIGH_POWER_MODE);

From 43b8bf3d3059f42785d7826ca3ec5018ed7753e3 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Sat, 28 May 2016 17:55:31 +0100
Subject: [PATCH 263/393] Add CCxxware macros for AUX ADC

---
 cpu/cc26xx-cc13xx/ti-lib.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/cpu/cc26xx-cc13xx/ti-lib.h b/cpu/cc26xx-cc13xx/ti-lib.h
index cbf9a8e61..c08d05ce3 100644
--- a/cpu/cc26xx-cc13xx/ti-lib.h
+++ b/cpu/cc26xx-cc13xx/ti-lib.h
@@ -139,6 +139,26 @@
 #define ti_lib_aon_wuc_osc_config(...)                AONWUCOscConfig(__VA_ARGS__)
 #define ti_lib_aon_wuc_jtag_power_off(...)            AONWUCJtagPowerOff(__VA_ARGS__)
 /*---------------------------------------------------------------------------*/
+/* aux_adc.h */
+#include "driverlib/aux_adc.h"
+
+#define ti_lib_aux_adc_disable(...)                            AUXADCDisable(__VA_ARGS__)
+#define ti_lib_aux_adc_enable_async(...)                       AUXADCEnableAsync(__VA_ARGS__)
+#define ti_lib_aux_adc_enable_sync(...)                        AUXADCEnableSync(__VA_ARGS__)
+#define ti_lib_aux_adc_disable_input_scaling(...)              AUXADCDisableInputScaling(__VA_ARGS__)
+#define ti_lib_aux_adc_flush_fifo(...)                         AUXADCFlushFifo(__VA_ARGS__)
+#define ti_lib_aux_adc_gen_manual_trigger(...)                 AUXADCGenManualTrigger(__VA_ARGS__)
+#define ti_lib_aux_adc_get_fifo_status(...)                    AUXADCGetFifoStatus(__VA_ARGS__)
+#define ti_lib_aux_adc_read_fifo(...)                          AUXADCReadFifo(__VA_ARGS__)
+#define ti_lib_aux_adc_pop_fifo(...)                           AUXADCPopFifo(__VA_ARGS__)
+#define ti_lib_aux_adc_select_input(...)                       AUXADCSelectInput(__VA_ARGS__)
+#define ti_lib_aux_adc_get_adjustment_gain(...)                AUXADCGetAdjustmentGain(__VA_ARGS__)
+#define ti_lib_aux_adc_get_adjustment_offset(...)              AUXADCGetAdjustmentOffset(__VA_ARGS__)
+#define ti_lib_aux_adc_value_to_microvolts(...)                AUXADCValueToMicrovolts(__VA_ARGS__)
+#define ti_lib_aux_adc_microvolts_to_value(...)                AUXADCMicrovoltsToValue(__VA_ARGS__)
+#define ti_lib_aux_adc_adjust_value_for_gain_and_offset(...)   AUXADCAdjustValueForGainAndOffset(__VA_ARGS__)
+#define ti_lib_aux_adc_unadjust_value_for_gain_and_offset(...) AUXADCUnadjustValueForGainAndOffset(__VA_ARGS__)
+/*---------------------------------------------------------------------------*/
 /* aux_wuc.h */
 #include "driverlib/aux_wuc.h"
 

From 487547d8afb93826f12b6aa2d9a18d16a3d7d0ee Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Thu, 21 Apr 2016 16:55:01 +0300
Subject: [PATCH 264/393] Add CC13xx/CC26xx ADC driver

---
 cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx |   2 +-
 cpu/cc26xx-cc13xx/dev/adc-sensor.c       | 133 +++++++++++++++++++++++
 cpu/cc26xx-cc13xx/dev/adc-sensor.h       |  61 +++++++++++
 3 files changed, 195 insertions(+), 1 deletion(-)
 create mode 100644 cpu/cc26xx-cc13xx/dev/adc-sensor.c
 create mode 100644 cpu/cc26xx-cc13xx/dev/adc-sensor.h

diff --git a/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx b/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
index 40638e80e..b9b755057 100644
--- a/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
+++ b/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
@@ -69,7 +69,7 @@ CONTIKI_CPU_DIRS += ../arm/common/dbg-io
 ### CPU-dependent source files
 CONTIKI_CPU_SOURCEFILES += clock.c rtimer-arch.c soc-rtc.c uart.c
 CONTIKI_CPU_SOURCEFILES += contiki-watchdog.c aux-ctrl.c
-CONTIKI_CPU_SOURCEFILES += putchar.c ieee-addr.c batmon-sensor.c
+CONTIKI_CPU_SOURCEFILES += putchar.c ieee-addr.c batmon-sensor.c adc-sensor.c
 CONTIKI_CPU_SOURCEFILES += slip-arch.c slip.c cc26xx-uart.c lpm.c
 CONTIKI_CPU_SOURCEFILES += gpio-interrupt.c oscillators.c
 CONTIKI_CPU_SOURCEFILES += rf-core.c rf-ble.c ieee-mode.c
diff --git a/cpu/cc26xx-cc13xx/dev/adc-sensor.c b/cpu/cc26xx-cc13xx/dev/adc-sensor.c
new file mode 100644
index 000000000..3ccf90e6d
--- /dev/null
+++ b/cpu/cc26xx-cc13xx/dev/adc-sensor.c
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2016, University of Bristol - http://www.bristol.ac.uk
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup cc26xx-adc-sensor
+ * @{
+ *
+ * \file
+ * Driver for the CC13xx/CC26xx ADC
+ */
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+#include "lib/sensors.h"
+#include "dev/adc-sensor.h"
+#include "gpio-interrupt.h"
+#include "sys/timer.h"
+#include "lpm.h"
+
+#include "ti-lib.h"
+#include "driverlib/aux_adc.h"
+#include "aux-ctrl.h"
+
+#include <stdio.h>
+#include <stdbool.h>
+/*---------------------------------------------------------------------------*/
+static uint8_t channel = ADC_COMPB_IN_AUXIO0;
+static bool is_active = false;
+
+static aux_consumer_module_t adc_aux = {
+  .clocks = AUX_WUC_ADI_CLOCK | AUX_WUC_ANAIF_CLOCK | AUX_WUC_SMPH_CLOCK
+};
+/*---------------------------------------------------------------------------*/
+static int
+config(int type, int c)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+    is_active = c;
+
+    if(is_active) {
+      /* Request AUX access, with ADI and SMPH clocks */
+      aux_ctrl_register_consumer(&adc_aux);
+
+      ti_lib_aux_adc_select_input(channel);
+    } else {
+      aux_ctrl_unregister_consumer(&adc_aux);
+    }
+    break;
+
+  case ADC_SENSOR_SET_CHANNEL:
+    channel = c;
+    if(is_active) {
+      ti_lib_aux_adc_select_input(channel);
+    }
+    break;
+
+  default:
+    break;
+  }
+
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+    if(is_active) {
+      return 1;
+    }
+    break;
+  default:
+    break;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  if(type == ADC_SENSOR_VALUE) {
+    int val;
+
+    if(!is_active) {
+      puts("ADC not active");
+      return 0;
+    }
+
+    ti_lib_aux_adc_enable_sync(AUXADC_REF_FIXED, AUXADC_SAMPLE_TIME_2P7_US,
+                               AUXADC_TRIGGER_MANUAL);
+
+    ti_lib_aux_adc_gen_manual_trigger();
+    val = ti_lib_aux_adc_read_fifo();
+
+    ti_lib_aux_adc_disable();
+
+    return val;
+  }
+
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(adc_sensor, ADC_SENSOR, value, config, status);
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/cpu/cc26xx-cc13xx/dev/adc-sensor.h b/cpu/cc26xx-cc13xx/dev/adc-sensor.h
new file mode 100644
index 000000000..fd8f71537
--- /dev/null
+++ b/cpu/cc26xx-cc13xx/dev/adc-sensor.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2016, University of Bristol - http://www.bristol.ac.uk
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup cc26xx
+ * @{
+ *
+ * \defgroup cc26xx-adc-sensor CC13xx/CC26xx ADC Sensor
+ * @{
+ *
+ * \file
+ * Header file for the CC13xx/CC26xx ADC driver
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef ADC_SENSOR_H_
+#define ADC_SENSOR_H_
+/*---------------------------------------------------------------------------*/
+#include "lib/sensors.h"
+/*---------------------------------------------------------------------------*/
+#define ADC_SENSOR "ADC"
+/*---------------------------------------------------------------------------*/
+#define ADC_SENSOR_VALUE    0
+/*---------------------------------------------------------------------------*/
+/* configuration commands */
+#define ADC_SENSOR_SET_CHANNEL 1 /* takes ADC_COMPB_IN_AUXIxx as parameter */
+/*---------------------------------------------------------------------------*/
+extern const struct sensors_sensor adc_sensor;
+/*---------------------------------------------------------------------------*/
+#endif /* ADC_SENSOR_H_ */
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */

From 2ec9c8ccf0794b1d43cd133b53711349877f1abc Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Sat, 28 May 2016 19:40:35 +0100
Subject: [PATCH 265/393] Add ALS support for Srf06 + CC13xx/CC26xxEM

This provides an example on how to use the CC13xx / CC26xx ADC
---
 platform/srf06-cc26xx/srf06/Makefile.srf06    |   1 +
 platform/srf06-cc26xx/srf06/als-sensor.c      | 105 ++++++++++++++++++
 platform/srf06-cc26xx/srf06/als-sensor.h      |  50 +++++++++
 .../srf06-cc26xx/srf06/board-peripherals.h    |   2 +-
 platform/srf06-cc26xx/srf06/board.c           |  18 +--
 platform/srf06-cc26xx/srf06/srf06-sensors.c   |   3 +-
 6 files changed, 170 insertions(+), 9 deletions(-)
 create mode 100644 platform/srf06-cc26xx/srf06/als-sensor.c
 create mode 100644 platform/srf06-cc26xx/srf06/als-sensor.h

diff --git a/platform/srf06-cc26xx/srf06/Makefile.srf06 b/platform/srf06-cc26xx/srf06/Makefile.srf06
index 3459cbadc..564a9d0ed 100644
--- a/platform/srf06-cc26xx/srf06/Makefile.srf06
+++ b/platform/srf06-cc26xx/srf06/Makefile.srf06
@@ -3,6 +3,7 @@ CFLAGS += -DBOARD_SMARTRF06EB=1
 CONTIKI_TARGET_DIRS += srf06
 
 BOARD_SOURCEFILES += leds-arch.c srf06-sensors.c button-sensor.c board.c
+BOARD_SOURCEFILES += als-sensor.c
 
 PYTHON = python
 BSL_FLAGS += -e -w -v
diff --git a/platform/srf06-cc26xx/srf06/als-sensor.c b/platform/srf06-cc26xx/srf06/als-sensor.c
new file mode 100644
index 000000000..f149d16a1
--- /dev/null
+++ b/platform/srf06-cc26xx/srf06/als-sensor.c
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2016, University of Bristol - http://www.bris.ac.uk/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup srf06-common-peripherals
+ * @{
+ *
+ * \file
+ *  Driver for the SmartRF06EB ALS when a CC13xx/CC26xxEM is mounted on it
+ */
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+#include "lib/sensors.h"
+#include "srf06/als-sensor.h"
+#include "sys/timer.h"
+#include "dev/adc-sensor.h"
+#include "dev/aux-ctrl.h"
+
+#include "ti-lib.h"
+
+#include <stdint.h>
+/*---------------------------------------------------------------------------*/
+static aux_consumer_module_t als_aux = {
+  .clocks = AUX_WUC_ADI_CLOCK | AUX_WUC_ANAIF_CLOCK | AUX_WUC_SMPH_CLOCK
+};
+/*---------------------------------------------------------------------------*/
+static int
+config(int type, int enable)
+{
+  switch(type) {
+  case SENSORS_HW_INIT:
+    ti_lib_ioc_pin_type_gpio_output(BOARD_IOID_ALS_PWR);
+    break;
+  case SENSORS_ACTIVE:
+    ti_lib_ioc_pin_type_gpio_output(BOARD_IOID_ALS_PWR);
+    ti_lib_ioc_port_configure_set(BOARD_IOID_ALS_OUT, IOC_PORT_GPIO,
+                                  IOC_STD_OUTPUT);
+    ti_lib_gpio_dir_mode_set(BOARD_ALS_OUT, GPIO_DIR_MODE_IN);
+
+    if(enable) {
+      ti_lib_gpio_pin_write(BOARD_ALS_PWR, 1);
+      aux_ctrl_register_consumer(&als_aux);
+      ti_lib_aux_adc_select_input(ADC_COMPB_IN_AUXIO7);
+      clock_delay_usec(2000);
+    } else {
+      ti_lib_gpio_pin_write(BOARD_ALS_PWR, 0);
+      aux_ctrl_unregister_consumer(&als_aux);
+    }
+    break;
+  default:
+    break;
+  }
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  int val;
+
+  ti_lib_aux_adc_enable_sync(AUXADC_REF_VDDS_REL, AUXADC_SAMPLE_TIME_2P7_US,
+                             AUXADC_TRIGGER_MANUAL);
+  ti_lib_aux_adc_gen_manual_trigger();
+  val = ti_lib_aux_adc_read_fifo();
+  ti_lib_aux_adc_disable();
+
+  return val;
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(als_sensor, ALS_SENSOR, value, config, status);
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/platform/srf06-cc26xx/srf06/als-sensor.h b/platform/srf06-cc26xx/srf06/als-sensor.h
new file mode 100644
index 000000000..5d70478f8
--- /dev/null
+++ b/platform/srf06-cc26xx/srf06/als-sensor.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2016, University of Bristol - http://www.bris.ac.uk/
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup srf06-common-peripherals
+ * @{
+ *
+ * \file
+ * Header file for the SmartRF06EB + CC13xx/CC26xxEM ALS Driver
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef ALS_SENSOR_H_
+#define ALS_SENSOR_H_
+/*---------------------------------------------------------------------------*/
+#include "lib/sensors.h"
+/*---------------------------------------------------------------------------*/
+#define ALS_SENSOR "ALS"
+/*---------------------------------------------------------------------------*/
+extern const struct sensors_sensor als_sensor;
+/*---------------------------------------------------------------------------*/
+#endif /* ALS_SENSOR_H_ */
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/platform/srf06-cc26xx/srf06/board-peripherals.h b/platform/srf06-cc26xx/srf06/board-peripherals.h
index d76936c2d..c709ec963 100644
--- a/platform/srf06-cc26xx/srf06/board-peripherals.h
+++ b/platform/srf06-cc26xx/srf06/board-peripherals.h
@@ -45,7 +45,7 @@
 #ifndef BOARD_PERIPHERALS_H_
 #define BOARD_PERIPHERALS_H_
 /*---------------------------------------------------------------------------*/
-/* ToDo: Include things here */
+#include "als-sensor.h"
 /*---------------------------------------------------------------------------*/
 #endif /* BOARD_PERIPHERALS_H_ */
 /*---------------------------------------------------------------------------*/
diff --git a/platform/srf06-cc26xx/srf06/board.c b/platform/srf06-cc26xx/srf06/board.c
index 9f53e8ae8..15528f79a 100644
--- a/platform/srf06-cc26xx/srf06/board.c
+++ b/platform/srf06-cc26xx/srf06/board.c
@@ -46,6 +46,16 @@
 #include <string.h>
 /*---------------------------------------------------------------------------*/
 static void
+lpm_handler(uint8_t mode)
+{
+  /* Ambient light sensor (off, output low) */
+  ti_lib_ioc_pin_type_gpio_output(BOARD_IOID_ALS_PWR);
+  ti_lib_gpio_pin_write(BOARD_ALS_PWR, 0);
+  ti_lib_ioc_pin_type_gpio_input(BOARD_IOID_ALS_OUT);
+  ti_lib_ioc_io_port_pull_set(BOARD_IOID_ALS_OUT, IOC_NO_IOPULL);
+}
+/*---------------------------------------------------------------------------*/
+static void
 wakeup_handler(void)
 {
   /* Turn on the PERIPH PD */
@@ -60,7 +70,7 @@ wakeup_handler(void)
  * getting notified before deep sleep. All we need is to be notified when we
  * wake up so we can turn power domains back on
  */
-LPM_MODULE(srf_module, NULL, NULL, wakeup_handler, LPM_DOMAIN_NONE);
+LPM_MODULE(srf_module, NULL, lpm_handler, wakeup_handler, LPM_DOMAIN_NONE);
 /*---------------------------------------------------------------------------*/
 static void
 configure_unused_pins(void)
@@ -72,12 +82,6 @@ configure_unused_pins(void)
   /* Accelerometer (PWR output low, CSn output, high) */
   ti_lib_ioc_pin_type_gpio_output(BOARD_IOID_ACC_PWR);
   ti_lib_gpio_pin_write(BOARD_ACC_PWR, 0);
-
-  /* Ambient light sensor (off, output low) */
-  ti_lib_ioc_pin_type_gpio_output(BOARD_IOID_ALS_PWR);
-  ti_lib_gpio_pin_write(BOARD_ALS_PWR, 0);
-  ti_lib_ioc_pin_type_gpio_input(BOARD_IOID_ALS_OUT);
-  ti_lib_ioc_io_port_pull_set(BOARD_IOID_ALS_OUT, IOC_NO_IOPULL);
 }
 /*---------------------------------------------------------------------------*/
 void
diff --git a/platform/srf06-cc26xx/srf06/srf06-sensors.c b/platform/srf06-cc26xx/srf06/srf06-sensors.c
index 9f05c1917..5f65a0cb2 100644
--- a/platform/srf06-cc26xx/srf06/srf06-sensors.c
+++ b/platform/srf06-cc26xx/srf06/srf06-sensors.c
@@ -39,11 +39,12 @@
 /*---------------------------------------------------------------------------*/
 #include "contiki.h"
 #include "srf06/button-sensor.h"
+#include "srf06/als-sensor.h"
 
 #include <string.h>
 /*---------------------------------------------------------------------------*/
 /** \brief Exports a global symbol to be used by the sensor API */
 SENSORS(&button_select_sensor, &button_left_sensor, &button_right_sensor,
-        &button_up_sensor, &button_down_sensor);
+        &button_up_sensor, &button_down_sensor, &als_sensor);
 /*---------------------------------------------------------------------------*/
 /** @} */

From 5a39df143962f010f07609cfdccae42b4b7973d6 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Sat, 28 May 2016 19:40:52 +0100
Subject: [PATCH 266/393] Demonstrate ALS support in the CC26xx demo

---
 examples/cc26xx/cc26xx-demo.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/examples/cc26xx/cc26xx-demo.c b/examples/cc26xx/cc26xx-demo.c
index 53c607837..50d2190d3 100644
--- a/examples/cc26xx/cc26xx-demo.c
+++ b/examples/cc26xx/cc26xx-demo.c
@@ -337,6 +337,15 @@ get_sync_sensor_readings(void)
   value = batmon_sensor.value(BATMON_SENSOR_TYPE_VOLT);
   printf("Bat: Volt=%d mV\n", (value * 125) >> 5);
 
+#if BOARD_SMARTRF06EB
+  SENSORS_ACTIVATE(als_sensor);
+
+  value = als_sensor.value(0);
+  printf("ALS: %d raw\n", value);
+
+  SENSORS_DEACTIVATE(als_sensor);
+#endif
+
   return;
 }
 /*---------------------------------------------------------------------------*/

From 334e38339eba2607c6560c09cb914d01cd0e7986 Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Thu, 3 Mar 2016 20:42:27 +0100
Subject: [PATCH 267/393] Fixed rssi-scanner example

---
 examples/rssi-scanner/rssi-scanner-cc2420.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/rssi-scanner/rssi-scanner-cc2420.c b/examples/rssi-scanner/rssi-scanner-cc2420.c
index fbbfddf00..94c9056b9 100644
--- a/examples/rssi-scanner/rssi-scanner-cc2420.c
+++ b/examples/rssi-scanner/rssi-scanner-cc2420.c
@@ -77,7 +77,7 @@ do_rssi(void)
   printf("RSSI:");
   for(channel = 0; channel <= 85; ++channel) {
     set_frq(channel);
-    printf("%d ", cc2420_rssi() + 55);
+    printf("%d ", cc2420_rssi() + 100);
   }
   printf("\n");
 }

From d70c75914aed2499d95eba9ba8cb0f7f0a09d4b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Sat, 28 May 2016 22:47:58 +0200
Subject: [PATCH 268/393] cfs-coffee: Fix build warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix this build warning, which is generated if micro logs are enabled:

In file included from ../../core/cfs/cfs-coffee.c:59:0:
../../core/cfs/cfs-coffee.c: In function 'read_log_page':
../../cpu/cc2538/./cfs-coffee-arch.h:145:24: warning: passing argument 1 of 'cfs_coffee_arch_read' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   cfs_coffee_arch_read((buf), (size), (offset))
                        ^
../../core/cfs/cfs-coffee.c:757:3: note: in expansion of macro 'COFFEE_READ'
   COFFEE_READ(lp->buf, lp->size, base);
   ^
../../cpu/cc2538/./cfs-coffee-arch.h:176:6: note: expected 'void *' but argument is of type 'const char *'
 void cfs_coffee_arch_read(void *buf, unsigned int size, cfs_offset_t offset);
      ^

COFFEE_READ() needs to write to lp->buf, so the target type of this
pointer cannot be qualified as "const".

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 core/cfs/cfs-coffee.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/cfs/cfs-coffee.c b/core/cfs/cfs-coffee.c
index 37b1a707e..374b3419f 100644
--- a/core/cfs/cfs-coffee.c
+++ b/core/cfs/cfs-coffee.c
@@ -196,7 +196,7 @@ struct file_header {
 /* This is needed because of a buggy compiler. */
 struct log_param {
   cfs_offset_t offset;
-  const char *buf;
+  char *buf;
   uint16_t size;
 };
 
@@ -1198,7 +1198,7 @@ cfs_write(int fd, const void *buf, unsigned size)
     need_dummy_write = 0;
     for(bytes_left = size; bytes_left > 0;) {
       lp.offset = fdp->offset;
-      lp.buf = buf;
+      lp.buf = (void *)buf;
       lp.size = bytes_left;
       i = write_log_page(file, &lp);
       if(i < 0) {

From 4ed5c50a4e81006ebcbba930a1ef4585bd034e63 Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Fri, 29 Jan 2016 20:56:34 +0100
Subject: [PATCH 269/393] Make CFS and Coffee examples platform-independent

Move the CFS and Coffee examples from sky to a common cfs-coffee folder
in order to have unified examples for multiple platforms.
---
 examples/cfs-coffee/Makefile                  | 11 +++
 examples/cfs-coffee/README.md                 | 26 +++++++
 examples/{sky => cfs-coffee}/example-coffee.c |  2 +-
 examples/{sky => cfs-coffee}/test-cfs.c       |  0
 examples/{sky => cfs-coffee}/test-coffee.c    | 74 +++++++++----------
 examples/sky/Makefile                         |  2 +-
 regression-tests/01-compile-base/Makefile     |  7 +-
 regression-tests/03-base/02-sky-coffee.csc    |  4 +-
 8 files changed, 83 insertions(+), 43 deletions(-)
 create mode 100644 examples/cfs-coffee/Makefile
 create mode 100644 examples/cfs-coffee/README.md
 rename examples/{sky => cfs-coffee}/example-coffee.c (99%)
 rename examples/{sky => cfs-coffee}/test-cfs.c (100%)
 rename examples/{sky => cfs-coffee}/test-coffee.c (91%)

diff --git a/examples/cfs-coffee/Makefile b/examples/cfs-coffee/Makefile
new file mode 100644
index 000000000..543cb8c3d
--- /dev/null
+++ b/examples/cfs-coffee/Makefile
@@ -0,0 +1,11 @@
+CONTIKI = ../..
+
+all: test-cfs test-coffee example-coffee
+
+CONTIKI_WITH_RIME = 1
+
+ifeq ($(TARGET),avr-raven)
+  COFFEE_FILES = 4
+endif
+
+include $(CONTIKI)/Makefile.include
diff --git a/examples/cfs-coffee/README.md b/examples/cfs-coffee/README.md
new file mode 100644
index 000000000..672376ef8
--- /dev/null
+++ b/examples/cfs-coffee/README.md
@@ -0,0 +1,26 @@
+Contiki File System (CFS) and Coffee Examples
+=============================================
+
+Coffee is a very simple, relatively small and easy to use file system that you
+are most likely going to be very familiar with if you have done any C file
+access in the past. The notion is the same as on a normal PC: you open a file,
+read and write to it and close it. Contiki will take care of the underlying
+flash memory, giving you more time to focus on the real issues.
+
+Coffee is a full implementation of the CFS API.
+
+An extended explanation on CFS and Coffee internals and how they work can be
+found at the [CFS](https://github.com/contiki-os/contiki/wiki/File-systems) and
+[Coffee](https://github.com/contiki-os/contiki/wiki/Coffee-filesystem-example)
+wiki pages.
+
+Supported Hardware (tested or known to work)
+--------------------------------------------
+* sky
+* z1
+* wismote
+* avr-raven
+
+The examples are known to build for the 'avr-raven' platform. However,
+some of them currently fail at runtime due to file system overflow.
+Tweaking the file sizes in the examples is necessary.
diff --git a/examples/sky/example-coffee.c b/examples/cfs-coffee/example-coffee.c
similarity index 99%
rename from examples/sky/example-coffee.c
rename to examples/cfs-coffee/example-coffee.c
index ee77849e4..998afa4de 100644
--- a/examples/sky/example-coffee.c
+++ b/examples/cfs-coffee/example-coffee.c
@@ -37,7 +37,7 @@
  */
 
 #include <stdio.h>
-
+#include <string.h>
 #include "contiki.h"
 #include "cfs/cfs.h"
 #include "cfs/cfs-coffee.h"
diff --git a/examples/sky/test-cfs.c b/examples/cfs-coffee/test-cfs.c
similarity index 100%
rename from examples/sky/test-cfs.c
rename to examples/cfs-coffee/test-cfs.c
diff --git a/examples/sky/test-coffee.c b/examples/cfs-coffee/test-coffee.c
similarity index 91%
rename from examples/sky/test-coffee.c
rename to examples/cfs-coffee/test-coffee.c
index b4152b2a8..4ec06f3cd 100644
--- a/examples/sky/test-coffee.c
+++ b/examples/cfs-coffee/test-coffee.c
@@ -49,7 +49,7 @@
 PROCESS(testcoffee_process, "Test CFS/Coffee process");
 AUTOSTART_PROCESSES(&testcoffee_process);
 
-#define FAIL(x) 	error = (x); goto end;
+#define TEST_FAIL(x) 	error = (x); goto end;
 
 #define FILE_SIZE	4096
 
@@ -73,64 +73,64 @@ coffee_test_basic(void)
   /* Test 1: Open for writing. */
   wfd = cfs_open("T1", CFS_WRITE);
   if(wfd < 0) {
-    FAIL(1);
+    TEST_FAIL(1);
   }
 
   /* Test 2 and 3: Write buffer. */
   r = cfs_write(wfd, buf, sizeof(buf));
   if(r < 0) {
-    FAIL(2);
+    TEST_FAIL(2);
   } else if(r < sizeof(buf)) {
-    FAIL(3);
+    TEST_FAIL(3);
   }
 
   /* Test 4: Deny reading. */
   r = cfs_read(wfd, buf, sizeof(buf));
   if(r >= 0) {
-    FAIL(4);
+    TEST_FAIL(4);
   }
 
   /* Test 5: Open for reading. */
   rfd = cfs_open("T1", CFS_READ);
   if(rfd < 0) {
-    FAIL(5);
+    TEST_FAIL(5);
   }
 
   /* Test 6: Write to read-only file. */
   r = cfs_write(rfd, buf, sizeof(buf));
   if(r >= 0) {
-    FAIL(6);
+    TEST_FAIL(6);
   }
 
   /* Test 7 and 8: Read the buffer written in Test 2. */
   memset(buf, 0, sizeof(buf));
   r = cfs_read(rfd, buf, sizeof(buf));
   if(r < 0) {
-    FAIL(7);
+    TEST_FAIL(7);
   } else if(r < sizeof(buf)) {
     printf("r=%d\n", r);
-    FAIL(8);
+    TEST_FAIL(8);
   }
 
   /* Test 9: Verify that the buffer is correct. */
   for(r = 0; r < sizeof(buf); r++) {
     if(buf[r] != r) {
       printf("r=%d. buf[r]=%d\n", r, buf[r]);
-      FAIL(9);
+      TEST_FAIL(9);
     }
   }
 
   /* Test 10: Seek to beginning. */
   if(cfs_seek(wfd, 0, CFS_SEEK_SET) != 0) {
-    FAIL(10);
+    TEST_FAIL(10);
   }
 
   /* Test 11 and 12: Write to the log. */
   r = cfs_write(wfd, buf, sizeof(buf));
   if(r < 0) {
-    FAIL(11);
+    TEST_FAIL(11);
   } else if(r < sizeof(buf)) {
-    FAIL(12);
+    TEST_FAIL(12);
   }
 
   /* Test 13 and 14: Read the data from the log. */
@@ -138,15 +138,15 @@ coffee_test_basic(void)
   memset(buf, 0, sizeof(buf));
   r = cfs_read(rfd, buf, sizeof(buf));
   if(r < 0) {
-    FAIL(14);
+    TEST_FAIL(14);
   } else if(r < sizeof(buf)) {
-    FAIL(15);
+    TEST_FAIL(15);
   }
 
   /* Test 16: Verify that the data is correct. */
   for(r = 0; r < sizeof(buf); r++) {
     if(buf[r] != r) {
-      FAIL(16);
+      TEST_FAIL(16);
     }
   }
 
@@ -155,16 +155,16 @@ coffee_test_basic(void)
     buf[r] = sizeof(buf) - r - 1;
   }
   if(cfs_seek(wfd, 0, CFS_SEEK_SET) != 0) {
-    FAIL(17);
+    TEST_FAIL(17);
   }
   r = cfs_write(wfd, buf, sizeof(buf));
   if(r < 0) {
-    FAIL(18);
+    TEST_FAIL(18);
   } else if(r < sizeof(buf)) {
-    FAIL(19);
+    TEST_FAIL(19);
   }
   if(cfs_seek(rfd, 0, CFS_SEEK_SET) != 0) {
-    FAIL(20);
+    TEST_FAIL(20);
   }
 
   /* Test 21 and 22: Read the reversed buffer. */
@@ -172,16 +172,16 @@ coffee_test_basic(void)
   memset(buf, 0, sizeof(buf));
   r = cfs_read(rfd, buf, sizeof(buf));
   if(r < 0) {
-    FAIL(21);
+    TEST_FAIL(21);
   } else if(r < sizeof(buf)) {
     printf("r = %d\n", r);
-    FAIL(22);
+    TEST_FAIL(22);
   }
 
   /* Test 23: Verify that the data is correct. */
   for(r = 0; r < sizeof(buf); r++) {
     if(buf[r] != sizeof(buf) - r - 1) {
-      FAIL(23);
+      TEST_FAIL(23);
     }
   }
 
@@ -208,14 +208,14 @@ coffee_test_append(void)
   for(i = 0; i < APPEND_BYTES; i += BULK_SIZE) {
     afd = cfs_open("T3", CFS_WRITE | CFS_APPEND);
     if(afd < 0) {
-      FAIL(1);
+      TEST_FAIL(1);
     }
     for(j = 0; j < BULK_SIZE; j++) {
       buf[j] = 1 + ((i + j) & 0x7f);
     }
     if((r = cfs_write(afd, buf, BULK_SIZE)) != BULK_SIZE) {
       printf("r=%d\n", r);
-      FAIL(2);
+      TEST_FAIL(2);
     }
     cfs_close(afd);
   }
@@ -224,22 +224,22 @@ coffee_test_append(void)
      is correct. */
   afd = cfs_open("T3", CFS_READ);
   if(afd < 0) {
-    FAIL(3);
+    TEST_FAIL(3);
   }
   total_read = 0;
   while((r = cfs_read(afd, buf2, sizeof(buf2))) > 0) {
     for(j = 0; j < r; j++) {
       if(buf2[j] != 1 + ((total_read + j) & 0x7f)) {
-	FAIL(4);
+	TEST_FAIL(4);
       }
     }
     total_read += r;
   }
   if(r < 0) {
-    FAIL(5);
+    TEST_FAIL(5);
   }
   if(total_read != APPEND_BYTES) {
-    FAIL(6);
+    TEST_FAIL(6);
   }
   cfs_close(afd);
 
@@ -262,18 +262,18 @@ coffee_test_modify(void)
   wfd = -1;
 
   if(cfs_coffee_reserve("T3", FILE_SIZE) < 0) {
-    FAIL(1);
+    TEST_FAIL(1);
   }
 
   if(cfs_coffee_configure_log("T3", FILE_SIZE / 2, 11) < 0) {
-    FAIL(2);
+    TEST_FAIL(2);
   }
 
   /* Test 16: Test multiple writes at random offset. */
   for(r = 0; r < 100; r++) {
     wfd = cfs_open("T2", CFS_WRITE | CFS_READ);
     if(wfd < 0) {
-      FAIL(3);
+      TEST_FAIL(3);
     }
 
     offset = random_rand() % FILE_SIZE;
@@ -283,26 +283,26 @@ coffee_test_modify(void)
     }
 
     if(cfs_seek(wfd, offset, CFS_SEEK_SET) != offset) {
-      FAIL(4);
+      TEST_FAIL(4);
     }
 
     if(cfs_write(wfd, buf, sizeof(buf)) != sizeof(buf)) {
-      FAIL(5);
+      TEST_FAIL(5);
     }
 
     if(cfs_seek(wfd, offset, CFS_SEEK_SET) != offset) {
-      FAIL(6);
+      TEST_FAIL(6);
     }
 
     memset(buf, 0, sizeof(buf));
     if(cfs_read(wfd, buf, sizeof(buf)) != sizeof(buf)) {
-      FAIL(7);
+      TEST_FAIL(7);
     }
 
     for(i = 0; i < sizeof(buf); i++) {
       if(buf[i] != i) {
         printf("buf[%d] != %d\n", i, buf[i]);
-        FAIL(8);
+        TEST_FAIL(8);
       }
     }
   }
diff --git a/examples/sky/Makefile b/examples/sky/Makefile
index dd09f0792..6d17fd421 100644
--- a/examples/sky/Makefile
+++ b/examples/sky/Makefile
@@ -3,7 +3,7 @@ ifndef TARGET
 TARGET=sky
 endif
 
-all: blink sky-collect #rt-leds test-button test-cfs tcprudolph0
+all: blink sky-collect #rt-leds test-button tcprudolph0
 
 %.tgz: %.ihex
 	mkdir $(basename $<) ; \
diff --git a/regression-tests/01-compile-base/Makefile b/regression-tests/01-compile-base/Makefile
index bbfbd0c6b..bc38a9777 100644
--- a/regression-tests/01-compile-base/Makefile
+++ b/regression-tests/01-compile-base/Makefile
@@ -37,8 +37,11 @@ settings-example/avr-raven \
 ipv6/multicast/sky \
 ipv6/rpl-tsch/z1 \
 ipv6/rpl-tsch/z1:MAKE_WITH_ORCHESTRA=1 \
-ipv6/rpl-tsch/z1:MAKE_WITH_SECURITY=1
-
+ipv6/rpl-tsch/z1:MAKE_WITH_SECURITY=1 \
+cfs-coffee/sky \
+cfs-coffee/z1 \
+cfs-coffee/wismote \
+cfs-coffee/avr-raven
 
 TOOLS=
 
diff --git a/regression-tests/03-base/02-sky-coffee.csc b/regression-tests/03-base/02-sky-coffee.csc
index f017a3e7d..035f72843 100644
--- a/regression-tests/03-base/02-sky-coffee.csc
+++ b/regression-tests/03-base/02-sky-coffee.csc
@@ -24,10 +24,10 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/sky/test-coffee.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/cfs-coffee/test-coffee.c</source>
       <commands EXPORT="discard">make clean TARGET=sky
 make test-coffee.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/sky/test-coffee.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/cfs-coffee/test-coffee.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>

From e23c1756990cba162f6db9f8e2ab685d541fa22e Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Fri, 29 Jan 2016 20:56:34 +0100
Subject: [PATCH 270/393] cfs-coffee: examples: Fix coding style

---
 examples/cfs-coffee/example-coffee.c | 28 ++++++++++++++--------------
 examples/cfs-coffee/test-cfs.c       |  7 +++----
 examples/cfs-coffee/test-coffee.c    | 14 ++++++--------
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/examples/cfs-coffee/example-coffee.c b/examples/cfs-coffee/example-coffee.c
index 998afa4de..7adc8d62c 100644
--- a/examples/cfs-coffee/example-coffee.c
+++ b/examples/cfs-coffee/example-coffee.c
@@ -28,31 +28,31 @@
  *
  * This file is part of the Contiki operating system.
  */
-
+/*---------------------------------------------------------------------------*/
 /**
  * \file
  *         Example on how to use CFS/Coffee.
  * \author
  *         Nicolas Tsiftes <nvt@sics.se>
  */
-
+/*---------------------------------------------------------------------------*/
 #include <stdio.h>
 #include <string.h>
 #include "contiki.h"
 #include "cfs/cfs.h"
 #include "cfs/cfs-coffee.h"
-
+/*---------------------------------------------------------------------------*/
 PROCESS(example_coffee_process, "Coffee example");
 AUTOSTART_PROCESSES(&example_coffee_process);
-
+/*---------------------------------------------------------------------------*/
 #define FILENAME "test"
 
-/* Formatting is needed if the storage device is in an unknown state; 
+/* Formatting is needed if the storage device is in an unknown state;
    e.g., when using Coffee on the storage device for the first time. */
 #ifndef NEED_FORMATTING
 #define NEED_FORMATTING 0
 #endif
-
+/*---------------------------------------------------------------------------*/
 static int
 file_test(const char *filename, char *msg)
 {
@@ -65,12 +65,12 @@ file_test(const char *filename, char *msg)
   } record;
 
   /*
-   * Coffee determines the file length by finding the last non-zero byte 
-   * of the file. This I/O semantic requires that each record should end 
-   * with a non-zero, if we are writing multiple records and closing the 
+   * Coffee determines the file length by finding the last non-zero byte
+   * of the file. This I/O semantic requires that each record should end
+   * with a non-zero, if we are writing multiple records and closing the
    * file descriptor in between.
    *
-   * In this example, in which the file_test function can be called 
+   * In this example, in which the file_test function can be called
    * multiple times, we ensure that the sequence counter starts at 1.
    */
 
@@ -84,7 +84,7 @@ file_test(const char *filename, char *msg)
   record.message[sizeof(record.message) - 1] = '\0';
   record.sequence = sequence;
 
-  /* Obtain a file descriptor for the file, capable of handling both 
+  /* Obtain a file descriptor for the file, capable of handling both
      reads and writes. */
   fd = cfs_open(FILENAME, CFS_WRITE | CFS_APPEND | CFS_READ);
   if(fd < 0) {
@@ -103,7 +103,7 @@ file_test(const char *filename, char *msg)
   printf("Wrote message \"%s\", sequence %u\n",
          record.message, record.sequence);
 
-  /* To read back the message, we need to move the file pointer to the 
+  /* To read back the message, we need to move the file pointer to the
      beginning of the file. */
   if(cfs_seek(fd, 0, CFS_SEEK_SET) != 0) {
     printf("seek failed\n");
@@ -133,7 +133,7 @@ file_test(const char *filename, char *msg)
 
   return 1;
 }
-
+/*---------------------------------------------------------------------------*/
 static int
 dir_test(void)
 {
@@ -156,7 +156,7 @@ dir_test(void)
 
   return 1;
 }
-
+/*---------------------------------------------------------------------------*/
 PROCESS_THREAD(example_coffee_process, ev, data)
 {
   PROCESS_BEGIN();
diff --git a/examples/cfs-coffee/test-cfs.c b/examples/cfs-coffee/test-cfs.c
index 68c91e720..b5068aaa2 100644
--- a/examples/cfs-coffee/test-cfs.c
+++ b/examples/cfs-coffee/test-cfs.c
@@ -29,19 +29,18 @@
  * This file is part of the Contiki operating system.
  *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
  * \file
  *         A quick program for testing the CFS xmem driver
  * \author
  *         Adam Dunkels <adam@sics.se>
  */
-
+/*---------------------------------------------------------------------------*/
 #include "contiki.h"
 #include "cfs/cfs.h"
-
 #include <stdio.h>
-
+/*---------------------------------------------------------------------------*/
 PROCESS(cfs_process, "Test CFS process");
 AUTOSTART_PROCESSES(&cfs_process);
 /*---------------------------------------------------------------------------*/
diff --git a/examples/cfs-coffee/test-coffee.c b/examples/cfs-coffee/test-coffee.c
index 4ec06f3cd..c274e5b81 100644
--- a/examples/cfs-coffee/test-coffee.c
+++ b/examples/cfs-coffee/test-coffee.c
@@ -29,14 +29,14 @@
  * This file is part of the Contiki operating system.
  *
  */
-
+/*---------------------------------------------------------------------------*/
 /**
  * \file
  *         Basic test for CFS/Coffee.
  * \author
  *         Nicolas Tsiftes <nvt@sics.se>
  */
-
+/*---------------------------------------------------------------------------*/
 #include "contiki.h"
 #include "cfs/cfs.h"
 #include "cfs/cfs-coffee.h"
@@ -45,14 +45,12 @@
 
 #include <stdio.h>
 #include <string.h>
-
+/*---------------------------------------------------------------------------*/
 PROCESS(testcoffee_process, "Test CFS/Coffee process");
 AUTOSTART_PROCESSES(&testcoffee_process);
-
+/*---------------------------------------------------------------------------*/
 #define TEST_FAIL(x) 	error = (x); goto end;
-
 #define FILE_SIZE	4096
-
 /*---------------------------------------------------------------------------*/
 static int
 coffee_test_basic(void)
@@ -220,7 +218,7 @@ coffee_test_append(void)
     cfs_close(afd);
   }
 
-  /* Test 3-6: Read back the data written previously and verify that it 
+  /* Test 3-6: Read back the data written previously and verify that it
      is correct. */
   afd = cfs_open("T3", CFS_READ);
   if(afd < 0) {
@@ -376,7 +374,7 @@ PROCESS_THREAD(testcoffee_process, ev, data)
   result = coffee_test_gc();
   print_result("Garbage collection", result);
 
-  printf("Coffee test finished. Duration: %d seconds\n", 
+  printf("Coffee test finished. Duration: %d seconds\n",
          (int)(clock_seconds() - start));
 
   PROCESS_END();

From 5d227b92a3619aa6330fb3a45dc2ec5e2b4ac9e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Sun, 29 May 2016 21:43:11 +0200
Subject: [PATCH 271/393] test-cfs: Fix possible test failure after reboot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove the file at the beginning of the test, before opening it for
writing, in order to start the test with an empty file system, not only
after flashing the test, but also following every reboot.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 examples/cfs-coffee/test-cfs.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/cfs-coffee/test-cfs.c b/examples/cfs-coffee/test-cfs.c
index b5068aaa2..2d44b6696 100644
--- a/examples/cfs-coffee/test-cfs.c
+++ b/examples/cfs-coffee/test-cfs.c
@@ -54,6 +54,7 @@ PROCESS_THREAD(cfs_process, ev, data)
     uint16_t filesize = 65000;
 #define CHUNKSIZE 128
 
+    cfs_remove("hej");
     fd = cfs_open("hej", CFS_WRITE);
     if(fd < 0) {
       printf("could not open file for writing, aborting\n");

From 76429e4f0e8858e094f5e6a2423833974ffc9a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Sun, 29 May 2016 22:01:40 +0200
Subject: [PATCH 272/393] test-coffee: Fix numbering of test failure cases
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 examples/cfs-coffee/test-coffee.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/cfs-coffee/test-coffee.c b/examples/cfs-coffee/test-coffee.c
index c274e5b81..c2a34d2c3 100644
--- a/examples/cfs-coffee/test-coffee.c
+++ b/examples/cfs-coffee/test-coffee.c
@@ -136,15 +136,15 @@ coffee_test_basic(void)
   memset(buf, 0, sizeof(buf));
   r = cfs_read(rfd, buf, sizeof(buf));
   if(r < 0) {
-    TEST_FAIL(14);
+    TEST_FAIL(13);
   } else if(r < sizeof(buf)) {
-    TEST_FAIL(15);
+    TEST_FAIL(14);
   }
 
   /* Test 16: Verify that the data is correct. */
   for(r = 0; r < sizeof(buf); r++) {
     if(buf[r] != r) {
-      TEST_FAIL(16);
+      TEST_FAIL(15);
     }
   }
 
@@ -153,16 +153,16 @@ coffee_test_basic(void)
     buf[r] = sizeof(buf) - r - 1;
   }
   if(cfs_seek(wfd, 0, CFS_SEEK_SET) != 0) {
-    TEST_FAIL(17);
+    TEST_FAIL(16);
   }
   r = cfs_write(wfd, buf, sizeof(buf));
   if(r < 0) {
-    TEST_FAIL(18);
+    TEST_FAIL(17);
   } else if(r < sizeof(buf)) {
-    TEST_FAIL(19);
+    TEST_FAIL(18);
   }
   if(cfs_seek(rfd, 0, CFS_SEEK_SET) != 0) {
-    TEST_FAIL(20);
+    TEST_FAIL(19);
   }
 
   /* Test 21 and 22: Read the reversed buffer. */
@@ -170,16 +170,16 @@ coffee_test_basic(void)
   memset(buf, 0, sizeof(buf));
   r = cfs_read(rfd, buf, sizeof(buf));
   if(r < 0) {
-    TEST_FAIL(21);
+    TEST_FAIL(20);
   } else if(r < sizeof(buf)) {
     printf("r = %d\n", r);
-    TEST_FAIL(22);
+    TEST_FAIL(21);
   }
 
   /* Test 23: Verify that the data is correct. */
   for(r = 0; r < sizeof(buf); r++) {
     if(buf[r] != sizeof(buf) - r - 1) {
-      TEST_FAIL(23);
+      TEST_FAIL(22);
     }
   }
 

From 150b9fbd8b5c0061f86604c86d4938f6d0ef2517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Sun, 29 May 2016 22:09:20 +0200
Subject: [PATCH 273/393] test-coffee: Fix test filenames
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The filenames were mixed up between some of the tests, thus breaking the
purpose of these tests.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 examples/cfs-coffee/test-coffee.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/cfs-coffee/test-coffee.c b/examples/cfs-coffee/test-coffee.c
index c2a34d2c3..9f134ae44 100644
--- a/examples/cfs-coffee/test-coffee.c
+++ b/examples/cfs-coffee/test-coffee.c
@@ -204,7 +204,7 @@ coffee_test_append(void)
 
   /* Test 1 and 2: Append data to the same file many times. */
   for(i = 0; i < APPEND_BYTES; i += BULK_SIZE) {
-    afd = cfs_open("T3", CFS_WRITE | CFS_APPEND);
+    afd = cfs_open("T2", CFS_WRITE | CFS_APPEND);
     if(afd < 0) {
       TEST_FAIL(1);
     }
@@ -220,7 +220,7 @@ coffee_test_append(void)
 
   /* Test 3-6: Read back the data written previously and verify that it
      is correct. */
-  afd = cfs_open("T3", CFS_READ);
+  afd = cfs_open("T2", CFS_READ);
   if(afd < 0) {
     TEST_FAIL(3);
   }
@@ -269,7 +269,7 @@ coffee_test_modify(void)
 
   /* Test 16: Test multiple writes at random offset. */
   for(r = 0; r < 100; r++) {
-    wfd = cfs_open("T2", CFS_WRITE | CFS_READ);
+    wfd = cfs_open("T3", CFS_WRITE | CFS_READ);
     if(wfd < 0) {
       TEST_FAIL(3);
     }

From 003b4b0d6345f94fdc5b3f13e0f061252b67e01d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Sun, 29 May 2016 22:23:15 +0200
Subject: [PATCH 274/393] test-coffee: Fix the file modification test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The r variable was used instead of i to fill the buffer, resulting in
the end of the test loop after only a single iteration. The file was not
even closed at the end of each iteration although it is opened at the
beginning of each iteration, so the available file descriptors would
very quickly be exhausted.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 examples/cfs-coffee/test-coffee.c          | 6 ++++--
 regression-tests/03-base/02-sky-coffee.csc | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/examples/cfs-coffee/test-coffee.c b/examples/cfs-coffee/test-coffee.c
index 9f134ae44..28cd3b5c6 100644
--- a/examples/cfs-coffee/test-coffee.c
+++ b/examples/cfs-coffee/test-coffee.c
@@ -276,8 +276,8 @@ coffee_test_modify(void)
 
     offset = random_rand() % FILE_SIZE;
 
-    for(r = 0; r < sizeof(buf); r++) {
-      buf[r] = r;
+    for(i = 0; i < sizeof(buf); i++) {
+      buf[i] = i;
     }
 
     if(cfs_seek(wfd, offset, CFS_SEEK_SET) != offset) {
@@ -303,6 +303,8 @@ coffee_test_modify(void)
         TEST_FAIL(8);
       }
     }
+
+    cfs_close(wfd);
   }
 
   error = 0;
diff --git a/regression-tests/03-base/02-sky-coffee.csc b/regression-tests/03-base/02-sky-coffee.csc
index 035f72843..050b4abc9 100644
--- a/regression-tests/03-base/02-sky-coffee.csc
+++ b/regression-tests/03-base/02-sky-coffee.csc
@@ -89,7 +89,7 @@ make test-coffee.sky TARGET=sky</commands>
   <plugin>
     org.contikios.cooja.plugins.ScriptRunner
     <plugin_config>
-      <script>TIMEOUT(80000);
+      <script>TIMEOUT(180000);
 
 fileOK = null;
 gcOK = null;

From 6df2b91a31c79e9c7661d3676933a1c3349eebbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Sun, 29 May 2016 22:48:30 +0200
Subject: [PATCH 275/393] test-coffee: Fix the garbage collection test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This test could sometimes fail because of a lack of free contiguous
pages in the file system. Fix this by removing the created files at the
end of each test. Besides, the test files do not have to be removed at
the beginning of each test since the file system is initially formatted.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 examples/cfs-coffee/test-coffee.c | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/examples/cfs-coffee/test-coffee.c b/examples/cfs-coffee/test-coffee.c
index 28cd3b5c6..3fcc40cfd 100644
--- a/examples/cfs-coffee/test-coffee.c
+++ b/examples/cfs-coffee/test-coffee.c
@@ -60,8 +60,6 @@ coffee_test_basic(void)
   unsigned char buf[256];
   int r;
 
-  cfs_remove("T1");
-
   wfd = rfd = afd = -1;
 
   for(r = 0; r < sizeof(buf); r++) {
@@ -187,6 +185,7 @@ coffee_test_basic(void)
 end:
   cfs_close(wfd);
   cfs_close(rfd);
+  cfs_remove("T1");
   return error;
 }
 /*---------------------------------------------------------------------------*/
@@ -200,8 +199,6 @@ coffee_test_append(void)
 #define APPEND_BYTES 1000
 #define BULK_SIZE 10
 
-  cfs_remove("T2");
-
   /* Test 1 and 2: Append data to the same file many times. */
   for(i = 0; i < APPEND_BYTES; i += BULK_SIZE) {
     afd = cfs_open("T2", CFS_WRITE | CFS_APPEND);
@@ -244,6 +241,7 @@ coffee_test_append(void)
   error = 0;
 end:
   cfs_close(afd);
+  cfs_remove("T2");
   return error;
 }
 /*---------------------------------------------------------------------------*/
@@ -256,7 +254,6 @@ coffee_test_modify(void)
   int r, i;
   unsigned offset;
 
-  cfs_remove("T3");
   wfd = -1;
 
   if(cfs_coffee_reserve("T3", FILE_SIZE) < 0) {
@@ -310,6 +307,7 @@ coffee_test_modify(void)
   error = 0;
 end:
   cfs_close(wfd);
+  cfs_remove("T3");
   return error;
 }
 /*---------------------------------------------------------------------------*/
@@ -318,21 +316,17 @@ coffee_test_gc(void)
 {
   int i;
 
-  cfs_remove("alpha");
-  cfs_remove("beta");
-
-
   for (i = 0; i < 100; i++) {
     if (i & 1) {
-      if(cfs_coffee_reserve("alpha", random_rand() & 0xffff) < 0) {
-	return i;
-      }
-      cfs_remove("beta");
-    } else {
-      if(cfs_coffee_reserve("beta", 93171) < 0) {
+      if(cfs_coffee_reserve("beta", random_rand() & 0xffff) < 0) {
 	return i;
       }
       cfs_remove("alpha");
+    } else {
+      if(cfs_coffee_reserve("alpha", 93171) < 0) {
+	return i;
+      }
+      cfs_remove("beta");
     }
   }
 

From bd961d1cd32922aadfaa09758bd8a65959c131d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Sun, 29 May 2016 23:05:17 +0200
Subject: [PATCH 276/393] cc2538: Fix possible linker script breakage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The conditional definitions in project-conf.h depending on
CONTIKI_TARGET_<TARGET_NAME> were ignored at link time, which broke the
linker script if it used these definitions, so the flashed applications
could crash or malfunction.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 cpu/cc2538/Makefile.cc2538 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cpu/cc2538/Makefile.cc2538 b/cpu/cc2538/Makefile.cc2538
index a11dc2b87..f28a77d11 100644
--- a/cpu/cc2538/Makefile.cc2538
+++ b/cpu/cc2538/Makefile.cc2538
@@ -115,8 +115,7 @@ CUSTOM_RULE_LINK=1
 	cp $< $@
 
 ### This rule is used to generate the correct linker script
-LDGENFLAGS += $(addprefix -D,$(subst $(COMMA), ,$(DEFINES)))
-LDGENFLAGS += $(addprefix -I,$(SOURCEDIRS))
+LDGENFLAGS += $(CFLAGS)
 LDGENFLAGS += -imacros "contiki-conf.h" -imacros "dev/cc2538-dev.h"
 LDGENFLAGS += -imacros "dev/flash.h" -imacros "cfs-coffee-arch.h"
 LDGENFLAGS += -x c -P -E

From 09a7566e0175acfefa8c7fd483dcf2613d2c8f14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Sun, 29 May 2016 23:36:01 +0200
Subject: [PATCH 277/393] cc2538: coffee: Add default micro-log configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 cpu/cc2538/cfs-coffee-arch.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cpu/cc2538/cfs-coffee-arch.h b/cpu/cc2538/cfs-coffee-arch.h
index 9d53994e5..a0bf3dd75 100644
--- a/cpu/cc2538/cfs-coffee-arch.h
+++ b/cpu/cc2538/cfs-coffee-arch.h
@@ -102,6 +102,8 @@
 /** Maximal amount of log table entries read in one batch */
 #ifdef COFFEE_CONF_LOG_TABLE_LIMIT
 #define COFFEE_LOG_TABLE_LIMIT COFFEE_CONF_LOG_TABLE_LIMIT
+#else
+#define COFFEE_LOG_TABLE_LIMIT 16
 #endif
 /** Default reserved file size */
 #ifdef COFFEE_CONF_DYN_SIZE
@@ -112,6 +114,8 @@
 /** Default micro-log size */
 #ifdef COFFEE_CONF_LOG_SIZE
 #define COFFEE_LOG_SIZE        COFFEE_CONF_LOG_SIZE
+#else
+#define COFFEE_LOG_SIZE        (4 * COFFEE_PAGE_SIZE)
 #endif
 /** Whether Coffee will use micro logs */
 #ifdef COFFEE_CONF_MICRO_LOGS

From 0079b78966d55ca329415a072e7dbb45e15a3a48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Sun, 29 May 2016 23:20:23 +0200
Subject: [PATCH 278/393] zoul: Make it possible to override COFFEE_CONF_SIZE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The projects need to be able to override it with project-conf.h.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 platform/zoul/contiki-conf.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform/zoul/contiki-conf.h b/platform/zoul/contiki-conf.h
index 52cd22dfd..2c2bcb854 100644
--- a/platform/zoul/contiki-conf.h
+++ b/platform/zoul/contiki-conf.h
@@ -101,7 +101,9 @@ typedef uint32_t rtimer_clock_t;
  *
  * @{
  */
+#ifndef COFFEE_CONF_SIZE
 #define COFFEE_CONF_SIZE            (4 * COFFEE_SECTOR_SIZE)
+#endif
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**

From 5b3432547e35597f12ca8cb351aa17484e62ad6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Sun, 29 May 2016 23:37:34 +0200
Subject: [PATCH 279/393] cfs-coffee: examples: Add support for CC2538
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 examples/cfs-coffee/Makefile                  |  1 +
 examples/cfs-coffee/README.md                 |  3 ++
 examples/cfs-coffee/project-conf.h            | 40 +++++++++++++++++++
 .../18-compile-arm-ports/Makefile             |  3 ++
 4 files changed, 47 insertions(+)
 create mode 100644 examples/cfs-coffee/project-conf.h

diff --git a/examples/cfs-coffee/Makefile b/examples/cfs-coffee/Makefile
index 543cb8c3d..0e1fe1b13 100644
--- a/examples/cfs-coffee/Makefile
+++ b/examples/cfs-coffee/Makefile
@@ -1,3 +1,4 @@
+DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
 CONTIKI = ../..
 
 all: test-cfs test-coffee example-coffee
diff --git a/examples/cfs-coffee/README.md b/examples/cfs-coffee/README.md
index 672376ef8..991e9583b 100644
--- a/examples/cfs-coffee/README.md
+++ b/examples/cfs-coffee/README.md
@@ -20,6 +20,9 @@ Supported Hardware (tested or known to work)
 * z1
 * wismote
 * avr-raven
+* cc2538dk
+* openmote-cc2538
+* zoul
 
 The examples are known to build for the 'avr-raven' platform. However,
 some of them currently fail at runtime due to file system overflow.
diff --git a/examples/cfs-coffee/project-conf.h b/examples/cfs-coffee/project-conf.h
new file mode 100644
index 000000000..4dd98edcb
--- /dev/null
+++ b/examples/cfs-coffee/project-conf.h
@@ -0,0 +1,40 @@
+/*
+ * 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 copyright holder 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 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 HOLDER 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_CONF_H_
+#define PROJECT_CONF_H_
+/*---------------------------------------------------------------------------*/
+#if CONTIKI_TARGET_CC2538DK || CONTIKI_TARGET_OPENMOTE_CC2538 || \
+    CONTIKI_TARGET_ZOUL
+#define COFFEE_CONF_SIZE              (CC2538_DEV_FLASH_SIZE / 2)
+#define COFFEE_CONF_MICRO_LOGS        1
+#define COFFEE_CONF_APPEND_ONLY       0
+#endif /* CONTIKI_TARGET_CC2538DK || CONTIKI_TARGET_ZOUL */
+
+#endif /* PROJECT_CONF_H_ */
+/*---------------------------------------------------------------------------*/
diff --git a/regression-tests/18-compile-arm-ports/Makefile b/regression-tests/18-compile-arm-ports/Makefile
index 4222eb7f6..225c4fd8d 100644
--- a/regression-tests/18-compile-arm-ports/Makefile
+++ b/regression-tests/18-compile-arm-ports/Makefile
@@ -45,6 +45,9 @@ stm32nucleo-spirit1/sensor-demo/stm32nucleo-spirit1 \
 ipv6/multicast/stm32nucleo-spirit1 \
 udp-ipv6/stm32nucleo-spirit1 \
 hello-world/stm32nucleo-spirit1 \
+cfs-coffee/cc2538dk \
+cfs-coffee/openmote-cc2538 \
+cfs-coffee/zoul
 
 TOOLS=
 

From 101575fbe2cc04b9aea7e2899e27f54e0bf31b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Corbal=C3=A1n?= <paul.corbalan@gmail.com>
Date: Wed, 1 Jun 2016 00:31:08 +0100
Subject: [PATCH 280/393] RIME: Extend unicast example to include a sent
 callback.

This PR simply adds a packet sent callback to the unicast connection used in the example. Every time a packet is sent the callback is called and prints the linkaddr_t dest, the MAC status of the message sent, and the link layer number of transmissions of the packet. This can be used to compute link quality estimations.
---
 examples/rime/example-unicast.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/examples/rime/example-unicast.c b/examples/rime/example-unicast.c
index 5d28ef66f..7ee764a54 100644
--- a/examples/rime/example-unicast.c
+++ b/examples/rime/example-unicast.c
@@ -39,11 +39,6 @@
 
 #include "contiki.h"
 #include "net/rime/rime.h"
-
-#include "dev/button-sensor.h"
-
-#include "dev/leds.h"
-
 #include <stdio.h>
 
 /*---------------------------------------------------------------------------*/
@@ -56,7 +51,19 @@ recv_uc(struct unicast_conn *c, const linkaddr_t *from)
   printf("unicast message received from %d.%d\n",
 	 from->u8[0], from->u8[1]);
 }
-static const struct unicast_callbacks unicast_callbacks = {recv_uc};
+/*---------------------------------------------------------------------------*/
+static void
+sent_uc(struct unicast_conn *c, int status, int num_tx)
+{
+  const linkaddr_t *dest = packetbuf_addr(PACKETBUF_ADDR_RECEIVER);
+  if(linkaddr_cmp(dest, &linkaddr_null)) {
+    return;
+  }
+  printf("unicast message sent to %d.%d: status %d num_tx %d\n",
+    dest->u8[0], dest->u8[1], status, num_tx);
+}
+/*---------------------------------------------------------------------------*/
+static const struct unicast_callbacks unicast_callbacks = {recv_uc, sent_uc};
 static struct unicast_conn uc;
 /*---------------------------------------------------------------------------*/
 PROCESS_THREAD(example_unicast_process, ev, data)

From 2b3cab18f496e32e20e418d5fe6d99d28e8a49dd Mon Sep 17 00:00:00 2001
From: Pere Tuset <peretuset@gmail.com>
Date: Wed, 1 Jun 2016 11:11:21 +0200
Subject: [PATCH 281/393] Run uncrustify through ADXL346 driver.

---
 platform/openmote-cc2538/dev/adxl346.c | 69 +++++++++++++-------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/platform/openmote-cc2538/dev/adxl346.c b/platform/openmote-cc2538/dev/adxl346.c
index 09d725474..400e3fdf6 100644
--- a/platform/openmote-cc2538/dev/adxl346.c
+++ b/platform/openmote-cc2538/dev/adxl346.c
@@ -186,7 +186,7 @@ adxl346_is_present(void)
   i2c_single_send(ADXL346_ADDRESS, ADXL346_DEVID_ADDR);
   i2c_single_receive(ADXL346_ADDRESS, &is_present);
 
-  return (is_present == ADXL346_DEVID_VALUE);
+  return is_present == ADXL346_DEVID_VALUE;
 }
 /*---------------------------------------------------------------------------*/
 static int16_t
@@ -212,17 +212,17 @@ adxl346_convert_accel(int16_t accel)
 
   result = (1000 * accel) / 256;
 
-  return (int16_t) result;
+  return (int16_t)result;
 }
 /*---------------------------------------------------------------------------*/
 static void
 adxl346_calibrate_offset(void)
 {
-	int32_t accum_x = 0;
-	int32_t accum_y = 0;
-	int32_t accum_z = 0;
-	uint8_t config[2];
-	int8_t offset;
+  int32_t accum_x = 0;
+  int32_t accum_y = 0;
+  int32_t accum_z = 0;
+  uint8_t config[2];
+  int8_t offset;
 
   config[0] = ADXL346_OFSX_ADDR;
   config[1] = 0;
@@ -234,38 +234,37 @@ adxl346_calibrate_offset(void)
   config[1] = 0;
   i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
 
-	uint16_t i;
-	for (i = 0; i < 100; i++) {
-		uint16_t x, y, z;
+  uint16_t i;
+  for(i = 0; i < 100; i++) {
+    uint16_t x, y, z;
 
-		x = adxl346_read_accel(ADXL346_DATAX0_ADDR, ADXL346_DATAX1_ADDR);
-		accum_x += x;
+    x = adxl346_read_accel(ADXL346_DATAX0_ADDR, ADXL346_DATAX1_ADDR);
+    accum_x += x;
 
-		y = adxl346_read_accel(ADXL346_DATAY0_ADDR, ADXL346_DATAY1_ADDR);
-		accum_y += y;
+    y = adxl346_read_accel(ADXL346_DATAY0_ADDR, ADXL346_DATAY1_ADDR);
+    accum_y += y;
 
-		z = adxl346_read_accel(ADXL346_DATAZ0_ADDR, ADXL346_DATAZ1_ADDR);
-		accum_z += z;
-	}
+    z = adxl346_read_accel(ADXL346_DATAZ0_ADDR, ADXL346_DATAZ1_ADDR);
+    accum_z += z;
+  }
 
-	offset    = (64 * accum_x) / 25600;
-	config[0] = ADXL346_OFSX_ADDR;
-	config[1] = -offset;
-	i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
-	PRINTF("ADXL346: X calibration offset is %d\n", offset);
+  offset = (64 * accum_x) / 25600;
+  config[0] = ADXL346_OFSX_ADDR;
+  config[1] = -offset;
+  i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
+  PRINTF("ADXL346: X calibration offset is %d\n", offset);
 
-	offset    = (64 * accum_y) / 25600;
-	config[0] = ADXL346_OFSY_ADDR;
-	config[1] = -offset;
-	i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
-	PRINTF("ADXL346: Y calibration offset is %d\n", offset);
-	
-	offset    = (64 * accum_z) / 25600;
-	config[0] = ADXL346_OFSZ_ADDR;
-	config[1] = -offset;
-	i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
-	PRINTF("ADXL346: Z calibration offset is %d\n", offset);
+  offset = (64 * accum_y) / 25600;
+  config[0] = ADXL346_OFSY_ADDR;
+  config[1] = -offset;
+  i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
+  PRINTF("ADXL346: Y calibration offset is %d\n", offset);
 
+  offset = (64 * accum_z) / 25600;
+  config[0] = ADXL346_OFSZ_ADDR;
+  config[1] = -offset;
+  i2c_burst_send(ADXL346_ADDRESS, config, sizeof(config));
+  PRINTF("ADXL346: Z calibration offset is %d\n", offset);
 }
 /*---------------------------------------------------------------------------*/
 static int
@@ -290,7 +289,7 @@ value(int type)
 
   if(type == ADXL346_READ_X) {
     return adxl346_read_accel(ADXL346_DATAX0_ADDR, ADXL346_DATAX1_ADDR);
-      } else if(type == ADXL346_READ_Y) {
+  } else if(type == ADXL346_READ_Y) {
     return adxl346_read_accel(ADXL346_DATAY0_ADDR, ADXL346_DATAY1_ADDR);
   } else if(type == ADXL346_READ_Z) {
     return adxl346_read_accel(ADXL346_DATAZ0_ADDR, ADXL346_DATAZ1_ADDR);
@@ -327,7 +326,7 @@ configure(int type, int value)
   }
 
   if(type == ADXL346_CALIB_OFFSET && enabled) {
-  	adxl346_calibrate_offset();
+    adxl346_calibrate_offset();
     return ADXL346_SUCCESS;
   }
 

From 03ca795bd6c163eaed116a129ec4d1a53833700c Mon Sep 17 00:00:00 2001
From: Marco Casaroli <marco.casaroli@gmail.com>
Date: Tue, 31 May 2016 17:11:59 -0300
Subject: [PATCH 282/393] fix ipv6 http socket host handling as in RFC2732

---
 core/net/http-socket/http-socket.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/net/http-socket/http-socket.c b/core/net/http-socket/http-socket.c
index 758c1473e..1e5ebbb27 100644
--- a/core/net/http-socket/http-socket.c
+++ b/core/net/http-socket/http-socket.c
@@ -412,7 +412,15 @@ event(struct tcp_socket *tcps, void *ptr,
       tcp_socket_send_str(tcps, " HTTP/1.1\r\n");
       tcp_socket_send_str(tcps, "Connection: close\r\n");
       tcp_socket_send_str(tcps, "Host: ");
+      /* If we have IPv6 host, add the '[' and the ']' characters
+         to the host. As in rfc2732. */
+      if (strchr(host, ':')) {
+        tcp_socket_send_str(tcps, "[");
+      }
       tcp_socket_send_str(tcps, host);
+      if (strchr(host, ':')) {
+        tcp_socket_send_str(tcps, "]");
+      }
       tcp_socket_send_str(tcps, "\r\n");
       if(s->postdata != NULL) {
         if(s->content_type) {

From 10601b2e5c6b82fb23455a47f3ed3196157045c6 Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Wed, 1 Jun 2016 13:45:57 +0200
Subject: [PATCH 283/393] Fixed CC2538/PIC labels being swapped

---
 platform/zoul/images/remote-pinout-front.png | Bin 119524 -> 434674 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/platform/zoul/images/remote-pinout-front.png b/platform/zoul/images/remote-pinout-front.png
index c32427d087c7a0165c5c194c0ba43214078f5916..18a9bf40cf5dabe5d12153f33acf8c53b54f23e4 100755
GIT binary patch
literal 434674
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%0A+w1?c%b?{h0%s>2WCndC>M-D|1h{5IYxO
z?H7lxNLDOyKd){MJbiDH==kwZd$#AC0*1)F+O?@oUU9e#EbN%ro#Gq9Tj{&MQXU7(
z3hApOxztiQ*&asAbe)*ThLyGBzk(XH4x<-VTY4p%7h5kF-X+IGq1h>=QjQT4Fx!2%
zKY>tYb}tb4Cg|nUMzQ4FmAGFY^C9zo_#Q!PJ9t4%X@zEp3uWZ5ErB^enQ$P@s@Mt=
zIje?)q&W&g?PrA>tlywYeS4Ff0V}Ri?K%6y<DOAMt01p<2#1n4Bn*R!89&S(89YKT
zkoX>ze02qaDMe){>BVDwXvniFVU;dDwZF@afG=;v!_;KoHrCb4Y?H^NO6?ZrBWa{M
zjE@K0fU^;fG#iNecM#VfGF<plS(u2(g7!$=_!gc%aNvGt;-H$4nx9&%K}8;c*7q+q
zYT+IhA7w3+-d7+HLBF?=0GDx?^AW3+uVmLXpm?F(`I(}AfwSi}^^Nj*%=g8#YEZJ^
z=Assn0+GgRvq(#m87VDGn344(?iY#df5escgE!Q0ARjrWPaG@3j>x~7V8EE*WIVpG
zVZILp@GC5z84QKh2OTn05*bA;R~J_NKptR^a=(uIn_-IO7i{OK2k*bntR`Ine5S`&
zfsgGZ&MgwIQ(xPGr<8wG9@N9*5r@}-ewX)L#0Z<>KKmnsKsihAdv%b><J@9xRhQS6
zLT}4Rwgr@FzVV+df>fxUV+=vuf5S!kKZ-fW6S+*oWWFcMTOW5PSzbAG$(`JeK4J(y
ze<jJS&V1nXLViI49m?V^>9>=Dj+8}UL8&grV5<2WpwDD{{WH<gkm~ZWq>;#l;6h7c
z#|}J!U<_tHS_x&mW&kCVV2RN_b|*pw`)Lw`>RuiW2Dpv>=GH%50c&q+XE}z>kLH^#
zn;gHfDzFGp+G+xeE5Hr1Zd`))zAQ*({?`c1mAoHxP*<XMI|9HIb3nfhz<zxu=63-s
z*Yxq-Swe?(z+sP+L=!tLsBeO$Hsh~cYSK4CK~mi}F{4Ex#|G<6>!R5@*75t|g0HUy
z7V89rDf31i#N9dhR2G5k+7B4ipvicIEVxE3SGXMuKD1KLLLcG($JAK{wcQ45pW^ON
zDDG~--GT*oFYfLx#oaAvad(Fncc*xP0>z!;&YS1Vd1ub2%w&=;$$#(r+TCk^i#dwI
z>jX@skAO~(d?#0HcvoSh`;bb{Cq~Q|Mk(HCv;UhLoNe_>ibz?+>j~#$ZqTU^dPOUr
zLYIU9eG=#sK`8_iC{Wt>9SVw0DOczqU*$9AUGoWzURb5(EG$dnH7XYa4Vt$!G@Zvx
z@cNJhoD$}cr7QGf1YW=!XUK5;cW=C$_U<GK>v~`OV2%-p+64oFlru7sl?DR}T9aM?
z#moeX^!E|_t7MA5N-7#AJvP{OnybMQaMc&=4B`^E$^@u^+`qG~L_|ozpGj^}p&QJx
zyM4*Q<gitmPh*%)TuB@(Ic9l=sDxlN5w1Q(b$ev%%9iDYNv>&5(kQ4(t>R<~z!JnI
zlVP!P%5%6ADebKgnh4!%#SWw+x{q@u=3I~P9H`8dtaE<(nEewpD(|Yf^7rv~d6mEx
zpPY*{f7~2oYa}A{CunN0y_ho3BNEnBC<1=sc4RV*Sx#g>?W%D|5B!kw0IeK3s)R(;
z_b{%BU-a^vpj5}B9+K*l+_#rq4L-cCOOj#1>_1oE^1GJGz0Tdbo@;*l)elcBtp0ik
zAj}Rtf9dI&e(p(pZWZ#1bx8I*MFw=0C*~L=qur^>klac9o|JC5(f!4_KIi!E?>kA9
zaoLuX%9IgsHMY8WZrO{IfiM4(UY+RiTM`q{LUHY%e{S(YBBD$B^t)A*#Ce7YBLFE_
z`QuvDG4Qs>kJssk*UiY5sJCEn4%yGk$=(;$(Nkf8=Kai5r@5eCS510|w$vw^86xk4
z`t|RTTY(=-FQk<?IiI)Qa~9BrF1QiMsz0hH1A^Q>SYnYq^IOZhf6!j8>2+AyiA(nL
z);YpF<}i&e3xEAJ8uZ{y*w-~GZ`9>ka~>VvJi~TTdn9V(t;+)2>)0#|`GB*`Ip>Oo
zQFCTF$GMbOhSFB=!*7`N=Uyk#8o2E$gvnUjJYwhPaj5qzaL}gv>8ARFu#m^rAW^+x
zxyj-4rQvgt*Uxb~ue*N+?$7S_=f7K54BVzIG7Z~I2H_QHao=VF?y8LfF8#J%n1vkz
zzS<WA+&{fTSg$cO-C8W&wrlkSMuGoMcJCQ9LrM6ND8}#y@LO)nwG}IyyZ1jcl}aD>
zG>@LGQBB9rcdkHiyBE1zzH`~{{f{`8q?^7X=Ib6>ydRGOFVQy0a(u27-^imv%rvWj
zxFyXggjMz*=Fs=%da%39Wa6AR(vl1b4E_qj(tr_V)y1+IUY=s{Uy=lYW!Q03agH*I
zij~iCm!7zEsje`2GP0()6jS!*P0p-DTqWa%cty8**O0D-xwJfg!Ak>q6e<NT;23{{
z`d)v#Mf#(fDmAu1eWSNCSq^H(+Ibz_RUIkf>usz8Ablb?bT*YKGNgsT%~g+s9w7d$
z|B)JRFwMAlW|~%;kqaO(@JpgHL?ZjEWo4G1FgNEgV>yA~;9JgTFtx(3+kvznzdqSn
zQY3TGn;=L<Ks7mh$@#7Z{<L&jxkk8j9umc<NlIo#c^|+nJY4sA><b<;S0`{)FOxe8
zRjlgpnR5Z+7yrcXN6LHh!y~q8wrm1nYK;AP1Nm779%fl#j8Ah7z_}jK3T&jz&$9oJ
zVO_ip*zz!Z)4OleYJV?wC_E)Gb70lSo#Ms{@GkfqzlzkBqgQ)>;nn*R4lCIEepmmo
zZ}e`_z4^5l0{Oc;RYzV|UR&n1T;a83^ShpZ*z#FGE_Xi2f5{3Gb}9%}wD!GQRwVkZ
z2*o>N-+dL0R<6XlQr~;kXXtRe#n*g30!h_;H`{Li`>x#=&e1qF!jPoG^RTuKf`|#F
ze{Z92<B>t{t(oU;I=!YV!gLuyH}Paoub1zqgQ6eVBG;c~emv8>)ODUmBLsOrka4lT
z9mIdsE{SAnN{hO0oE8^4dcXc53Up-)HuDl?PciI#nty3)BZ@q4t3Mvm*Xn(|esMZk
zA%7-bcOqkj?%2Lp)A&>!uBMgX_c{0LN4e;th`UcxmVlk&L#f|x8(rQ<SNYY*5`M7L
zhQYjT!Q|xYPO+fs#O*WP`DqXj{C0=oo2;kB=58qqiGcmeW1-WqYLIWz%OnD_ldwBh
zZR)(RXTZMp%+G(5Tkq$iqUDLi{s*Vp`3;_L53F#;px~ZsrbFA`>sAv=0>>qZfw#qn
z`F^ayOV!#ksA$?o0e1(}IY!qhnLqj*F(DkL2W@ozjIK>YJ3=I;pY^6<xQE$HJwZ=p
z?LX^vh0H&H_@VRYyL}khJVT3XFk^m_IJ#i(*7S?@+6)}t+AIMpAz_A$nTPM_j1Ex#
z)l<YnF{p38ot}1S@tahgm(}$9VgS(1LyZw!#-8Iq0VkF7bbjx@>BEDWit!V66=u!w
zHczYJ@=!V1EgFMesx+yz<!N1I!{8tDfkPLZQaHrp49Clwl{JsjrBN5|Y~YLqAI8V|
z1Tq2`rrH9MIm(xsimT&eZ05ByQ`B0xWQAs;v?V}cFyQAUpU*-q>}QYED^{HgmcfT7
zP{lmZnA|5SYJ!ruzzD*<E+OGkCe?+3#BtvhgF|&>O7q3(16q%EyDJ|mGg6wqCK7I*
zx-hY7xY<K#!}tdJ^h%8~r2b~kB#~K#%6~|z%veyPJJB?zmY}D=GokN7nJ1i6#Ts?U
zqdTUmo`M_a&I=L_)I$}@yns%m8|U-nxgxf{Av7Z1pMUeZcZnwVl`9Q%D|>KE<jduD
z;Gr&Ptp;UugiSItrr!RFAsCvNM?TcW8T`1%`*__ZSy^fCZ~PAr`tajWm`S^C%7J(j
z>-^N{LjdZnyM`s@*+08%oljfa)=8&l9qe~eTxmxoZ&PG&wJNEaf3rBgPxkwe9IAb>
zobC7PqrRv9()HV{u>Y(j8z%YVQPo={s-)yPe|&!bi_&RMuU{bBNZN&ePmQl<kwx!|
z(`=%72E*pl5B*~pqUoSO$90m}bGxg?QY7PmK{Q@szq7{K$8sV0K@oZUJFK0zp!kGu
zLW5-@r$4QpKi+>@yVYg+?f+f0`}#}JIWzeW9*%#2oXDJ;p^<B+^~=mxv{ODgx^&jg
zQtuBcfprEk3E&#kT>r~L)#g51kl7KMZMZc3arK(+z7OhV4o}6_ED(jZE@}oB_lK~b
z1Q%ZlO(o2g@`-}_I@Qt>p-mB#3cN!~Fs77DoT9Z&&zWDdV@d8x@xC<e%F|*vQ^QG%
zPaAsdFR_`Xp*;XFn_ig>0AlD>J#^&7BQz1be=M<BU$dEROT3R&xM(S(<gCBx{MqEP
zT1^E@Z^<ths+F1totU887QUu?|6_ZBB$Aev9M)+a{y4Rv2CsVvI}<(xfG;L6?I^*V
zY=1q4IYRqA!Bp!`z)Mfu$i)E|7Z>BGJu^eEMXR&48G)bdjGUFVxKutCDy_>yt{%xb
z{+R9j2lEq1us5l{c#K>QZ=DT*JO%n^kgD%yoa7Mu8<7!@Wpto<;p_zye}oQLNdTp{
zmASB<c3BQOq6iZfpk>t50!?!-8o(%hleR5V!<)4<uSr!NDpsy~A+@wD&<!c@-i(#;
z>U9NwENE%#wuZLjev})DOtm>|rpf`KH(hsAes6^Ta-gsBED+Lvy>1L?sQFF>KJ)sy
z_HmDKSN?FX&;M3lA6_?yFOiybI*)HsaOif+^jfGavcA$(xM`qS=`c#v^O`8>3~2e>
zu*Oyr>+{Ft@NeTVj9}zFbdV?B989BB(dseF$G`dwLv5}^zQ@M5ueBq#JlP>x9e;(o
zYTeg`m)6;^Vv4JJ5j`!%oS+Rc#dUZT6<mKNeC0)ReV!XHgXfw(lY!3(nEZ}n)R)0*
z+8s^$FB#L>9-oH+X_ks1-I3Exc**|P5xw^dJQ-%#d5l7ZpzPY%UdVVkF(ERX!PJ;a
z$nFipjBH(-qHS*Z-FHpV&+Ju9{Np%-(HPSoO;Zn=$T$HMpX?XI#!+&##KRgn<i2~#
zH%c`3PYDS~7n^Am?C=HD7ErQtuHLY>Dk`yJwJE}E<^(BHmW?Y44Q9_ig=3&Y`tdPw
zP>q;E0##vs26+KS+(fX_rHsgM+?}}13lkn3f-IwSHEMED4Gv#Oihc7+$)q9(Yf7qC
zqQ8OQmcGaptUD~(542UP6v6Qo{MA=dJl!6%7QMAyzl%8~3wk^Lvp3{;`x6YltCkl1
z<G_-K!{!Q_Oh3!8NwwZIMN#JPYK+|SZNI6$3khQ<b)|6%5Pv&Ip<VBkT)pp~DMWLK
z5{l$$DLmiHC~Aq0vXgK@SoUK?fkiwWuiaPF#~ox7Fkr@Fva1`O3Lz(VN5PS3Mc|bA
z?CyqD>Mn%aOioEr)9AvzB37Tur2U<wIBp^oJQ<TKbL2lXZ+oIl`>6MFEN~z-^4ifr
z$R11q4IHM7kCV`$T+ME_ZLj1XH6H%1lv9OAamH?v5~mRHl|DwHr4tx*k?{mE6Yc?}
zIis>e52a~Q_}r)lV;G=6h-3dkjkhUCCJYn%LsU&(B4fdel;u@R*-Bgk{XvO1dtG64
zN)gFPB!)UkiY&fEwi?YFtoC0xvR%!DN2h4nxC9QY*6gXN+A{O9WYxc_i>Dx&I5Wug
z@*<+>u>Vi4T8Hao_J$!%;Si0Ow3HGjw48GAfcs0p;%}c~HeNaa6s`_IjYg+k9%7M}
znYi_0I-5<MI7rn2xZ0MhBXLJ~a_4OsF*@3*K})I1n3~qaUtXe&S$GqoJKhQZsmeg2
zFv^oCf7T6+TbCSLnIBMTqbNoDWDNs!7U~>TuK#m;T}-<AP=R+ZmA8Di|F<pVhaUG@
z+t|%oqg>2C%RA-$bHB_$w^(DH#Y^zlS8i|8RInt`@41LEH|zgi@ogE>hplCB*c&hz
zN>g?0J4GI{fyUOpm_;3ofDPVz)tM-sWN}T#P{a)KxVR<<mufgITA(;!eD1Q<Q$#Gs
z$8VYWn<6V{94~2V`Y>#&h8aW?7iWhh1;owUN5)}aF=po|T-kS>hK)gqQ*d_eRT{?3
zDDJ(r7@JtI`gIsPwLOLrgF0NtO6`S9F-Y8sHziujAz=w{D+#5-VfLP!d9jNVz;?n|
z^Reln2TOwc;^LUC?{hcADfjiohp38?fwg6(!{_+^WZ{&8=t3CM$4)}o8d>>jI5<Tb
zN`;m0-)Q#6lcdx8a*4oCxtE+M;y%ucul(cy;CEX^B=I|4no?_Syk-JI8u__L>RIlJ
z&7w73QZr3PBoozAP>=F?hNCow43$>O!HG3@p?T83dm69qDg%6&g_bwU)I6;dPNlxT
zlc<!Vson3_T?bW$JO$o78E+PAy_&6LgiN!YzZ$D14G%HzR=uCBcr$o6?T-(9C^5kd
zf2ptbG}L_m=TG?GKf|=qy@>f>3H9M$?qUl$rn~RLb|C7lK<G8!1P;&MHXj1Dz_{(K
zm}H1-1{3tqIW1H84{^2p(NOiSZno1`sDT{ZHJd=_=`kE6O1$JtWTN2|Ov(uighRwa
zki|vIcqXb=9a{{DP9w#j<J%1kCCuKD?fq~}B|TPFI?~kC81MwJP6Wm!a#l#hMR%N1
zMc=pCvN^{g<n#mkW~y2U&;w9$7-^SLp_-UcK^g}@egRJC3iGbaeh5ZT3E2eu8A$sR
zu{hrfn~Ew%Y?|LP;&i|ROWWlDN{ZdgQZGKfxMaol3%5mGq8p@gqcDB?8a!6=-f}e-
z<r*Gs?FkR6)JnyRZREg)E;eHhv*oez#5Xge*Oo=Jb4Tr&{pmR2Lr=SpLqJWAC?Qt4
zIPlfmJn77oq>mF<^YCPp6n}nfM6ngE_e^nd!!To<#!kOYs*bJ9vRZk=WV#iJS{7Dg
zr~h-!$M)1<?%`Yn4<u(MhD1S|+4s3mIrypPsepK$o5A1ggjK%6xX2Pw)XlPe_=Ee%
zSQ^#iATYZn)N;sLch*W%*56%1Amwi>XM*(ViZlx56VJ7WzF><+3%6y}&D;ar)k`R`
zv8@~;aN3RT9LiK8|BJw^kg=uuUoa$g<+d>~^5Y@;KxBFhH6rh(hA_D|l~));O|C1H
zzee*blnU{!!$gkyt)IG<gW95WR@A|lm<6)*TNdZ99PEOURAvUXl+0^qRHf@%iRT8X
zoim4JXKhRXy)GP_q2}f!5idPt=8=(T#8#{(=A{bt04)amCC0Gt^Bhx*o`%gvyxZk0
zxHk3%t2}Xj*&|N3_R_RfiI^s)y+Z4Z(>%#V*8q09^3?wEF=tf4$lCn>&IeEbJsXrq
z+j8{s^m&<9`KxY0FNK)nq@*h!NIGG^sj<j<7iZc=a>wD;@dS#}3G=HbW|_`?!`WZb
zcSU!o3@j|sxYMOg35US020VeLl5)Up*YGq6eXpd0hWT3}Au<(<T;5?$1bh7EU7X<G
zQ571Hi)=Pup1i@71}U7m2OBsA3SVVNDJDMiXT6`47CH5IG}mF!iuT<U+ClyjCvg~$
zI)GZm(9FO36kZQLYZ0MJjy57#tY@eoez*fW#Nh5FGia@hA?U@G18NDU#L{^Auv}W<
zDY?E7+j<?KJ4RU{XWKQXX;k+&(PNOZ%{>{=OQCqaAIn5Q;mQkfR9co%1i1f>(T$5w
z#jMZ}msql@RLz{ys7^7vS*@_<N?YIUs0yWkO$TM{0_|HsAjg@;b;-uC-%(()!0hD0
zAKmp|AD@GCMc2RI+5<s9LO%<IRE3d1xruo74s^i=V4cejVS-W5!yRV#us^r{njxLm
z`(iOab|L7aU~Qhbn2f9&J2BWK`(mb>k#-G!!(}M7&=tH8a$JER{;Ij!#gB1u?nn$o
zTdYdw&MS`@_V3lMPro!o+s1>^H(C^W`w{v|aHH)eXif?SWp6Q|HHh%`V=mgT+aw2|
zv4qHel5&<)!X%}Lbk=nqvd7xI@E0^cOjXlP2PIs&=ZhQX+d%N_d(8u3_F^cyoS{?;
z7(oYLy`e`?6Q=su*h*he5vXYw8qD*v=$6!zo)K|O@A`$Fb0{ItAS|UX-6;NWidavM
zLfCSy{S@OC8I<7XgCHey{G(S+Y{E}b65<N16r(1V7oLk#X=*Y3TAd0wIL`J{+!}5P
zrMTfmSq6;KBeICd;7TzdJON^qiJ#%VPu0@iGqb2$viMhXN+77PL-o4XWWcRw4D}J3
zRl@HgFx+lw*keC-x}Xs49NcCFIJCL!o-%AVDNi^Ew9)-+_p$O4^m>@bPrLl7UYSJK
zGV{v?rSDKjtf3MK11|FEa;@KpXoXtk+4rneFb6q!{P^4$=$8r&Z~2EgoY)ls1DREy
zr45A|2p@^5$)wVA;wjE$e8rr?VI$u@`Sd9iC0JUfvc$wnMOwbC_Vi)QqjOz#KSsB$
zvSfBzT5JfJa#CE)*|p&&rZ7vFL3SL9Szc#gDz{`#+vpGs##?B{1MgX8a|gJ1I=k%(
zTTh48XegWLH5+>r&g3ZO0~r+=a>Z0?dO1J!)@iZp%9{UjWez}5PrWUvgw^5!z(%P>
zTP#)arp-~nj*Q4LWZOB{+x<;z;LQP+qgZkSq!T2Smwc4U{Ntx=jSgSX5=vU8Jf$Lt
zBk3}XEn|c+>SDnRampzcy2IFs%B}$s2iY}Q($eEiHOZ=s+8rE|n~t8&Xi^^US!i|N
zt*8M*9LHMBcjM9epZ0@2^{mYs1{XJlAdhwTc?ft-%6;GO;_Nu45H0!8Gs|s{@o-FY
zFpKuD-)-c1v8Yg7sErfprd_h1H>4klUd~{ZsMIOQI5Xi<a(_F<WD&=s7JZ_)+uKzY
zSA0DZhlI(juPGx7@cU`bWMX<1_=7JrZ+0nCVVD}878W9b)pWBAK;h8HQjlD);j&tZ
zC_`~Lgq1V{RHdZvvDtAOMsI5LW&6jUNJbjX?s!K8HP^*)3w@2sC^hc6qqAKf$JOHa
ztA#{`UISD5kQDjEA9LI|6`ky`cX`W!vHa~1u43kKOO_N>PzrrhL&Zr)RZX9hv|(}s
z{h)L2$O<@p26EvFp7C*znlxZF{0qv;*?E*w<tr8rq=lIT2Z2ZTea*J+3Iy9Y0f2Y`
zz{cnetSixxfA1Ko?DAc#0(8R~z9MTO*d}Z{l`aEuvPj|^T}B0%!Iql_qD%1FSnP8~
z=`@QIv{K#qeaS<h*^5^~Q=s~reEfx$IAYJi%Nphlc?&VGC;L<7Ib7O;vNJcGFL;5M
zf|0$~kRv=H=6}@sPZdQ>q`d{WyJ8YRyJDq#D!5mIzLk<oMtbp_0L@XilSQRw_>CBW
zikrK9`-vQxn{M~5_rA8^Ci%+D^9m78swg?)Bl<Uw3}$>np$<MnN&k0{Cc9hraL9JI
zHFp|;**ZL@m%xUtbVF+YnP;a4tZs>TMM4}oRzolB1=FllIaPO_Sk_1fVE<(?Yu9o1
zOAa~3lz}`ZA=TMPOG*qWt$A5GeI5%JRVuPxjHJ%WC)(3w9D>L=_?3P;T33cS8MJCN
zA50A*u3D5>RCfTsd~%xcFObU2P&Q@M{d3q8B~I@68^qlfDLx)rIR@;H?#J${o6O^h
z)C9x!J+O1e|8r5Tqn|tg+u(qY>cgPt&YK!I0H$kNw?i_wCg{8G`E)MbK0lw@p=VTS
z)-J{xun3{UEKE$Jv+`8yCi5e~Hu+h&ZHftlyQ#LG5x-gBZ^p739I!*ArD?Kq6i?jK
z)UJf?h2nA3zY<LxI%a}sNa_NUqt)wYWz3TpdPuNQ&>SFIk8&20K3T`ExT;IODIMG%
z(5@23sxXH=qmhEDM;Thbe@ljUuEQ2nN|u)4STSFb3R1*ULUNr7qBx%VO3Q*vE=iix
z5JR)Kgq(s|p{4V5<SAYvlz76a!PuO3<jDsnFq_@2WT5?3t4|#UEsiJ^(jP-3hgA6;
zchqm0>j5Klr^~f&rr6BX_{Ov;DIM)!q7P3QM3%Ge$#Zq0m;5@{Cd=7eC@=G1hv8)V
zPQvzcTM}>CN3lCKB(D-^P?xYDyexB*GmOQrfT)qB8=lDwoMUIw<-mdgF~~+cW(qo3
z(EGp#OEWB5`HTZp=_?vt>Sn{Jfg_RFF5TmBk>`x1l&ObL{{7?1Jr-dhS*g1@XNo9<
zLLdJK5i`Q0<rI_~51ZC;7S<Psu$vrq_=H6I?+9&M@x-Xi2HH$?iv$MLT-ztHkm8f2
z%!jkUJ9_al(y-CY1b_aFO?_x?zK_{keH{O%?fyG+{(C*d^R&&AM3Owoi(94wc=Dp+
zNyw->ruO5f!u1=&H?F0WE2F>nb=9y86adNFM?sC4l)5oC=yjcbYD5nNCI<qu$M#>V
z61b2KlSF&SNr}oOR5@}&W&AXtSDQLjO6scJFXTavZ3^zSKM^}a@Ca(C#TfbMR_7V%
zIfbhc=tc`&;RZrZ8QNjCw4Xz|4bzy;_$ZOku&IS1lQ~Ki0JRx5YC!T$<-cMZDdx!3
zEG@UI8XlXyd^x)`*RQ2}0+mL(eEW5TdSd1woGd7EBO2;*G~NBYeOCjNX1HW@-wQvn
zP(!lNc712Ri3cg!iCXM&{hvx=!CVPPU3Mh$CbGy_SZRMd;p3H6Du?o*z5IUDOe&l-
zha5Jh4K&>`Cfobx@bxZp8T#eM{FtYJ<U|LLkeue&MRDMCuLV0Qd^=h$e+_;%Ghar1
z-P-gQBQEo(YS&@&rgY;_n_{ptaj%-$tQ7<I^5+`e%widNSel(K1Ll)4XN`o$x8&&M
zso*hlDp5Xw2`A&FnBxDa$^T7sl+Z*{+2hn}*iq?+Rh8sJ6#t?AOtcE-=0q8!?x0q0
zSlEb^3S}y_v|<+#Z%eIKq6iqTEpzTBR$JLSl{QbO=0C9GhS;@Z=S@Y3D6IWATw@kR
z0rU6;XlU3tp76n`&$i!6{$OLEm#HC9?G9kWN;JZ1s!qeV3icCq8M@{+@OT@WXH7e}
zPCPl=<=_y;Qz^a;`V7{c>ZzN^%(OItRiuKRrgO&#wr$0hd1IztXGT*P#XF2G0sP(W
z=_yS{`JAWxL<H$^R2&KEYSYt&o2C+TF0vGy8rR)PSDeYn@ZaQgG#Cq2V6%LM-34R5
zIcm!>*c0tDb~^UunU$PHA?71g8sGKe?eP~lh@&FsFcdIVTxK8RfOGjRfb=~DVW^+X
zk+O9{j%^-E<qNFJeEbJk@xvXe$4jq%1hZuj2Gggf)f9>lZL||dR%y=LRDVqjlakLs
zTrX_!%uZKx^GKVZ$FD8N1Y3W*OH}Y28HT0|HRm7yzo9W4BeZMCzE1(GhP6aR4h|?K
z_&(o8aE#r^t1VVsh1-ZZRI;X63-v9#vOFm#@^7tM!|b*2qLq#RK+_qlDXd0&tR+l-
zeU!pCk32rby;i<C5~S@?acvkXuS^;H)YW--G80`>`vJx<V?H*3uk&z?(5zZaxa=TH
zS(I3G`=pO0A5SKeM3NR4O>p@31fs7nJsi7#Vmc*-!rIbUJMbB|gfn7oEQ@HrCnnQJ
zC*UeOdH|gktF3TfdW8AIV7p~xL!*%DxXO};&P&C-50=8cpEq(Y7!0PN6A(gEG5JdS
zi*S{k2tMnOb}QwIIQTk%TM%u<0&}%P0SfjLdsJA|wO&cuJ8cD`_3=t6_J1Ph?l9Ul
zT##nb3RmaW*L=N5Cv6AFPBHIRRZ{m4pEi3&i3zY(b_-XgivO3HjEDx2KUt17jE~nE
zJ-?#&NRSUUiaCca)7TQ^lb=R9t?;x9sXtJL(BrymsaqwoP%@^Mt`~deph(3jCpowk
z(p#3P(j%5*P78A0oS}A+gpikG?q{kmFvi)JfZY?dwMTrKM^<pN(e}It54|bb01P5@
zifux#s{fU4c!2*CO!&p%JTUE+jlsk)NL+gyJJhF0mCrQPptBQj0CUu3K*87GhryEG
ze#t;)L}~hc{D79e3_R|~T5q83E>NY$-F`jcHt%=>&jZ+)JX9=o9&|JwW4@9VCzn7s
zDQ{qoOH6e*l!?Gux47__KW7y0Oi)$Y-4dEXaALxx-?)SClach9{1rX}3)zhuKnqqU
z0H}gURIY~h>&4Bj#U-*Ktx0Bf=<?&3>&I{S*x<d#+)QK;VkCMTD%NU~f>2-Zna5ft
zhYv>eA|oX>unL1mUM!>r*Bk&)$uGCGTJ<m)TA&QsRVjoWr5MF>0r4=KYa)Y?w=j^o
zSSWHs4xp75kuoRGJm-%aF28}J!f4V`l8J2$rYmuowong@5BbkP(>0#ZE?V(CBz<tV
zwAVuM$^Xz8AL^lub@gn+4KmX;nmL7dEYq2GOgVc*+7$Pzj@<FS+3REWH+h?4i&t@W
z*i?XRE<E~C*QHZz>A7n=TXcNFbWFHCR{xAk=kdcCxzZ-hH3P+(2>9^gDgORfPPh+|
z$p3Sm*vTu@!YR}2d?qrJEj&f_&hl|#^nxLHhb*{Le@^wsiu6f!HyL5Gb9i^BCp<ZA
zZZgm7&zfy3WEm}F&`hx6t9%=y8VAY{z->wemBIgT_yHH)Z}F}}je3Pjm7pDj-mPvf
z-#A<L_fyW#$c($dH%iCP;l{C1xa8zn^s4TYF6$+YekpEl%&;IDtXw7PQZ+`gyfi3m
z;tx^PreECpUSI5q8MYG@-AN<l8oU?mbqR<*w<!it!cfIl_!>I4>VTriZ8DO+m#qG*
zcuCv6o_?R<l&u<@t>D!9Mq$C{Evt|dk4h){<>)h^VOe!lF{3U(3igGsK>D&o8}V>?
z`sBDQE!Zl{nHwkFrJL4av}I(vRJEf>Hw)5}s7Wr5p#?J7wy)hl5D$*iT#``9Vo`5l
z4V2qTZ=|*=Nje&`^<7YZyI6TG)7LGMpkT4W!a;=l$huk;TV~|#a}FlD=Iav-StRBB
z-ics`9B`-%9uQH}O?@>>SDYeb+OpBQ?uOkM8;om0LFlG2IU%dSB$fUsZQis{rG}mP
zkE&Yeu-FDoR3I?U7)e1P25jSLs0CpSn-+oKrWir0C-bpVy;{Ydv3e|ZOR!k>g05c~
zhMSv@Jak3h8d)%fTgQNe4@cLf$nul~s7KJL#?BGJ2i;5dQ(e=fvcQN2Nd_O0(cXbr
z2gxQQlUv1NB%cAIx=n~bf@~Gsp3D}sA2^!d@Jr}gIn(gDF}A0hb9B$m>h<Y^|NKsJ
z59#BNq9A|5!{uh0M84}=(D@!m^63XtxKR7}pQ3B$)GaxZ<2zrwmAck*tK0RRm-bE1
z^#s907dq<FEWPhpG|fgwYvo&i6O=Q<lhOxyewROtBv4jUhmrqH@ssJii*@<n4G(Ca
zh_?GFpKu_Z4huWHL3i`OfYqUjkR^||JnYazUHOccNXU5ZBEhVEIS(6F3E$?fG}UD7
zpTdkah*V~8?(Qjj*Cn)Kyd|?5+~q94JhqS5+*N1Gty(K3Yzbnx@Q`DqMMP{OHrY>Y
zqHXWCG*60GI59*iVU(khMKD0&gy#e2)%zeh-GqR%w2)uEdYF+`SLg|SbAztKH)&=g
zj425@bgPG95Fe_M*c%nt%*7rND~OGWp=-_yq{V2y4#=-|Yo7#4XnU>L;vT%V1|>Vj
zAT>g7Sn${$Oe?W()**zL;_G2YJU2a#*wO0n25_dX;Wc3vtyHLFw8`94ExhIQ{%M+t
zytF9fENEUhy3=8(o5dv9M^-g>2La7>iwt%gwYd+Cbu}2lm{{i-Cmwf<!4@bc;11q9
zg4oaaVDl8tJwqms#z|U^dHQAFq=5pao8?m18wg1}lz>`{vV%umJ+qGkf0F{)v7p&#
zXSj{R=a*A?!bad}s^AmP^}T+90>$jd<GCiJ#Phz}u8o#V2UTI|MQ4P(hIqAM26?v$
z%bF=j)n`=|5T8-nG63CXHNiZYqIMC*N#OJrPppxIY*vbbMpHRJ<aiiOI9qK`AK0NT
zG~dKL>H@T`a(1uwY&q>|ecjvAOIIxA-CTW{#nEV|7b`@xQemz#5nr6LY&tt)1Z3x=
z=9hzLQm}ur9{$6o7#}bExkM<&Bd|}uk>Zkui>&T2j;g?y(7-N0%Nz^9L{V*JM~Evv
z^E+x;eYo>BiHIrsHHQdIA-9^7aXW@OqxxRI37I9RWn?A-6)s3Omlpj{ZtUnAD>42G
z0GJGf@$LU01j7jwOnX9O!WIQ1kHy8w)wUQW&(Fw=TZw<-cPpu=44qM{(n{?nDe+ML
zP8lW^rpCJ$hjtS~8=WT27L2SK4|ZPAN#kS~t+3}V8CR5z1CR$OPjdsyVJKq}O9Al-
z$3o?SL*Gln)R+UTSErCc9878;IE7x|KnP|72`jE~G&#wauZWz39+m6S`iO&j<w$`=
z+-6E3K&y2PSRv5@)0Tvg6UIKNo|PJKtS|nWOHV2!wVo>Iy*i5;gH%nJ@jaSGNU+$~
zuo8Fa6dF>>EQ--Jj4_}en^(;SYuyogb2Da!@4|k?0}a?R9lI?eP9X)$6E02nC#x3X
zmg8TiPYLnpi#$6z4dak|+OOibb{jBYVVPI2b~zaN%)U#kq3f3HN)k#OV){xuyL0T$
z9-e7?|8tT(Y0k^@Cj!U!QR%mz?QyIXQeDN}`#jr19vXfuNKrOG;TP7Gw@WQfdTQ8?
z)hivpyk*BAx$;Sl_Ae=;7~R}QYnNe-b*AOa{6jo#!2}4j%3(dj0xKC)!l<VS<Gkke
z_fT0cZn)xWir`ZW6_}DxWP<X~)Q_;S!u5S6-U^=6OHbRa^y5DY+hhdC$xy4MH#ijX
zweO<HLyXUbf)}2ev(slIgCq?ZhGJi-av`%8D{~R!I+m8QQpT287G`tj&h5o-J5i%y
zNN|zJaM^4C+Q+lcp60&+Zd9D)*H0LLXBNgkJvP&ZoHic#%_O)`989IZSsdFXM9iBj
z@k}t0BnU3<qZNwq0mVA<$C+{BGYCl?YhvBQ)MHIR57?!u9x4XQ{TCrlxUEAjzQt_m
zX!igEkny?!vwA1$I(m{-edHQpaRX6s#?AO?oW(^DQC4pX=b7Yzflhbd*zFSzfe)tL
z_VxiDe6TL2qC(XObE{rWTFnX^OgjCI+%q_YK4bBSZ^=rtxxW@-qB3=#qAZdSXEjWy
zbhr}Iim@syH9HNbkd{_qcENr_Pf+mpve2r*<*e;#cfTbeXGOZU_E`v2&7_;${n^!B
zN$d1^pR~TS*>h}U8E^Et87CV7bQDS5kD*s(Ym89wBVZ;l{PRb|(AIJL@*1MMffrrk
zI6BEUiov=6B>cH};f@IRlwJel-4B?{_JBWXuLX`f#%KcEk1fpdp|emvj5M`|R+;(j
z_LF|GFHSB_IjZ_}ShSqs(P$}TnG%Vrqu<M(r$8dCu#H(NVJUNqXIR{u<g!yrOru!g
z(Ccun#C!jaU_<3*%|qiS)5FO}BMgn%eMp6PDckTQ=7z!=@{U+6pE;b>K-UHxhD&b6
zj$FgpJ6yN@jo#+Cas(MfgvdGKn!RJ@d&)&hV?cB3cWxYI*wO;T5*13P*_N_Yfq-RH
z)KYv)(=Ds^a?GJxBlGX;+|7J+H8~cc<8nb1X%vs+!Q|or6JrdS;hG?RZJFw6@+OkF
zgcvpc$D&UYH|(4+$DD@?Ba|?}P*I<rt3wStB_xytxYBK3d#)bFgR2~F3<||XL;)y)
zGI#FKGeg81b|V|%eM2QJ#i277MYM$XU3Ibz6iN;O>5S=VTBgb`9-p+*K{{Dt&qNdH
zG0^J8Gc|LL{Y@P_*zR@sC|3cdT51v?cJ;y}lNpeaU&)18ix<3)`Y;HvKDwc$=N434
zdX^kY#`I%>rEdOVi4+TqyF=aa-9DF<(osw4!{MdZ=tNl&8;ONf0VoH*O+L$C(oXV!
zrMwM6utE@t%pwWfd7O5@%I{`<;o&ys^#(*AWD2fpT#2#y!JPO^?L{Z&RWpbaMpabv
zgsSL3j=XRxSrLO-C2+xA#6`*{RQ-DD5w>*hv@&15B%P5_qf)0WeL(2!r35-JGt9os
zVqpvsF9!Ep;n&F1yQ@HZq)Gh7V2O?bp1CjU`22XRnQ|b<_W5(MaIPv;>@YPs4LfRB
z7G^+Mm@y+@esORrnf3cRrzY__23d-#an||0fpK*3I0n~8i}a%|hdiA6)B-l{#GfI$
z&y)5@up7eUrK=CRl?|RbNkc`n-%Tc_lW8HKwJ1%sDru5)e6gbKs74o6`jMbJp?t8Z
zkt3Uo4P`S64FX&w(zPZ_uAtL;&A4dTl-CfwiInY?JtlmR{>_AXvP9Yj-495o(pn`J
zc12pFa4cT;;%?6%w68*Ax|B6ctQ6U#@|n4B!_jWQ0a9!{mj;T9|JrctT+^VE;6uNr
zOg$AvXh_9t<~u6<mHpyJ>NWa@M^j{>=`3WI`m!3X*ZW}csG7Dd@W*=Kch3p#TC(0>
zms<AX{1~*>6;%L8aq0j2ANVZkGhuxIzx_an3iEOq`-l{`b+XhfNjWG+WB(Q`ZWtR^
zc!m)du@y-dzt=L!6@QUH{3+NL1u0NyC>K-E^hejt>}?}ff}{XD8PkPQT-A$?MJuW}
zI0K$zeS6s!JaRXmv{c$0KF4^5IU`o76vZTZ#(t6oKX*_o%FcBoMo5J?e4FRct!_L_
zxdqGVLVNbNF^k{G(0b^E?%A7jHCrX2nXy3Z`hc~i6n{Mv=XF|nTkfB=I;$-Q(zKDj
zD_QkpPh#JfD#&RmD%2!9Q+|n3LswC;!%}=wsUEK7r=e+K#zcTSByW;+*6AF*p(wIn
zM#)d?6!7RK7jI*chFPt2zXyFD1+A4IwJV#WvZzm-fKMXKBjB*9({4KpZh&hW&N0A9
zfCn6-0s!TPaMa&<UPDlm;a<<o-!Lxw%j<tlHbz`;*UBw>=VmE4H`pTEX<|i0h>0bk
z_@w!)Q>Yb9qT$q%p$ym9L(tg|VxUQ{iiT;PkvRhqbF^#z-Zyiyk}iIIb|~d^m}JF8
z?g|p=8ifxiyuXMy>=lx;>aL{&jczS>p6Jl?Ntl;2Pxzq!`@hZK$C?H1c7KWm#N%iF
z-t9$@vTV4c3tI4zoPP^P%(IY3KMSXR#{Nozr@d>ZOe<^q#8e3`&gce_364bq;;6BF
zFwSI=YdEqLVn0Z&KGrj*f8aYKnAas!Kmu`9RI(GjA+3U!oyT!aOTnX<x*3{g{Y!KU
zu8b)gJ#36ri#`;2y4pk&aOO}AT2^L8U&6T&x8K%z>r@vpS6+&?dhlD|ULOnsFJZ(g
zdDcGMVFi2~nG~&Y(u9ItovBqr*qu5w_8u<Klg?4M(AW$$N~2$Vl(MqLo23snIp<RX
z$c?|ijT;CJ6{-Q*rt7iq3k0?)wqmI=OH)-iW?EY5?AwOjOBu{pQsl2-0%SHd==_px
zyopc`6|l*H#0}C+o7)WeUe45~aISfW5W_8`eGQw0X=<*4H)+j1Z_9wGS#5)R$Y<&r
zec~~1KXBeS&&m{nzOKSwrh}azx$c5vHqP9?{Evub(&?s7KlXAl*TM3$q<g3)h@rGZ
zM?mo3KZ#w*;h$v1(V>e|9lA5df1fE1{>!2Ne|4j^l;>8@DUtA<b&|P-ocw&Bb_N#p
zJuuXKtckfat$~Sjgt?k^f>m$7q8?!D1uPvnZ&N~{Zo3;ALK;g}8;E*mVAhXIMA=kA
zYM?O|tVuia=$D=}!sb-TP#oR(w9X?fZ7iq~V~{DpvM&$M)Q&KV=LsHQE>Keit<Gr}
zhbOhOSFVFsndmAlik~;3biq+fl(<qGsWE{wZbjRyJHg)|Yq(HDc!sxA$5m$b;^s_y
z|0$a8Sg*kjHIBGSNVmID%wQxaOmJ`lEG1o3*0a$3D&%mY#Q<UhrYw~b0+CgIU*S+G
zGlSiuOvm*T$SMi0bNY9o4?Kyc`S)KwQPykJU>>qJpLlqC;)7hU$M%7=oP4FZ%Gm8C
z7KSA;J<;I)mn~#ezRVD3hO#xEWd*XsWMa|ef)dyi;+E}pP5=}$A}(@K2lbB?b}M)~
z@gf81${GO&+r@M>D3oroT^w`W4cmd64mGS&SGB5UCv!|;yI?iySSB)TX#MkclxpMf
zc+}@`>3mBn7_6t_Q9Qcks{84dS*ngF_F?h3l;5(ARTJzt{QsSYbW-^w_3bXc&4Gpt
zY4^E0bw*p=K4$lOFxs$HBI>oz5c_4z#>}78ZfOL?Zpb7;WO;$X*Bl-0PE$D#W`X>G
zU5)CVTHRTaJ)ai8HvA0D{gfD3_NBIq-v-v5?qkSK`yE#K_-{6sav$F<9547Vl-DQi
zZ0nJf6PGXJ)gA2YCMO_Y)q!+R&mB1Xt8@fZ^ND#sPCUBQA4C>^3uqd)nU8;a;oHX!
z9x+pPH2i=Hwm`V#?Ha9{O))$7d`S#?HEUiIy6D)=U^V<gVgxakhhm6yT=u+>`d{_4
zmG}Wc(bQ_yD}IE%TB^wLZACFwj^zp$??+NC92S-gh72$g^RR1Fl8EB1sy4ci<`$;E
zbWprk!nmRRb3q%Gy^KnUTR*u(W!zVc5o_R+3a22SF8-1<u#jF16Q5Wn9V8?S#{ky3
z6PRGoX~Wy|!42gX6jAu#j?#(|%-e2&EX%dZhe`Dsl`SfRpH)0Xd$v-GrY=a2lvPdY
zkVEl1kkc-+%~AiwCyt%ooNNV;#b$j~P7DU3xTJ-1i_7wy4g5tt2cUej=A9+Rx2E;Q
zVo?8(Ln6e6G8sq%6L~nc|9u}jLDaNElxKZY%CWM_DwaXLk)nMi3-zLFd{$_kvR4yb
zl9z+e#8uUkra?4({CQBqD*LCEZOljAkXA5o+2^Erpg_sINQVC#4B_G6m<l<pW}WN`
zPF{u@aynqG4Krk9gi0p|<xV}Jv?tissMokPV8107!k(s|1)p0OTT+BbAbIWWxgKU*
zS5@9mk2D9TwOL&cCs?0*`VB^)RcqBk%3=rq?oL<O^xLLh4FhL*sN-b{6i5oXE_aSv
z)ft5S{8Gxz^0(}`+B7E2_OGqao^FfhlPiy9J~4wgIG^pz98rSjllPxn4~Ii44r~M~
zNZ5Jat3uIrKlXOD9sH>U9>19>$9*+&nKgV^vTDBcT~{5g(`z&xJeY=Tmqj~3BICOs
zTC|qb#~pLqy*+3Sx@O~OGiZ7#H+nksQ)1@DkiPGJctZ&$`{R3;S>MYg@c7?g09!&p
zEs}-k+vG>b&Obl(%aex@BHlkY7`<<S?lY8)&4E1kl{otK!VPb+eoO_OWnDj}pxWFa
z0Ib8;?S$W-otQ_RbQd5iil>LYtdt?(6|)sl!r5!?54Y1`-uHj=f34~&r4NOA?}xes
z9iLy}=0zX)o*vCa9+l$RdB1jFWCXo@<$Wb2SPxpVd%yd!&h|PE8J`ho`(T9P4R{aX
zzVsXIcM{rPd+hgvOv?yzbGJfxFmAKL5C3gRPZW7R^6Y+#R`&n<4S|&Jq@uXzd8z)Q
zeJjxD{W{Z#fHx|V)b|MGVas3A47sn7N?xRC^wUdPb#^_qw{4xqWC8Q%a^lwUVaKur
zLrXS1`OV}SlqFVNYsWhKPiqn~;zRq$?dxYRSV3`}GC=BHLWl6_DpiWHwvdBg?1`hs
zh{=CkT+z3=5HLoy$+4Bh35a;G2N*Rq$}4fVpJLLDndT1T#=O)Cg)G$+Lfnby<;QDj
z?*zVhMS;S@*v%-S(h66TS%V->$%CKAMBv5kWUptbB9_$97_0P8*jTek{DH`xBaGP`
zGERC?!wQwEwAV23LGYB4$p%U9IqY_^q1<M=V{<JbQ4A-qdr6X@;Peq$T7w<bv$(oU
z@tTtCJgN53sNXF-l+w~svJVNa-P7@1Y9=j%T|4yZnSzf($>K`pw^=TkRW4-->R}1M
zU>Kb3=B;ho-_gG02!c+1t~0yv@*;GATq9%i0annAKM_1Xned8Syi*Hos%GVwqkgas
z$Px~bdR>J7vR{i4P$rbvi=fP#X1JMJ18Q^Yuc4XWR<{!Ae5IT{{0j^PgR>-T_qRi>
zBS&+gc<fiNDj^^y2$AXi&qL2=;X{Y^^@6uEtDyIrf&#BUJ`fzqZ?{g0PYv&py*eL1
z<sSkDnG$_J!1MgtfmcE|uQ;Ojf20Ve{4Tnm^Iz&Wtd@}MFoMk7ud23!e9ldrHm&N-
zZtbAh_}_)QnYWBS?&|#NpqyXlKO}nt&!Y8<d3)~eK3a+|eR^JJyb4@5{;m88T-PiR
z78Q7`|9GjNa%1g%@4^T;)W`bqI&ix6`bX5qtd;nz;$wwqtLbl0UhU2i#>~@D_S=2$
zc9VR4mvxlTXTs~n`)OW?BEn<3-2Cyco~?JA&g=DEk}aS)BILpGkN3UuyVQqf!PDd&
zum97t{KvC}Q_yt(D0G(X(z@d;@ku+zhVS6+!~4gdd$~N30C&qt=&cSu2Oq_^-N_ub
z&2E@&`IUr#-GdnE{N9fC>tUivEX+JxeHPw%iu?6Q(2A&y(QBD*9_=O{Q3dzZ%gC^q
zQ}^pS6zPw@5C27zVS>)j%j&NH$fVjz-a~rmtp8iTlTWQW>#<cl)V=SM%S*wt>)X)3
zvig9_`=H*(HL?8vurZ5^i~lXa29;iiv-$5#LShR-{dpXPU}FA50=-^OX0jUk?#A=>
zTn1d~LoOy1@|&kQNsOPnB$rt^DEStzmY$P}Zk(U%MH~xUxmPuD^ry?1&$TrcXdcSG
z{)<BV%2?Wh?%hHY^PHTfw)ptdEcKF2YPRsZg9bU1n>M4GymaFEV4nLI;}UW-8XP6@
zr;5OWw6vPfrQV_>B;yR5s9D;ntv0}+He=f0@yx>OkQs`qj*At7T;0aBiKet$&FbNw
ztc|}cIyLB3Dk*<4f9HpbDVw2-yY9txJi{S0r^5Nxlskq<Aq#ZP>`ab6(P$2(qRO)k
zi2<%6soq%Cbd3{^{DuRLh>`Foi|dU_J=|H)2gw2zJK--;+;sLCF!9Mxea-QJf+?Ac
zQk@J2BmosEDOTn4r*Pk3-ToVkh^mPCvGiBkP%4=t)8j}1-=JT%2CSHZb%s@V!$@z;
z{@aINyoG4Rm6JRQ0ze+}IN0uQiP-$1yTMm~!!WCOsP2Z`H>8SWk@KFsgBx%mb~qi0
zCHG8Lw&zP7OoEUAV`=NvVeri&$J*^1WM&8hCyM~f%~Z&nHEAf9A$BHt=9k(x%N)|-
z8$@_g+oj&CZ4%zs9qgW~Y8hgeAqdOq=ffYr%cx$^f5TIUA`hL#2?GCxrIN|~;dV?D
z5q7}qj?uegVrpX0RSFY^--<pL@tuGnRQ>Bjr#!mOqD!FpF4@EC`Bfy3LHB`Fz1x}T
z1%K(^qjRsXZF{9bVBx~UHmbPifrigyo{#4k8$kovgXjcAyy}^s4Lpy#*`6K4ID?#L
z=+Iwo>7e|#S8+a09ISvk8s!R~e!L}d8~J`9@G2^!xmYgall<Xx9-g4`+^nCs!x*UG
zeSfHa5LPRefs(H>Q~g$FBX1`j?r^&T*W=Q-_ItDYizhUnaddkr&g&i|XeR9LuZvy}
zQ(_eG{=&Odz~i;e8-0F+#K`;`N#9^^Pg#q*#Gn$CQfJBKS+U>Q7rZVFFI_D?fq(Yi
zO^`7@$gcv@e*AIaQQ!S?(ameWs#2@<sYS2$s6_*54&C<Sn(YI-U&+Dk*UMkChv7B&
zh_^irdE%Ahe;r<UFK%j}t%uUIPsdV^620gjC$SD640tc=_X{t&%@I7NycU+YO!Vnt
z<l>)3ZF8B#iqyFFUUs~h4*k>`O=S<rLx(`_zo$S2HK;<gfWBx6QbWb;FW=Eiu?uFB
z{)wa%z7n)oh`Doxp&@?2+y`8^d;3<Ow4|qq^I8{*nVAh>|NE1@>t9St5u<RV21PwZ
zef%R?4vqA@VYeYPodV|<FMwDoLXmdI`c=nmDY(Xx-9rKR^_|93M4~MWPMQ{*_8d~k
zSOu;Z$jV3`bs{2QNU?bY#)?r6k(%q84;SSzG7i$XnT*aQf2yRORdTCGfOJ?b%+qYC
zVAYJZVsaEA7C&@nQ}wwhlak55`2A7jj5|W1QjKCbsmm!AkZjF7x&~^v|Eyd9#zV7`
zR47o)%veMH%Zk59aVV)Y?T&vKYV%AvC0Q*Oayj?i>aceO7Ul_hltO_`eB$9RaR$qD
zbx%hHrccFYnD{!X#jJ+BKW>g_ID*VIpl=3?k+H~g-Y#aJCUTp`;~J|J;Vm8|&qoB8
z4exRslv{-B7mf}5&RfY|w-I<9H#(@^8EbVK|C*7#tP1}5hkmo&WHI^mp=%{C=>2K-
zEdsW$O#kx2F^B(p(}{^CZ}l;f=uZ4i%s+X(jOD@0FMiO--M5nO`N*vOPVhV_RH<@S
zIN5Jt+2P@566X9?u0N>N;C-z9{pZrL|JkDGxbR`Fe9-M(!Mpi%;L9oY2Itp6*Xo66
zweJvt_i-L!2et9KI<oc0w^_PeQhu$-jKCLiC9o)qIRE}OipFPR*X^=MihxS6ca)C6
zQXLm~lv4ltlw2=jyZ_CiyrYkoHSlF;vs6@g46eatdF@wWu_xJLs?SvZ&;9)g1U90e
z!=1e1`y)-_R>((r?1b>QhR8k!yGkQTa5X!#cp$e#GZCp<&iPB=<0O@c^Fi}YH0uFJ
zV$1q@F+_R&gq-#-TOaSdKX%amLx1=j=CwoiEpD`vIrk;BymA#Ot+mEG?6gJ0CbN`2
z95L!~>^ziZ-m(6+{W<#Z76k!9IY0^QRB{%mfjHjO%e~qSo%OVpSBEIU&VZem29~(E
zM$8SH9B?jfyGl$TE#F_CEO5rKX|QQp*lEgIv~6yE$`z7a$h5J4WygY6Yc_*+y;ov?
z;P3NBb@Is=WLz^yzw9r;#woo~RmE~zRE!jd04?;d4dTE&d-I~$bFZfPID{KRA6)Lr
zffWc!jxb~_UP0OiPkM#sISC$tJQoMdq%<RS;ycZ=9S)2*h>iQC5uy!*rTBFi$zT0F
z4hKqB1?qu9wvrqTo?@)&6K|fW67{SZ55w@(oj^CMogqHNgIKJGRuxpLHqGzIEoq&h
zRKG71@dBjX6QZPKT&Zbngo^)+Y`_@%%;j4LUYBp?4G&e((YIw(%XX+X`Q{#$^tsE@
zbynF><GK@uu7H+$#=zK|AbN<G@Yp|H;ROBhxui@pc#NSUS#_zR`P9^x=yPlXi57NG
zeRxo^wXz~mS`OlO;}T_$f?CPTva1H|%UO;`?Ek4Q?$!Gl8O6@YY5D)Sdh4LJqb*z;
zC|+9J-QC?OPH=Y*P+S7EI0cGZaCfJ8ahKv!thf}XSaFB@>p9=dckaz3Gs#T;OZMJt
zul2sqOHBE)CG~0YJ|b*v!um3E<7w|-S$*bWm<L=g?>2+c0RwZVSFJ{QQSAYwi4ykj
zq6a^__#c_wk@HT|%b6J64YRG8mF~;JzD0T0BJZ9<diFlCsiE8!$kGguu07qUL)LJ9
zzVcAaHYEE=)cyMK$my|nhSulsMrD@l^FhXh;TclxZG~k)<SOZ$3FN8{UG!y9o0$B*
z-?6#tDZH`ep#A=_$MDzl{K}+&#fG12KX2GcKu>U-c*@CBM~&EH>Bhq{2AIurhtR|0
z<p*Ys|0A^K;FH1137nn@aniJb2I=G0A^F`1Y4>Zl?$c2H=s}pO@1^36aYH;mo7>~7
z6H)qUBsY4^n~y&5W?stgBBf;f4;!y@SB>v?obATO=Ho~fybss2zjnBuFY@L-3Iz`N
z`>kCRntZ?bA@}CMDKmXFpk_7EaHWKQ&F$8*yX)UE$*wgzRh-*?(nK5xtdHA=e24DY
z({|@DFNxuCU@SgChEJ(o4m2z=%BP7>*ROtkI-?acy$twubUKYwdf!!J9#Y+kD=F<m
zZTI2|{*xObb#hZVKt~&b(KnpyvYJqeZA{ZcU0AR6dyqwhJqlc}of@uDGD<u3RvS^U
z?#*625qy%8w_4;m16dYfb`v;4G9u(BLqd}D&pX*wh_*h;80uTOMAnjC3alKSV%6cM
zkM84Kb2=K1=_PK~IO!jK982&XPvSJ83c2I5I|ymPz_>CsWvNIEs*v3Go<PJ+jLHf&
z-tc!8_Pq@!*TGSTRr*6BGzb|sGDIa0Q;!24#goK|n_hgF<&LLPZ`v+@;a!72oaMF_
z+gqyQ%ij<WcOfRdMZwwz^qW|51DL&u?6j|rg+h|ak$@jdI@BR*knXcxWD;6$8t5IF
zFnO{&5qWBi(%(Qv1*RyYMTelC9rvC0vEWEvexm#4p!-2|w>Al!^nrfHQ5)8Rj$Rar
zVmRx02MLgSo3ybtvJSk((1(08c|2NI%hLXswvUsp&4q6mOXw8G9El;cXHFYpMj+dj
zrfTvCBH`fm$-ntI8lbtFbs^@l?6nC2BXTZ*49{6*{!V~2XZ&4U0^j8G@Aq|-=R#{p
z?5!7f5OHL)`+TJ8*Y)D;!=;OzyMvteYOf7p)JD|6NA}K(bMbFJ*SeF+=UAfMd-t6{
ziR81Y9`N35X~yrg^>tLG)cgW1z3FUy$jR4z&G^<Re?^$u&}Y%`Ito}Dug@ME94j9_
z2?(1xJcaOvJzoZxz;9->p9<`@Y@61()fib*T$(i+b$!|nrA%8@hwhtpAD@ibW0Sw!
zFL;t>&*_gERpNkPns{sw<C^vdF3>x#CSEO1n8khOf4tsCzTS<n1+)X3zxCpM!()`G
zx1;gptPTlcZLy$g=hdj|SwOCu_@&Dcxxetk$i|$1Tc7bJF@D5}+khR+W7h+1J4u%T
zIU{R!TGuP|DN5A*WEA_?mgSl8YvNeI<N4I{$PZIrz`;|gTcd)T2iF3CUV)3d(S)bV
zl2z)z<70MQO88;z_uY0}_f{mc22vccv4v9;yt>ymHUynSr19)XR!E$k_oa&C{?6fA
zX^(TFg`pTtBky=+R-B|fU?P>QLe6`mN?;D}O9~R9M?Gg+1n7cgs3d~6UM$KawX8<P
zY*H*W?UACGffs*feDETFiS^rylC?}WTXQ>!`kWq~tZexbm~rV+Pa!mM9UQhzosRJC
zkINYDJK=^&O&uy)EsO{PcdTG%Rq#WTaz?OJ8eEa8&EF@Svfm<TAj-nhRJ=b=nz7OH
z+l4TMVc`7xNzFNm5tw1d9@nHK+xX-k#vs>r!X(GHUw|1>^?{hdZrf^E;leJ(qoXw4
z)>jpoL4vdpz~h(146MacUFz^n9O*jw>0K9T`~ezxZKjWWgjuw5CFA1t<qK$a*wkxG
zgfvWE@t60()VbAsvC$*GQC|w*x#Z07v<jM=-fhB%+a)``jS&)2MKb)d`6$WA6^tP(
z3(O+5A#8Uvs;Sm$=jW}5!M|dC0<w0<9hs_8P-R0fBoCMp;&~X@=zpJ5e{D5g7_9n5
z+Wz%q$qzx~D@OO@+S#`v8Q)fGq{B-K{#BQL;NL&J+xYJSdDI6XyFYn{)P0UqY8079
z=V|D3pt^DXoBr1tlxfz_Us-p`Bw+SaO*f-J{qH(M^kwl^^AJn?g^q*o8>Y80a^$9#
zWN|Y^kH;S4HPy=(e?!GjTZT1L7hZtv{;sk)J3p@DY`&(GiQU;&W35Rj`;BfjQP2n}
zu9sa*Vz>X&O1IZ`0D0#Hg(ea$0wX}P2zc&cRd3&eG1MUSx#g^B|4n~uH=Xpg+jY8c
zvWyb4+tS=It}CV$z08aBBcEzYtit1YYViBV(Y}ql4#OLj&c~<)vCkvPIUkr)8zVYz
z;eW0J0Tt9!{Q#Pv?WlV8t0;ggMpP@;`iGg+R29|ML<M>jw%tI_=_=RLU3fnW0?-$|
zv2Ej)C&NB%h=Y@+4axOFio2iIwgYbHq6<QEqfU$GPqn#km^r<_xp`_9NVwTAwHME{
z8hMg^BKeaXclfj=Z(|)yI}GC6zJ4PJCk-dUSMmp=I<w->xK+!@4|;X;QaWRqx)8gs
zEGrtI#+CY&>3h-lMEVHHAR{Ii=`QK!cN?mIBqZ;|P!Y83KTg(Z#EZFU(<TTnw$$q)
z3m_Q4v`ESd7j0~+a&n<T3`y!j|Ktd*-N={R*^pC&i7ky8Jy{Eo^P898^+;xKOb*k$
zM}?9Z>FsS&Ozs_oSl3u#U@kR%C%t(N`NV`?-<0tUhX8EIBSsl1BO3b0vsGO;N3Pcr
zIWp}tJj!L^Wm%KnBHtk0H%V9+MHC&1Aji5|>3j*vA~kN<NDph}G{Kpd*$hNVK!sVm
z;D$EgCH9vOW<xrE_=P)VNZPHJ9mX@X5%(PHcis#x;6;*|x&QE1tYNWSZD)jb?ql8x
zN|(V**qKfKH#l(3Py@Fb6OpnwTBTU4W1`=KhKJ>RckA9umt{7XkL%-i!sJATV&4tY
zr6+wudGg1<orN?!D0txqEfKrAPJSZ0yHGhY!BtrC=XWE6mCkzpb5S}uILA!?j`dJe
z(@YEg?~iBNIdUs^caCEzWVLR${a51r&Yc0<g+~vRsxUy0DIiyye${)3w*BOSYGG_i
z6fd%o)Z5L}e_%O`EZ~^G`P=NP$V1*dyRgWsu-o96Dx%9Yxj)io)8pCL4CXt>un#%Q
zCQTc^#oI1#P1|oubG_$tuZ8!I3r%l<X6#F9z-^)Cdl4duu@jxQ#cy=KJ?%aaXLL>)
zz862-0}zd^YrBoEFbiUC_>xWe{?2p#85j9cpq0zlcH5nx6~$bky7`-foGJtu=Aq}v
z!gUDv5da)@yPqsFK7NAvZlumy7M#)wG?ixDe;A@WR{M0!x!HOt!?k!yVfNHl!2djp
zdDy;^`)EkBoKr#yppVc^+;+*uE^CmwuRT<X(efG{y?0UU$$?JOcIAzpThDsTP>#`S
z@GBc@Ho@9ux^tx-K+u)JH+Bd1ep2s){C|*P-5Qfl;L7l?*6e%BKIhwX1YmCf#I(ut
zAKh-4)Azu=Y$4zoc#ge(UhuePgc*uqyB{V)s%FwoK!%0U7j<rq3g|ji-Iz0|_vSx?
z`>mqdCVnV(zHJwQBgMFg=a6aOUo7lj()P`$Wm_x?&67~YLM2vsPbpR>3O*(VVu{#k
zLZnVHLn_U-7`TL6^5J7Ei(O$~y>wcebUEM$bTdZ8M5*{CT`Vb$RsvUUfdXkbrt89t
z{E(yil}a;FB7U5yx|laxwR~l0!Cqf~KjI=w)uY)O5h=cK+!ih8YyI>lksPD-r~o;s
zI^&lVG$m3FF^%YYlzmvxr(&m#?_$Nn199j)U3_bAp{1Ok(Kxgg83@WP7&dGUsiBle
zBuF`L$3SL$Q`FXr03jk$@`EMulARkQ){k&3gNQ5II{z~j7pyT;p;}%YO1<O!QGwu4
z&d~29j0P&nI{8LSCY;$i%e<B350&;e<{vuZCxYKlVGEM0-|c`dD5y)*g~bxyrLPbZ
zj^1ky-goqx3rxNBTqjwjs<pbjgXbl6;?-9uPU|Fls;~XN!(OEEEy=F2Wge_U>7l!N
z<Dj7ZVEJifx`sqs_uEIma|O<=8Fk7E^u@jySw#KMTjW`jF<||P%-FikFr!uYP3lJy
z@BVSThIt4Wyd!$%H5E8GozFTz6errcTOu4MejCiJiY%mAF_!Xlvz@!*Zr{^xs4oP&
z3EeP4H*0PTV*^^qK;*pVhO6B3eNH=)i8d2<clRlAX49%Tg>CCYPh#$(`@R&QVzq4U
zzoxhz+yi-aXps51U5a}5kh(K%_z!3Jd2VdyzFrnU*q)(c7yR_OZZG<0_nC>R_wA;p
z@6F<h$HZNZBN7{z?PJAmfO5;&WvRGr?}k~tedk~CwWYc5_n7)By5<14Xp?GO@BuJp
zQ%u!s`o6jbT>Q=r0N`dMHwk_VJ2{1kDH|Q<-Tz=qSJ3W&c~g=Wi`}@>r)PJYQ`WHD
zIk)zI#TPQiPQu#ji*`UhciHngz&eo<b62<ZF>&!h>9MJfI5c4s==A@|rAyD+?F!lL
zK1HeB67TBp`pNb5_jJZxx8wS!^;og$3*Bc_kDnn=L#g~8#ZKM)cEU$Cu1#Lhk3JcE
z!1VB6laAm2ex>{QZvP7Uuj32UXigmup_xvoJ57T(rq^2#@g0%3=tQdj4^1gxk2@Fk
z@591>5LPxhgf2vWSB2z$d{+ZG_=b&k^Z2*IeIZin3PmZ2Y81su6inZJ+Wl_nx!Fw~
zdpKWBJgOnf3v8r*!)H#cxF4I06O*5hinpI{D3hIy4VNF%)-h4yDe}FTgZU(>s$|Q8
z9Q|4#@9Y^7pd^H08DCZunNDcy?acpB<00~7>yE?GRA`&)e{c#lL&5q{aQ67uR|o5B
z5Ca}7ruGq+zNEJOT;?Q4Y(<_`5^~0?4l?#zD`Cop@?oR>WWw~?qnT)>)x>lXk!8b7
za-@O2jPl`w9;P7FF&#nqM|c?7v0T98oskDSi4@aJwB*+IS%9L66W#z%tV)%Yi>_Po
za}c!PI|~i>XQsJou!KTxGLE`Wp~k8c)08FE7R67nVOp9Q<A|ry{*QyQV*!TLuP4ZX
z;YCMorL2CYHp0r~BVbdD_z7+US$!BS7IR;?pccU}PeTRMLwmHY21(Axwb;KRm3#$E
zxPdI$JeokiZ2l;8lrdWEk+br1d3gZiNJla@;T}WNn=I9LWb<kR_H^SmcCt%5nwbbP
zbe-04q>}>FM1nPO2c=98`g(SM5AwCEFByLl7ZawZM`%^iIVeu>79B;X7;?7gP@C7C
zxi*ijy|0wuANqDTZ%PLnz4qLL&F=j+A|}!Oj4h@+`%h=F=mXy#W^t0^iu#MD`x(3Q
zv!wRALWt}onyaE5ywSvm<ROz}=oz`k1wMJlcH0A==P^K!yf|){TDOc74He!jwT;^V
zKz_z?0yHXUWL<6F-7UsQZ)4BeFWN4<upH%0ZeGQj$}&WNMT;J2tTT`l1{|Q>S|n?2
zC;70$4Mt?5J9(PF)^36ihO0gq&7APUBt;h5qx;y0Sbh@lnLVe6yL*`Lj*Wd<t6_h=
zBMk7|q72(wNPY9~Vx%f~`WdEK+~u{D{Vp`L5T+|&;Y6|PYAW}o;Zt_NFP|&uSWUOn
z-8_NA6`I(&o!{lBsk0yM9VRO$H_WqsPXD-2I{5$>O6v6cNkpt15tt2;*^i=k{iW6M
z6H8M~?@$VzQ|iA$xNb=7l6GlorgkbpM)lWubvKu`YC(3}br<*iLN|UmI3)Q?<Wgl)
zMi|-R%BSLHUz9j4*7D<YS@Z4f;+0cIu{K8dEcjXqO0;N7oio)+Pu=d04A^2lWH>j}
zYdF?{K^CJ_#)+|vRi{0d^^f}_jC$MKR7#FA)QZiOM39|UKsQ%tDT$m&E)N0#07+Nd
z-%+HZV_kcDkI_VO?Rc4VDdG8vD`r7VBlKq-=Gvut^;$*xQnQn#Awmt&0{6khgr$Ju
zx2rVc-RZT!JiMah9Dr1!-3jAdiRSO|vX*D`^0ud&?$fH!YsAbyH%ah4SPDmbQ@@fJ
zqpy=7QJ{raXbF9J2U8u}6R5|5k*WonP%3xQJ))mkgiqR8O3xEaOh<jM%!1jJOq`y#
zJuM+H<6-5OVw|cW`CWfsO0~ewP`&!+q5$TI^_wcZBv8CA;Usoihy;);MHJq$Ak|)O
zlZC8RZcu2s>Qvd<hI(bC?5#%&qP2Hlbt9Q1Ch<ZUyw95YmhRqNd?*6&B?Rs1;_N<t
znarfOIe^Zz@CXaQ?6y^?+ce`}ya}U7nVl4_5l4s<>s3`bg7~I%8d%Ndb~)ht{y6<s
znGzBPRr!5q;u^!Ag8Vtww_vV4f3aN#qb=tod9vhed^yJ%`tyPtu6F&}`gKKorrPs%
z1@cf;GarN1RykV_<elK#0HCN#=8ijlnq1M>3QC>(fl}=6h3<oyVVu9C0CYgbvt&kS
zy(Wo-^7l)<AL_U^1flt&nixDb5b{F~_$ni5k|uSblheC*&0C=>N_?akQEJaB-J4|{
z<0MAi@mSoN^=i`j6sR&-aMs@MFjBtOxjOM_H)mH4!4#@B#9cCZt0rMs!hnKsG2v(0
z-g?K$OG?m@SpQICax<YP7EoECfdre|GIQh}%b6@Hf17u9Y1roc<C`hYg{-MNxXIXx
zBkh=bS)O@i%q_%auIzl^8_r{y{KH0+t8GgN9)k&!u#lOnoD>eG2#1q+^Fw`t86qci
z^FTo<@G(7vLP}hg_s{Vo4;K^aSF=S5$d6$~+`&nD6lY`%K+Hu93k3!M?ITRW(<r~O
zb(Bu%nlq6v6Q|`4kL@e!c{nxp7}Zq33E|8(z1-*q++M*pL%IB1Kx^j%^iWs;WBuFb
zpFvstTm@=*BeWHQr3S3E8o$G!7zJ8ER;~?%`D(EmUE^?CcAlR1z0Ul(FTKkL?>ZlD
zQ?>peoar9FfNCz~_#fv{6tPw>emkD2zQtd+^2(veuOv`%S~uH;%;_rk3$6S!JWK8T
zM<+C`&lCr~38%G_gT;t2>!uY5B=|k8c0<K9$}^@s(d(gHl7M>hewoyhgp;qj!8{^6
z*UH>I$-(fu;WuBJMt+T~GX4GE4;3pi<!G3d5nSBfVntKZpog7yaI!KZrlxMZQj;p5
z2RWnJ+^&&DGJO3Ev2>zkgkY6}tz8)Sraf!suhPk$rVv9gb)q8%?nw60EaB=?(yIN4
zEM0%*L$s_csFx|Q_Z!x%oxc2G9*yhQQIfg&1P2qFsoiu&sxQT37)>{Iz~S@eu;HYq
zi85qHyJmbf7fes9tPn^+34k9o5c2*2@q<Anv(Z!Oqkpr8i)c6**(u9&1%LMRLWii6
zv3?hk?8pv}VY9*GT2Uv4b>a*8Z}86YbFFX+pis&Vsg)NjXy?3*cOk)1?5hVjCy^Pf
zsD_a11{fLe2M&l=b;EwZv)$fsaC7yucbF3qv>E3~PM$Zds@UgSS_)Fcmh0qM=~(jy
z9f7pukuib*pH3m~STScv_Wv-S3Z!#{oMjKKTMs;>T?wr}$aDmA(U1_zR>xc*@z;Hs
zu~k^uHNoGl&x408AEYeMQ16P1tzooN^8F~3?vaB6cz>p(icyDtZ6^BV7MEsTFJ4MF
zFw#a@C?I1-tHKY_ZSW>^0SfXU6~W*sx}}>?_!<SYYIrPtX^`yTD&BqwDT<pqSRk_A
z#YqAzu%tGW@tVqE=F&j#LTMf+7M}QcSGG16jaK}J{!w~x04<`(K6f}U&j`QM>8Gij
z(ESL`yvWM?Oj;=8K5MVE>=8?5_Lp8=3C0T}9S};mQ)<PBR<3qYIOgmCG_2C`oG1x(
z?h<>D^dJm3Jn|TprKJ`VcSFULTWOU!{RNhOdF;^B@Bmu1I=KT{(e_NJ{9vIfxIQ>@
zQf@7oQi_ZI3|{Z&<{))M5*;e5nF~#+#~0`a^8Jb4!eovfFDkvJ3D1}U6CJ-UEA@Qo
zIXGG(v9Hy%u<$4s^E2Y>yq;s7C&}%<baM()l-zooj5d~pv{(NYHT?FbEXDvsVGzE)
zq0%-}Qb>AvN}hiI|KkCqj_k9{d16fLw+JEVQs(+(v;*&gV5L(&CJ7{mDRfc<g(u%)
zNl@JdL<#6?W)O*dEx@LB7e4T4<tqSLVFhXRT$f=Z9zUkpmsv}pe34X0Vs=15HrFWq
zgZ{R@jRG@L3Y7}?S1jFMJuWUZ9ic`6Q}B!zlVqp|_Th=AiQ#hKuym=+Y(_@ZoDl?V
zcV_X;$dv(Ia?;{WLdvZ?^nnh^^ezJ>2c(uuxDZm@$=2Q}an4P9AUV$X4hzy7tfy;4
zO>vl?^Hu^Ai&2g?IpN!aReLdr7E2ODUWIqm=CC`Iw|Zi$V+ewCpso$?sj6iq$_?4(
z;9jtqKItg}p{`UlKqIoJVxpnsQClR6u5Puf4bqLzh*KV9=29(!pT+kZ4u`TH0jeKF
z$MHv!l2--vL%{yTmYazln1TNywlF*`8M!=bI}AC)F<c%tmR^qB*L~-UT*Hq+8Wyfm
zd&a5zgRh(o{p0_u1Wp?Vmn+0y4PXq<i48l6LPGc#&G>mkV6n?sq{WmZ^WygCd$g((
zYRgu>>_f0z5rU~bc|A><pD^EiBl75t2H`5?l{G*>uprbWo$UA0Y4xBI=aKsKaE9?r
zXtfu%kfX3Om?Hq}mbCz*%E^O`<HP1lKHf*Q_+AiUjXYDkn+GY**28@i^BfZ~>|Lep
zzNTQ=K}#fsd4+DG#S{W2cJYFez&XIr{dM099jT~=FaO*;)LD(18wVc5SMvT8tMy#5
z{>xCBg@tY=rf>BGPJ*G2(A|q^gzK2}+RtHy>FxV=wj#J5_|rCv5W>JCjTWZ~{~uXy
z%2dA>3373os*<*r2wOUpiY2(X2=}4vQds`(cdB3nj*){A8GmqD+_(asO~z86*~FEr
z{}<>8=~H@i^!Y-^IpcLwSQDT%HCrMn%NdBNA&H6z;_=`L!Q+X6Y)Yn?{>W0~eo2?i
z|IhZ*6ilsZ*rO}#A;1caP(bnjv>&UGaXCWw`;y9lo{HI}=BO)Y+Plccw`YHmDgz_r
zYtr<QQGq&yc~IfWVk@#tO%p>OXAcytF}5i>sw>F|y>~<4!cCD$W=dr~Zu^pE-q9cR
zuq7Y3=#n%3UYW{?U%ht36EFsoqmy}&Ilv|_l?|KgQG|zBF`7~&H)gVP!3-~A1H4Z0
zeO#$~v1R2`4{GGfZi9c_VXg8K15WcIS}7u|Ee>|8;TV^soMN68r8I#8cXONXt^5m0
zMjzM2x$2%2UU>_*y8xG)THQH;Os~i9`-}*_Kfbe0+;5t~w<x0L^eq<H;N|p}uRa+`
zF!5xnaaIHVhgfGg+o)tUjUM$iHeYr$$)FX!PH@QAI+QWjq9hUFiB2*MoAnte3W5Rk
zzUEA8L>7btm43!5i3XM{rx7h25c`_fFN5pD9fa8Xa7-mT8@eywAcjpxk+I*ML_~WX
z#UiT8l$-@^<N(^6MXa46^y@V2W;oO=e6WD{Mn;5+BGt@aH@rvoNyznoDyt^er)(d4
z$CX3VSGWA1u4@1viPi>b4-<E4N3Rjf(+QjU5c%hSp;SDqL^`-p%(EscAbXfv7R6B;
zy+m1%t^Tjrx5A7?gdgg;W)~S)j+@27c)NO9f$r^=MlJ-n5<$4Z?T+u0$u9ifz(ciJ
zriU3En3E0i$`n`yTMp5Sf{qZ%t62sj-CRQ$K3IY+DPVpJNVm$rTWS0>DqE6!8TtEG
z$j&;lofKkEOd(O+vII<ii?vXHl~7S5%9Xs*&{1Irjf7m{?EB^{4Ws4gXhLaYq(tIG
z`Jt<Lc##N^k!5dar_9t5-inoT^!|WbiiMHJ`0ycxqDl((*SF!&B!*0eugG}e71Vu<
z$dqMTII+}yy@d#ALD|v(e{zXWafEwz^@tYPpL(1;z;MJYw*<b0N=2uSI-*_Un@U95
z6mh!$T`4)5ylBMFT()S;k?`>jHO5`p8`6-FcE%|r);lzdL;UoXbq^ovM9Mv`Qr?G(
z$oL=1-E?R;n4_}RLkgZ^Hh^n5K#Gg6tHHUd0aLHheMyBZu``8r;|n>hNTMZaZQt{D
zzwmW%`Wv01vmB)7@_;q*({awa_Ybpk&|;lBHvH-S3gct9Kl1r%dd*I2+%F%JK~_j#
zvxR==yZ2^5l|kxb6eBNKqO}Y1J;R6tX{-s)YHfLO`mRa3Xh^zPF@(HAY$WuCfAGe>
zV1-y!O2X#kS`?~BufnMhaFGR`VWvuCqy;PO!v^XhXO79(HAZZsn)nH#Mr))i^tfWc
z6d}kUqWxfrUxZ{pr@KbLi&7Z78UQ`7e*O3I`$$@h;S<-I(nf8W%3@Sn_3sP~-MrL=
zJ(2pfE}tZ<i5hEfa(^jp5M3K{N7znmY?Ur3*=;*nTTR#&(_m{<C~|nN-!5JTX&6f2
zkj%--*D#~<b^N}kNtUF;l?^mzI8T6MMxYw2M}tRTK%o7tC?8iuMZ1&=Vzi)@=)>Dd
zQe#X!36y920f4Ox58Q{3KJ*i>nCr|zC~4)s$xG(x!RHwOt$_+~r~Tq_YP8ZF1%&~Z
zLBABvm{Q<={_K||6d@h!!cIOyRW9mu^7Qfc;b=6%if*csI4*LHkY>0ya<f6OCxIOW
zhaDDI%-OgRDVx6gm?ApiBh}R4GU^5l0Jc?)fsHR3429J@3EXX*TB`ZGwGmI^eOIk(
zdcQf@5hHR{Ypf~vvSn3sclQGy_+7mg#!SSdb6_?}no1#yIRqJm8`K-l<o7S;BuYM)
z2PRR^e4h^T`)wu3qix)#z{2PC47A=g3P^-ktY5XL9^f(S{D|xb9~zQ?Ss;!bQ1=`<
zM71WPQYO;*DSS@wTsON5Zx;>L!We4%n&l$qPSD3zRv_8zI1|Evm_#)u*$RgmX(Clo
z;6)YefN4v|HM+@(X|70QU!b*M^Fdlt%dWs+p1c%<d+Pb~<AIr4^F*wapB|(DkkU#y
zta1=G^h?hsW&FD0)i7BUWXp}M#z)yqVnlgQ8s#G$GYlTWcWofkh%DI~K2}V@lH_2<
zi6S6wW?4~+Q%{45;Lx+^4LhX6lN|H6b0-TX91F7QHQ!5+k@j{CeS>9Ti-miwB*Z6J
z2z^UMqzw9Qn3g%4#a-)Q{i}8sjpEHP^L}g=ejCSPQyCu<6D}n@HzY#6>iqco@wIzn
znP+lgI2YHwPzHe0H~fHQ@nbe)3l+46%2msWj%I@#+1D#m;hpjz#GW7;&-v;|g_+?(
zmj2zvyLVrP4jql2sxUM7ojO?wh8y6aO8eCzw&(yBa7|n_5C59;&+OezDR>&9J(OK*
z*Mh=%Vp-b#8+e%$g#8ycdDF+k)pUKh7NBKmYt5^fY5D#=C{0)<5{rWBV+J)i+|c7R
zsy8TNpNL0ScN<%aA(EyB4F*AHCTzb?{)K?)ruPu1A`QOnk9oaZNS+qLYST#N?1~lT
zuxH5hrhK3i!H!cL0LPFV^`fB;7Fmp6b}Y@}*AR47(LiVwM#PRpP_HtOMjb~}#7G_k
zJygu=sO@-x7_q>3JXG+4@&{nL4@7BwNi4e)wogF<!UDAUW~ija$!6S8l%;$`8N`zB
z(bLjI%J#@;eM-X2wUGu&@{2-0NQKFDwono|_}+c8e7~r4%4ULV9WMw;OHh>8wW&u@
z>;bPZ;7vPlacj!cP;1ZeXIf>wr%H4;!9Q}V3jr;eDSfSV<P}me<maYHDCZks{CQRQ
zr574eB0&%iy~JUkU@=NT!SjOh%&QG!1aq1@RQ&ziH4GmZgUN1z`1TzrB5A3T(2tz~
zGkxbx($jF-<i2cZntnw*uE8~A9htC{DiMcNS$c3siOlW)LU56J5hdlz*MBZ^iK~Dk
zLo4G@wxL4(k%7%uH5?=nrIxnYyQt3jWw_3KWn4+4_wwPIsZOh6_RHDPfQHH+cyDZ{
z5((vdIZ0UtE=rzJPO+$u^az+AdXC&6?<402u+&|)PRzo;7p|I#C#MdWq+_i`V`?(f
z3c3WxCk9%T&T2|Cr2e$)&tu|5QvIl_HasE4xyNG-!*M7o7z%Yo6EyZE2s#ntX^>AM
z(!leiyBYPP#%{pi+>OmeWFHrLrvxM4gGHx`0gzO-h6$z&7@Wa-T~@K@g)t;cN_c~C
z6Y=Fl_l|HZnQsxU+89^Kf3;EbenvC094^Ank;Flj9@(8>VNn!9fKRHpmuJ5du(n3f
zD<95N1-Gc0{^rI?=a9<`C|!;nCgA-(at@KmAfxB)qSREHqvtB`g-~P9-4YKmPI(PH
zb-r2FM4DfJ@A|*BbXg2_jxNpZU*wS>_b$wDX*79ST6!P(a$L($F?!KtYscs%WV~r4
zvi@LERK%#Y!bPHlCtWEh)U#l6e*3eQCDVr&*@t7bL#kQen800zt^{8^hV_Pq^g6(8
zRl3weE@^8{2MbLG&4N+EJCfA$4S`Jp&c&5r@Q$%05smz%HOQq<95Xxw!ThkQK@C(l
zgF)>sP=suaB}w4Ge>j{rlI{Ses-@?xtSR>|XQwH&4~nj}v6v{*ETkOdfT)kyX7h7R
z52c^>n$hzu1j8_5U}G=!H5E1l_p*MGr|*X$i+<uQq-7H{R>))@wGfL4gywH`oCp8J
ztaEhbXVBzhu%CG#bol$t?T<NZ4<$MWZC#{ADDqfBf0_o7!%zzYF(J4tqF@Mi$^?9s
z+WRpYZD{JEg${8lO38DArWDuJGuw7^^O*|!n}+qS&p6uHuX2w|LL^M6hV`@{ZK*bM
zx%6G)W7P-;*T^ujeQ2oo{{n=!hH@D{OcH!XyjLpEb1zL(mm*Ghfxz%;>**6+3?Wk?
z8e-sa6~&sVGeo+{5Qs*i<t=G}fJ#gdp&>q6f<Zf(ecFlp9o$UT93)OlDjnYDvuhz!
z2M7H@X##EpPafF%YX@Shzm*eR1ad+TMbHGwej{DJ74!t&P<cu_r)DIk;90bJ86In3
z2L}#=$QjD5iuWK#=O(rcn+a9OfAF7_i_nQ}{gMdf%s9pB^+JUz@RVd27or_Xm2X01
ziUK}@;ohx}fnyj-J?{rS#YqVXHd&V@ZMrB%GlO_ix!?$f4kI0|h)L2@6zO_WkG+f{
z-8JE^Nz0SmjNee(YA=^bac#|5G|-5M`qw{l;-&+XOEoZ>%OXG5bM#DSY>9}%^5t>H
z;l3~Yz1fb6ASu#l4BDHDg>69WWom%8V5e18ywI+Jn2C@0Eggp{#th(980{BAJ|au}
z<DLJ1P`Mwrm<<**f6JJ~)Aj3S(vbpo6DKQdP3tlK`r>?(nEaXQ0<VuJB#PKuM;R_M
z(gcG9N{bIzHN7DTqTM2Da0xJCvA4@A`_3!>bZxY&ny=HqM2(_kg~F6tz7VVt@obvb
z@XpIA=yKac8Zlfxo;GCsxRjd86pljMjXWB@0xV<xT5%|mMX)0s1gDT<#!X8=t|~|#
zfh2^$CUER^?8BqGe~yBM2dly4#5;Y0xI0yhg#umcwdply@=7RRr;`%o9#Q~brXM2V
znR98v%&h9YEjTU}-yN0~1t@ZxJ_8g%8slB)Q(qH$ld#hj-@=6C)gti_39%r?E)aZ~
z;Y~5eZB;nOVna)m<z2gz8>!K|afRW0%UJC1g3<I!DEQ}UQ+9x=C_hYn)s}fovY2RF
zexX>F+QM#EdYg7ePQZ(q;{l}*Zu#ngQ(~@<IuS&66BR9g#Sxk$qAvO;h#I>p{mJ%+
zW)?uTgbBh>lKi5ekdsMmT^%#fnfmRF2~kT$h@9rLAjo!TQ#0gKP3;=xq>DB4+AO-m
zf53nLyxBKF&9m#SH&X%EnLoCt%4_`Zt?&b8McjboM?hd}^AyaKJQ_QkVeg5Uv8m}S
z*GLrR1HaVnP=-5l+3KJk!hhAIh=D3mIu!eEg{r%dB@70~!Oic+*~H3&lun0)wxEwS
zb@)r~Kx9NR_|)ATUphbD%o7tY3$Bf{VTJpT3=fj3&5S&9Jld_7wL)n`;dm_#3`X$y
zH|a%OYmLK!-sskhhd~ng#xyDf5$XJ%Vy;#;?A}{W{;)bum{r?KPv(!SEZW0Ozy{0B
zRW7vR&R;mKm2R;`ijls`OD$3HN}I`|^BDv+m#C9$j`55to{N*0F51IJp9~6N(~XsT
zn<Rp*#7B2GE-SmhBX?M{dfM+W#%P1Mj~0ls&OqDl1QRJasXzIeB@&sJW-KegG@rJs
zljsnZpG5!l>O;^tZ{^IlQcl7&i{5*vd74t6Egcg#mmlKPCw~cWUvm60GU;%(R0P;8
znzEre$bYsCsBM9mAaniEddU&mVgpvVasy>-wYrQ_*u-?)g7*%40_^XK^Xp5hi>2Fb
z^^(Sfsp@`0ZkV462dUB9AW{2$x2(}c2c9+Ep8YD-6>c-kx5{;o{--vn$2%2FuV<tI
zP22U4?*X7=j(z)4&Le)Z_>og5x5t3TTBH5K@(uU>$zQ+MrWL1^>3y~ztA)4P3HqmP
zMLTMxLpf8iF>X+p7P6<U52VY9<qnr<-k*{N92TsK%}|i37Hk+bJCzX2U;unx<n94w
zr$y}<B0?v8OZA0_8!Fu>t+fRq_JZ_hUPWC?oL(%6w%-$X?!i~QpKJ1p;w|{Nrge-d
zX)6<ozQ1eD5J36+@q>9>9DXDN-ljJy+93)pA&sFjA~rS)r5!JpMb9QCnT{7UAH3x%
z0Y=<W=d!1hBI}oJptZnbhK%B25h5m?K`c{5#qr+r?r3j`=_5*~T}EfAg2v^P{k(SC
z=nz$85h+x@!_B~L{)Fj(W%N*VFAF7#OJ`n~MjtyYt7l(IHP>OC9~))7N*Nw?Q)xW|
z=;|QVen}@TAb=E#q8qAiDxoI<#*+7GFX3IvY;)Ovv*V!O=h~w94L>~LBcI-boqJNa
zmRccZJ0%+Z^{gmLl^0240g|dZkJ7Kx2=^q5r`CR2p?^dp$NJ_nHeUcn75vvQcXfn6
z=F{o}7}e`#$hl^D#PWi?yVLGJ2@zkHQ>rwhMspo!XUnNIK+LW0{2r_UjJ2CwR!z7z
zuUuPVkOK^?Xq+O#pSE$bRMagL50LZ7tAu&0<4PMwtp0Tyf6Talp@pcKA$%S~*&*`}
zmihrY@4qIghLCy<Y)SZgq$x{6I!c&%+ukNMh6wqJ$&+3W{JtV6Mr5>}T~J@IySTY*
zCU>Y3BVpR27b?@E8;Zl1G;B{wlnD4L`=nq937fW-Ga|UoV%Hl3zBtG%g{kc&WuLTF
z6+F(YY_<mmKREYZ8uCNKMdC5<d6H%D2?!C3R{D*yi{~yGC2Ad+a7LQa!_!7?hatZo
zX;^STm~?Sn1+ANo99i2WY6B&xyPhJy6kv#{Bn*PG;e6O&0iCgjXz`Hj;AS*VfCEGE
z%G5oESBakIgA83WF?Y_dQvCGQ;mqBxDKl_=cFHO`%B>d@Zo`~TMc-}fng!LbMwk=4
zPr^Hk$BNquvD5Yy5lH~_Yp%i6DQb;xNs(CVs^?%b=_I}QV#KOQa<Fkz5t=B8?o<cn
z&}Oyp0jM%7qo!K;>*}`XM-6M)zO!jDJ)w?<pDxlw>OIC{kDf5R-k-EKd6qVmJ)Qfd
zFIkCRPH@l_4!(C(KWE+2(1c-FEF!?B?%ThhE{^lrEqwbm2uL?}w2!2qN|;1x*rk@U
zc}XXJHFo*fmOp4;khA)maupVd)$W9^jg*&*Dbgx%=~{0jUJv&#?ZQ$0aU}==ra9x_
z`_f#`xTT#kh5=Tlp85yI_d@8{3CRlTNl$1rGLuNTV{~1-Te5y``AfZ;lSoYAN<s3r
za71HNRhq+QwE2=HMs!SgkWHu8-ied;@}>gnVrI@us@YGzF#4gCGzjWjea9WcXarda
z3XV%h6%Q<06xopl!FDmnK^Qn+*JKgQXmMe|`Xl2wb?Ph1UK!-ib2>bH6rhjlZsaaO
zG}4^7-aOd0G>^T37<j3mzedQ&E7MmM9f7@&Y}LJIM#}f_SQNM^KOvqjI+4lAy;@VU
z;96kmy+odn_^uCA&=m3|f8HkzkN~IY>*2-3j9DnSuZ&(MopD3e#zm{_5`X&b=Jo0H
ztI(!%avqU*l{W4t#wu42^*%!aC;`mo=6Ykzr<E_DB~J;>0dOthP&H8_Y7|Mpzits(
zrHsdKriKz<Q*%JT120tFo;Xx=<n`ZS+X;fxb0kyYS}g_4Rrs@dcT3ZO0FjqL3ZQkD
z<Y=(cA8pDU6B8U{br0a@q;k6~gA4kaR|ccS`KQ4yXqZjnA(9XtQ+tu=t4`v|1V)zw
zd53Bqg(b6X?J^xz4|oE-xlb9)B4H7Jr*5L*3bP8judJjh);jiaG4^a%k1^H~Bzelk
z_#OyFf}T?SAQxuf3SLlZQW1_tL#jwDc^K<^220$ui3pE<L#9D4iw$?9wH}M9Y!TGT
zRG6ipWN)9Tk>%8GBRxM#yDBaJ(DJ%@xHYcV{|2mYL=5ets=-fscNNid<J5)Svhb5=
zq-eMBa`Cv+*bHnY*^VGLIN)3|P)$e(Q9%Af90GXZuVi)wH=KEIqR?Pjfab0d+nY^K
zK*}pnsE6xsue_+hZeS{WbDC2_k}0&<s4ECoVZj{hcrUJg<8)mW>vy;I^_jn^T0mt|
z>0>#`hjL;GUkE`0+W+#Li9P9-EEw|N4NJx!xt2?0-pxDRmlbT|M9B=fvW(3LPRSF>
zfEYtQvb`Ryck;*Jt#n0?Jy{T{uJr9_06e>?m~x&BRyI%-QaHGp<)b~1k&G66rY$Lt
zwybhE!jA#h0EV!OOgarXj0@oQ3FdL2+bUuT9=T74sVl)UyD<B8AILax30QS<6hX3?
zJAu&TnV=x+SfB!)6E8Fw)%(O5@|%i{B({|wLOtvJ6t1j!6gjE{E_0r+t0&<Hf~>yy
zkdE`h{9+Ol;iE&PMUC=K*Y~P+^BGMY05Obo?Pw^>0b1s|%RW%DeaWH)ptIY%$=(vv
zKIJ|Oy&U-^?H76=-a-p+r=4f#^7ai1)lye5^`WolUuk|za$M|zR$+k9EKQWAO3B3`
zABY1P=w*(+**f@wxy#;d!@?z^3U0ET7!drak*=@aS<NuAp*X;~rxi&V+g{u-<cHhT
z(MPG8w7!drjwyLS?+pXr0XnLOww^5)Lgr@!7M^#b=2K`Nf^i^4idi8&Qh)z5YW{CT
z5v$lrt$Ba9$mcPSYui9T1Ap;b^!;L`R!lGP5Ijd0xcp<&1Kvs#@7`RkW_NgeDckwQ
z#~G7zo#{K31q93p_<Tg<S{B3D*vfK8H7*I^9L1R_>n^SeL_vCK{c?HOsrY2{Mg@Ia
z!AY@gdnFcuuK3N`55{jKMLq-2Xi*jfgBbmt6c3Xx`b^*VejWuzykS$C{3uVC=q3G(
z7)N75<!<M;m{BCgh%o6z?W}PJy!}0k`UgLKPUSP@EK{;p_WQ;?I1Rk9!Ns!LDCEUZ
zk<;(3D_=C2z{EO4S)YVzS+wM~dRfgwIl~6DOW`LVX^(;;6kO%Jgd@7L$n?A|=|nO5
zAMt9fmDG~lx=feEcX4V$oh?+j=zk1*tq-$+CkXNk*qvo47=Cn;-IG0vVMDF*)pjJm
z)VFq&x-buC>g0q`G*2}%<}ez32FoLRqPF?*>kE<nM7Fh{{N`Ww{h>Dq%P`70m#wqE
z-r+KW3?}aYZ=H|(A~M1;_xn7MG-$f=G(9p`ejsONJB1=Fo%p|P0`9)a=FStx7+I;;
z%gFQz{&8hf-@mRzz8QvGI!YmUCqt8{?|38RLrQLi)SFA!Z-=K7f8ME-OPGL^xM0FC
zB+E3?SE@eavuO`=6E3*OzLrj>)vZj1>FM_>blT%Y>N9b16Ne7?=HWB2EaC~w_(h{i
zM<k9&go5x8_Z+@PP%z}v%}jaG`puUW?*BQ~<4c9x?&q<@z+|Dsx~d)NrM@DbW-7K8
zm%pmb?@l03A2{XXY$3b{t5e$Od1GmiB<19Nzl7I`G<0;DVw8|T9>TIr1RDzZu<h^h
z?D6o*Bm9UX-Si1Z;6qM{3F)zh`JyqRkcKYLHA}=NL?^EXHQ$Y>=EC#gF<7n-W{%a*
z3&%~s5oWYqI^Ikot404tMP&^Y7s#B%mM1)X0AdBTRuUr0f)T#qq($f}D1hn`SZEb<
z{Y>R2l4T<MYx(vUo67k>#aQrP3OyacYXl_ezJ!@#P|jZS)6M4+4+*gR?YRM;7a11s
zNpFIUwYF0nS%6LH(8RJ~N#vP}gPh@99|fGhwY5$21Dk2q=Pd_A5fhP@rc>=9Mr-Ca
zLpWlgi2$#^u}9VSjHXX9)Ug6v{{(3OEF!Gi^?#%V7IjkqV*vAb?$_T=b}`QlK*$&b
zh0#v<eJ|lS^^qHFp^~Vq&hLv#spa*WGbBU*dhZkO)c|K^hEqZ$+{e)0V=KKdRUl-z
zr&UbCm;(Pp;ST(r5p||7zYp=c5O-ucX{wiA=o)E{#3+7S<W0qV$dO%-;tx3dF_^@o
z{*(HoX<5FTrW$yQNhtC%<9j`odfpI0?1B42b2D&(*Z3U6Ahb7-#gzafMWZoe)y}?z
z(anJ<mtxE!^h%WHkAYtChFUK$KQM<4w7Slxp$)d;56FV``=LKF^Z|;ZD5MEh2bFuu
z)ov}zi#Kg}Ve5U^Qx<2(zzfggG`YGenktAH+J`^KaI^sv!~>-IV3X7$4Gk_xngv3i
zyHnD=);PSzhgAChkA7CBGsip?+UmrV<}#b{xw7B~);k0lYgphu1*HrOiC^-OIl#^R
z`*8}Qz6vosN6X%KC!sHJ1YlJ#Ng5zVg~V&xTo%VW36I>NcK(I=V}Y=~BH$NlUb{L9
zJ%bBed3-(#2>2JA4kY0kx4P~AwQ>5_CIYHE$I=G$j!V|*BWC|kYkuhBIX;t^_9j}+
zJWd_=O=qvi3wy+`C&J><Dn5^g^lyIBvw#;%&4~FNTDD__b-wAjUQNr%AvHU$cs^e*
z)BtAQc&Yd0T1?ODK0UBV#}bzsmGkvTHTFs}C)!L&UbXNFBhtHN5yS9FjAXByjoNHN
z7S*iOogxG~>>n<EGO1M|B2XH88W+PQVM*ce6%#4Vhqc(vt-j4@BUSG<ig$g7%}jT^
zgE0$bZ85@>u7xM2m-f*B3Du;V6*kSZgz&b)YLjRne$6S$vXSs2^CdU?H;JEDpIC^b
zN@OWq+RUl!t9)zjxY-X!Efp^O374J<n@81d2Wv2!+F%>3>$q{=Kc@46jetT~QgK>f
zZ;nB#hZ>|yHQuDKvEPdL$wvtTqhRyrT?j@H;S6N{7>$`wxpFjK<*<kW;Upbx0%D(+
zYJ_DF0xnfggcPJC1dU@6$Fy4~QYP%%AjP@u5s{-ByOrzlW~SNKYDyH3j)NFW;KlF}
zee6<(c%1^jvm`NVRiR?`I4n6;4l31iw$xmD=?VSr*sGn0LE|o5+iPu0>PpE{YBU9g
z)PG@P`(xkGU3mX}-mID^!AjAtRPPbX+)Pl$^9K^t63iDS_rIl=;uFH(-?)R#^a0EJ
zRk2Bug9sfAcU|XEa50>t`#RmXAQa)MpIca1j9)R<ht=!b@c!)e!4f}-$A-Pzzv~Nb
zMyloh-rCyg?0=b=dp~aD`EzvT9Wft_UZb7%ANm%ZN>a!;=Ntc^+*swcTbC>E5m=wn
zm*vmL3N>pJWJo{La~z#B3D+RHrA7u?<__bI=N;<_BLa_Whdj&KZDIwcy8rMzWiOTc
zw?r|lg@t3J?F5}N<UFeXu;xG_UDVpkb*{Mm%jE^L|8u@-4ms?P?)wcJzo)EM<Ep`K
z+M1`E+jYOm4O!<b67t7(cH_L)s}YD84&_vDzZh@(asAk&=<O=Ds>nZlhT!=CcK6dR
z`<wr`;{^A!fE-&@Wo6hqAWXR3{cvWrdE?WDpYUiA$0cA;Nf)i|Ymxw6?9PoAtY`nW
zv&iKCXt=HF;cZuhRaOCxfpH^IXE=B+cW<BjSbLQy+~;m$pYscZ%~|pu1f)pUCxB&O
z^z``bc+K@;1aJ&9b*W07;W+3kN8Y@kOnv>8hn?brN&^qaLAQylU)6UVPbqqmdVYjY
zIN4dIR5AwR%wg|@6qidh%TjG34=zZ=)w>tt|Fa4ScCbMfhGm%2Y~Thdj82@=ap|d9
z%PQ)HGkVTMalB={_*GHfyGYOV7F!#%iMO#05CWspMcMywPU>^N;qo8fStKCLw^+i$
zp`LfsSHOoTQ-BRLR;RqKY#evLBvz-D&u{4{DwL;%Z`p|ApbslVkZ{N^@<q}zrJApV
z!+Qvm=GZeFa$_#DYO`qM6BIO#SD6868>y)(_D@%F<C^Wb$dnvhk#;e?fJRZ6IC}yu
zARwS%PTeJAlCx>JuB`A&ur-W@wNl5-M*ZZnUnYK_9iq##QtZ`6o5zvK!%QmMGI`!x
z_Kw<(T(+*et$(LSX^!`w`~BRSxNoN2FIkXD{d(|7hj_2*Q1#QM*YwfMOvFFKJRr4~
zUA(}z@x$t|XTKW)f{m3s&mY)*?Z=cq{Yx?4+nU)Q6UrXk)qTbe)HFE{kd;e03RZRM
zvRQK!|9o`x%IMwca0pAE{n;~6i`cOG;W^dxJOMr3?7BD1xn=t_w@UQ5>Ysb=t(ow{
zjnpre@|dTUcMH;TCV)3I_|ux`=ZBwJk1xi}HXGNG$v)ZM1Iu-G*C|Nk(d&=E*E=q1
z`;V%AO*!j-nje%4HGKXz|J$m6E6H*H74rJ0)28zX>GgcRU&UKA@ZW~KAMlWfF8VaQ
zME-Q3y|9M5c~Y9|dzpPJ?d;IF{Cebf_5x_Ex$re^h;PdE+t<WyS0PivXC1RD!j1qT
z%h`K2v%2fyPa+W849R_5CA7(MofO;$nw_^@x1AgJlb?W3S@=CgSuTAjx<;-te>Tqx
z75mpPQK)`USWqE<sc5q?cxZA&8cA0x{_t9(0XmB*0#2IoH3PN;c5L2K%;#vQ58n$|
zs3cS{zfyT5_u7si7R#-xaK0_XK#x_MPvmvdOwfaB23me7CwNAU0?sxTO!<4UKMj;^
zd2=?kbpgMw$kg#Tk8)5bHS!qVMe8Fl8YtFc1i>{eawJ<fY`fGb%6dY3!DX6M>7U1A
zl*XBGfTp4Z6JuIpa4F`?W-YaT1~bh2FjVS(Ds}<=3XMbW)imucBq~Z|74_&CY)o#w
zht;$%8sML~vVvZtVsAJZbtM&&{q16K&L2Y3>*l^^bV&PA&muLcyTxJ!V?!O0rbuDr
z$=?!WX*@`bYcYgt$Q;?pLcdTjC50R8!7%P4Eo9VV5^{yd;SkU9WjERJ<tNFu2O)oj
zOCHr?=&OgvWd1Q;RP-`~8L<hgmNrQ}pgWcviEdUsIYU21ZK`3OV*_jLG6PjmuAJn~
zv>ya>oRX*a&JvXzT{<J+tTPuS9k;_?A#v-SmW$*X``}75uJDnQPP1Q4{HkZ^_6>KO
zjy7(N@o{E*(g8gK8&*R?%5&2G(ZYTxvD5G~%FD5h_~YMxbin1cEb`J=<9AX9KvZ6z
zF0WPp0zA9ze`(KCp}KN@SKs_huM;M(j;~GcezCsZbRv6+)t$xyt7y8@GvH}(MRWMF
zm)U>g^Uk@<-Q&y7o)759G!$x_v*@lGBBH6o6zc>ygQVh~>c}gyGW@SzkOCfqmcqL%
z0Ey`91_V~=*)N)7>hrnclo0DWzrU^bgK5A;fA{0{?lkn(`}T3;AyQZNRpj|$+w^jG
z%JecqHMe%JmUVV^jGlhuk>2^~j=#&gU@3cbfCFC2P|I`D>-FjSZCB^sPbv4RV?t*?
z%gTBG6T^*ibNax4^$FeZ(+j$PhwpuT+;dGsv;AVJbz7g!hTknhEns&8oTDCVz|OKz
zv(e#od1P`c1d|Nfb#(Sw0qk*CeQ8l~zB|;wV-JcscK`SEG4pF-TgK$2)^vV_sHU6q
zbdLsM$(J&|ja$EsTalW%j`7Q-rf|HHHaTgn@*XT9#{@;AbOc>#j$LBqtzSGuP*e@|
zeEF|b4XDEMu!=p5@g-keg^v{j%d`qCI0x$pU7~Q5RSF={_3tVrUYiss3o!dFthe8@
zAtSCi0eEES?+)mQWbZ1S((FBs^(lV3*d?*B^YNHeiIIfYzx;!JSQ>csI-0@3>n0OM
zAPz@wboeCc60t#z1#1k%DTT>sjGGQmlN2Y85}2TI<2`zt+{>Ee$gA|Loh}|I`~^8(
zNh-8t)QZa~tRC9jFm$&Bq+G*u3;xW`p;A*luVwuorp`L3t#FI>K+)pv6bbI`?i4Q$
z#R*PvE$;3TylAoFR@~j)oj`Ff{?hyIo%d$=E6gM_IXU0iYwf*%3%?cBeY4;CNiFQu
z-Rl?TwNNb`9$TxFB1>&K_n4C%1#Dss(^!-A53AHs_cA-&=(If@q9=2f1SmC@LRG}K
zT^~#e`zV2oYhzk<>88Pkd+eS4m|<%NbIM)-Zi7_`Ro|6=EX`ESUo9`PsYxjf!=6mS
z17Nr?(L!zpiv0&goHV-7NOlXYdotcuN*^}}zhPs?FA36|=|TAPa#!u|d(nYC(g)#S
z9cGxtMfwG?w(cicF2q7e0HeuqXAW7BadwbxtADhNR9aG>Ep&hD+!fE$5y7t4y?>7g
zN|eLFp>J!p2keX<qIOWO2EWboe6?~MmxR+HLFLcdQx{cjcj2<19`EtT-)>^?yBZdb
zg>L_veG_==zunl5;hiJ=Ch~|47P?$61n1r5qLUD3UsiFxy;N0u9>Ar4CCa%xGkX8n
z{S+JjQqB5$6ZP(PA9x{Jv2dJyb)6i(_WYkSzcKIq4+E5Jr59#E-y+G=wj??_U1G<<
zy`cZ)-sdUrCD89amq1AI;&a)908Ih`PR=BHcXZmVa6myeq8DWk4-XC5uxqD8o(;ZV
z4baB2G9py~Dw7A(ja)BlebOuFzbbUZ{_#4M&$aVkdib3Sw)Q-J?o3fHRH83F`Tgs}
zJ2$*F%k#cDPDx$dIVuJ~D_?AF9BLn}&R>AbuB(Et-oY;yq`rq`^f8D|bJ)FLQikp1
z;~LwCUa1i0R65I->|p@N2OFnzFwO%*KmKa~wX1OMwYkmSSmkgx3VmdX-;d?aVX2@z
zP|XAJcSm#Qtqkh1*h!?OLl@KoxD{oFw1FcXM8RU4@fuc$VXBK504D?i_CrEdV}ECE
z(pXw*xG3LwKgr97d`d}cKq9^`QulLFc3A6OYq~t;YRlbaLMil0G;uJW^@k9+8K~uT
zjDg3DQ)Xs8tX7URP!jZL`0^2RVkmSVF)O_>fCty;q>UjbK(<JH-@`{p@B<_{vht^Z
zX)J4P)Ietf2a>HB$DjQVl;Qvdi&+M~9XD$JkQ)a$2z%^f_)sF!ffqhU)l<1<Gu27G
z4G^+)GqOUsl6m9HswX{rV_sUN$9(RZkG1*(MQ-Wf*jnp2=#fP`3Qc!C`ytU_H?NKY
zR-mK5C;rsMYQlY-s!{LkpGL;?Pu;wV^C(*7TdFqtB#gO;_evt_!*kOe204Qf4INsK
zClA8OTGm!2+tz?Q8{QsJ;{qGDqR$ts-b-2KpK0;+35Z?vn;hD{LAVy~U!7E&mzEn2
z-ux_oiCmgPHE%s`t%z>;f&E!Q>$d3!&t1m%Lad^uXP+F}?jU>7K40OzY}#!0sA&D}
zUm&OM1^=C^@BSHW*V8@1x&MRoR;=>$$gGFa?bn=r2=t}R+PnPz^p@-*pQo~kbhV(K
zt^+AwuWG&J9Pjn1se<*Z%Mk^XL)RWlz197f_sc0(pDUz1A+RLo&2)R8NN^LRs)iiF
zcmHaTWEBy9US1Dyjz?$0p=qA){o@~KTP2|cTmU4~rd1VC)>28PH}g8Eb@D;2BkdP-
zbRB}a!h)~q_nR$Gtl3@zeIyv#=tn+)t~7@>jo8n5v2FM8Lacrf!vpee6xm;(12ekW
zGxY(=3I^Uom_Z672!c@=Q%a*;Y`JoP#9O#e-#n2RYrZ8CiYPxt-Lk|b7^Tj>&Q3hn
z^iX-MIg}2^%-&}y^aKkj$9pj*AGsMPMp1TfSODlU=On~0YMFv%u+lk95X{MV?y9kb
z`ZsPASB)5HHXg#9=o98eH>4SqH_-!z8m9ZO;D0p6Xmx@gZ`#2zUbEB1kYKd_NWXGc
zW{9r90cqf$T%DpU*wh(_E23Z<6KEyLsb;i&rbr|CF>tgNl97ZE6`4<<nk1Ox>gHi6
z!7a?kE>^xqotbQA7CEX?JnfLR)h-_UQ%3l2Ks{v%+xeYpo=I^8VkH{~jSY8IAE6%t
zwstNth@2UOV+sv58(Y@DZAW^XuP-jZAy?Ke<u%+RT>{)sJt+`D-ZF#DPeNQb=|R<G
zDp0pr8#KrfB&DPr3M7!MCBWT!+F%LK*3o<5@v9@J4GCEC&8|p7J-Lxa8+ZN$Prf0~
zaVzxjE5@MV{=mp{JC69z+A@|bnb*G0<_%eLuB8=n0|d$9Jjd)YW&gdv?>%g9>NQ{F
z@88(w__HpX^gitm|JMGS)}5;TUb|WS1?!xfA$18>a;8<{GIrKEA@Pb*@Sw$K^kvAB
zq90V<|65XoV2&)vwje)vTAq!^Ol`kYIL_8@qUIAKZ5LN(MsE+?4_iKq*46KjRb%$g
zHcD*=oj(7T6kpS9TEFiJd!Q5C<1#+z)o;E11L9qta6+Q9^xJ`W{Y`pjg-c{VjNbR~
zJKN2jcdJGIcFsRO2*3R8dV6l3e7~jbay&O;c7)UynJ0}K4yC!Re!JLtEq}@@&LL30
z59mUUkno+h!%TcVZhs!%^!bnbrhyqV$4*sDX~SbxT0X?S!^KV=Jqzv8P(>+P;QQK%
z_vWP)Eyn0yV|(1}eKOv$<gRPEfieLt^=bjCq>0LrtIRFJ%Eixo2^!<)B4#9}w_Jm#
zjr}skEQLBhFb54dmotC=%C^;^DwL8)Q8@iPt{jf4;k3Z6c6$u1Jg2Jg?IHMt1NQ5<
z!qO3uiK`!cZ?IH>p2b0*+sebjcx7Ek4KrMg`u<2hTpXy4G<6MVEk%R><G6-VL00Cy
z8ZlFJZjyK)Fa<8}Ff%fa4GbCE;Sl75497@TV{62wF>2YT$Tg2+KC?7}VZtTB5E^uh
zyP=cBH1+9)rc_YE@JJoF9{j}_dc^UUB#-IWvtvlC884Beoit3P9D`h>9A|%%ryV3h
zaMzleBlC4OA_98F+QlXAyQtOU+^5m$cw9=g`IKoZu9m~q$hH7Cn`H5`l1l^4vYI^%
zOfRxk`xfD<G(zr6novdTm-)b^$Q^#__>iaSqTi&sAf(J<T}Yy0`9i)V|6aRax}1y*
z!6avr5jMsn+3^?-Psp&}3Kf{2kPwgqj=2eJvhhr71w!)9>&fp@OIphKP<*Oo9pa$|
zj49dl$qNGZ<=Mv!RVI`r>CN;c!I2ATPCl(>Wx$oLwR-e)^;Jl$Z$aVU<j+FGEnup;
z*6SbTc;vGU?{S`iDdGFFn76e|Y@g@q@~+o;{N<@+7C{@Htf?N$*vfVLbSkY2=l(w%
zi)4DaB<SwsqAwO6Yvca8*DSA7%)A?3m->clp0^`w@2|U%+h=>;7k$dX6Q%n!Y>44A
zZGngI6vk7}mb*{vCxa*dThV5Rwu}4^${d8Y*y#BW0>Hh!=705!Ejl`nTJBcc)#1fO
z*Too7Y(RVYLaz0={qYj(Z^`AXI8mpu+Xk7ee>kwnaFQsI;hS3f9!=J=Sg7S`(ILO?
z<-fe5e-j~G4JL&sw149?O$28#&7GLt(xUCK-JgDSoTq5#yhQDxcm4UT@1}4g?0;ps
z()_ZK&f+;yVR*G!zv;Gi=CKcnU<~uMDe?Jy{`-Wbs`MHnRzCUt-GPFXch>*-v(}~1
ze{V}geFq6GPXV082fLKF>Ws)`%T2?1zr9oa^*dg|3?Hctt#KoR#D*NU1ZF!(>bvN1
zMp!-?IhTp$=Bdh$m`caWU>S!|kc7()rCg}h|L|s^L%6(kA(&^i7t_N~ckxqgEeRQL
zK~0O&?K!IjtN)<$%{!?deZZIN!2H3%lOk&^@}mdJRVq?;C~=`&mB}|ATCOYw#n?p^
zGrQ9rD+L+u*&+mQUtQ?f+MHN(A8nY=!jdjZ5g?QKZa5Ww@d0+I#D+QO;nZvWrwdT8
z-fOb*rnVszBZg#(zdv19H*UWXJ0;0vHkFE?@H1~C)cAhV&j#mi7*veJ6Ncu}mBu7j
zz8lt-$~>H(nE~RXH`705`4noA{C)_6_#yi>tN3nji$a_6U@f;cAwkl($)B-NHcE(z
z!pWeW=k*i%W7}I|w$v3K{3t+3XDb19OA(y%%o$y=93l(fjA_wZt5JXdz!i>c;z-9w
z0CrI;KBI8FWeINmktjF47ll@m?+6?@6Zz7@aM^RNOzXiA(L`T7k@k`{@jL%lox*1@
z_iH@RmUE{;Cb#ZRwbiNkOHpf^2d?~TsRo_9DtoGd{%_agC|pJ|&u!?}wwHcvl}d;q
ztou~?Ulgt>*^2AQ#)dto?dC(A1hXfZ?;M!b^E$1qU5mKe4eU!Ta8oj6l#djZ`w(Hj
z>g?aV#0R0+!O^OE>3Xc8^VoNOo7zA>dq|^NYJa<~csq_%5_hhiS%xgEpSL_)&LBOk
z`&-mEp8YL+ABt;BF!XqdTyO@lKB)yXdu;6mT*Pc?=S}2#-HKP}=b#0Y9g+lS`Yx_P
zo9%V|o%ez=d<MCM6aS||FQ^xG-@5y7@qKLn@3O7oT@-el=zY*Pe-->8zw^&VkP2tW
z|AsN|{XP_5Woi+6-ev(<pGvy(?d>hk?<sFfcn6{wy7qo~h5OnxK_n=|WHj>J2^~vk
z?Sgpb=bg{z^^*d~-T(5ISib%?=?fcU?Ro)=zCZqx>G-qr09%|r%8`J#Fk@tj9}(N$
z>o*yo^cY>K*wIrD8E~hWu2jLYotsQW@68H*68L63TTjH~Uusk$Io6MafK~+bhgXwc
zW>_9?bXwR*3306o0PeF0M}DYTIogMPz}kBOjSMi%zORY$P7da$hL&+|m2J(?S(+=!
zIClzofFUKZS>~FPESpY31juUf>rj?wo_*6;XP^$NX~C}Mgb1lHdpJR!Clf)hE)n{g
zDmdfb-4C32$}wTYnS$u!S(m6gdLCYEdJx{qhRL=9!-PAvkgCx-CqT}DG}V`D()a$I
z8>ilMQ867f$G`!QG_C>HLYwnNI;uDDLa8#TH+OeV&1(yD)B-sY=mnGs!FR^GU}^Z)
z;-wgJy#5g(`$eyFcP}6fN>J~xPRg00v2yYBv10`!<;nPI_{9|o@pDCa$~F$=gvvnW
zAI?i5(?bR6WuA%BusTSpQ<m0Dyk#_D?og$AE@UcP;?3Z`*oHfm+E{lzx6qJxK%A6C
z!_?91=9cCn1@pIw*G`=KGw<dwqwiMyXtUcjXD@`GN#8M>{C>22dL!~DFq7IiQ0k-k
zpG_l5CY?je@S1;o&VSIlo$ybac0B*&>AzQ|R%AupHzv%Us|EhXmP*O;82a`Fi@r~c
zy}uP=4rfD{^^BsPo4ab7UN4b?Lo)7yR_{7rEFs6Y@ZaIP4+-F-;cH3lJTmbK>SQ0A
z16+I2mfQE!qjCm+muvb3=SKwXuPasvYh(4wKCeD10*?^PX^OzjS$L%`q{>M*@+S?r
z*m8Sr7RX8eREq~nDM1o+**W>w`mvg-&$%v7R`FUG`B%gLQptOdPZR+|?8c{a^zZx0
z;O|E-D*o!9tQ%KP99k&_d;k6C_0!AWN{^h@1e3fvUkJA3alTaKu7tM(sasa`X$E3A
zB6Z&_8Tp^Lf?@dn`RxxK7aiS@gaXaXNExX`uc#KRZ$*$l1vo4i;ds(p2I^~zngwfj
z&&QC3)1P{}P&E-!%bP_`XpAFwge;m;trFJ82{-_{6xHjW3mVpwQzX5b^>3U?W`zW)
zSSx7ML*ZZY)guK+F_s@%7YZC$C0fOW^JXfL_UfG<+*-3M8lb>E<ZC~!<QGny>ql}e
zgAz&J$O`*CC=w$TOcJ%}vXBL-0@6EvL)!v(5|L&KDT@hUDaEx^XDe}<^-sO?Z?_4D
zXIOhs*?Pos58F%mKF^dE&i<tYG+n27$)0b^;Z?&|+atgsbcUnMeFI*OH_+samq+f)
z05`9YFnSB*<awsN%5Xdc%SDJq*iB;MA{7=COnsor*9HuNh2#558F1Y5>ez#4ALMz;
zHeiuh@P?hcquRdGAps#-9XymtmHbl{=6rS)ak(O>xr<h<HDD8OVi+cdB;oEIQaJL2
z;+E^7$;CaRMuS%y^arE7qquuVl-@MuvAO~lcp&f~-tJYfqWKq<{kIJ@JbIJi0;v{(
zD>mx*Ru6<m&MBdr+95K*n{iI)Z0|p1PXjK-hNaKj)Y|{3isKMUkib3UM20kRz5+rU
zt@B<tA<UnDWKpC%h<^gH&5vA(K5VvJY!3Y)+Q8q(yXBVs)MnxRq|$ZQcr-i~uk##+
z-^C@7n>l_T;rrnGJW}o8Ch+NLvibJv;{8e6GUxuuR^;k9+V92|3PJ*Mt@j!b_V|bX
zsmd_8erNf8sfj>(%>dP{s%i1B>d2^>NP2~TxqB9Ub`$-RKTo^`Y5dsSO@^X8&)Y4O
zYwCuc{G7iJ<ricpmaSn%z7Fw@mSGCe&F1;a7fM=;gN!LZrJF|0^$Ah($d?4uGg}{O
zu#95Z?{X&bUP+6|91)%oc<^{h#1uk@M~|K+HJ_qEmk&lfcF6_*?qN6)QY^uSPYf_i
z#sDUpKp}@xBPs?Y&D&?mC#aT7*8L&{#0kLjKXn_#V#GZwyN&W{f22M|i{@>B#TwxF
zux@2FxH13t>QU+{@hzANM4;G#H=a`YMJe%NA1${H*zhd=Y(+*kCPU-Ms_q|YVH{Ch
z<nS33Tc@b|6GRLOxdAau2N(}_qX3PJoE<T`8!;)xV}Jj$LS+TO76syz*8(L(lg^^U
z2qMW5qh050vB--7l=T@D&YL9d@i#K&NfzC!UdgQTw#dgeYwN>w#pZ1gzXd)yD8i-?
zg8k@?nxut{3)-o-ji?{5&`{Qq;zXJ2OG(Hh9oK_<Z$SAONU&N*t{{Ox9~1^Wb{;Zn
zA*GB5SIXq_hd3(iY85Ju@guhhQP7+K-zjvpo3oze)oi|rL7u4JRM-%jKu6O)d&4=&
z$x9XQ+o8-EDN8&ALjO|YSGdvER(B9B?Z(SwGr#4qwa^IZn$bH&jgI$agVF54dH$V`
zQwqh-Z;#+oG?Bggrm?OZf!&nPE5Xm5f2hlnR;dwAbA-<xIfhs=j}`18&6$`<9T`^j
z>N{c;|B0>rI1s7hP~C^YK@}aBW%OUaXNCS|=`ZHEt)4)5o~*A^{;ym9aK>Y|xBt8m
z$*o7Nl)-t_>~Erv3$&H|ik}|A@9jsL-4J03z5P;e`gO%$&<yfBgmfh#t#g=|WMck$
zHH8FnV8ZHM5F_XV(nl9C085oNQk_5|A%Q7H8tF|XSh9Z3WGIqo+&NW9s<wz=-hqBA
z8pII0x@rK9T~d@%Wl9>x`vF8M`c(FdJgo$A&=QhKK3&#2zWrK<WbN=nqZ>g$C7=e`
zfX=ZLH5iFg(DTji{*#bWi$b<V!vu4qlJ$sG;t0ARI64kUl{^$djF<nETat0cTSb#R
zO%7%j3{~eFz?-wYbi6{UBgKM|5M$_jB$+J!In4PP)2@?-!nrKTI+xYjKwO~uhGs||
zM%pr8??u}r(ZT}3GN4#vf=16JV0w#&ouhosNePTwZ^PBH5rgRZQ$xaDiZ7Hdl|`a*
zQoUfK?)TTPal|n_C_|VFM5&_ySmC+E8DtS+5L1Mv!jCo7n_2!j0jmiBDQ83|zb*y3
zI6&v@dW@LN|0dj{?7La^x1jgEk*9;X?<nQAMUC0hZu`kr2E4r<$_tunEPSc;IeC+M
zI2h5<LJ`*M0I$C%kmU>LmTHmDmhJp*mmB!L+J&PPEZ*j9qN=VX){@!$|2Gdim*IL}
z3dBfgAKP=|h1Z*kd1c)&rh?g#@d!I0bCR=}AsuRBZj5t${Q9NqNipXSRxuWSbnk<w
zL)_Pg_o>aUA$=`P%ic@QK?7T(DG~5|?5-gW;>RFpahzj<cG{roL4f^HLiJn@!J4u_
zmvYVAq3ssNk#e&UB|B;I5)Zo(RxS52L6&R79MQKKx`+aD#He+J{QQ7&myM;yMUsn8
zE>*3E2DWFu%Hs0MYPKPH{Ed_UkWP#1&*PSH?76ZZtBU+CJChW&x~ON8<+$~XkqPCb
z#ypw!YI_9T5kQ=~nf^4jjKWF5*{-k^-kdg^h0^Qe5ygiShS5K9gpzl=+3GaVH1&$7
zCE9?{j;mXG42u$wjcLm(2U`lE8^iT&7cNbk-Nsb#ggK2R9ycL|{H|2=2i%hN#nJKo
zQGszs;O2{iywi`)zvO^wFcx+#{i~&w5*6a~pJC$-$F!1UPi6bLF-3TZO8;37)O39=
ztG}Kk@?=hs#qp9#e02fS;mDNlV!P%tfGk<2UqAVj7qzU|*m6)66~jgr2h#@fm$WRF
zdA)!EVEh(A*|5TeM0)uPR}5o6=nk(OKm=tF1|w`B;cao>2ueAPGrAxr<u6`&EL|h)
zbj;=kpz1F4uawy<oglzL9ZyLkO+I^e_9dj$J`MMGKWm9@MipHzDqj4{N&4CfNR*L_
z45R-Jzh)RyymTddt|o7qNUKoRU7u+3vuV|)BGJ;map9gxA{R|OdZR@@PzhE3*?M4S
z&57Q|?n?!-8ae+iC3((0*Dh*}DM5-AD8{W`*e5;ZoVyP=i`ze@chbAK!PS^)Ts|Ng
z!A@dRTr{UtTchmS#o8CBDlK6!Nnj2NTpOpaw?Mbh+h8RPc4fo03{@f)N>nI`;TEvq
z&2-{L24Pa>6dX`$WZ6rfV@3QmXAj-xteY*{OD6`>*e)%QQ(VF~yD9u!p{}OUm_&J;
zXr{YaS04z;OSGSlr3vec@l}}RL>#>mvaEt$?3zP^q?Ey3&@!v!ydKqFv|nz2{C1vE
z7q7^1d-MTVV9t@aU_lf==OqpNGx3EsJcmDD&uGZem@6Rymzl}2t&hJTD~T{5SS*Nq
zYFx%h>ws7AuEH1_RHm0V?G%%0A&-@E8+exK^n%Q2(XUdXX&K3I)Ks600#gLJ2%dZ3
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%0Dy;whoc2RN+p{o?KxvAOt+f^#%P^}2(1LJ
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

literal 119524
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
AApigX


From e537a2ea92e3097bc971bda4452d4ab75c8ce024 Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Wed, 1 Jun 2016 16:01:58 +0200
Subject: [PATCH 284/393] Add CC2538DK

---
 core/net/mac/tsch/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/net/mac/tsch/README.md b/core/net/mac/tsch/README.md
index ffd6dc789..dea59dedc 100644
--- a/core/net/mac/tsch/README.md
+++ b/core/net/mac/tsch/README.md
@@ -36,6 +36,7 @@ It has been tested on the following platforms:
   * NXP JN516x (`jn516x`, tested on hardware)
   * Tmote Sky (`sky`, tested on hardware and in cooja)
   * Zolertia Z1 (`z1`, tested in cooja only)
+  * CC2538DK (`cc2538dk`, tested on hardware)
 
 This implementation was present at the ETSI Plugtest
 event in Prague in July 2015, and did successfully inter-operate with all
@@ -76,7 +77,7 @@ Orchestra is implemented in:
 
 A simple TSCH+RPL example is included under `examples/ipv6/rpl-tsch`.
 To use TSCH, first make sure your platform supports it.
-Currently, `jn516x`, `sky` and `z1` are the supported platforms.
+Currently, `jn516x`, `sky`, `z1` and `cc2538dk` are the supported platforms.
 To add your own, we refer the reader to the next section.
 
 To add TSCH to your application, first include the TSCH module from your makefile with:

From 8a7b1f07d19e202d24b2703d072d321348d4665c Mon Sep 17 00:00:00 2001
From: thomas-ha <thomas-ha@users.noreply.github.com>
Date: Wed, 1 Jun 2016 17:58:57 +0200
Subject: [PATCH 285/393] add cc2538dk

---
 core/net/mac/tsch/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/mac/tsch/README.md b/core/net/mac/tsch/README.md
index dea59dedc..fd512a896 100644
--- a/core/net/mac/tsch/README.md
+++ b/core/net/mac/tsch/README.md
@@ -163,7 +163,7 @@ Finally, one can also implement his own scheduler, centralized or distributed, b
 ## Porting TSCH to a new platform
 
 Porting TSCH to a new platform requires a few new features in the radio driver, a number of timing-related configuration paramters.
-The easiest is probably to start from one of the existing port: `jn516x`, `sky`, `z1`.
+The easiest is probably to start from one of the existing port: `jn516x`, `sky`, `z1`, `cc2538dk`.
 
 ### Radio features required for TSCH
 

From 688f4aefe0b2c2a57661a823a8096e7360fdc786 Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Thu, 2 Jun 2016 09:32:24 +0200
Subject: [PATCH 286/393] Updates ARM toolchain to latest launchpad embedded
 version

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 55b7d2f1d..41167da06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -96,9 +96,9 @@ before_script:
     
   ## Install mainline ARM toolchain and download nRF52 SDK
   - if [ ${BUILD_ARCH:-0} = nrf52dk ] ; then
-      sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded &&
+      sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa &&
       sudo apt-get -qq update &&
-      sudo apt-get -qq install gcc-arm-none-eabi srecord &&
+      sudo apt-get -qq install gcc-arm-embedded srecord &&
       arm-none-eabi-gcc --version &&
       $WGET https://developer.nordicsemi.com/nRF5_IoT_SDK/nRF5_IoT_SDK_v0.9.x/nrf5_iot_sdk_3288530.zip &&
       mkdir /tmp/nrf52-sdk &&

From 8cd075f3e50263fdda740956cf423a8f5d767efb Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Thu, 2 Jun 2016 10:02:32 +0200
Subject: [PATCH 287/393] Moved regression test to new placeholder

---
 .../{23-compile-nrf52-ports => 24-compile-nrf52-ports}/Makefile   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename regression-tests/{23-compile-nrf52-ports => 24-compile-nrf52-ports}/Makefile (100%)

diff --git a/regression-tests/23-compile-nrf52-ports/Makefile b/regression-tests/24-compile-nrf52-ports/Makefile
similarity index 100%
rename from regression-tests/23-compile-nrf52-ports/Makefile
rename to regression-tests/24-compile-nrf52-ports/Makefile

From 7dd2f1144bfd56a2374839482646231cb926c95e Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Thu, 2 Jun 2016 10:17:57 +0200
Subject: [PATCH 288/393] Disabled rtimer redefinition, removed outdated
 address print and timer-test from regression tests

---
 platform/nrf52dk/contiki-main.c                  | 8 +++-----
 platform/nrf52dk/platform-conf.h                 | 2 +-
 regression-tests/24-compile-nrf52-ports/Makefile | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/platform/nrf52dk/contiki-main.c b/platform/nrf52dk/contiki-main.c
index 50fcfcd28..9181d7faf 100644
--- a/platform/nrf52dk/contiki-main.c
+++ b/platform/nrf52dk/contiki-main.c
@@ -110,7 +110,7 @@ static void
 board_init(void)
 {
 #ifdef SOFTDEVICE_PRESENT
-  // Initialize the SoftDevice handler module.
+  /* Initialize the SoftDevice handler module */
   SOFTDEVICE_HANDLER_INIT(NRF_CLOCK_LFCLKSRC_XTAL_20_PPM, NULL);
 #endif
 #ifdef PLATFORM_HAS_BUTTON
@@ -167,12 +167,10 @@ main(void)
   netstack_init();
   linkaddr_t linkaddr;
   ble_get_mac(linkaddr.u8);
-  // Set link layer address
+  /* Set link layer address */
   linkaddr_set_node_addr(&linkaddr);
-  // Set device link layer address in uip stack.
+  /* Set device link layer address in uip stack */
   memcpy(&uip_lladdr.addr, &linkaddr, sizeof(uip_lladdr.addr));
-  uip_debug_lladdr_print(&uip_lladdr);
-  PRINTF("\n");
   process_start(&ble_iface_observer, NULL);
   process_start(&tcpip_process, NULL);
 #endif /* NETSTACK_CONF_WITH_IPV6 */
diff --git a/platform/nrf52dk/platform-conf.h b/platform/nrf52dk/platform-conf.h
index 931a3c275..bb073f4ab 100644
--- a/platform/nrf52dk/platform-conf.h
+++ b/platform/nrf52dk/platform-conf.h
@@ -132,9 +132,9 @@ typedef uint32_t uip_stats_t;
 /*
  * rtimer.h typedefs rtimer_clock_t as unsigned short. We need to define
  * RTIMER_CLOCK_LT to override this
- */
 typedef uint32_t rtimer_clock_t;
 #define RTIMER_CLOCK_LT(a, b)     ((int32_t)((a) - (b)) < 0)
+*/
 
 /** @} */
 /*---------------------------------------------------------------------------*/
diff --git a/regression-tests/24-compile-nrf52-ports/Makefile b/regression-tests/24-compile-nrf52-ports/Makefile
index 5e9ee19de..c165d569d 100644
--- a/regression-tests/24-compile-nrf52-ports/Makefile
+++ b/regression-tests/24-compile-nrf52-ports/Makefile
@@ -8,11 +8,10 @@ TOOLSDIR=../../tools
  
 EXAMPLES = \
 hello-world/nrf52dk \
-nrf52dk/blink-hello/nrf52dk \
 nrf52dk/coap-demo/nrf52dk:coap-server \
 nrf52dk/coap-demo/nrf52dk:coap-client:SERVER_IPV6_ADDR=ffff \
 nrf52dk/mqtt-demo/nrf52dk \
-nrf52dk/timer-test/nrf52dk
+nrf52dk/blink-hello/nrf52dk
 
 TOOLS=
 

From 77f93c3b5aaf4f1260f166b4eda2aca7e57ec9b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Wed, 1 Jun 2016 23:30:57 +0200
Subject: [PATCH 289/393] 21-large-rpl: Avoid frequent timeout in Travis CI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With a timeout set to 40 min, this test often failed at about 95% of the
script, causing many spurious pull request test failures. Increase the
timeout to 50 min.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 regression-tests/21-large-rpl/testscript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regression-tests/21-large-rpl/testscript.js b/regression-tests/21-large-rpl/testscript.js
index 4c4c8a56b..1481d6bf5 100644
--- a/regression-tests/21-large-rpl/testscript.js
+++ b/regression-tests/21-large-rpl/testscript.js
@@ -1,5 +1,5 @@
 
-TIMEOUT(2400000); /* 40 minutes */
+TIMEOUT(3000000); /* 50 minutes */
 
 var NR_FEATHERS = mote.getSimulation().getMotesCount() - 1;
 

From dca929cd0702f647deaa15fb9dd1dc875dff269c Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Fri, 3 Jun 2016 13:26:08 +0200
Subject: [PATCH 290/393] Platform nrf52dk: use RTIMER_CLOCK_DIFF instead of
 RTIMER_CLOCK_LT

---
 platform/nrf52dk/platform-conf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/nrf52dk/platform-conf.h b/platform/nrf52dk/platform-conf.h
index bb073f4ab..cf89dc0a8 100644
--- a/platform/nrf52dk/platform-conf.h
+++ b/platform/nrf52dk/platform-conf.h
@@ -131,9 +131,9 @@ typedef uint32_t uip_stats_t;
 #define RTIMER_ARCH_SECOND 62500
 /*
  * rtimer.h typedefs rtimer_clock_t as unsigned short. We need to define
- * RTIMER_CLOCK_LT to override this
+ * RTIMER_CLOCK_DIFF to override this
 typedef uint32_t rtimer_clock_t;
-#define RTIMER_CLOCK_LT(a, b)     ((int32_t)((a) - (b)) < 0)
+#define RTIMER_CLOCK_DIFF(a,b)     ((int32_t)((a)-(b)))
 */
 
 /** @} */

From ae0c5f0dd057af50673858188481ae1c53ace8cf Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <ol.sc@web.de>
Date: Fri, 3 Jun 2016 13:30:25 +0200
Subject: [PATCH 291/393] Make use of new cl65 option --print-target-path.

The new cl65 option --print-target-path allows to get rid of CC65_HOME altogether.
---
 .travis.yml                           |   1 -
 cpu/6502/Makefile.6502                |   6 +-
 platform/apple2enh/Makefile.apple2enh |   4 +-
 platform/atarixl/Makefile.atarixl     |   2 +-
 platform/c128/Makefile.c128           |  18 +-
 platform/c64/Makefile.c64             |  18 +-
 tools/6502/Makefile                   | 340 +++++++++++++-------------
 7 files changed, 192 insertions(+), 197 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3a035fd2e..371c90373 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,7 +70,6 @@ before_script:
       git clone https://github.com/cc65/cc65 /tmp/cc65 &&
       make -C /tmp/cc65 bin apple2enh atarixl c64 c128 &&
       sudo make -C /tmp/cc65 avail &&
-      export CC65_HOME=/tmp/cc65/ &&
       cc65 --version ;
     fi
 
diff --git a/cpu/6502/Makefile.6502 b/cpu/6502/Makefile.6502
index 4d9034a8f..07e8e3af6 100644
--- a/cpu/6502/Makefile.6502
+++ b/cpu/6502/Makefile.6502
@@ -31,10 +31,6 @@
 # Author: Oliver Schmidt <ol.sc@web.de>
 #
 
-ifndef CC65_HOME
-  ${error CC65_HOME not defined! You must specify where cc65 resides}
-endif
-
 .SUFFIXES:
 
 CONTIKI_TARGET_DIRS = . lib sys
@@ -70,3 +66,5 @@ ASFLAGS = -t $(TARGET)
 CFLAGS += -t $(TARGET) -Or -W -unused-param
 LDFLAGS = -t $(TARGET) -m contiki-$(TARGET).map -D __STACKSIZE__=0x200
 AROPTS  = a
+
+CC65_TARGET_DIR := $(shell $(CC) --print-target-path)/$(TARGET)
diff --git a/platform/apple2enh/Makefile.apple2enh b/platform/apple2enh/Makefile.apple2enh
index b59c82e44..01734c6ea 100644
--- a/platform/apple2enh/Makefile.apple2enh
+++ b/platform/apple2enh/Makefile.apple2enh
@@ -55,14 +55,14 @@ endif
 
 disk: all
 	cp $(CONTIKI)/tools/$(TARGET)/prodos.dsk contiki.dsk
-	java -jar $(AC) -p    contiki.dsk contiki.system sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    contiki.dsk contiki.system sys   < $(CC65_TARGET_DIR)/util/loader.system
 	java -jar $(AC) -cc65 contiki.dsk contiki        bin   < $(CONTIKI_PROJECT).$(TARGET)
 	java -jar $(AC) -p    contiki.dsk contiki.cfg    bin 0 < $(CONTIKI)/tools/$(TARGET)/sample.cfg
 	java -jar $(AC) -p    contiki.dsk cs8900a.eth    rel 0 < cs8900a.eth
 	java -jar $(AC) -p    contiki.dsk lan91c96.eth   rel 0 < lan91c96.eth
 	java -jar $(AC) -p    contiki.dsk w5100.eth      rel 0 < w5100.eth
 ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE)
-	java -jar $(AC) -p    contiki.dsk contiki.mou    rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
+	java -jar $(AC) -p    contiki.dsk contiki.mou    rel 0 < $(CC65_TARGET_DIR)/drv/mou/a2e.stdmou.mou
 endif
 ifeq ($(HTTPD-CFS),1)
 	java -jar $(AC) -p    contiki.dsk index.htm      bin 0 < httpd-cfs/index.htm
diff --git a/platform/atarixl/Makefile.atarixl b/platform/atarixl/Makefile.atarixl
index b6f103b88..64ade5a13 100644
--- a/platform/atarixl/Makefile.atarixl
+++ b/platform/atarixl/Makefile.atarixl
@@ -55,7 +55,7 @@ disk: all
 	cp $(CONTIKI)/tools/$(TARGET)/sample.cfg    atr/contiki.cfg
 	cp cs8900a.eth                              atr/cs8900a.eth
 ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE)
-	cp $(CC65_HOME)/mou/atrxst.mou              atr/contiki.mou
+	cp $(CC65_TARGET_DIR)/drv/mou/atrxst.mou    atr/contiki.mou
 endif
 ifeq ($(HTTPD-CFS),1)
 	cp httpd-cfs/index.htm                      atr/index.htm
diff --git a/platform/c128/Makefile.c128 b/platform/c128/Makefile.c128
index fbbcf8eda..0c674ee38 100644
--- a/platform/c128/Makefile.c128
+++ b/platform/c128/Makefile.c128
@@ -46,16 +46,16 @@ endif
 
 disk: all
 	$(C1541) -format contiki,00 d71 contiki.d71
-	$(C1541) -attach contiki.d71 -write $(CONTIKI_PROJECT).$(TARGET)          contiki,p
-	$(C1541) -attach contiki.d71 -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg,s
-	$(C1541) -attach contiki.d71 -write cs8900a.eth                           cs8900a.eth,s
-	$(C1541) -attach contiki.d71 -write lan91c96.eth                          lan91c96.eth,s
+	$(C1541) -attach contiki.d71 -write $(CONTIKI_PROJECT).$(TARGET)             contiki,p
+	$(C1541) -attach contiki.d71 -write $(CONTIKI)/tools/$(TARGET)/sample.cfg    contiki.cfg,s
+	$(C1541) -attach contiki.d71 -write cs8900a.eth                              cs8900a.eth,s
+	$(C1541) -attach contiki.d71 -write lan91c96.eth                             lan91c96.eth,s
 ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE)
-	$(C1541) -attach contiki.d71 -write $(CC65_HOME)/mou/c128-1351.mou        contiki.mou,s
+	$(C1541) -attach contiki.d71 -write $(CC65_TARGET_DIR)/drv/mou/c128-1351.mou contiki.mou,s
 endif
 ifeq ($(HTTPD-CFS),1)
-	$(C1541) -attach contiki.d71 -write httpd-cfs/index.htm                   index.htm,s
-	$(C1541) -attach contiki.d71 -write httpd-cfs/backgrnd.gif                backgrnd.gif,s
-	$(C1541) -attach contiki.d71 -write httpd-cfs/contiki.gif                 contiki.gif,s
-	$(C1541) -attach contiki.d71 -write httpd-cfs/notfound.htm                notfound.htm,s
+	$(C1541) -attach contiki.d71 -write httpd-cfs/index.htm                      index.htm,s
+	$(C1541) -attach contiki.d71 -write httpd-cfs/backgrnd.gif                   backgrnd.gif,s
+	$(C1541) -attach contiki.d71 -write httpd-cfs/contiki.gif                    contiki.gif,s
+	$(C1541) -attach contiki.d71 -write httpd-cfs/notfound.htm                   notfound.htm,s
 endif
diff --git a/platform/c64/Makefile.c64 b/platform/c64/Makefile.c64
index 7769b6ceb..f78dcf717 100644
--- a/platform/c64/Makefile.c64
+++ b/platform/c64/Makefile.c64
@@ -50,16 +50,16 @@ endif
 
 disk: all
 	$(C1541) -format contiki,00 d64 contiki.d64
-	$(C1541) -attach contiki.d64 -write $(CONTIKI_PROJECT).$(TARGET)          contiki,p
-	$(C1541) -attach contiki.d64 -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg,s
-	$(C1541) -attach contiki.d64 -write cs8900a.eth                           cs8900a.eth,s
-	$(C1541) -attach contiki.d64 -write lan91c96.eth                          lan91c96.eth,s
+	$(C1541) -attach contiki.d64 -write $(CONTIKI_PROJECT).$(TARGET)            contiki,p
+	$(C1541) -attach contiki.d64 -write $(CONTIKI)/tools/$(TARGET)/sample.cfg   contiki.cfg,s
+	$(C1541) -attach contiki.d64 -write cs8900a.eth                             cs8900a.eth,s
+	$(C1541) -attach contiki.d64 -write lan91c96.eth                            lan91c96.eth,s
 ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE)
-	$(C1541) -attach contiki.d64 -write $(CC65_HOME)/mou/c64-1351.mou         contiki.mou,s
+	$(C1541) -attach contiki.d64 -write $(CC65_TARGET_DIR)/drv/mou/c64-1351.mou contiki.mou,s
 endif
 ifeq ($(HTTPD-CFS),1)
-	$(C1541) -attach contiki.d64 -write httpd-cfs/index.htm                   index.htm,s
-	$(C1541) -attach contiki.d64 -write httpd-cfs/backgrnd.gif                backgrnd.gif,s
-	$(C1541) -attach contiki.d64 -write httpd-cfs/contiki.gif                 contiki.gif,s
-	$(C1541) -attach contiki.d64 -write httpd-cfs/notfound.htm                notfound.htm,s
+	$(C1541) -attach contiki.d64 -write httpd-cfs/index.htm                     index.htm,s
+	$(C1541) -attach contiki.d64 -write httpd-cfs/backgrnd.gif                  backgrnd.gif,s
+	$(C1541) -attach contiki.d64 -write httpd-cfs/contiki.gif                   contiki.gif,s
+	$(C1541) -attach contiki.d64 -write httpd-cfs/notfound.htm                  notfound.htm,s
 endif
diff --git a/tools/6502/Makefile b/tools/6502/Makefile
index e1e0925ef..d88a4790f 100644
--- a/tools/6502/Makefile
+++ b/tools/6502/Makefile
@@ -35,10 +35,6 @@ ifndef CONTIKI
   ${error CONTIKI not defined! You must specify where Contiki resides}
 endif
 
-ifndef CC65_HOME
-  ${error CC65_HOME not defined! You must specify where cc65 resides}
-endif
-
 ifndef AC
   ${error AC not defined! You must specify where the AppleCommander jar resides}
 endif
@@ -66,6 +62,8 @@ else
   ZIPCOMMENT := N/A
 endif
 
+CC65 := $(shell cl65 --print-target-path)
+
 define makes
 $1-makes:
 	$(MAKE) -C ../../cpu/6502/ethconfig        TARGET=$1
@@ -92,51 +90,51 @@ contiki-apple2.zip: contiki-apple2-1.dsk contiki-apple2-2.dsk contiki-apple2-3.d
 contiki-apple2-1.dsk: apple2enh-makes
 	cp ../apple2enh/prodos.dsk $@
 	java -jar $(AC) -p    $@ menu.system     sys   < ../apple2enh/menu.system
-	java -jar $(AC) -p    $@ ethconfi.system sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ ethconfi.system sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ ethconfi        bin   < ../../cpu/6502/ethconfig/ethconfig.apple2enh
-	java -jar $(AC) -p    $@ ipconfig.system sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ ipconfig.system sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ ipconfig        bin   < ../../cpu/6502/ipconfig/ipconfig.apple2enh
-	java -jar $(AC) -p    $@ webbrows.system sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ webbrows.system sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ webbrows        bin   < ../../examples/webbrowser-80col/webbrowser.apple2enh
-	java -jar $(AC) -p    $@ wget.system     sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ wget.system     sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ wget            bin   < ../../examples/wget/wget.apple2enh
 	java -jar $(AC) -p    $@ contiki.cfg     bin 0 < ../apple2enh/default.cfg
 	java -jar $(AC) -p    $@ cs8900a.eth     rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
 	java -jar $(AC) -p    $@ lan91c96.eth    rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
 	java -jar $(AC) -p    $@ w5100.eth       rel 0 < ../../cpu/6502/ethconfig/w5100.eth
-	java -jar $(AC) -p    $@ contiki.mou     rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
+	java -jar $(AC) -p    $@ contiki.mou     rel 0 < $(CC65)/apple2enh/drv/mou/a2e.stdmou.mou
 
 contiki-apple2-2.dsk: apple2enh-makes
 	cp ../apple2enh/prodos.dsk $@
 	java -jar $(AC) -p    $@ menu.system     sys   < ../apple2enh/menu.system
-	java -jar $(AC) -p    $@ ethconfi.system sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ ethconfi.system sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ ethconfi        bin   < ../../cpu/6502/ethconfig/ethconfig.apple2enh
-	java -jar $(AC) -p    $@ ipconfig.system sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ ipconfig.system sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ ipconfig        bin   < ../../cpu/6502/ipconfig/ipconfig.apple2enh
-	java -jar $(AC) -p    $@ irc.system      sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ irc.system      sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ irc             bin   < ../../examples/irc-80col/irc-client.apple2enh
 	java -jar $(AC) -p    $@ contiki.cfg     bin 0 < ../apple2enh/default.cfg
 	java -jar $(AC) -p    $@ cs8900a.eth     rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
 	java -jar $(AC) -p    $@ lan91c96.eth    rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
 	java -jar $(AC) -p    $@ w5100.eth       rel 0 < ../../cpu/6502/ethconfig/w5100.eth
-	java -jar $(AC) -p    $@ contiki.mou     rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
+	java -jar $(AC) -p    $@ contiki.mou     rel 0 < $(CC65)/apple2enh/drv/mou/a2e.stdmou.mou
 
 contiki-apple2-3.dsk: apple2enh-makes
 	cp ../apple2enh/prodos.dsk $@
 	java -jar $(AC) -p    $@ menu.system     sys   < ../apple2enh/menu.system
-	java -jar $(AC) -p    $@ ethconfi.system sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ ethconfi.system sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ ethconfi        bin   < ../../cpu/6502/ethconfig/ethconfig.apple2enh
-	java -jar $(AC) -p    $@ ipconfig.system sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ ipconfig.system sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ ipconfig        bin   < ../../cpu/6502/ipconfig/ipconfig.apple2enh
-	java -jar $(AC) -p    $@ webserv.system  sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ webserv.system  sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ webserv         bin   < ../../examples/webserver/webserver-example.apple2enh
-	java -jar $(AC) -p    $@ telnetd.system  sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ telnetd.system  sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ telnetd         bin   < ../../examples/telnet-server/telnet-server.apple2enh
 	java -jar $(AC) -p    $@ contiki.cfg     bin 0 < ../apple2enh/default.cfg
 	java -jar $(AC) -p    $@ cs8900a.eth     rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
 	java -jar $(AC) -p    $@ lan91c96.eth    rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
 	java -jar $(AC) -p    $@ w5100.eth       rel 0 < ../../cpu/6502/ethconfig/w5100.eth
-	java -jar $(AC) -p    $@ contiki.mou     rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
+	java -jar $(AC) -p    $@ contiki.mou     rel 0 < $(CC65)/apple2enh/drv/mou/a2e.stdmou.mou
 	java -jar $(AC) -p    $@ index.htm       bin 0 < ../../examples/webserver/httpd-cfs/index.htm
 	java -jar $(AC) -p    $@ backgrnd.gif    bin 0 < ../../examples/webserver/httpd-cfs/backgrnd.gif
 	java -jar $(AC) -p    $@ contiki.gif     bin 0 < ../../examples/webserver/httpd-cfs/contiki.gif
@@ -145,25 +143,25 @@ contiki-apple2-3.dsk: apple2enh-makes
 contiki-apple2.po: apple2enh-makes
 	cp ../apple2enh/prodos.po $@
 	java -jar $(AC) -p    $@ menu.system     sys   < ../apple2enh/menu.system
-	java -jar $(AC) -p    $@ ethconfi.system sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ ethconfi.system sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ ethconfi        bin   < ../../cpu/6502/ethconfig/ethconfig.apple2enh
-	java -jar $(AC) -p    $@ ipconfig.system sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ ipconfig.system sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ ipconfig        bin   < ../../cpu/6502/ipconfig/ipconfig.apple2enh
-	java -jar $(AC) -p    $@ webbrows.system sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ webbrows.system sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ webbrows        bin   < ../../examples/webbrowser-80col/webbrowser.apple2enh
-	java -jar $(AC) -p    $@ wget.system     sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ wget.system     sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ wget            bin   < ../../examples/wget/wget.apple2enh
-	java -jar $(AC) -p    $@ irc.system      sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ irc.system      sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ irc             bin   < ../../examples/irc-80col/irc-client.apple2enh
-	java -jar $(AC) -p    $@ webserv.system  sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ webserv.system  sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ webserv         bin   < ../../examples/webserver/webserver-example.apple2enh
-	java -jar $(AC) -p    $@ telnetd.system  sys   < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -p    $@ telnetd.system  sys   < $(CC65)/apple2enh/util/loader.system
 	java -jar $(AC) -cc65 $@ telnetd         bin   < ../../examples/telnet-server/telnet-server.apple2enh
 	java -jar $(AC) -p    $@ contiki.cfg     bin 0 < ../apple2enh/default.cfg
 	java -jar $(AC) -p    $@ cs8900a.eth     rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
 	java -jar $(AC) -p    $@ lan91c96.eth    rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
 	java -jar $(AC) -p    $@ w5100.eth       rel 0 < ../../cpu/6502/ethconfig/w5100.eth
-	java -jar $(AC) -p    $@ contiki.mou     rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
+	java -jar $(AC) -p    $@ contiki.mou     rel 0 < $(CC65)/apple2enh/drv/mou/a2e.stdmou.mou
 	java -jar $(AC) -p    $@ index.htm       bin 0 < ../../examples/webserver/httpd-cfs/index.htm
 	java -jar $(AC) -p    $@ backgrnd.gif    bin 0 < ../../examples/webserver/httpd-cfs/backgrnd.gif
 	java -jar $(AC) -p    $@ contiki.gif     bin 0 < ../../examples/webserver/httpd-cfs/contiki.gif
@@ -184,11 +182,11 @@ contiki-atari-1.atr: atarixl-makes
 	cp ../../examples/wget/wget.atarixl             atr/wget.com
 	cp ../atarixl/default.cfg                       atr/contiki.cfg
 	cp ../../cpu/6502/ethconfig/cs8900a.eth         atr/cs8900a.eth
-	cp $(CC65_HOME)/mou/atrxst.mou                  atr/contiki.mou
-	cp $(CC65_HOME)/mou/atrxami.mou                 atr/ami.mou
-	cp $(CC65_HOME)/mou/atrxjoy.mou                 atr/joy.mou
-	cp $(CC65_HOME)/mou/atrxtrk.mou                 atr/trk.mou
-	cp $(CC65_HOME)/mou/atrxtt.mou                  atr/tt.mou
+	cp $(CC65)/atarixl/drv/mou/atrxst.mou           atr/contiki.mou
+	cp $(CC65)/atarixl/drv/mou/atrxami.mou          atr/ami.mou
+	cp $(CC65)/atarixl/drv/mou/atrxjoy.mou          atr/joy.mou
+	cp $(CC65)/atarixl/drv/mou/atrxtrk.mou          atr/trk.mou
+	cp $(CC65)/atarixl/drv/mou/atrxtt.mou           atr/tt.mou
 	$(DIR2ATR) -b Dos25 1040 $@ atr
 	rm -r atr
 
@@ -200,11 +198,11 @@ contiki-atari-2.atr: atarixl-makes
 	cp ../../examples/irc/irc-client.atarixl    atr/irc.com
 	cp ../atarixl/default.cfg                   atr/contiki.cfg
 	cp ../../cpu/6502/ethconfig/cs8900a.eth     atr/cs8900a.eth
-	cp $(CC65_HOME)/mou/atrxst.mou              atr/contiki.mou
-	cp $(CC65_HOME)/mou/atrxami.mou             atr/ami.mou
-	cp $(CC65_HOME)/mou/atrxjoy.mou             atr/joy.mou
-	cp $(CC65_HOME)/mou/atrxtrk.mou             atr/trk.mou
-	cp $(CC65_HOME)/mou/atrxtt.mou              atr/tt.mou
+	cp $(CC65)/atarixl/drv/mou/atrxst.mou       atr/contiki.mou
+	cp $(CC65)/atarixl/drv/mou/atrxami.mou      atr/ami.mou
+	cp $(CC65)/atarixl/drv/mou/atrxjoy.mou      atr/joy.mou
+	cp $(CC65)/atarixl/drv/mou/atrxtrk.mou      atr/trk.mou
+	cp $(CC65)/atarixl/drv/mou/atrxtt.mou       atr/tt.mou
 	$(DIR2ATR) -b Dos25 1040 $@ atr
 	rm -r atr
 
@@ -217,11 +215,11 @@ contiki-atari-3.atr: atarixl-makes
 	cp ../../examples/telnet-server/telnet-server.atarixl atr/telnetd.com
 	cp ../atarixl/default.cfg                             atr/contiki.cfg
 	cp ../../cpu/6502/ethconfig/cs8900a.eth               atr/cs8900a.eth
-	cp $(CC65_HOME)/mou/atrxst.mou                        atr/contiki.mou
-	cp $(CC65_HOME)/mou/atrxami.mou                       atr/ami.mou
-	cp $(CC65_HOME)/mou/atrxjoy.mou                       atr/joy.mou
-	cp $(CC65_HOME)/mou/atrxtrk.mou                       atr/trk.mou
-	cp $(CC65_HOME)/mou/atrxtt.mou                        atr/tt.mou
+	cp $(CC65)/atarixl/drv/mou/atrxst.mou                 atr/contiki.mou
+	cp $(CC65)/atarixl/drv/mou/atrxami.mou                atr/ami.mou
+	cp $(CC65)/atarixl/drv/mou/atrxjoy.mou                atr/joy.mou
+	cp $(CC65)/atarixl/drv/mou/atrxtrk.mou                atr/trk.mou
+	cp $(CC65)/atarixl/drv/mou/atrxtt.mou                 atr/tt.mou
 	cp ../../examples/webserver/httpd-cfs/index.htm       atr/index.htm
 	cp ../../examples/webserver/httpd-cfs/backgrnd.gif    atr/backgrnd.gif
 	cp ../../examples/webserver/httpd-cfs/contiki.gif     atr/contiki.gif
@@ -241,11 +239,11 @@ contiki-atari.atr: atarixl-makes
 	cp ../../examples/telnet-server/telnet-server.atarixl atr/telnetd.com
 	cp ../atarixl/default.cfg                             atr/contiki.cfg
 	cp ../../cpu/6502/ethconfig/cs8900a.eth               atr/cs8900a.eth
-	cp $(CC65_HOME)/mou/atrxst.mou                        atr/contiki.mou
-	cp $(CC65_HOME)/mou/atrxami.mou                       atr/ami.mou
-	cp $(CC65_HOME)/mou/atrxjoy.mou                       atr/joy.mou
-	cp $(CC65_HOME)/mou/atrxtrk.mou                       atr/trk.mou
-	cp $(CC65_HOME)/mou/atrxtt.mou                        atr/tt.mou
+	cp $(CC65)/atarixl/drv/mou/atrxst.mou                 atr/contiki.mou
+	cp $(CC65)/atarixl/drv/mou/atrxami.mou                atr/ami.mou
+	cp $(CC65)/atarixl/drv/mou/atrxjoy.mou                atr/joy.mou
+	cp $(CC65)/atarixl/drv/mou/atrxtrk.mou                atr/trk.mou
+	cp $(CC65)/atarixl/drv/mou/atrxtt.mou                 atr/tt.mou
 	cp ../../examples/webserver/httpd-cfs/index.htm       atr/index.htm
 	cp ../../examples/webserver/httpd-cfs/backgrnd.gif    atr/backgrnd.gif
 	cp ../../examples/webserver/httpd-cfs/contiki.gif     atr/contiki.gif
@@ -261,96 +259,96 @@ contiki-c64.zip: contiki-c64-1.d64 contiki-c64-2.d64 contiki-c64-3.d64 contiki-c
 
 contiki-c64-1.d64: c64-makes
 	$(C1541) -format contiki-1,00 d64 $@
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64         ethconfig,p
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64           ipconfig,p
-	$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64       webbrowser,p
-	$(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c64 webbrowser80,p
-	$(C1541) -attach $@ -write ../../examples/wget/wget.c64                   wget,p
-	$(C1541) -attach $@ -write ../c64/default.cfg                             contiki.cfg,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth           cs8900a.eth,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth          lan91c96.eth,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-1351.mou                  contiki.mou,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-inkwell.mou               inkwell.mou,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-joy.mou                   joy.mou,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-pot.mou                   pot.mou,s
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64         ethconfig,p    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64           ipconfig,p     >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64       webbrowser,p   >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c64 webbrowser80,p >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/wget/wget.c64                   wget,p         >$(NULLDEV)
+	$(C1541) -attach $@ -write ../c64/default.cfg                             contiki.cfg,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth           cs8900a.eth,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth          lan91c96.eth,s >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-1351.mou               contiki.mou,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-inkwell.mou            inkwell.mou,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-joy.mou                joy.mou,s      >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-pot.mou                pot.mou,s      >$(NULLDEV)
 
 contiki-c64-2.d64: c64-makes
 	$(C1541) -format contiki-2,00 d64 $@
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64  ethconfig,p
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64    ipconfig,p
-	$(C1541) -attach $@ -write ../../examples/irc/irc-client.c64       irc,p
-	$(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c64 irc80,p
-	$(C1541) -attach $@ -write ../c64/default.cfg                      contiki.cfg,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth    cs8900a.eth,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth   lan91c96.eth,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-1351.mou           contiki.mou,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-inkwell.mou        inkwell.mou,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-joy.mou            joy.mou,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-pot.mou            pot.mou,s
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64  ethconfig,p    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64    ipconfig,p     >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/irc/irc-client.c64       irc,p          >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c64 irc80,p        >$(NULLDEV)
+	$(C1541) -attach $@ -write ../c64/default.cfg                      contiki.cfg,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth    cs8900a.eth,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth   lan91c96.eth,s >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-1351.mou        contiki.mou,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-inkwell.mou     inkwell.mou,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-joy.mou         joy.mou,s      >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-pot.mou         pot.mou,s      >$(NULLDEV)
 
 contiki-c64-3.d64: c64-makes
 	$(C1541) -format contiki-3,00 d64 $@
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64          ethconfig,p
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64            ipconfig,p
-	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64  webserver,p
-	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64  telnetd,p
-	$(C1541) -attach $@ -write ../c64/default.cfg                              contiki.cfg,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth            cs8900a.eth,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth           lan91c96.eth,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-1351.mou                   contiki.mou,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-inkwell.mou                inkwell.mou,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-joy.mou                    joy.mou,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-pot.mou                    pot.mou,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm    index.htm,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif  contiki.gif,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64          ethconfig,p    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64            ipconfig,p     >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64  webserver,p    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64  telnetd,p      >$(NULLDEV)
+	$(C1541) -attach $@ -write ../c64/default.cfg                              contiki.cfg,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth            cs8900a.eth,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth           lan91c96.eth,s >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-1351.mou                contiki.mou,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-inkwell.mou             inkwell.mou,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-joy.mou                 joy.mou,s      >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-pot.mou                 pot.mou,s      >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm    index.htm,s    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif  contiki.gif,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s >$(NULLDEV)
 
 contiki-c64.d71: c64-makes
 	$(C1541) -format contiki,00 d71 $@
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64          ethconfig,p
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64            ipconfig,p
-	$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64        webbrowser,p
-	$(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c64  webbrowser80,p
-	$(C1541) -attach $@ -write ../../examples/wget/wget.c64                    wget,p
-	$(C1541) -attach $@ -write ../../examples/irc/irc-client.c64               irc,p
-	$(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c64         irc80,p
-	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64  webserver,p
-	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64  telnetd,p
-	$(C1541) -attach $@ -write ../c64/default.cfg                              contiki.cfg,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth            cs8900a.eth,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth           lan91c96.eth,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-1351.mou                   contiki.mou,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-inkwell.mou                inkwell.mou,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-joy.mou                    joy.mou,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-pot.mou                    pot.mou,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm    index.htm,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif  contiki.gif,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64          ethconfig,p    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64            ipconfig,p     >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64        webbrowser,p   >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c64  webbrowser80,p >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/wget/wget.c64                    wget,p         >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/irc/irc-client.c64               irc,p          >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c64         irc80,p        >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64  webserver,p    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64  telnetd,p      >$(NULLDEV)
+	$(C1541) -attach $@ -write ../c64/default.cfg                              contiki.cfg,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth            cs8900a.eth,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth           lan91c96.eth,s >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-1351.mou                contiki.mou,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-inkwell.mou             inkwell.mou,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-joy.mou                 joy.mou,s      >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-pot.mou                 pot.mou,s      >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm    index.htm,s    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif  contiki.gif,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s >$(NULLDEV)
 
 contiki-c64.d81: c64-makes
 	$(C1541) -format contiki,00 d81 $@
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64          ethconfig,p
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64            ipconfig,p
-	$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64        webbrowser,p
-	$(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c64  webbrowser80,p
-	$(C1541) -attach $@ -write ../../examples/wget/wget.c64                    wget,p
-	$(C1541) -attach $@ -write ../../examples/irc/irc-client.c64               irc,p
-	$(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c64         irc80,p
-	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64  webserver,p
-	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64  telnetd,p
-	$(C1541) -attach $@ -write ../c64/default.cfg                              contiki.cfg,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth            cs8900a.eth,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth           lan91c96.eth,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-1351.mou                   contiki.mou,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-inkwell.mou                inkwell.mou,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-joy.mou                    joy.mou,s
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-pot.mou                    pot.mou,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm    index.htm,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif  contiki.gif,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64          ethconfig,p    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64            ipconfig,p     >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64        webbrowser,p   >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c64  webbrowser80,p >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/wget/wget.c64                    wget,p         >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/irc/irc-client.c64               irc,p          >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c64         irc80,p        >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64  webserver,p    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64  telnetd,p      >$(NULLDEV)
+	$(C1541) -attach $@ -write ../c64/default.cfg                              contiki.cfg,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth            cs8900a.eth,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth           lan91c96.eth,s >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-1351.mou                contiki.mou,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-inkwell.mou             inkwell.mou,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-joy.mou                 joy.mou,s      >$(NULLDEV)
+	$(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-pot.mou                 pot.mou,s      >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm    index.htm,s    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif  contiki.gif,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s >$(NULLDEV)
 
 $(eval $(call makes,c128))
 
@@ -360,59 +358,59 @@ contiki-c128.zip: contiki-c128-1.d64 contiki-c128-2.d64 contiki-c128.d71 contiki
 
 contiki-c128-1.d64: c128-makes
 	$(C1541) -format contiki-1,00 d64 $@
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128         ethconfig,p
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128           ipconfig,p
-	$(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c128 webbrowser,p
-	$(C1541) -attach $@ -write ../../examples/wget/wget.c128                   wget,p
-	$(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c128        irc,p
-	$(C1541) -attach $@ -write ../c128/default.cfg                             contiki.cfg,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth            cs8900a.eth,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth           lan91c96.eth,s
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128         ethconfig,p    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128           ipconfig,p     >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c128 webbrowser,p   >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/wget/wget.c128                   wget,p         >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c128        irc,p          >$(NULLDEV)
+	$(C1541) -attach $@ -write ../c128/default.cfg                             contiki.cfg,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth            cs8900a.eth,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth           lan91c96.eth,s >$(NULLDEV)
 
 contiki-c128-2.d64: c128-makes
 	$(C1541) -format contiki-3,00 d64 $@
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128         ethconfig,p
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128           ipconfig,p
-	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128 webserver,p
-	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p
-	$(C1541) -attach $@ -write ../c128/default.cfg                             contiki.cfg,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth            cs8900a.eth,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth           lan91c96.eth,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm    index.htm,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif  contiki.gif,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128         ethconfig,p    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128           ipconfig,p     >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128 webserver,p    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p      >$(NULLDEV)
+	$(C1541) -attach $@ -write ../c128/default.cfg                             contiki.cfg,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth            cs8900a.eth,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth           lan91c96.eth,s >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm    index.htm,s    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif  contiki.gif,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s >$(NULLDEV)
 
 contiki-c128.d71: c128-makes
 	$(C1541) -format contiki,00 d71 $@
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128         ethconfig,p
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128           ipconfig,p
-	$(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c128 webbrowser,p
-	$(C1541) -attach $@ -write ../../examples/wget/wget.c128                   wget,p
-	$(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c128        irc,p
-	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128 webserver,p
-	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p
-	$(C1541) -attach $@ -write ../c128/default.cfg                             contiki.cfg,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth            cs8900a.eth,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth           lan91c96.eth,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm    index.htm,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif  contiki.gif,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128         ethconfig,p    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128           ipconfig,p     >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c128 webbrowser,p   >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/wget/wget.c128                   wget,p         >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c128        irc,p          >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128 webserver,p    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p      >$(NULLDEV)
+	$(C1541) -attach $@ -write ../c128/default.cfg                             contiki.cfg,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth            cs8900a.eth,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth           lan91c96.eth,s >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm    index.htm,s    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif  contiki.gif,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s >$(NULLDEV)
 
 contiki-c128.d81: c128-makes
 	$(C1541) -format contiki,00 d81 $@
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128         ethconfig,p
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128           ipconfig,p
-	$(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c128 webbrowser,p
-	$(C1541) -attach $@ -write ../../examples/wget/wget.c128                   wget,p
-	$(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c128        irc,p
-	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128 webserver,p
-	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p
-	$(C1541) -attach $@ -write ../c128/default.cfg                             contiki.cfg,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth            cs8900a.eth,s
-	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth           lan91c96.eth,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm    index.htm,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif  contiki.gif,s
-	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128         ethconfig,p    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128           ipconfig,p     >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c128 webbrowser,p   >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/wget/wget.c128                   wget,p         >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c128        irc,p          >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128 webserver,p    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p      >$(NULLDEV)
+	$(C1541) -attach $@ -write ../c128/default.cfg                             contiki.cfg,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth            cs8900a.eth,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth           lan91c96.eth,s >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm    index.htm,s    >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif  contiki.gif,s  >$(NULLDEV)
+	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s >$(NULLDEV)

From 1afaae3fd777df94bac40f1a7b3cf41e73c736ad Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Fri, 3 Jun 2016 14:14:28 +0200
Subject: [PATCH 292/393] nrf52dk: enable 32bit rtimer

---
 platform/nrf52dk/platform-conf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/nrf52dk/platform-conf.h b/platform/nrf52dk/platform-conf.h
index cf89dc0a8..d40fd2b3e 100644
--- a/platform/nrf52dk/platform-conf.h
+++ b/platform/nrf52dk/platform-conf.h
@@ -132,9 +132,9 @@ typedef uint32_t uip_stats_t;
 /*
  * rtimer.h typedefs rtimer_clock_t as unsigned short. We need to define
  * RTIMER_CLOCK_DIFF to override this
+ */
 typedef uint32_t rtimer_clock_t;
 #define RTIMER_CLOCK_DIFF(a,b)     ((int32_t)((a)-(b)))
-*/
 
 /** @} */
 /*---------------------------------------------------------------------------*/

From 4e9b027141b72e4d7f574a09f69053be2139197d Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Sun, 29 Nov 2015 21:27:09 +0100
Subject: [PATCH 293/393] rpl.h: updated constants and comments to match the
 standard

---
 core/net/rpl/rpl.h | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/core/net/rpl/rpl.h b/core/net/rpl/rpl.h
index 532df4b3a..157433ee8 100644
--- a/core/net/rpl/rpl.h
+++ b/core/net/rpl/rpl.h
@@ -49,8 +49,8 @@
 typedef uint16_t rpl_rank_t;
 typedef uint16_t rpl_ocp_t;
 /*---------------------------------------------------------------------------*/
-/* DAG Metric Container Object Types, to be confirmed by IANA. */
-#define RPL_DAG_MC_NONE			0 /* Local identifier for empty MC */
+/* IANA Routing Metric/Constraint Type as defined in RFC6551 */
+#define RPL_DAG_MC_NONE			            0 /* Local identifier for empty MC */
 #define RPL_DAG_MC_NSA                  1 /* Node State and Attributes */
 #define RPL_DAG_MC_ENERGY               2 /* Node Energy */
 #define RPL_DAG_MC_HOPCOUNT             3 /* Hop Count */
@@ -60,27 +60,31 @@ typedef uint16_t rpl_ocp_t;
 #define RPL_DAG_MC_ETX                  7 /* Expected Transmission Count */
 #define RPL_DAG_MC_LC                   8 /* Link Color */
 
-/* DAG Metric Container flags. */
-#define RPL_DAG_MC_FLAG_P               0x8
-#define RPL_DAG_MC_FLAG_C               0x4
-#define RPL_DAG_MC_FLAG_O               0x2
-#define RPL_DAG_MC_FLAG_R               0x1
+/* IANA Routing Metric/Constraint Common Header Flag field as defined in RFC6551 (bit indexes) */
+#define RPL_DAG_MC_FLAG_P               5
+#define RPL_DAG_MC_FLAG_C               6
+#define RPL_DAG_MC_FLAG_O               7
+#define RPL_DAG_MC_FLAG_R               8
 
-/* DAG Metric Container aggregation mode. */
+/* IANA Routing Metric/Constraint Common Header A Field as defined in RFC6551 */
 #define RPL_DAG_MC_AGGR_ADDITIVE        0
 #define RPL_DAG_MC_AGGR_MAXIMUM         1
 #define RPL_DAG_MC_AGGR_MINIMUM         2
 #define RPL_DAG_MC_AGGR_MULTIPLICATIVE  3
 
-/* The bit index within the flags field of
-   the rpl_metric_object_energy structure. */
-#define RPL_DAG_MC_ENERGY_INCLUDED	3
-#define RPL_DAG_MC_ENERGY_TYPE		1
-#define RPL_DAG_MC_ENERGY_ESTIMATION	0
+/* The bit index within the flags field of the rpl_metric_object_energy structure. */
+#define RPL_DAG_MC_ENERGY_INCLUDED	    3
+#define RPL_DAG_MC_ENERGY_TYPE		      1
+#define RPL_DAG_MC_ENERGY_ESTIMATION	  0
 
-#define RPL_DAG_MC_ENERGY_TYPE_MAINS		0
-#define RPL_DAG_MC_ENERGY_TYPE_BATTERY		1
-#define RPL_DAG_MC_ENERGY_TYPE_SCAVENGING	2
+/* IANA Node Type Field as defined in RFC6551 */
+#define RPL_DAG_MC_ENERGY_TYPE_MAINS		   0
+#define RPL_DAG_MC_ENERGY_TYPE_BATTERY		 1
+#define RPL_DAG_MC_ENERGY_TYPE_SCAVENGING	 2
+
+/* IANA Objective Code Point as defined in RFC6550 */
+#define RPL_OCP_OF0     0
+#define RPL_OCP_MRHOF   1
 
 struct rpl_metric_object_energy {
   uint8_t flags;

From 2fa239ee8d592b6cb8a6e29860f1b383ccb51f7c Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Sun, 29 Nov 2015 21:31:59 +0100
Subject: [PATCH 294/393] Added link-stats module to keep strack of link
 statistics and their freshness

---
 core/net/ipv6/sicslowpan.c  |   4 +
 core/net/ipv6/uip-ds6-nbr.c |   5 +
 core/net/link-stats.c       | 212 ++++++++++++++++++++++++++++++++++++
 core/net/link-stats.h       |  65 +++++++++++
 4 files changed, 286 insertions(+)
 create mode 100644 core/net/link-stats.c
 create mode 100644 core/net/link-stats.h

diff --git a/core/net/ipv6/sicslowpan.c b/core/net/ipv6/sicslowpan.c
index ebbd8768e..8c174b228 100644
--- a/core/net/ipv6/sicslowpan.c
+++ b/core/net/ipv6/sicslowpan.c
@@ -62,6 +62,7 @@
 
 #include "contiki.h"
 #include "dev/watchdog.h"
+#include "net/link-stats.h"
 #include "net/ip/tcpip.h"
 #include "net/ip/uip.h"
 #include "net/ipv6/uip-ds6.h"
@@ -1516,6 +1517,9 @@ input(void)
   uint8_t first_fragment = 0, last_fragment = 0;
 #endif /*SICSLOWPAN_CONF_FRAG*/
 
+  /* Update link statistics */
+  link_stats_input_callback(packetbuf_addr(PACKETBUF_ADDR_SENDER));
+
   /* init */
   uncomp_hdr_len = 0;
   packetbuf_hdr_len = 0;
diff --git a/core/net/ipv6/uip-ds6-nbr.c b/core/net/ipv6/uip-ds6-nbr.c
index e5c6167e5..3ccebddd1 100644
--- a/core/net/ipv6/uip-ds6-nbr.c
+++ b/core/net/ipv6/uip-ds6-nbr.c
@@ -47,6 +47,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include "lib/list.h"
+#include "net/link-stats.h"
 #include "net/linkaddr.h"
 #include "net/packetbuf.h"
 #include "net/ipv6/uip-ds6-nbr.h"
@@ -74,6 +75,7 @@ NBR_TABLE_GLOBAL(uip_ds6_nbr_t, ds6_neighbors);
 void
 uip_ds6_neighbors_init(void)
 {
+  link_stats_init();
   nbr_table_register(ds6_neighbors, (nbr_table_callback *)uip_ds6_nbr_rm);
 }
 /*---------------------------------------------------------------------------*/
@@ -204,6 +206,9 @@ uip_ds6_link_neighbor_callback(int status, int numtx)
     return;
   }
 
+  /* Update neighbor link statistics */
+  link_stats_packet_sent(dest, status, numtx);
+  /* Call upper-layer callback (e.g. RPL) */
   LINK_NEIGHBOR_CALLBACK(dest, status, numtx);
 
 #if UIP_DS6_LL_NUD
diff --git a/core/net/link-stats.c b/core/net/link-stats.c
new file mode 100644
index 000000000..2312f5b23
--- /dev/null
+++ b/core/net/link-stats.c
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2015, SICS Swedish ICT.
+ * 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.
+ *
+ *
+ * Authors: Simon Duquennoy <simonduq@sics.se>
+ */
+
+#include "contiki.h"
+#include "sys/clock.h"
+#include "net/packetbuf.h"
+#include "net/nbr-table.h"
+#include "net/link-stats.h"
+#include <stdio.h>
+
+#define DEBUG 0
+#if DEBUG
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+
+/* Half time for the freshness counter, in minutes */
+#define FRESHNESS_HALF_LIFE             20
+/* Statistics are fresh if the freshness counter is FRESHNESS_TARGET or more */
+#define FRESHNESS_TARGET                 4
+/* Maximum value for the freshness counter */
+#define FRESHNESS_MAX                   16
+/* Statistics with no update in FRESHNESS_EXPIRATION_TIMEOUT is not fresh */
+#define FRESHNESS_EXPIRATION_TIME       (10 * 60 * CLOCK_SECOND)
+
+/* EWMA (exponential moving average) used to maintain statistics over time */
+#define EWMA_SCALE            100
+#define EWMA_ALPHA             10
+#define EWMA_BOOTSTRAP_ALPHA   30
+
+/* ETX fixed point divisor. 128 is the value used by RPL (RFC 6551 and RFC 6719) */
+#define ETX_DIVISOR     LINK_STATS_ETX_DIVISOR
+/* Number of Tx used to update the ETX EWMA in case of no-ACK */
+#define ETX_NOACK_PENALTY                   16
+/* Initial ETX value */
+#define ETX_INIT                             2
+
+/* Per-neighbor link statistics table */
+NBR_TABLE(struct link_stats, link_stats);
+
+/* Called every FRESHNESS_HALF_LIFE minutes */
+struct ctimer periodic_timer;
+
+/* Used to initialize ETX before any transmission occurs. In order to
+ * infer the initial ETX from the RSSI of previously received packets, use: */
+/* #define LINK_STATS_CONF_INIT_ETX(stats) guess_etx_from_rssi(stats) */
+
+#ifdef LINK_STATS_CONF_INIT_ETX
+#define LINK_STATS_INIT_ETX(stats) LINK_STATS_CONF_INIT_ETX(stats)
+#else /* LINK_STATS_INIT_ETX */
+#define LINK_STATS_INIT_ETX(stats) (ETX_INIT * ETX_DIVISOR)
+#endif /* LINK_STATS_INIT_ETX */
+
+/*---------------------------------------------------------------------------*/
+/* Returns the neighbor's link stats */
+const struct link_stats *
+link_stats_from_lladdr(const linkaddr_t *lladdr)
+{
+  return nbr_table_get_from_lladdr(link_stats, lladdr);
+}
+/*---------------------------------------------------------------------------*/
+/* Are the statistics fresh? */
+int
+link_stats_is_fresh(const struct link_stats *stats)
+{
+  return (stats != NULL)
+      && clock_time() - stats->last_tx_time < FRESHNESS_EXPIRATION_TIME
+      && stats->freshness >= FRESHNESS_TARGET;
+}
+/*---------------------------------------------------------------------------*/
+uint16_t
+guess_etx_from_rssi(const struct link_stats *stats)
+{
+  if(stats != NULL) {
+    if(stats->rssi == 0) {
+      return ETX_INIT * ETX_DIVISOR;
+    } else {
+      /* A rough estimate of PRR from RSSI, as a linear function where:
+       *      RSSI >= -60 results in PRR of 1
+       *      RSSI <= -90 results in PRR of 0
+       * prr = (bounded_rssi - RSSI_LOW) / (RSSI_DIFF)
+       * etx = ETX_DIVOSOR / ((bounded_rssi - RSSI_LOW) / RSSI_DIFF)
+       * etx = (RSSI_DIFF * ETX_DIVOSOR) / (bounded_rssi - RSSI_LOW)
+       * */
+#define ETX_INIT_MAX 3
+#define RSSI_HIGH -60
+#define RSSI_LOW  -90
+#define RSSI_DIFF (RSSI_HIGH - RSSI_LOW)
+      uint16_t etx;
+      int16_t bounded_rssi = stats->rssi;
+      bounded_rssi = MIN(bounded_rssi, RSSI_HIGH);
+      bounded_rssi = MAX(bounded_rssi, RSSI_LOW + 1);
+      etx = RSSI_DIFF * ETX_DIVISOR / (bounded_rssi - RSSI_LOW);
+      return MIN(etx, ETX_INIT_MAX * ETX_DIVISOR);
+    }
+  }
+  return 0xffff;
+}
+/*---------------------------------------------------------------------------*/
+/* Packet sent callback. Updates stats for transmissions to lladdr */
+void
+link_stats_packet_sent(const linkaddr_t *lladdr, int status, int numtx)
+{
+  struct link_stats *stats;
+  uint16_t packet_etx;
+  uint8_t ewma_alpha;
+
+  if(status != MAC_TX_OK && status != MAC_TX_NOACK) {
+    /* Do not penalize the ETX when collisions or transmission errors occur. */
+    return;
+  }
+
+  stats = nbr_table_get_from_lladdr(link_stats, lladdr);
+  if(stats == NULL) {
+    /* Add the neighbor */
+    stats = nbr_table_add_lladdr(link_stats, lladdr);
+    if(stats != NULL) {
+      stats->etx = LINK_STATS_INIT_ETX(stats);
+    } else {
+      return; /* No space left, return */
+    }
+  }
+
+  /* Update last timestamp and freshness */
+  stats->last_tx_time = clock_time();
+  stats->freshness = MIN(stats->freshness + numtx, FRESHNESS_MAX);
+
+  /* ETX used for this update */
+  packet_etx = ((status == MAC_TX_NOACK) ? ETX_NOACK_PENALTY : numtx) * ETX_DIVISOR;
+  /* ETX alpha used for this update */
+  ewma_alpha = link_stats_is_fresh(stats) ? EWMA_ALPHA : EWMA_BOOTSTRAP_ALPHA;
+
+  /* Compute EWMA and update ETX */
+  stats->etx = ((uint32_t)stats->etx * (EWMA_SCALE - ewma_alpha) +
+      (uint32_t)packet_etx * ewma_alpha) / EWMA_SCALE;
+}
+/*---------------------------------------------------------------------------*/
+/* Packet input callback. Updates statistics for receptions on a given link */
+void
+link_stats_input_callback(const linkaddr_t *lladdr)
+{
+  struct link_stats *stats;
+  int16_t packet_rssi = packetbuf_attr(PACKETBUF_ATTR_RSSI);
+
+  stats = nbr_table_get_from_lladdr(link_stats, lladdr);
+  if(stats == NULL) {
+    /* Add the neighbor */
+    stats = nbr_table_add_lladdr(link_stats, lladdr);
+    if(stats != NULL) {
+      /* Initialize */
+      stats->rssi = packet_rssi;
+      stats->etx = LINK_STATS_INIT_ETX(stats);
+    } else {
+      return; /* No space left, return */
+    }
+  }
+
+  /* Update RSSI EWMA */
+  stats->rssi = ((int32_t)stats->rssi * (EWMA_SCALE - EWMA_ALPHA) +
+      (int32_t)packet_rssi * EWMA_ALPHA) / EWMA_SCALE;
+}
+/*---------------------------------------------------------------------------*/
+/* Periodic timer called every FRESHNESS_HALF_LIFE minutes */
+static void
+periodic(void *ptr)
+{
+  /* Age (by halving) freshness counter of all neighbors */
+  struct link_stats *stats;
+  ctimer_reset(&periodic_timer);
+  for(stats = nbr_table_head(link_stats); stats != NULL; stats = nbr_table_next(link_stats, stats)) {
+    stats->freshness >>= 1;
+  }
+}
+/*---------------------------------------------------------------------------*/
+/* Initializes link-stats module */
+void
+link_stats_init(void)
+{
+  nbr_table_register(link_stats, NULL);
+  ctimer_set(&periodic_timer, 60 * CLOCK_SECOND * FRESHNESS_HALF_LIFE,
+      periodic, NULL);
+}
diff --git a/core/net/link-stats.h b/core/net/link-stats.h
new file mode 100644
index 000000000..d28a1c1a4
--- /dev/null
+++ b/core/net/link-stats.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2015, SICS Swedish ICT.
+ * 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.
+ *
+ *
+ * Authors: Simon Duquennoy <simonduq@sics.se>
+ */
+
+#ifndef LINK_STATS_H_
+#define LINK_STATS_H_
+
+#include "core/net/linkaddr.h"
+
+/* ETX fixed point divisor. 128 is the value used by RPL (RFC 6551 and RFC 6719) */
+#ifdef LINK_STATS_CONF_ETX_DIVISOR
+#define LINK_STATS_ETX_DIVISOR              LINK_STATS_CONF_ETX_DIVISOR
+#else /* LINK_STATS_CONF_ETX_DIVISOR */
+#define LINK_STATS_ETX_DIVISOR              128
+#endif /* LINK_STATS_CONF_ETX_DIVISOR */
+
+/* All statistics of a given link */
+struct link_stats {
+  uint16_t etx;               /* ETX using ETX_DIVISOR as fixed point divisor */
+  int16_t rssi;               /* RSSI (received signal strength) */
+  uint8_t freshness;          /* Freshness of the statistics */
+  clock_time_t last_tx_time;  /* Last Tx timestamp */
+};
+
+/* Returns the neighbor's link statistics */
+const struct link_stats *link_stats_from_lladdr(const linkaddr_t *lladdr);
+/* Are the statistics fresh? */
+int link_stats_is_fresh(const struct link_stats *stats);
+
+/* Initializes link-stats module */
+void link_stats_init(void);
+/* Packet sent callback. Updates statistics for transmissions on a given link */
+void link_stats_packet_sent(const linkaddr_t *lladdr, int status, int numtx);
+/* Packet input callback. Updates statistics for receptions on a given link */
+void link_stats_input_callback(const linkaddr_t *lladdr);
+
+#endif /* LINK_STATS_H_ */

From 752fef9e42037c7e892721ee8654c626aa36c37d Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Sun, 29 Nov 2015 21:32:28 +0100
Subject: [PATCH 295/393] Added link-stats and nbr-table to avr-ravenusb
 makefile

---
 platform/avr-ravenusb/Makefile.avr-ravenusb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/avr-ravenusb/Makefile.avr-ravenusb b/platform/avr-ravenusb/Makefile.avr-ravenusb
index b6301b329..6c702a261 100644
--- a/platform/avr-ravenusb/Makefile.avr-ravenusb
+++ b/platform/avr-ravenusb/Makefile.avr-ravenusb
@@ -71,5 +71,5 @@ MODULES+=core/net/mac core/net/mac/sicslowmac \
          core/net/llsec
 else
 vpath %.c $(CONTIKI)/core/net/ipv6
-CONTIKI_SOURCEFILES += sicslowpan.c linkaddr.c
+CONTIKI_SOURCEFILES += sicslowpan.c linkaddr.c link-stats.c nbr-table.c
 endif

From 426e10c3ed0969a8bdc57fbd2d6a9440d859fe8d Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Sun, 29 Nov 2015 21:44:39 +0100
Subject: [PATCH 296/393] Rehauling of RPL OFs, both MRHOF and OF0. Fixed
 compliance with RFC6551, 6552, 6719. Now using the link-stats module.

---
 core/net/ipv6/uip-ds6-nbr.h |   1 -
 core/net/rpl/rpl-conf.h     |  25 +--
 core/net/rpl/rpl-dag.c      | 153 ++++++++++-----
 core/net/rpl/rpl-mrhof.c    | 369 +++++++++++++++++-------------------
 core/net/rpl/rpl-of0.c      | 227 +++++++++++++---------
 core/net/rpl/rpl-private.h  |   7 -
 core/net/rpl/rpl-timers.c   |   1 +
 core/net/rpl/rpl.c          |   6 -
 core/net/rpl/rpl.h          |  43 +++--
 9 files changed, 445 insertions(+), 387 deletions(-)

diff --git a/core/net/ipv6/uip-ds6-nbr.h b/core/net/ipv6/uip-ds6-nbr.h
index 2f3a51d28..40a17d1e2 100644
--- a/core/net/ipv6/uip-ds6-nbr.h
+++ b/core/net/ipv6/uip-ds6-nbr.h
@@ -71,7 +71,6 @@ typedef struct uip_ds6_nbr {
   uip_ipaddr_t ipaddr;
   uint8_t isrouter;
   uint8_t state;
-  uint16_t link_metric;
 #if UIP_ND6_SEND_NA || UIP_ND6_SEND_RA
   struct stimer reachable;
   struct stimer sendns;
diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h
index 073186071..4474d1449 100644
--- a/core/net/rpl/rpl-conf.h
+++ b/core/net/rpl/rpl-conf.h
@@ -52,6 +52,13 @@
  * When MRHOF (RFC6719) is used with ETX, no metric container must
  * be used; instead the rank carries ETX directly.
  */
+#ifdef RPL_CONF_WITH_MC
+#define RPL_WITH_MC RPL_CONF_WITH_MC
+#else /* RPL_CONF_WITH_MC */
+#define RPL_WITH_MC 0
+#endif /* RPL_CONF_WITH_MC */
+
+/* The MC advertised in DIOs and propagating from the root */
 #ifdef RPL_CONF_DAG_MC
 #define RPL_DAG_MC RPL_CONF_DAG_MC
 #else
@@ -186,15 +193,6 @@
 #define RPL_DIO_REDUNDANCY          10
 #endif
 
-/*
- * Initial metric attributed to a link when the ETX is unknown
- */
-#ifndef RPL_CONF_INIT_LINK_METRIC
-#define RPL_INIT_LINK_METRIC        2
-#else
-#define RPL_INIT_LINK_METRIC        RPL_CONF_INIT_LINK_METRIC
-#endif
-
 /*
  * Default route lifetime unit. This is the granularity of time
  * used in RPL lifetime values, in seconds.
@@ -287,15 +285,6 @@
 #define RPL_PROBING_INTERVAL (120 * CLOCK_SECOND)
 #endif
 
-/*
- * RPL probing expiration time.
- */
-#ifdef RPL_CONF_PROBING_EXPIRATION_TIME
-#define RPL_PROBING_EXPIRATION_TIME RPL_CONF_PROBING_EXPIRATION_TIME
-#else
-#define RPL_PROBING_EXPIRATION_TIME (10 * 60 * CLOCK_SECOND)
-#endif
-
 /*
  * Function used to select the next parent to be probed.
  */
diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index 27f781bdf..e7fc60a96 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -44,6 +44,7 @@
  */
 
 #include "contiki.h"
+#include "net/link-stats.h"
 #include "net/rpl/rpl-private.h"
 #include "net/ip/uip.h"
 #include "net/ipv6/uip-nd6.h"
@@ -91,22 +92,25 @@ void
 rpl_print_neighbor_list(void)
 {
   if(default_instance != NULL && default_instance->current_dag != NULL &&
-      default_instance->of != NULL && default_instance->of->calculate_rank != NULL) {
+      default_instance->of != NULL) {
     int curr_dio_interval = default_instance->dio_intcurrent;
     int curr_rank = default_instance->current_dag->rank;
     rpl_parent_t *p = nbr_table_head(rpl_parents);
-    clock_time_t now = clock_time();
+    const struct link_stats *stats = rpl_get_parent_link_stats(p);
 
-    printf("RPL: rank %u dioint %u, %u nbr(s)\n", curr_rank, curr_dio_interval, uip_ds6_nbr_num());
+    printf("RPL: OCP %u rank %u dioint %u, nbr count %u\n",
+        default_instance->of->ocp, curr_rank, curr_dio_interval, uip_ds6_nbr_num());
     while(p != NULL) {
-      uip_ds6_nbr_t *nbr = rpl_get_nbr(p);
-      printf("RPL: nbr %3u %5u, %5u => %5u %c%c (last tx %u min ago)\n",
-          nbr_table_get_lladdr(rpl_parents, p)->u8[7],
-          p->rank, nbr ? nbr->link_metric : 0,
-          default_instance->of->calculate_rank(p, 0),
-          default_instance->current_dag == p->dag ? 'd' : ' ',
-          p == default_instance->current_dag->preferred_parent ? '*' : ' ',
-          (unsigned)((now - p->last_tx_time) / (60 * CLOCK_SECOND)));
+      printf("RPL: nbr %3u %5u, %5u => %5u -- %5u %c%c (last tx %u min ago)\n",
+          rpl_get_parent_ipaddr(p)->u8[15],
+          p->rank,
+          rpl_get_parent_link_metric(p),
+          rpl_rank_via_parent(p),
+          stats != NULL ? stats->freshness : 0,
+          link_stats_is_fresh(stats) ? 'f' : ' ',
+          p == default_instance->current_dag->preferred_parent ? 'p' : ' ',
+          (unsigned)((now - p->last_tx_time) / (60 * CLOCK_SECOND))
+      );
       p = nbr_table_next(rpl_parents, p);
     }
     printf("RPL: end of list\n");
@@ -151,30 +155,61 @@ rpl_get_parent_rank(uip_lladdr_t *addr)
   if(p != NULL) {
     return p->rank;
   } else {
-    return 0;
+    return INFINITE_RANK;
   }
 }
 /*---------------------------------------------------------------------------*/
 uint16_t
-rpl_get_parent_link_metric(const uip_lladdr_t *addr)
+rpl_get_parent_link_metric(rpl_parent_t *p)
 {
-  uip_ds6_nbr_t *nbr;
-  nbr = nbr_table_get_from_lladdr(ds6_neighbors, (const linkaddr_t *)addr);
-
-  if(nbr != NULL) {
-    return nbr->link_metric;
-  } else {
-    return 0;
+  if(p != NULL && p->dag != NULL) {
+    rpl_instance_t *instance = p->dag->instance;
+    if(instance != NULL && instance->of != NULL && instance->of->parent_link_metric != NULL) {
+      return instance->of->parent_link_metric(p);
+    }
   }
+  return 0xffff;
+}
+/*---------------------------------------------------------------------------*/
+rpl_rank_t
+rpl_rank_via_parent(rpl_parent_t *p)
+{
+  if(p != NULL && p->dag != NULL) {
+    rpl_instance_t *instance = p->dag->instance;
+    if(instance != NULL && instance->of != NULL && instance->of->rank_via_parent != NULL) {
+      return instance->of->rank_via_parent(p);
+    }
+  }
+  return INFINITE_RANK;
+}
+/*---------------------------------------------------------------------------*/
+const linkaddr_t *
+rpl_get_parent_lladdr(rpl_parent_t *p)
+{
+  return nbr_table_get_lladdr(rpl_parents, p);
 }
 /*---------------------------------------------------------------------------*/
 uip_ipaddr_t *
 rpl_get_parent_ipaddr(rpl_parent_t *p)
 {
-  linkaddr_t *lladdr = nbr_table_get_lladdr(rpl_parents, p);
+  const linkaddr_t *lladdr = rpl_get_parent_lladdr(p);
   return uip_ds6_nbr_ipaddr_from_lladdr((uip_lladdr_t *)lladdr);
 }
 /*---------------------------------------------------------------------------*/
+const struct link_stats *
+rpl_get_parent_link_stats(rpl_parent_t *p)
+{
+  const linkaddr_t *lladdr = rpl_get_parent_lladdr(p);
+  return link_stats_from_lladdr(lladdr);
+}
+/*---------------------------------------------------------------------------*/
+int
+rpl_parent_is_fresh(rpl_parent_t *p)
+{
+  const struct link_stats *stats = rpl_get_parent_link_stats(p);
+  return link_stats_is_fresh(stats);
+}
+/*---------------------------------------------------------------------------*/
 static void
 rpl_set_preferred_parent(rpl_dag_t *dag, rpl_parent_t *p)
 {
@@ -640,20 +675,12 @@ rpl_add_parent(rpl_dag_t *dag, rpl_dio_t *dio, uip_ipaddr_t *addr)
     if(p == NULL) {
       PRINTF("RPL: rpl_add_parent p NULL\n");
     } else {
-      uip_ds6_nbr_t *nbr;
-      nbr = rpl_get_nbr(p);
-
       p->dag = dag;
       p->rank = dio->rank;
       p->dtsn = dio->dtsn;
-
-      /* Check whether we have a neighbor that has not gotten a link metric yet */
-      if(nbr != NULL && nbr->link_metric == 0) {
-	nbr->link_metric = RPL_INIT_LINK_METRIC * RPL_DAG_MC_ETX_DIVISOR;
-      }
-#if RPL_DAG_MC != RPL_DAG_MC_NONE
+#if RPL_WITH_MC
       memcpy(&p->mc, &dio->mc, sizeof(p->mc));
-#endif /* RPL_DAG_MC != RPL_DAG_MC_NONE */
+#endif /* RPL_WITH_MC */
     }
   }
 
@@ -757,7 +784,7 @@ rpl_select_dag(rpl_instance_t *instance, rpl_parent_t *p)
 
   instance->of->update_metric_container(instance);
   /* Update the DAG rank. */
-  best_dag->rank = instance->of->calculate_rank(best_dag->preferred_parent, 0);
+  best_dag->rank = rpl_rank_via_parent(best_dag->preferred_parent);
   if(last_parent == NULL || best_dag->rank < best_dag->min_rank) {
     best_dag->min_rank = best_dag->rank;
   } else if(!acceptable_rank(best_dag, best_dag->rank)) {
@@ -798,20 +825,35 @@ rpl_select_dag(rpl_instance_t *instance, rpl_parent_t *p)
 static rpl_parent_t *
 best_parent(rpl_dag_t *dag)
 {
-  rpl_parent_t *p, *best;
+  rpl_parent_t *p;
+  rpl_of_t *of;
+  rpl_parent_t *best = NULL;
 
-  best = NULL;
+  if(dag == NULL || dag->instance == NULL || dag->instance->of == NULL) {
+    return NULL;
+  }
 
-  p = nbr_table_head(rpl_parents);
-  while(p != NULL) {
+  of = dag->instance->of;
+  /* Search for the best parent according to the OF */
+  for(p = nbr_table_head(rpl_parents); p != NULL; p = nbr_table_next(rpl_parents, p)) {
+
+    /* Exclude parents from other DAGs or announcing an infinite rank */
     if(p->dag != dag || p->rank == INFINITE_RANK) {
-      /* ignore this neighbor */
-    } else if(best == NULL) {
-      best = p;
-    } else {
-      best = dag->instance->of->best_parent(best, p);
+      continue;
     }
-    p = nbr_table_next(rpl_parents, p);
+
+#ifndef UIP_CONF_ND6_SEND_NA
+    {
+    uip_ds6_nbr_t *nbr = rpl_get_nbr(p);
+    /* Exclude links to a neighbor that is not reachable at a NUD level */
+    if(nbr == NULL || nbr->state != NBR_REACHABLE) {
+      continue;
+    }
+    }
+#endif /* UIP_CONF_ND6_SEND_NA */
+
+    /* Now we have an acceptable parent, check if it is the new best */
+    best = of->best_parent(best, p);
   }
 
   return best;
@@ -823,9 +865,12 @@ rpl_select_parent(rpl_dag_t *dag)
   rpl_parent_t *best = best_parent(dag);
 
   if(best != NULL) {
-    rpl_set_preferred_parent(dag, best);
-    dag->rank = dag->instance->of->calculate_rank(dag->preferred_parent, 0);
+    if(rpl_parent_is_fresh(best)) {
+      rpl_set_preferred_parent(dag, best);
+      dag->rank = rpl_rank_via_parent(dag->preferred_parent);
+    }
   } else {
+    rpl_set_preferred_parent(dag, best);
     dag->rank = INFINITE_RANK;
   }
 
@@ -1003,6 +1048,10 @@ rpl_join_instance(uip_ipaddr_t *from, rpl_dio_t *dio)
 
   instance->of = of;
   instance->mop = dio->mop;
+  instance->mc.type = dio->mc.type;
+  instance->mc.flags = dio->mc.flags;
+  instance->mc.aggr = dio->mc.aggr;
+  instance->mc.prec = dio->mc.prec;
   instance->current_dag = dag;
   instance->dtsn_out = RPL_LOLLIPOP_INIT;
 
@@ -1022,7 +1071,7 @@ rpl_join_instance(uip_ipaddr_t *from, rpl_dio_t *dio)
 
   rpl_set_preferred_parent(dag, p);
   instance->of->update_metric_container(instance);
-  dag->rank = instance->of->calculate_rank(p, 0);
+  dag->rank = rpl_rank_via_parent(p);
   /* So far this is the lowest rank we are aware of. */
   dag->min_rank = dag->rank;
 
@@ -1045,6 +1094,8 @@ rpl_join_instance(uip_ipaddr_t *from, rpl_dio_t *dio)
   } else {
     PRINTF("RPL: The DIO does not meet the prerequisites for sending a DAO\n");
   }
+
+  instance->of->reset(dag);
 }
 
 #if RPL_MAX_DAG_PER_INSTANCE > 1
@@ -1115,7 +1166,7 @@ rpl_add_dag(uip_ipaddr_t *from, rpl_dio_t *dio)
   memcpy(&dag->prefix_info, &dio->prefix_info, sizeof(rpl_prefix_t));
 
   rpl_set_preferred_parent(dag, p);
-  dag->rank = instance->of->calculate_rank(p, 0);
+  dag->rank = rpl_rank_via_parent(p);
   dag->min_rank = dag->rank; /* So far this is the lowest rank we know of. */
 
   PRINTF("RPL: Joined DAG with instance ID %u, rank %hu, DAG ID ",
@@ -1157,7 +1208,7 @@ global_repair(uip_ipaddr_t *from, rpl_dag_t *dag, rpl_dio_t *dio)
     PRINTF("RPL: Failed to add a parent during the global repair\n");
     dag->rank = INFINITE_RANK;
   } else {
-    dag->rank = dag->instance->of->calculate_rank(p, 0);
+    dag->rank = rpl_rank_via_parent(p);
     dag->min_rank = dag->rank;
     PRINTF("RPL: rpl_process_parent_event global repair\n");
     rpl_process_parent_event(dag->instance, p);
@@ -1446,14 +1497,14 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
   PRINT6ADDR(&instance->current_dag->dag_id);
   PRINTF(", rank %u, min_rank %u, ",
 	 instance->current_dag->rank, instance->current_dag->min_rank);
-  PRINTF("parent rank %u, parent etx %u, link metric %u, instance etx %u\n",
-	 p->rank, -1/*p->mc.obj.etx*/, rpl_get_nbr(p)->link_metric, instance->mc.obj.etx);
+  PRINTF("parent rank %u, link metric %u\n",
+	 p->rank, rpl_get_parent_link_metric(p));
 
   /* We have allocated a candidate parent; process the DIO further. */
 
-#if RPL_DAG_MC != RPL_DAG_MC_NONE
+#if RPL_WITH_MC
   memcpy(&p->mc, &dio->mc, sizeof(p->mc));
-#endif /* RPL_DAG_MC != RPL_DAG_MC_NONE */
+#endif /* RPL_WITH_MC */
   if(rpl_process_parent_event(instance, p) == 0) {
     PRINTF("RPL: The candidate parent is rejected\n");
     return;
diff --git a/core/net/rpl/rpl-mrhof.c b/core/net/rpl/rpl-mrhof.c
index f9ea76080..fde280110 100644
--- a/core/net/rpl/rpl-mrhof.c
+++ b/core/net/rpl/rpl-mrhof.c
@@ -32,7 +32,7 @@
 
 /**
  * \file
- *         The Minimum Rank with Hysteresis Objective Function (MRHOF)
+ *         The Minimum Rank with Hysteresis Objective Function (MRHOF), RFC6719
  *
  *         This implementation uses the estimated number of
  *         transmissions (ETX) as the additive routing metric,
@@ -46,83 +46,48 @@
  * @{
  */
 
+#include "net/rpl/rpl.h"
 #include "net/rpl/rpl-private.h"
 #include "net/nbr-table.h"
+#include "net/link-stats.h"
 
 #define DEBUG DEBUG_NONE
 #include "net/ip/uip-debug.h"
 
-static void reset(rpl_dag_t *);
-static void neighbor_link_callback(rpl_parent_t *, int, int);
-#if RPL_WITH_DAO_ACK
-static void dao_ack_callback(rpl_parent_t *, int);
-#endif
-static rpl_parent_t *best_parent(rpl_parent_t *, rpl_parent_t *);
-static rpl_dag_t *best_dag(rpl_dag_t *, rpl_dag_t *);
-static rpl_rank_t calculate_rank(rpl_parent_t *, rpl_rank_t);
-static void update_metric_container(rpl_instance_t *);
-
-rpl_of_t rpl_mrhof = {
-  reset,
-  neighbor_link_callback,
-#if RPL_WITH_DAO_ACK
-  dao_ack_callback,
-#endif
-  best_parent,
-  best_dag,
-  calculate_rank,
-  update_metric_container,
-  1
-};
-
-/* Constants for the ETX moving average */
-#define ETX_SCALE   100
-#define ETX_ALPHA   90
-
-/* Reject parents that have a higher link metric than the following. */
-#define MAX_LINK_METRIC			10
+/* RFC6551 and RFC6719 do not mandate the use of a specific formula to
+ * compute the ETX value. This MRHOF implementation relies on the value
+ * computed by the link-stats module. It has an optional feature,
+ * RPL_MRHOF_CONF_SQUARED_ETX, that consists in squaring this value.
+ * This basically penalizes bad links while preserving the semantics of ETX
+ * (1 = perfect link, more = worse link). As a result, MRHOF will favor
+ * good links over short paths. Recommended when reliability is a priority.
+ * Without this feature, a hop with 50% PRR (ETX=2) is equivalent to two
+ * perfect hops with 100% PRR (ETX=1+1=2). With this feature, the former
+ * path obtains ETX=2*2=4 and the former ETX=1*1+1*1=2. */
+#ifdef RPL_MRHOF_CONF_SQUARED_ETX
+#define RPL_MRHOF_SQUARED_ETX RPL_MRHOF_CONF_SQUARED_ETX
+#else /* RPL_MRHOF_CONF_SQUARED_ETX */
+#define RPL_MRHOF_SQUARED_ETX 0
+#endif /* RPL_MRHOF_CONF_SQUARED_ETX */
 
+/* Configuration parameters of RFC6719. Reject parents that have a higher
+ * link metric than the following. We use the default values from the RFC. */
+#define MAX_LINK_METRIC      512   /* Eq ETX of 4 */
 /* Reject parents that have a higher path cost than the following. */
-#define MAX_PATH_COST			100
-
-/*
- * The rank must differ more than 1/PARENT_SWITCH_THRESHOLD_DIV in order
- * to switch preferred parent.
+#define MAX_PATH_COST			 32768   /* Eq path ETX of 256 */
+/* Hysteresis of MRHOF: the rank must differ more than PARENT_SWITCH_THRESHOLD_DIV
+ * in order to switch preferred parent. Default in RFC6719: 192, eq ETX of 1.5.
+ * We use a more aggressive setting: 96, eq ETX of 0.75.
  */
-#define PARENT_SWITCH_THRESHOLD_DIV	2
-
-typedef uint16_t rpl_path_metric_t;
-
-static rpl_path_metric_t
-calculate_path_metric(rpl_parent_t *p)
-{
-  uip_ds6_nbr_t *nbr;
-  if(p == NULL) {
-    return MAX_PATH_COST * RPL_DAG_MC_ETX_DIVISOR;
-  }
-  nbr = rpl_get_nbr(p);
-  if(nbr == NULL) {
-    return MAX_PATH_COST * RPL_DAG_MC_ETX_DIVISOR;
-  }
-#if RPL_DAG_MC == RPL_DAG_MC_NONE
-  {
-    return p->rank + (uint16_t)nbr->link_metric;
-  }
-#elif RPL_DAG_MC == RPL_DAG_MC_ETX
-  return p->mc.obj.etx + (uint16_t)nbr->link_metric;
-#elif RPL_DAG_MC == RPL_DAG_MC_ENERGY
-  return p->mc.obj.energy.energy_est + (uint16_t)nbr->link_metric;
-#else
-#error "Unsupported RPL_DAG_MC configured. See rpl.h."
-#endif /* RPL_DAG_MC */
-}
+#define PARENT_SWITCH_THRESHOLD 96
 
+/*---------------------------------------------------------------------------*/
 static void
 reset(rpl_dag_t *dag)
 {
   PRINTF("RPL: Reset MRHOF\n");
 }
-
+/*---------------------------------------------------------------------------*/
 #if RPL_WITH_DAO_ACK
 static void
 dao_ack_callback(rpl_parent_t *p, int status)
@@ -141,80 +106,117 @@ dao_ack_callback(rpl_parent_t *p, int status)
   }
 }
 #endif /* RPL_WITH_DAO_ACK */
-
-static void
-neighbor_link_callback(rpl_parent_t *p, int status, int numtx)
+/*---------------------------------------------------------------------------*/
+static uint16_t
+parent_link_metric(rpl_parent_t *p)
 {
-  uint16_t recorded_etx = 0;
-  uint16_t packet_etx = numtx * RPL_DAG_MC_ETX_DIVISOR;
-  uint16_t new_etx;
-  uip_ds6_nbr_t *nbr = NULL;
-
-  nbr = rpl_get_nbr(p);
-  if(nbr == NULL) {
-    /* No neighbor for this parent - something bad has occurred */
-    return;
-  }
-
-  recorded_etx = nbr->link_metric;
-
-  /* Do not penalize the ETX when collisions or transmission errors occur. */
-  if(status == MAC_TX_OK || status == MAC_TX_NOACK) {
-    if(status == MAC_TX_NOACK) {
-      packet_etx = MAX_LINK_METRIC * RPL_DAG_MC_ETX_DIVISOR;
-    }
-
-    if(p->flags & RPL_PARENT_FLAG_LINK_METRIC_VALID) {
-      /* We already have a valid link metric, use weighted moving average to update it */
-      new_etx = ((uint32_t)recorded_etx * ETX_ALPHA +
-                 (uint32_t)packet_etx * (ETX_SCALE - ETX_ALPHA)) / ETX_SCALE;
-    } else {
-      /* We don't have a valid link metric, set it to the current packet's ETX */
-      new_etx = packet_etx;
-      /* Set link metric as valid */
-      p->flags |= RPL_PARENT_FLAG_LINK_METRIC_VALID;
-    }
-
-    PRINTF("RPL: ETX changed from %u to %u (packet ETX = %u)\n",
-        (unsigned)(recorded_etx / RPL_DAG_MC_ETX_DIVISOR),
-        (unsigned)(new_etx  / RPL_DAG_MC_ETX_DIVISOR),
-        (unsigned)(packet_etx / RPL_DAG_MC_ETX_DIVISOR));
-    /* update the link metric for this nbr */
-    nbr->link_metric = new_etx;
+  const struct link_stats *stats = rpl_get_parent_link_stats(p);
+  if(stats != NULL) {
+#if RPL_MRHOF_SQUARED_ETX
+    uint32_t squared_etx = ((uint32_t)stats->etx * stats->etx) / LINK_STATS_ETX_DIVISOR;
+    return (uint16_t)MIN(squared_etx, 0xffff);
+#else /* RPL_MRHOF_SQUARED_ETX */
+  return stats->etx;
+#endif /* RPL_MRHOF_SQUARED_ETX */
   }
+  return 0xffff;
 }
+/*---------------------------------------------------------------------------*/
+static uint16_t
+parent_path_cost(rpl_parent_t *p)
+{
+  uint16_t base;
 
+  if(p == NULL || p->dag == NULL || p->dag->instance == NULL) {
+    return 0xffff;
+  }
+
+#if RPL_WITH_MC
+  /* Handle the different MC types */
+  switch(p->dag->instance->mc.type) {
+    case RPL_DAG_MC_ETX:
+      base = p->mc.obj.etx;
+      break;
+    case RPL_DAG_MC_ENERGY:
+      base = p->mc.obj.energy.energy_est << 8;
+      break;
+    default:
+      base = p->rank;
+      break;
+  }
+#else /* RPL_WITH_MC */
+  base = p->rank;
+#endif /* RPL_WITH_MC */
+
+  /* path cost upper bound: 0xffff */
+  return MIN((uint32_t)base + parent_link_metric(p), 0xffff);
+}
+/*---------------------------------------------------------------------------*/
 static rpl_rank_t
-calculate_rank(rpl_parent_t *p, rpl_rank_t base_rank)
+rank_via_parent(rpl_parent_t *p)
 {
-  rpl_rank_t new_rank;
-  rpl_rank_t rank_increase;
-  uip_ds6_nbr_t *nbr;
+  uint16_t min_hoprankinc;
+  uint16_t path_cost;
 
-  if(p == NULL || (nbr = rpl_get_nbr(p)) == NULL) {
-    if(base_rank == 0) {
-      return INFINITE_RANK;
-    }
-    rank_increase = RPL_INIT_LINK_METRIC * RPL_DAG_MC_ETX_DIVISOR;
-  } else {
-    rank_increase = nbr->link_metric;
-    if(base_rank == 0) {
-      base_rank = p->rank;
-    }
+  if(p == NULL || p->dag == NULL || p->dag->instance == NULL) {
+    return INFINITE_RANK;
   }
 
-  if(INFINITE_RANK - base_rank < rank_increase) {
-    /* Reached the maximum rank. */
-    new_rank = INFINITE_RANK;
-  } else {
-   /* Calculate the rank based on the new rank information from DIO or
-      stored otherwise. */
-    new_rank = base_rank + rank_increase;
-  }
+  min_hoprankinc = p->dag->instance->min_hoprankinc;
+  path_cost = parent_path_cost(p);
 
-  return new_rank;
+  /* Rank lower-bound: parent rank + min_hoprankinc */
+  return MAX(MIN((uint32_t)p->rank + min_hoprankinc, 0xffff), path_cost);
 }
+/*---------------------------------------------------------------------------*/
+static int
+parent_is_acceptable(rpl_parent_t *p)
+{
+  uint16_t link_metric = parent_link_metric(p);
+  uint16_t path_cost = parent_path_cost(p);
+  /* Exclude links with too high link metrics or path cost (RFC6719, 3.2.2) */
+  return link_metric <= MAX_LINK_METRIC && path_cost <= MAX_PATH_COST;
+}
+/*---------------------------------------------------------------------------*/
+static rpl_parent_t *
+best_parent(rpl_parent_t *p1, rpl_parent_t *p2)
+{
+  rpl_dag_t *dag;
+  uint16_t p1_cost;
+  uint16_t p2_cost;
+  int p1_is_acceptable;
+  int p2_is_acceptable;
 
+  if(p1 == NULL || p2 == NULL) {
+    /* Return non-null parent if any */
+    return p1 == NULL ? p2 : p1;
+  }
+
+  p1_is_acceptable = parent_is_acceptable(p1);
+  p2_is_acceptable = parent_is_acceptable(p2);
+  /* Is only one parent is acceptable, select it. If both are acceptable, or
+   * both non-acceptable, proceed to traditional parent comparison. This is a
+   * slight departure from the standard but allows to keep connectivity even
+   * all neighbors appear to have a bad link. */
+  if(p1_is_acceptable != p2_is_acceptable) {
+    return p1_is_acceptable ? p1 : p2;
+  }
+
+  dag = p1->dag; /* Both parents are in the same DAG. */
+  p1_cost = parent_path_cost(p1);
+  p2_cost = parent_path_cost(p2);
+
+  /* Maintain stability of the preferred parent in case of similar ranks. */
+  if(p1 == dag->preferred_parent || p2 == dag->preferred_parent) {
+    if(p1_cost < p2_cost + PARENT_SWITCH_THRESHOLD &&
+       p1_cost > p2_cost - PARENT_SWITCH_THRESHOLD) {
+      return dag->preferred_parent;
+    }
+  }
+
+  return p1_cost < p2_cost ? p1 : p2;
+}
+/*---------------------------------------------------------------------------*/
 static rpl_dag_t *
 best_dag(rpl_dag_t *d1, rpl_dag_t *d2)
 {
@@ -228,93 +230,76 @@ best_dag(rpl_dag_t *d1, rpl_dag_t *d2)
 
   return d1->rank < d2->rank ? d1 : d2;
 }
-
-static rpl_parent_t *
-best_parent(rpl_parent_t *p1, rpl_parent_t *p2)
-{
-  rpl_dag_t *dag;
-  rpl_path_metric_t min_diff;
-  rpl_path_metric_t p1_metric;
-  rpl_path_metric_t p2_metric;
-
-  dag = p1->dag; /* Both parents are in the same DAG. */
-
-  min_diff = RPL_DAG_MC_ETX_DIVISOR /
-             PARENT_SWITCH_THRESHOLD_DIV;
-
-  p1_metric = calculate_path_metric(p1);
-  p2_metric = calculate_path_metric(p2);
-
-  /* Maintain stability of the preferred parent in case of similar ranks. */
-  if(p1 == dag->preferred_parent || p2 == dag->preferred_parent) {
-    if(p1_metric < p2_metric + min_diff &&
-       p1_metric > p2_metric - min_diff) {
-      PRINTF("RPL: MRHOF hysteresis: %u <= %u <= %u\n",
-             p2_metric - min_diff,
-             p1_metric,
-             p2_metric + min_diff);
-      return dag->preferred_parent;
-    }
-  }
-
-  return p1_metric < p2_metric ? p1 : p2;
-}
-
-#if RPL_DAG_MC == RPL_DAG_MC_NONE
+/*---------------------------------------------------------------------------*/
+#if !RPL_WITH_MC
 static void
 update_metric_container(rpl_instance_t *instance)
 {
-  instance->mc.type = RPL_DAG_MC;
+  instance->mc.type = RPL_DAG_MC_NONE;
 }
-#else
+#else /* RPL_WITH_MC */
 static void
 update_metric_container(rpl_instance_t *instance)
 {
-  rpl_path_metric_t path_metric;
   rpl_dag_t *dag;
-#if RPL_DAG_MC == RPL_DAG_MC_ENERGY
+  uint16_t path_cost;
   uint8_t type;
-#endif
-
-  instance->mc.type = RPL_DAG_MC;
-  instance->mc.flags = RPL_DAG_MC_FLAG_P;
-  instance->mc.aggr = RPL_DAG_MC_AGGR_ADDITIVE;
-  instance->mc.prec = 0;
 
   dag = instance->current_dag;
-
-  if (!dag->joined) {
+  if(dag == NULL || !dag->joined) {
     PRINTF("RPL: Cannot update the metric container when not joined\n");
     return;
   }
 
   if(dag->rank == ROOT_RANK(instance)) {
-    path_metric = 0;
+    /* Configure MC at root only, other nodes are auto-configured when joining */
+    instance->mc.type = RPL_DAG_MC;
+    instance->mc.flags = 0;
+    instance->mc.aggr = RPL_DAG_MC_AGGR_ADDITIVE;
+    instance->mc.prec = 0;
+    path_cost = dag->rank;
   } else {
-    path_metric = calculate_path_metric(dag->preferred_parent);
+    path_cost = parent_path_cost(dag->preferred_parent);
   }
 
-#if RPL_DAG_MC == RPL_DAG_MC_ETX
-  instance->mc.length = sizeof(instance->mc.obj.etx);
-  instance->mc.obj.etx = path_metric;
-
-  PRINTF("RPL: My path ETX to the root is %u.%u\n",
-	instance->mc.obj.etx / RPL_DAG_MC_ETX_DIVISOR,
-	(instance->mc.obj.etx % RPL_DAG_MC_ETX_DIVISOR * 100) /
-	 RPL_DAG_MC_ETX_DIVISOR);
-#elif RPL_DAG_MC == RPL_DAG_MC_ENERGY
-  instance->mc.length = sizeof(instance->mc.obj.energy);
-
-  if(dag->rank == ROOT_RANK(instance)) {
-    type = RPL_DAG_MC_ENERGY_TYPE_MAINS;
-  } else {
-    type = RPL_DAG_MC_ENERGY_TYPE_BATTERY;
+  /* Handle the different MC types */
+  switch(instance->mc.type) {
+    case RPL_DAG_MC_NONE:
+      break;
+    case RPL_DAG_MC_ETX:
+      instance->mc.length = sizeof(instance->mc.obj.etx);
+      instance->mc.obj.etx = path_cost;
+      break;
+    case RPL_DAG_MC_ENERGY:
+      instance->mc.length = sizeof(instance->mc.obj.energy);
+      if(dag->rank == ROOT_RANK(instance)) {
+        type = RPL_DAG_MC_ENERGY_TYPE_MAINS;
+      } else {
+        type = RPL_DAG_MC_ENERGY_TYPE_BATTERY;
+      }
+      instance->mc.obj.energy.flags = type << RPL_DAG_MC_ENERGY_TYPE;
+      /* Energy_est is only one byte, use the least significant byte of the path metric. */
+      instance->mc.obj.energy.energy_est = path_cost >> 8;
+      break;
+    default:
+      PRINTF("RPL: MRHOF, non-supported MC %u\n", instance->mc.type);
+      break;
   }
-
-  instance->mc.obj.energy.flags = type << RPL_DAG_MC_ENERGY_TYPE;
-  instance->mc.obj.energy.energy_est = path_metric;
-#endif /* RPL_DAG_MC == RPL_DAG_MC_ETX */
 }
-#endif /* RPL_DAG_MC == RPL_DAG_MC_NONE */
+#endif /* RPL_WITH_MC */
+/*---------------------------------------------------------------------------*/
+rpl_of_t rpl_mrhof = {
+  reset,
+#if RPL_WITH_DAO_ACK
+  dao_ack_callback,
+#endif
+  parent_link_metric,
+  parent_path_cost,
+  rank_via_parent,
+  best_parent,
+  best_dag,
+  update_metric_container,
+  RPL_OCP_MRHOF
+};
 
 /** @}*/
diff --git a/core/net/rpl/rpl-of0.c b/core/net/rpl/rpl-of0.c
index b0a909a4d..2fcb17a07 100644
--- a/core/net/rpl/rpl-of0.c
+++ b/core/net/rpl/rpl-of0.c
@@ -27,11 +27,12 @@
  * SUCH DAMAGE.
  *
  * This file is part of the Contiki operating system.
+ *
  */
 
 /**
  * \file
- *         An implementation of RPL's objective function 0.
+ *         An implementation of RPL's objective function 0, RFC6552
  *
  * \author Joakim Eriksson <joakime@sics.se>, Nicolas Tsiftes <nvt@sics.se>
  */
@@ -41,136 +42,176 @@
  * @{
  */
 
+#include "net/rpl/rpl.h"
 #include "net/rpl/rpl-private.h"
+#include "net/nbr-table.h"
+#include "net/link-stats.h"
 
 #define DEBUG DEBUG_NONE
 #include "net/ip/uip-debug.h"
 
-static void reset(rpl_dag_t *);
-static rpl_parent_t *best_parent(rpl_parent_t *, rpl_parent_t *);
-static rpl_dag_t *best_dag(rpl_dag_t *, rpl_dag_t *);
-static rpl_rank_t calculate_rank(rpl_parent_t *, rpl_rank_t);
-static void update_metric_container(rpl_instance_t *);
+/* Constants from RFC6552. We use the default values. */
+#define RANK_STRETCH       0 /* Must be in the range [0;5] */
+#define RANK_FACTOR        1 /* Must be in the range [1;4] */
 
-rpl_of_t rpl_of0 = {
-  reset,
-  NULL,
-#if RPL_WITH_DAO_ACK
-  NULL,
-#endif
-  best_parent,
-  best_dag,
-  calculate_rank,
-  update_metric_container,
-  0
-};
+#define MIN_STEP_OF_RANK   1
+#define MAX_STEP_OF_RANK   9
 
-#define DEFAULT_RANK_INCREMENT  RPL_MIN_HOPRANKINC
+/* OF0 computes rank increase as follows:
+ * rank_increase = (RANK_FACTOR * STEP_OF_RANK + RANK_STRETCH) * min_hop_rank_increase
+ * STEP_OF_RANK is an implementation-specific scalar value in the range [1;9].
+ * RFC6552 provides a default value of 3 but recommends to use a dynamic link metric
+ * such as ETX.
+ * */
 
-#define MIN_DIFFERENCE (RPL_MIN_HOPRANKINC + RPL_MIN_HOPRANKINC / 2)
+#define RPL_OF0_FIXED_SR      0
+#define RPL_OF0_ETX_BASED_SR  1
+/* Select RPL_OF0_FIXED_SR or RPL_OF0_ETX_BASED_SR */
+#ifdef RPL_OF0_CONF_SR
+#define RPL_OF0_SR            RPL_OF0_CONF_SR
+#else /* RPL_OF0_CONF_SR */
+#define RPL_OF0_SR            RPL_OF0_ETX_BASED_SR
+#endif /* RPL_OF0_CONF_SR */
 
+#if RPL_OF0_FIXED_SR
+#define STEP_OF_RANK(p)       (3)
+#endif /* RPL_OF0_FIXED_SR */
+
+#if RPL_OF0_ETX_BASED_SR
+/* Numbers suggested by P. Thubert for in the 6TiSCH WG. Anything that maps ETX to
+ * a step between 1 and 9 works. */
+#define STEP_OF_RANK(p)       (((3 * parent_link_metric(p)) / LINK_STATS_ETX_DIVISOR) - 2)
+#endif /* RPL_OF0_ETX_BASED_SR */
+
+/*---------------------------------------------------------------------------*/
 static void
 reset(rpl_dag_t *dag)
 {
-  PRINTF("RPL: Resetting OF0\n");
+  PRINTF("RPL: Reset OF0\n");
 }
-
-static rpl_rank_t
-calculate_rank(rpl_parent_t *p, rpl_rank_t base_rank)
+/*---------------------------------------------------------------------------*/
+static uint16_t
+parent_link_metric(rpl_parent_t *p)
 {
-  rpl_rank_t increment;
-  if(base_rank == 0) {
-    if(p == NULL) {
-      return INFINITE_RANK;
-    }
-    base_rank = p->rank;
-  }
-
-  increment = p != NULL ?
-                p->dag->instance->min_hoprankinc :
-                DEFAULT_RANK_INCREMENT;
-
-  if((rpl_rank_t)(base_rank + increment) < base_rank) {
-    PRINTF("RPL: OF0 rank %d incremented to infinite rank due to wrapping\n",
-        base_rank);
+  /* OF0 operates without metric container; the only metric we have is ETX */
+  const struct link_stats *stats = rpl_get_parent_link_stats(p);
+  return stats != NULL ? stats->etx : 0xffff;
+}
+/*---------------------------------------------------------------------------*/
+static uint16_t
+parent_rank_increase(rpl_parent_t *p)
+{
+  uint16_t min_hoprankinc;
+  if(p == NULL || p->dag == NULL || p->dag->instance == NULL) {
     return INFINITE_RANK;
   }
-  return base_rank + increment;
-
+  min_hoprankinc = p->dag->instance->min_hoprankinc;
+  return (RANK_FACTOR * STEP_OF_RANK(p) + RANK_STRETCH) * min_hoprankinc;
 }
-
-static rpl_dag_t *
-best_dag(rpl_dag_t *d1, rpl_dag_t *d2)
+/*---------------------------------------------------------------------------*/
+static uint16_t
+parent_path_cost(rpl_parent_t *p)
 {
-  if(d1->grounded) {
-    if (!d2->grounded) {
-      return d1;
-    }
-  } else if(d2->grounded) {
-    return d2;
+  if(p == NULL) {
+    return 0xffff;
   }
-
-  if(d1->preference < d2->preference) {
-    return d2;
+  /* path cost upper bound: 0xffff */
+  return MIN((uint32_t)p->rank + parent_link_metric(p), 0xffff);
+}
+/*---------------------------------------------------------------------------*/
+static rpl_rank_t
+rank_via_parent(rpl_parent_t *p)
+{
+  if(p == NULL) {
+    return INFINITE_RANK;
   } else {
-    if(d1->preference > d2->preference) {
-      return d1;
-    }
-  }
-
-  if(d2->rank < d1->rank) {
-    return d2;
-  } else {
-    return d1;
+    return MIN((uint32_t)p->rank + parent_rank_increase(p), INFINITE_RANK);
   }
 }
-
+/*---------------------------------------------------------------------------*/
+static int
+parent_is_acceptable(rpl_parent_t *p)
+{
+  return STEP_OF_RANK(p) >= MIN_STEP_OF_RANK
+      && STEP_OF_RANK(p) <= MAX_STEP_OF_RANK;
+}
+/*---------------------------------------------------------------------------*/
 static rpl_parent_t *
 best_parent(rpl_parent_t *p1, rpl_parent_t *p2)
 {
-  rpl_rank_t r1, r2;
-  rpl_dag_t *dag;  
-  uip_ds6_nbr_t *nbr1, *nbr2;
-  nbr1 = rpl_get_nbr(p1);
-  nbr2 = rpl_get_nbr(p2);
+  rpl_dag_t *dag;
+  uint16_t p1_cost;
+  uint16_t p2_cost;
+  int p1_is_acceptable;
+  int p2_is_acceptable;
 
-  dag = (rpl_dag_t *)p1->dag; /* Both parents must be in the same DAG. */
-
-  if(nbr1 == NULL || nbr2 == NULL) {
-    return dag->preferred_parent;
+  if(p1 == NULL || p2 == NULL) {
+    /* Return non-null parent if any */
+    return p1 == NULL ? p2 : p1;
   }
 
-  PRINTF("RPL: Comparing parent ");
-  PRINT6ADDR(rpl_get_parent_ipaddr(p1));
-  PRINTF(" (confidence %d, rank %d) with parent ",
-        nbr1->link_metric, p1->rank);
-  PRINT6ADDR(rpl_get_parent_ipaddr(p2));
-  PRINTF(" (confidence %d, rank %d)\n",
-        nbr2->link_metric, p2->rank);
+  p1_is_acceptable = parent_is_acceptable(p1);
+  p2_is_acceptable = parent_is_acceptable(p2);
+  /* Is only one parent is acceptable, select it. If both are acceptable, or
+   * both non-acceptable, proceed to traditional parent comparison. This is a
+   * slight departure from the standard but allows to keep connectivity even
+   * all neighbors appear to have a bad link. */
+  if(p1_is_acceptable != p2_is_acceptable) {
+    return p1_is_acceptable ? p1 : p2;
+  }
 
+  dag = p1->dag; /* Both parents are in the same DAG. */
+  p1_cost = parent_path_cost(p1);
+  p2_cost = parent_path_cost(p2);
 
-  r1 = DAG_RANK(p1->rank, p1->dag->instance) * RPL_MIN_HOPRANKINC  +
-    nbr1->link_metric;
-  r2 = DAG_RANK(p2->rank, p1->dag->instance) * RPL_MIN_HOPRANKINC  +
-    nbr2->link_metric;
-  /* Compare two parents by looking both and their rank and at the ETX
-     for that parent. We choose the parent that has the most
-     favourable combination. */
-
-  if(r1 < r2 + MIN_DIFFERENCE &&
-     r1 > r2 - MIN_DIFFERENCE) {
-    return dag->preferred_parent;
-  } else if(r1 < r2) {
-    return p1;
+  /* Paths costs coarse-grained (multiple of min_hoprankinc), we operate without hysteresis */
+  if(p1_cost != p2_cost) {
+    /* Pick parent with lowest path cost */
+    return p1_cost < p2_cost ? p1 : p2;
   } else {
-    return p2;
+    /* We have a tie! */
+    /* Stik to current preferred parent if possible */
+    if(p1 == dag->preferred_parent || p2 == dag->preferred_parent) {
+      return dag->preferred_parent;
+    }
+    /* None of the nodes is the current preferred parent,
+     * choose parent with best link metric */
+    return parent_link_metric(p1) < parent_link_metric(p2) ? p1 : p2;
   }
 }
+/*---------------------------------------------------------------------------*/
+static rpl_dag_t *
+best_dag(rpl_dag_t *d1, rpl_dag_t *d2)
+{
+  if(d1->grounded != d2->grounded) {
+    return d1->grounded ? d1 : d2;
+  }
 
+  if(d1->preference != d2->preference) {
+    return d1->preference > d2->preference ? d1 : d2;
+  }
+
+  return d1->rank < d2->rank ? d1 : d2;
+}
+/*---------------------------------------------------------------------------*/
 static void
 update_metric_container(rpl_instance_t *instance)
 {
   instance->mc.type = RPL_DAG_MC_NONE;
 }
+/*---------------------------------------------------------------------------*/
+rpl_of_t rpl_of0 = {
+  reset,
+#if RPL_WITH_DAO_ACK
+  NULL,
+#endif
+  parent_link_metric,
+  parent_path_cost,
+  rank_via_parent,
+  best_parent,
+  best_dag,
+  update_metric_container,
+  RPL_OCP_OF0
+};
 
 /** @}*/
diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h
index ec885eaea..062c4ab86 100644
--- a/core/net/rpl/rpl-private.h
+++ b/core/net/rpl/rpl-private.h
@@ -199,13 +199,6 @@
 #define RPL_MCAST_LIFETIME 3
 #endif
 
-/*
- * The ETX in the metric container is expressed as a fixed-point value 
- * whose integer part can be obtained by dividing the value by 
- * RPL_DAG_MC_ETX_DIVISOR.
- */
-#define RPL_DAG_MC_ETX_DIVISOR		256
-
 /* DIS related */
 #define RPL_DIS_SEND                    1
 
diff --git a/core/net/rpl/rpl-timers.c b/core/net/rpl/rpl-timers.c
index 158f5fd74..6369f32fb 100644
--- a/core/net/rpl/rpl-timers.c
+++ b/core/net/rpl/rpl-timers.c
@@ -43,6 +43,7 @@
 
 #include "contiki-conf.h"
 #include "net/rpl/rpl-private.h"
+#include "net/link-stats.h"
 #include "net/ipv6/multicast/uip-mcast6.h"
 #include "lib/random.h"
 #include "sys/ctimer.h"
diff --git a/core/net/rpl/rpl.c b/core/net/rpl/rpl.c
index c541463d4..47a3d1bcc 100644
--- a/core/net/rpl/rpl.c
+++ b/core/net/rpl/rpl.c
@@ -268,10 +268,6 @@ rpl_link_neighbor_callback(const linkaddr_t *addr, int status, int numtx)
         /* Trigger DAG rank recalculation. */
         PRINTF("RPL: rpl_link_neighbor_callback triggering update\n");
         parent->flags |= RPL_PARENT_FLAG_UPDATED;
-        if(instance->of->neighbor_link_callback != NULL) {
-          instance->of->neighbor_link_callback(parent, status, numtx);
-          parent->last_tx_time = clock_time();
-        }
       }
     }
   }
@@ -350,8 +346,6 @@ rpl_init(void)
 #if RPL_CONF_STATS
   memset(&rpl_stats, 0, sizeof(rpl_stats));
 #endif
-
-  RPL_OF.reset(NULL);
 }
 /*---------------------------------------------------------------------------*/
 
diff --git a/core/net/rpl/rpl.h b/core/net/rpl/rpl.h
index 157433ee8..dce9d1354 100644
--- a/core/net/rpl/rpl.h
+++ b/core/net/rpl/rpl.h
@@ -113,11 +113,10 @@ struct rpl_dag;
 
 struct rpl_parent {
   struct rpl_dag *dag;
-#if RPL_DAG_MC != RPL_DAG_MC_NONE
+#if RPL_WITH_MC
   rpl_metric_container_t mc;
-#endif /* RPL_DAG_MC != RPL_DAG_MC_NONE */
+#endif /* RPL_WITH_MC */
   rpl_rank_t rank;
-  clock_time_t last_tx_time;
   uint8_t dtsn;
   uint8_t flags;
 };
@@ -159,11 +158,21 @@ typedef struct rpl_instance rpl_instance_t;
  *  Resets the objective function state for a specific DAG. This function is
  *  called when doing a global repair on the DAG.
  *
- * neighbor_link_callback(parent, known, etx)
+ * parent_link_metric(parent)
  *
- *  Receives link-layer neighbor information. The parameter "known" is set
- *  either to 0 or 1. The "etx" parameter specifies the current
- *  ETX(estimated transmissions) for the neighbor.
+ *  Returns the link metric of a parent
+ *
+ * parent_path_cost(parent)
+ *
+ *  Returns the path cost of a parent
+ *
+ * rank_via_parent(parent)
+ *
+ *  Returns our rank if we select a given parent as preferred parent
+ *
+ * parent_is_acceptable
+ *
+ *  Returns 1 if a parent is usable as preferred parent, 0 otherwise
  *
  * best_parent(parent1, parent2)
  *
@@ -173,13 +182,6 @@ typedef struct rpl_instance rpl_instance_t;
  *
  *  Compares two DAGs and returns the best one, according to the OF.
  *
- * calculate_rank(parent, base_rank)
- *
- *  Calculates a rank value using the parent rank and a base rank.
- *  If "parent" is NULL, the objective function selects a default increment
- *  that is adds to the "base_rank". Otherwise, the OF uses information known
- *  about "parent" to select an increment to the "base_rank".
- *
  * update_metric_container(dag)
  *
  *  Updates the metric container for outgoing DIOs in a certain DAG.
@@ -194,20 +196,19 @@ typedef struct rpl_instance rpl_instance_t;
  */
 struct rpl_of {
   void (*reset)(struct rpl_dag *);
-  void (*neighbor_link_callback)(rpl_parent_t *, int, int);
 #if RPL_WITH_DAO_ACK
   void (*dao_ack_callback)(rpl_parent_t *, int status);
 #endif
+  uint16_t (*parent_link_metric)(rpl_parent_t *);
+  uint16_t (*parent_path_cost)(rpl_parent_t *);
+  rpl_rank_t (*rank_via_parent)(rpl_parent_t *);
   rpl_parent_t *(*best_parent)(rpl_parent_t *, rpl_parent_t *);
   rpl_dag_t *(*best_dag)(rpl_dag_t *, rpl_dag_t *);
-  rpl_rank_t (*calculate_rank)(rpl_parent_t *, rpl_rank_t);
   void (*update_metric_container)( rpl_instance_t *);
   rpl_ocp_t ocp;
 };
 typedef struct rpl_of rpl_of_t;
 
-/* Declare the selected objective function. */
-extern rpl_of_t RPL_OF;
 /*---------------------------------------------------------------------------*/
 /* Instance */
 struct rpl_instance {
@@ -272,10 +273,14 @@ int rpl_verify_header(int);
 void rpl_insert_header(void);
 void rpl_remove_header(void);
 uint8_t rpl_invert_header(void);
+const struct link_stats *rpl_get_parent_link_stats(rpl_parent_t *p);
+int rpl_parent_is_fresh(rpl_parent_t *p);
+uint16_t rpl_get_parent_link_metric(rpl_parent_t *p);
+rpl_rank_t rpl_rank_via_parent(rpl_parent_t *p);
+const linkaddr_t *rpl_get_parent_lladdr(rpl_parent_t *p);
 uip_ipaddr_t *rpl_get_parent_ipaddr(rpl_parent_t *nbr);
 rpl_parent_t *rpl_get_parent(uip_lladdr_t *addr);
 rpl_rank_t rpl_get_parent_rank(uip_lladdr_t *addr);
-uint16_t rpl_get_parent_link_metric(const uip_lladdr_t *addr);
 void rpl_dag_init(void);
 uip_ds6_nbr_t *rpl_get_nbr(rpl_parent_t *parent);
 void rpl_print_neighbor_list(void);

From c5cf8608e91b01ec1ea8320463dc27bf2f9b8952 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Sun, 29 Nov 2015 21:46:41 +0100
Subject: [PATCH 297/393] RPL probing: now using link-stats to first prioritize
 probing of non-fresh parents, and to support urgent probing (fast probing of
 a potential new preferred parent

---
 core/net/rpl/rpl-conf.h   |  5 +--
 core/net/rpl/rpl-dag.c    | 11 ++++--
 core/net/rpl/rpl-timers.c | 78 ++++++++++++++++++++++++++-------------
 core/net/rpl/rpl.h        |  1 +
 4 files changed, 64 insertions(+), 31 deletions(-)

diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h
index 4474d1449..78f032252 100644
--- a/core/net/rpl/rpl-conf.h
+++ b/core/net/rpl/rpl-conf.h
@@ -291,7 +291,7 @@
 #ifdef RPL_CONF_PROBING_SELECT_FUNC
 #define RPL_PROBING_SELECT_FUNC RPL_CONF_PROBING_SELECT_FUNC
 #else
-#define RPL_PROBING_SELECT_FUNC(dag) get_probing_target((dag))
+#define RPL_PROBING_SELECT_FUNC get_probing_target
 #endif
 
 /*
@@ -314,8 +314,7 @@
 #ifdef RPL_CONF_PROBING_DELAY_FUNC
 #define RPL_PROBING_DELAY_FUNC RPL_CONF_PROBING_DELAY_FUNC
 #else
-#define RPL_PROBING_DELAY_FUNC() ((RPL_PROBING_INTERVAL / 2) \
-    + random_rand() % (RPL_PROBING_INTERVAL))
+#define RPL_PROBING_DELAY_FUNC get_probing_delay
 #endif
 
 /*
diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index e7fc60a96..6bbc99fab 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -96,12 +96,13 @@ rpl_print_neighbor_list(void)
     int curr_dio_interval = default_instance->dio_intcurrent;
     int curr_rank = default_instance->current_dag->rank;
     rpl_parent_t *p = nbr_table_head(rpl_parents);
-    const struct link_stats *stats = rpl_get_parent_link_stats(p);
+    clock_time_t clock_now = clock_time();
 
     printf("RPL: OCP %u rank %u dioint %u, nbr count %u\n",
         default_instance->of->ocp, curr_rank, curr_dio_interval, uip_ds6_nbr_num());
     while(p != NULL) {
-      printf("RPL: nbr %3u %5u, %5u => %5u -- %5u %c%c (last tx %u min ago)\n",
+      const struct link_stats *stats = rpl_get_parent_link_stats(p);
+      printf("RPL: nbr %3u %5u, %5u => %5u -- %2u %c%c (last tx %u min ago)\n",
           rpl_get_parent_ipaddr(p)->u8[15],
           p->rank,
           rpl_get_parent_link_metric(p),
@@ -109,7 +110,7 @@ rpl_print_neighbor_list(void)
           stats != NULL ? stats->freshness : 0,
           link_stats_is_fresh(stats) ? 'f' : ' ',
           p == default_instance->current_dag->preferred_parent ? 'p' : ' ',
-          (unsigned)((now - p->last_tx_time) / (60 * CLOCK_SECOND))
+          (unsigned)((clock_now - stats->last_tx_time) / (60 * CLOCK_SECOND))
       );
       p = nbr_table_next(rpl_parents, p);
     }
@@ -868,6 +869,10 @@ rpl_select_parent(rpl_dag_t *dag)
     if(rpl_parent_is_fresh(best)) {
       rpl_set_preferred_parent(dag, best);
       dag->rank = rpl_rank_via_parent(dag->preferred_parent);
+    } else {
+      /* Probe the new best parent shortly in order to get a fresh estimate */
+      dag->instance->urgent_probing_target = best;
+      rpl_schedule_probing(dag->instance);
     }
   } else {
     rpl_set_preferred_parent(dag, best);
diff --git a/core/net/rpl/rpl-timers.c b/core/net/rpl/rpl-timers.c
index 6369f32fb..f5f017535 100644
--- a/core/net/rpl/rpl-timers.c
+++ b/core/net/rpl/rpl-timers.c
@@ -56,6 +56,14 @@
 void RPL_CALLBACK_NEW_DIO_INTERVAL(uint8_t dio_interval);
 #endif /* RPL_CALLBACK_NEW_DIO_INTERVAL */
 
+#ifdef RPL_PROBING_SELECT_FUNC
+rpl_parent_t *RPL_PROBING_SELECT_FUNC(rpl_dag_t *dag);
+#endif /* RPL_PROBING_SELECT_FUNC */
+
+#ifdef RPL_PROBING_DELAY_FUNC
+clock_time_t RPL_PROBING_DELAY_FUNC(rpl_dag_t *dag);
+#endif /* RPL_PROBING_DELAY_FUNC */
+
 /*---------------------------------------------------------------------------*/
 static struct ctimer periodic_timer;
 
@@ -359,42 +367,57 @@ rpl_schedule_unicast_dio_immediately(rpl_instance_t *instance)
 }
 /*---------------------------------------------------------------------------*/
 #if RPL_WITH_PROBING
-static rpl_parent_t *
+clock_time_t
+get_probing_delay(rpl_dag_t *dag)
+{
+  if(dag != NULL && dag->instance != NULL
+      && dag->instance->urgent_probing_target != NULL) {
+    /* Urgent probing needed (to find out if a neighbor may become preferred parent) */
+    return random_rand() % (CLOCK_SECOND * 10);
+  } else {
+    /* Else, use normal probing interval */
+    return ((RPL_PROBING_INTERVAL) / 2) + random_rand() % (RPL_PROBING_INTERVAL);
+  }
+}
+/*---------------------------------------------------------------------------*/
+rpl_parent_t *
 get_probing_target(rpl_dag_t *dag)
 {
-  /* Returns the next probing target. The current implementation probes the current
-   * preferred parent if we have not updated its link for RPL_PROBING_EXPIRATION_TIME.
+  /* Returns the next probing target. The current implementation probes the urgent
+   * probing target if any, or the preferred parent if its link statistics need refresh.
    * Otherwise, it picks at random between:
-   * (1) selecting the best parent not updated for RPL_PROBING_EXPIRATION_TIME
+   * (1) selecting the best parent with non-fresh link statistics
    * (2) selecting the least recently updated parent
    */
 
   rpl_parent_t *p;
   rpl_parent_t *probing_target = NULL;
   rpl_rank_t probing_target_rank = INFINITE_RANK;
-  /* min_last_tx is the clock time RPL_PROBING_EXPIRATION_TIME in the past */
-  clock_time_t min_last_tx = clock_time();
-  min_last_tx = min_last_tx > 2 * RPL_PROBING_EXPIRATION_TIME
-      ? min_last_tx - RPL_PROBING_EXPIRATION_TIME : 1;
+  clock_time_t probing_target_age = 0;
+  clock_time_t clock_now = clock_time();
 
   if(dag == NULL ||
-      dag->instance == NULL ||
-      dag->preferred_parent == NULL) {
+      dag->instance == NULL) {
     return NULL;
   }
 
-  /* Our preferred parent needs probing */
-  if(dag->preferred_parent->last_tx_time < min_last_tx) {
-    probing_target = dag->preferred_parent;
+  /* There is an urgent probing target */
+  if(dag->instance->urgent_probing_target != NULL) {
+    return dag->instance->urgent_probing_target;
   }
 
-  /* With 50% probability: probe best parent not updated for RPL_PROBING_EXPIRATION_TIME */
-  if(probing_target == NULL && (random_rand() % 2) == 0) {
+  /* The preferred parent needs probing */
+  if(dag->preferred_parent != NULL && !rpl_parent_is_fresh(dag->preferred_parent)) {
+    return dag->preferred_parent;
+  }
+
+  /* With 50% probability: probe best non-fresh parent */
+  if(random_rand() % 2 == 0) {
     p = nbr_table_head(rpl_parents);
     while(p != NULL) {
-      if(p->dag == dag && p->last_tx_time < min_last_tx) {
+      if(p->dag == dag && !rpl_parent_is_fresh(p)) {
         /* p is in our dag and needs probing */
-        rpl_rank_t p_rank = dag->instance->of->calculate_rank(p, 0);
+        rpl_rank_t p_rank = rpl_rank_via_parent(p);
         if(probing_target == NULL
             || p_rank < probing_target_rank) {
           probing_target = p;
@@ -405,14 +428,16 @@ get_probing_target(rpl_dag_t *dag)
     }
   }
 
-  /* The default probing target is the least recently updated parent */
+  /* If we still do not have a probing target: pick the least recently updated parent */
   if(probing_target == NULL) {
     p = nbr_table_head(rpl_parents);
     while(p != NULL) {
-      if(p->dag == dag) {
+      const struct link_stats *stats =rpl_get_parent_link_stats(p);
+      if(p->dag == dag && stats != NULL) {
         if(probing_target == NULL
-            || p->last_tx_time < probing_target->last_tx_time) {
+            || clock_now - stats->last_tx_time > probing_target_age) {
           probing_target = p;
+          probing_target_age = clock_now - stats->last_tx_time;
         }
       }
       p = nbr_table_next(rpl_parents, p);
@@ -431,11 +456,14 @@ handle_probing_timer(void *ptr)
 
   /* Perform probing */
   if(target_ipaddr != NULL) {
-    PRINTF("RPL: probing %u ((last tx %u min ago))\n",
-        nbr_table_get_lladdr(rpl_parents, probing_target)->u8[7],
-        (unsigned)((clock_time() - probing_target->last_tx_time) / (60 * CLOCK_SECOND)));
-    /* Send probe (unicast DIO or DIS) */
+    PRINTF("RPL: probing %u %s last tx %u min ago\n",
+        rpl_get_parent_llpaddr(probing_target)->u8[7],
+        instance->urgent_probing_target != NULL ? "(urgent)" : "",
+        (unsigned)((clock_time() - probing_target->last_tx_time) / (60 * CLOCK_SECOND)),
+        );
+    /* Send probe, e.g. unicast DIO or DIS */
     RPL_PROBING_SEND_FUNC(instance, target_ipaddr);
+    instance->urgent_probing_target = NULL;
   }
 
   /* Schedule next probing */
@@ -449,7 +477,7 @@ handle_probing_timer(void *ptr)
 void
 rpl_schedule_probing(rpl_instance_t *instance)
 {
-  ctimer_set(&instance->probing_timer, RPL_PROBING_DELAY_FUNC(),
+  ctimer_set(&instance->probing_timer, RPL_PROBING_DELAY_FUNC(instance->current_dag),
                   handle_probing_timer, instance);
 }
 #endif /* RPL_WITH_PROBING */
diff --git a/core/net/rpl/rpl.h b/core/net/rpl/rpl.h
index dce9d1354..f4efafd50 100644
--- a/core/net/rpl/rpl.h
+++ b/core/net/rpl/rpl.h
@@ -246,6 +246,7 @@ struct rpl_instance {
   clock_time_t dio_next_delay; /* delay for completion of dio interval */
 #if RPL_WITH_PROBING
   struct ctimer probing_timer;
+  rpl_parent_t *urgent_probing_target;
 #endif /* RPL_WITH_PROBING */
   struct ctimer dio_timer;
   struct ctimer dao_timer;

From cd76b4b1c2b7f2205f20328262bb77d2c750df1b Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Sun, 29 Nov 2015 21:48:06 +0100
Subject: [PATCH 298/393] RPL: support for run-time selection of the OF.
 RPL_OF_OCP defines the OF to be advertised at the root, while
 RPL_SUPPORTED_OFS defines the set of supported OFs

---
 core/net/rpl/rpl-conf.h    | 50 ++++++++++++++++++++++++--------------
 core/net/rpl/rpl-dag.c     | 11 ++++++---
 core/net/rpl/rpl-icmp6.c   |  4 +--
 core/net/rpl/rpl-private.h | 21 ++++++++++++++--
 4 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h
index 78f032252..c30183934 100644
--- a/core/net/rpl/rpl-conf.h
+++ b/core/net/rpl/rpl-conf.h
@@ -45,12 +45,38 @@
 #define RPL_CONF_STATS 0
 #endif /* RPL_CONF_STATS */
 
-/* 
- * Select routing metric supported at runtime. This must be a valid
- * DAG Metric Container Object Type (see below). Currently, we only 
- * support RPL_DAG_MC_ETX and RPL_DAG_MC_ENERGY.
- * When MRHOF (RFC6719) is used with ETX, no metric container must
- * be used; instead the rank carries ETX directly.
+/*
+ * The objective function (OF) used by a RPL root is configurable through
+ * the RPL_CONF_OF_OCP parameter. This is defined as the objective code
+ * point (OCP) of the OF, RPL_OCP_OF0 or RPL_OCP_MRHOF. This flag is of
+ * no relevance to non-root nodes, which run the OF advertised in the
+ * instance they join.
+ * Make sure the selected of is inRPL_SUPPORTED_OFS.
+ */
+#ifdef RPL_CONF_OF_OCP
+#define RPL_OF_OCP RPL_CONF_OF_OCP
+#else /* RPL_CONF_OF_OCP */
+#define RPL_OF_OCP RPL_OCP_MRHOF
+#endif /* RPL_CONF_OF_OCP */
+
+/*
+ * The set of objective functions supported at runtime. Nodes are only
+ * able to join instances that advertise an OF in this set. To include
+ * both OF0 and MRHOF, use {&rpl_of0, &rpl_mrhof}.
+ */
+#ifdef RPL_CONF_SUPPORTED_OFS
+#define RPL_SUPPORTED_OFS RPL_CONF_SUPPORTED_OFS
+#else /* RPL_CONF_SUPPORTED_OFS */
+#define RPL_SUPPORTED_OFS {&rpl_of0, &rpl_mrhof}
+#endif /* RPL_CONF_SUPPORTED_OFS */
+
+/*
+ * Enable/disable RPL Metric Containers (MC). The actual MC in use
+ * for a given DODAG is decided at runtime, when joining. Note that
+ * OF0 (RFC6552) operates without MC, and so does MRHOF (RFC6719) when
+ * used with ETX as a metric (the rank is the metric). We disable MC
+ * by default, but note it must be enabled to support joining a DODAG
+ * that requires MC (e.g., MRHOF with a metric other than ETX).
  */
 #ifdef RPL_CONF_WITH_MC
 #define RPL_WITH_MC RPL_CONF_WITH_MC
@@ -65,18 +91,6 @@
 #define RPL_DAG_MC RPL_DAG_MC_NONE
 #endif /* RPL_CONF_DAG_MC */
 
-/*
- * The objective function used by RPL is configurable through the 
- * RPL_CONF_OF parameter. This should be defined to be the name of an 
- * rpl_of object linked into the system image, e.g., rpl_of0.
- */
-#ifdef RPL_CONF_OF
-#define RPL_OF RPL_CONF_OF
-#else
-/* ETX is the default objective function. */
-#define RPL_OF rpl_mrhof
-#endif /* RPL_CONF_OF */
-
 /* This value decides which DAG instance we should participate in by default. */
 #ifdef RPL_CONF_DEFAULT_INSTANCE
 #define RPL_DEFAULT_INSTANCE RPL_CONF_DEFAULT_INSTANCE
diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index 6bbc99fab..8435ca207 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -67,8 +67,8 @@ void RPL_CALLBACK_PARENT_SWITCH(rpl_parent_t *old, rpl_parent_t *new);
 #endif /* RPL_CALLBACK_PARENT_SWITCH */
 
 /*---------------------------------------------------------------------------*/
-extern rpl_of_t RPL_OF;
-static rpl_of_t * const objective_functions[] = {&RPL_OF};
+extern rpl_of_t rpl_of0, rpl_mrhof;
+static rpl_of_t * const objective_functions[] = RPL_SUPPORTED_OFS;
 
 /*---------------------------------------------------------------------------*/
 /* RPL definitions. */
@@ -376,7 +376,12 @@ rpl_set_root(uint8_t instance_id, uip_ipaddr_t *dag_id)
   dag->grounded = RPL_GROUNDED;
   dag->preference = RPL_PREFERENCE;
   instance->mop = RPL_MOP_DEFAULT;
-  instance->of = &RPL_OF;
+  instance->of = rpl_find_of(RPL_OF_OCP);
+  if(instance->of == NULL) {
+    PRINTF("RPL: OF with OCP %u not supported\n", RPL_OF_OCP);
+    return NULL;
+  }
+
   rpl_set_preferred_parent(dag, NULL);
 
   memcpy(&dag->dag_id, dag_id, sizeof(dag->dag_id));
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 774e3ba6a..6ea9b3e02 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -91,8 +91,6 @@ void RPL_DEBUG_DAO_OUTPUT(rpl_parent_t *);
 
 static uint8_t dao_sequence = RPL_LOLLIPOP_INIT;
 
-extern rpl_of_t RPL_OF;
-
 #if RPL_CONF_MULTICAST
 static uip_mcast6_route_t *mcast_group;
 #endif
@@ -302,7 +300,7 @@ dio_input(void)
   dio.dag_redund = RPL_DIO_REDUNDANCY;
   dio.dag_min_hoprankinc = RPL_MIN_HOPRANKINC;
   dio.dag_max_rankinc = RPL_MAX_RANKINC;
-  dio.ocp = RPL_OF.ocp;
+  dio.ocp = RPL_OF_OCP;
   dio.default_lifetime = RPL_DEFAULT_LIFETIME;
   dio.lifetime_unit = RPL_DEFAULT_LIFETIME_UNIT;
 
diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h
index 062c4ab86..b127bb9c4 100644
--- a/core/net/rpl/rpl-private.h
+++ b/core/net/rpl/rpl-private.h
@@ -144,11 +144,28 @@
           ((unsigned long)(instance)->lifetime_unit * (lifetime))
 
 #ifndef RPL_CONF_MIN_HOPRANKINC
+/* RFC6550 defines the default MIN_HOPRANKINC as 256.
+ * However, we use MRHOF as a default Objective Function (RFC6719),
+ * which recommends setting MIN_HOPRANKINC with care, in particular
+ * when used with ETX as a metric. ETX is computed as a fixed point
+ * real with a divisor of 128 (RFC6719, RFC6551). We choose to also
+ * use 128 for RPL_MIN_HOPRANKINC, resulting in a rank equal to the
+ * ETX path cost. Larger values may also be desirable, as discussed
+ * in section 6.1 of RFC6719. */
+#if RPL_OF_OCP == RPL_OCP_MRHOF
+#define RPL_MIN_HOPRANKINC          128
+#else /* RPL_OF_OCP == RPL_OCP_MRHOF */
 #define RPL_MIN_HOPRANKINC          256
-#else
+#endif /* RPL_OF_OCP == RPL_OCP_MRHOF */
+#else /* RPL_CONF_MIN_HOPRANKINC */
 #define RPL_MIN_HOPRANKINC          RPL_CONF_MIN_HOPRANKINC
-#endif
+#endif /* RPL_CONF_MIN_HOPRANKINC */
+
+#ifndef RPL_CONF_MAX_RANKINC
 #define RPL_MAX_RANKINC             (7 * RPL_MIN_HOPRANKINC)
+#else /* RPL_CONF_MAX_RANKINC */
+#define RPL_MAX_RANKINC             RPL_CONF_MAX_RANKINC
+#endif /* RPL_CONF_MAX_RANKINC */
 
 #define DAG_RANK(fixpt_rank, instance) \
   ((fixpt_rank) / (instance)->min_hoprankinc)

From d53a3a3df2f24f897daafd7bf25bde79a6632fcb Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Sun, 29 Nov 2015 21:48:53 +0100
Subject: [PATCH 299/393] RPL: logging fixes

---
 core/net/rpl/rpl-dag.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index 8435ca207..447be3df2 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -121,8 +121,7 @@ rpl_print_neighbor_list(void)
 uip_ds6_nbr_t *
 rpl_get_nbr(rpl_parent_t *parent)
 {
-  linkaddr_t *lladdr = NULL;
-  lladdr = nbr_table_get_lladdr(rpl_parents, parent);
+  const linkaddr_t *lladdr = rpl_get_parent_lladdr(parent);
   if(lladdr != NULL) {
     return nbr_table_get_from_lladdr(ds6_neighbors, lladdr);
   } else {
@@ -1296,7 +1295,8 @@ rpl_process_parent_event(rpl_instance_t *instance, rpl_parent_t *p)
   if(!acceptable_rank(p->dag, p->rank)) {
     /* The candidate parent is no longer valid: the rank increase resulting
        from the choice of it as a parent would be too high. */
-    PRINTF("RPL: Unacceptable rank %u\n", (unsigned)p->rank);
+    PRINTF("RPL: Unacceptable rank %u (Current min %u, MaxRankInc %u)\n", (unsigned)p->rank,
+        p->dag->min_rank, p->dag->instance->max_rankinc);
     rpl_nullify_parent(p);
     if(p != instance->current_dag->preferred_parent) {
       return 0;

From 7855ba20ba0203876c2df726d71dc02df27488e5 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Sun, 29 Nov 2015 21:50:16 +0100
Subject: [PATCH 300/393] RPL: Check acceptable_rank even after first obtaining
 a parent. Added comment on a slight departure from RFC6550.

---
 core/net/rpl/rpl-dag.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index 447be3df2..e5ff63923 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -791,8 +791,12 @@ rpl_select_dag(rpl_instance_t *instance, rpl_parent_t *p)
   /* Update the DAG rank. */
   best_dag->rank = rpl_rank_via_parent(best_dag->preferred_parent);
   if(last_parent == NULL || best_dag->rank < best_dag->min_rank) {
+    /* This is a slight departure from RFC6550: if we had no preferred parent before,
+     * reset min_rank. This helps recovering from temporary bad link conditions. */
     best_dag->min_rank = best_dag->rank;
-  } else if(!acceptable_rank(best_dag, best_dag->rank)) {
+  }
+
+  if(!acceptable_rank(best_dag, best_dag->rank)) {
     PRINTF("RPL: New rank unacceptable!\n");
     rpl_set_preferred_parent(instance->current_dag, NULL);
     if(instance->mop != RPL_MOP_NO_DOWNWARD_ROUTES && last_parent != NULL) {

From 64679642f283a675cc428cbf93709d5d5004ac5b Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Mon, 25 Jan 2016 13:51:10 +0100
Subject: [PATCH 301/393] Saving ROM and RAM

---
 core/net/rpl/rpl-conf.h                  | 2 +-
 examples/ipv6/rpl-collect/project-conf.h | 7 +++++++
 examples/ipv6/rpl-tsch/project-conf.h    | 2 +-
 platform/micaz/contiki-conf.h            | 4 ++--
 platform/sky/contiki-conf.h              | 4 ++--
 platform/zoul/contiki-conf.h             | 4 ++--
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h
index c30183934..1da6c5ea8 100644
--- a/core/net/rpl/rpl-conf.h
+++ b/core/net/rpl/rpl-conf.h
@@ -67,7 +67,7 @@
 #ifdef RPL_CONF_SUPPORTED_OFS
 #define RPL_SUPPORTED_OFS RPL_CONF_SUPPORTED_OFS
 #else /* RPL_CONF_SUPPORTED_OFS */
-#define RPL_SUPPORTED_OFS {&rpl_of0, &rpl_mrhof}
+#define RPL_SUPPORTED_OFS {&rpl_mrhof}
 #endif /* RPL_CONF_SUPPORTED_OFS */
 
 /*
diff --git a/examples/ipv6/rpl-collect/project-conf.h b/examples/ipv6/rpl-collect/project-conf.h
index 4b39f7de9..c33ca27fb 100644
--- a/examples/ipv6/rpl-collect/project-conf.h
+++ b/examples/ipv6/rpl-collect/project-conf.h
@@ -56,4 +56,11 @@
 
 #define RPL_CONF_DEFAULT_ROUTE_INFINITE_LIFETIME 1
 
+/* Save some ROM */
+#undef UIP_CONF_TCP
+#define UIP_CONF_TCP                   0
+
+#undef SICSLOWPAN_CONF_FRAG
+#define SICSLOWPAN_CONF_FRAG           0
+
 #endif /* PROJECT_CONF_H_ */
diff --git a/examples/ipv6/rpl-tsch/project-conf.h b/examples/ipv6/rpl-tsch/project-conf.h
index a725cbba0..8ac0a93b6 100644
--- a/examples/ipv6/rpl-tsch/project-conf.h
+++ b/examples/ipv6/rpl-tsch/project-conf.h
@@ -139,7 +139,7 @@
 #undef UIP_CONF_TCP
 #define UIP_CONF_TCP 0
 #undef QUEUEBUF_CONF_NUM
-#define QUEUEBUF_CONF_NUM 4
+#define QUEUEBUF_CONF_NUM 3
 #undef UIP_CONF_MAX_ROUTES
 #define UIP_CONF_MAX_ROUTES  8
 #undef NBR_TABLE_CONF_MAX_NEIGHBORS
diff --git a/platform/micaz/contiki-conf.h b/platform/micaz/contiki-conf.h
index 04aaccf6b..50e2ace1e 100644
--- a/platform/micaz/contiki-conf.h
+++ b/platform/micaz/contiki-conf.h
@@ -125,8 +125,8 @@
 #define UIP_CONF_ROUTER                 0
 
 /* configure number of neighbors and routes */
-#define NBR_TABLE_CONF_MAX_NEIGHBORS    5
-#define UIP_CONF_MAX_ROUTES             5
+#define NBR_TABLE_CONF_MAX_NEIGHBORS    4
+#define UIP_CONF_MAX_ROUTES             4
 
 #define RPL_CONF_MAX_PARENTS            4
 #define RPL_CONF_MAX_DAG_PER_INSTANCE   1
diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h
index 39d8bc882..7665d146e 100644
--- a/platform/sky/contiki-conf.h
+++ b/platform/sky/contiki-conf.h
@@ -150,10 +150,10 @@
 
 /* configure number of neighbors and routes */
 #ifndef NBR_TABLE_CONF_MAX_NEIGHBORS
-#define NBR_TABLE_CONF_MAX_NEIGHBORS     20
+#define NBR_TABLE_CONF_MAX_NEIGHBORS     16
 #endif /* NBR_TABLE_CONF_MAX_NEIGHBORS */
 #ifndef UIP_CONF_MAX_ROUTES
-#define UIP_CONF_MAX_ROUTES   20
+#define UIP_CONF_MAX_ROUTES   16
 #endif /* UIP_CONF_MAX_ROUTES */
 
 #define UIP_CONF_ND6_SEND_RA		0
diff --git a/platform/zoul/contiki-conf.h b/platform/zoul/contiki-conf.h
index 3d07103ef..c28d789d3 100644
--- a/platform/zoul/contiki-conf.h
+++ b/platform/zoul/contiki-conf.h
@@ -512,10 +512,10 @@ typedef uint32_t rtimer_clock_t;
 #define UIP_CONF_ND6_RETRANS_TIMER       10000
 
 #ifndef NBR_TABLE_CONF_MAX_NEIGHBORS
-#define NBR_TABLE_CONF_MAX_NEIGHBORS                20
+#define NBR_TABLE_CONF_MAX_NEIGHBORS                16
 #endif
 #ifndef UIP_CONF_MAX_ROUTES
-#define UIP_CONF_MAX_ROUTES                 20
+#define UIP_CONF_MAX_ROUTES                 16
 #endif
 
 /* uIP */

From 62de6548caec76dc193ec519c93f790379a79105 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Mon, 1 Feb 2016 21:11:01 +0100
Subject: [PATCH 302/393] Regression test 06-rpl-temporary-root-loss: give
 extra time for recovery, as the previous settings led to occasional
 stochastic failures

---
 regression-tests/12-rpl/06-rpl-temporary-root-loss.csc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/regression-tests/12-rpl/06-rpl-temporary-root-loss.csc b/regression-tests/12-rpl/06-rpl-temporary-root-loss.csc
index 096713102..6c29c643f 100644
--- a/regression-tests/12-rpl/06-rpl-temporary-root-loss.csc
+++ b/regression-tests/12-rpl/06-rpl-temporary-root-loss.csc
@@ -289,9 +289,9 @@ lostMsgs = 0;&#xD;
 &#xD;
 // we check that we got up to at least message 62 and&#xD;
 // (the simulation is 4000000ms = 66 minutes long)&#xD;
-// that we did not lose anything since 34&#xD;
+// that we did not lose anything since 45&#xD;
 // (the sink is back at 2000000ms = 33 minutes)&#xD;
-TIMEOUT(4000000, if(lastMsg &gt;= 62 &amp;&amp; lastMissed &lt;= 34) { log.testOK(); } );&#xD;
+TIMEOUT(4000000, if(lastMsg &gt;= 62 &amp;&amp; lastMissed &lt;= 45) { log.testOK(); } );&#xD;
 &#xD;
 lastMsg = -1;&#xD;
 lastMissed = -1;&#xD;

From 0d7e1e8be4d840f0d528705ef2e53208832d63ff Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Tue, 2 Feb 2016 17:16:03 +0100
Subject: [PATCH 303/393] Fix PRINTF statement in rpl-timers.c

---
 core/net/rpl/rpl-timers.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/net/rpl/rpl-timers.c b/core/net/rpl/rpl-timers.c
index f5f017535..7ddfbcba9 100644
--- a/core/net/rpl/rpl-timers.c
+++ b/core/net/rpl/rpl-timers.c
@@ -456,10 +456,13 @@ handle_probing_timer(void *ptr)
 
   /* Perform probing */
   if(target_ipaddr != NULL) {
+    const struct link_stats *stats = rpl_get_parent_link_stats(probing_target);
+    (void)stats;
     PRINTF("RPL: probing %u %s last tx %u min ago\n",
         rpl_get_parent_llpaddr(probing_target)->u8[7],
         instance->urgent_probing_target != NULL ? "(urgent)" : "",
-        (unsigned)((clock_time() - probing_target->last_tx_time) / (60 * CLOCK_SECOND)),
+        probing_target != NULL ?
+        (unsigned)((clock_time() - stats->last_tx_time) / (60 * CLOCK_SECOND)) : 0
         );
     /* Send probe, e.g. unicast DIO or DIS */
     RPL_PROBING_SEND_FUNC(instance, target_ipaddr);

From 63490193845fdfe3bb2ec047d2cb15abefb10368 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Thu, 4 Feb 2016 22:43:34 +0100
Subject: [PATCH 304/393] Fine tuning of link stats and RPL OFs

---
 core/net/link-stats.c    |  4 ++--
 core/net/rpl/rpl-mrhof.c | 23 +++++++++--------------
 core/net/rpl/rpl-of0.c   | 19 +++++++------------
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/core/net/link-stats.c b/core/net/link-stats.c
index 2312f5b23..37e764458 100644
--- a/core/net/link-stats.c
+++ b/core/net/link-stats.c
@@ -55,13 +55,13 @@
 
 /* EWMA (exponential moving average) used to maintain statistics over time */
 #define EWMA_SCALE            100
-#define EWMA_ALPHA             10
+#define EWMA_ALPHA             15
 #define EWMA_BOOTSTRAP_ALPHA   30
 
 /* ETX fixed point divisor. 128 is the value used by RPL (RFC 6551 and RFC 6719) */
 #define ETX_DIVISOR     LINK_STATS_ETX_DIVISOR
 /* Number of Tx used to update the ETX EWMA in case of no-ACK */
-#define ETX_NOACK_PENALTY                   16
+#define ETX_NOACK_PENALTY                   10
 /* Initial ETX value */
 #define ETX_INIT                             2
 
diff --git a/core/net/rpl/rpl-mrhof.c b/core/net/rpl/rpl-mrhof.c
index fde280110..a3f4d2b87 100644
--- a/core/net/rpl/rpl-mrhof.c
+++ b/core/net/rpl/rpl-mrhof.c
@@ -71,8 +71,8 @@
 #endif /* RPL_MRHOF_CONF_SQUARED_ETX */
 
 /* Configuration parameters of RFC6719. Reject parents that have a higher
- * link metric than the following. We use the default values from the RFC. */
-#define MAX_LINK_METRIC      512   /* Eq ETX of 4 */
+ * link metric than the following. The default value is 512 but we use 1024. */
+#define MAX_LINK_METRIC     1024   /* Eq ETX of 8 */
 /* Reject parents that have a higher path cost than the following. */
 #define MAX_PATH_COST			 32768   /* Eq path ETX of 256 */
 /* Hysteresis of MRHOF: the rank must differ more than PARENT_SWITCH_THRESHOLD_DIV
@@ -187,19 +187,14 @@ best_parent(rpl_parent_t *p1, rpl_parent_t *p2)
   int p1_is_acceptable;
   int p2_is_acceptable;
 
-  if(p1 == NULL || p2 == NULL) {
-    /* Return non-null parent if any */
-    return p1 == NULL ? p2 : p1;
-  }
+  p1_is_acceptable = p1 != NULL && parent_is_acceptable(p1);
+  p2_is_acceptable = p2 != NULL && parent_is_acceptable(p2);
 
-  p1_is_acceptable = parent_is_acceptable(p1);
-  p2_is_acceptable = parent_is_acceptable(p2);
-  /* Is only one parent is acceptable, select it. If both are acceptable, or
-   * both non-acceptable, proceed to traditional parent comparison. This is a
-   * slight departure from the standard but allows to keep connectivity even
-   * all neighbors appear to have a bad link. */
-  if(p1_is_acceptable != p2_is_acceptable) {
-    return p1_is_acceptable ? p1 : p2;
+  if(!p1_is_acceptable) {
+    return p2_is_acceptable ? p2 : NULL;
+  }
+  if(!p2_is_acceptable) {
+    return p1_is_acceptable ? p1 : NULL;
   }
 
   dag = p1->dag; /* Both parents are in the same DAG. */
diff --git a/core/net/rpl/rpl-of0.c b/core/net/rpl/rpl-of0.c
index 2fcb17a07..84b14d1ba 100644
--- a/core/net/rpl/rpl-of0.c
+++ b/core/net/rpl/rpl-of0.c
@@ -145,19 +145,14 @@ best_parent(rpl_parent_t *p1, rpl_parent_t *p2)
   int p1_is_acceptable;
   int p2_is_acceptable;
 
-  if(p1 == NULL || p2 == NULL) {
-    /* Return non-null parent if any */
-    return p1 == NULL ? p2 : p1;
-  }
+  p1_is_acceptable = p1 != NULL && parent_is_acceptable(p1);
+  p2_is_acceptable = p2 != NULL && parent_is_acceptable(p2);
 
-  p1_is_acceptable = parent_is_acceptable(p1);
-  p2_is_acceptable = parent_is_acceptable(p2);
-  /* Is only one parent is acceptable, select it. If both are acceptable, or
-   * both non-acceptable, proceed to traditional parent comparison. This is a
-   * slight departure from the standard but allows to keep connectivity even
-   * all neighbors appear to have a bad link. */
-  if(p1_is_acceptable != p2_is_acceptable) {
-    return p1_is_acceptable ? p1 : p2;
+  if(!p1_is_acceptable) {
+    return p2_is_acceptable ? p2 : NULL;
+  }
+  if(!p2_is_acceptable) {
+    return p1_is_acceptable ? p1 : NULL;
   }
 
   dag = p1->dag; /* Both parents are in the same DAG. */

From b176991a06b82c2009f2ba2fdd66d8dcbe008150 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Thu, 4 Feb 2016 22:44:24 +0100
Subject: [PATCH 305/393] Compile out code related to RPL probing when probing
 is disabled

---
 core/net/rpl/rpl-dag.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index e5ff63923..5b176167b 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -878,9 +878,11 @@ rpl_select_parent(rpl_dag_t *dag)
       rpl_set_preferred_parent(dag, best);
       dag->rank = rpl_rank_via_parent(dag->preferred_parent);
     } else {
+#if RPL_WITH_PROBING
       /* Probe the new best parent shortly in order to get a fresh estimate */
       dag->instance->urgent_probing_target = best;
       rpl_schedule_probing(dag->instance);
+#endif /* RPL_WITH_PROBING */
     }
   } else {
     rpl_set_preferred_parent(dag, best);

From 65b854fceee9c67a1f056a37516519b500b6010b Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Thu, 4 Feb 2016 22:45:25 +0100
Subject: [PATCH 306/393] RPL: trigger a local repair only the first time no
 parent is found in a DODAG

---
 core/net/rpl/rpl-dag.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index 5b176167b..a534a7c92 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -1290,6 +1290,7 @@ int
 rpl_process_parent_event(rpl_instance_t *instance, rpl_parent_t *p)
 {
   int return_value;
+  rpl_parent_t *last_parent = instance->current_dag->preferred_parent;
 
 #if DEBUG
   rpl_rank_t old_rank;
@@ -1312,10 +1313,12 @@ rpl_process_parent_event(rpl_instance_t *instance, rpl_parent_t *p)
   }
 
   if(rpl_select_dag(instance, p) == NULL) {
-    /* No suitable parent; trigger a local repair. */
-    PRINTF("RPL: No parents found in any DAG\n");
-    rpl_local_repair(instance);
-    return 0;
+    if(last_parent != NULL) {
+      /* No suitable parent anymore; trigger a local repair. */
+      PRINTF("RPL: No parents found in any DAG\n");
+      rpl_local_repair(instance);
+      return 0;
+    }
   }
 
 #if DEBUG

From 36dd282eb7ca2adca166f7a03d2e9e40b4fca89b Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Thu, 4 Feb 2016 22:46:16 +0100
Subject: [PATCH 307/393] RPL: reset Trickle timer on incoming DIOs with
 INFINITE_RANK only if the DIO is from the preferred parent

---
 core/net/rpl/rpl-dag.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index a534a7c92..a0f01caaf 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -1441,8 +1441,6 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
     PRINTF("RPL: Ignoring DIO with too low rank: %u\n",
            (unsigned)dio->rank);
     return;
-  } else if(dio->rank == INFINITE_RANK && dag->joined) {
-    rpl_reset_dio_timer(instance);
   }
 
   /* Prefix Information Option treated to add new prefix */
@@ -1509,6 +1507,11 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
   }
   p->rank = dio->rank;
 
+  if(dio->rank == INFINITE_RANK && p == dag->preferred_parent) {
+    /* Our preferred parent advertised an infinite rank, reset DIO timer */
+    rpl_reset_dio_timer(instance);
+  }
+
   /* Parent info has been updated, trigger rank recalculation */
   p->flags |= RPL_PARENT_FLAG_UPDATED;
 

From 75967438e3fff7f6fbaec150bce157ee89b6263d Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Thu, 4 Feb 2016 22:51:39 +0100
Subject: [PATCH 308/393] RPL ext header: check if sender is closer only after
 updating its rank

---
 core/net/rpl/rpl-ext-header.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/net/rpl/rpl-ext-header.c b/core/net/rpl/rpl-ext-header.c
index a2392c124..fd7cf8604 100644
--- a/core/net/rpl/rpl-ext-header.c
+++ b/core/net/rpl/rpl-ext-header.c
@@ -125,14 +125,6 @@ rpl_verify_header(int uip_ext_opt_offset)
   }
 
   sender_rank = UIP_HTONS(UIP_EXT_HDR_OPT_RPL_BUF->senderrank);
-  sender_closer = sender_rank < instance->current_dag->rank;
-
-  PRINTF("RPL: Packet going %s, sender closer %d (%d < %d)\n", down == 1 ? "down" : "up",
-	 sender_closer,
-	 sender_rank,
-	 instance->current_dag->rank
-	 );
-
   sender = nbr_table_get_from_lladdr(rpl_parents, packetbuf_addr(PACKETBUF_ADDR_SENDER));
 
   if(sender != NULL && (UIP_EXT_HDR_OPT_RPL_BUF->flags & RPL_HDR_OPT_RANK_ERR)) {
@@ -142,6 +134,14 @@ rpl_verify_header(int uip_ext_opt_offset)
     rpl_select_dag(instance, sender);
   }
 
+  sender_closer = sender_rank < instance->current_dag->rank;
+
+  PRINTF("RPL: Packet going %s, sender closer %d (%d < %d)\n", down == 1 ? "down" : "up",
+   sender_closer,
+   sender_rank,
+   instance->current_dag->rank
+   );
+
   if((down && !sender_closer) || (!down && sender_closer)) {
     PRINTF("RPL: Loop detected - senderrank: %d my-rank: %d sender_closer: %d\n",
 	   sender_rank, instance->current_dag->rank,

From f18a4fdd7bbc9694e682516cc84be5544aa1e373 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Fri, 22 Apr 2016 23:46:33 +0200
Subject: [PATCH 309/393] Adjust RPL neighbor policy to new OF interface

---
 core/net/rpl/rpl-nbr-policy.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/net/rpl/rpl-nbr-policy.c b/core/net/rpl/rpl-nbr-policy.c
index 87849af40..0af5a9041 100644
--- a/core/net/rpl/rpl-nbr-policy.c
+++ b/core/net/rpl/rpl-nbr-policy.c
@@ -138,7 +138,7 @@ update_nbr(void)
                 parent->rank > 0 &&
                 parent->dag != NULL &&
                 parent->dag->instance != NULL &&
-                (rank = parent->dag->instance->of->calculate_rank(parent, 0)) > worst_rank) {
+                (rank = parent->dag->instance->of->rank_via_parent(parent)) > worst_rank) {
         /* This is the worst-rank neighbor - this is a good candidate for removal */
         worst_rank = rank;
         worst_rank_nbr = lladdr;
@@ -190,7 +190,6 @@ const linkaddr_t *
 find_removable_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
 {
   rpl_instance_t *instance;
-  rpl_rank_t rank;
 
   update_nbr();
 
@@ -201,8 +200,7 @@ find_removable_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
   }
 
   /* Add the new neighbor only if it is better than the worst parent. */
-  rank = instance->of->calculate_rank(NULL, dio->rank);
-  if(rank < worst_rank - instance->min_hoprankinc / 2) {
+  if(dio->rank + instance->min_hoprankinc < worst_rank - instance->min_hoprankinc / 2) {
     /* Found *great* neighbor - add! */
     PRINTF("Found better neighbor %d < %d - add to cache...\n",
            rank, worst_rank);

From bddf8207ed07b2ed7f03b09e5453bb685112c9da Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Fri, 22 Apr 2016 23:51:50 +0200
Subject: [PATCH 310/393] Link-stats: use new nbr table API

---
 core/net/link-stats.c | 4 ++--
 core/net/nbr-table.h  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/net/link-stats.c b/core/net/link-stats.c
index 37e764458..e8fd70100 100644
--- a/core/net/link-stats.c
+++ b/core/net/link-stats.c
@@ -143,7 +143,7 @@ link_stats_packet_sent(const linkaddr_t *lladdr, int status, int numtx)
   stats = nbr_table_get_from_lladdr(link_stats, lladdr);
   if(stats == NULL) {
     /* Add the neighbor */
-    stats = nbr_table_add_lladdr(link_stats, lladdr);
+    stats = nbr_table_add_lladdr(link_stats, lladdr, NBR_TABLE_REASON_LINK_STATS, NULL);
     if(stats != NULL) {
       stats->etx = LINK_STATS_INIT_ETX(stats);
     } else {
@@ -175,7 +175,7 @@ link_stats_input_callback(const linkaddr_t *lladdr)
   stats = nbr_table_get_from_lladdr(link_stats, lladdr);
   if(stats == NULL) {
     /* Add the neighbor */
-    stats = nbr_table_add_lladdr(link_stats, lladdr);
+    stats = nbr_table_add_lladdr(link_stats, lladdr, NBR_TABLE_REASON_LINK_STATS, NULL);
     if(stats != NULL) {
       /* Initialize */
       stats->rssi = packet_rssi;
diff --git a/core/net/nbr-table.h b/core/net/nbr-table.h
index c797a44ec..320ef2e5f 100644
--- a/core/net/nbr-table.h
+++ b/core/net/nbr-table.h
@@ -83,7 +83,8 @@ typedef enum {
 	NBR_TABLE_REASON_ROUTE,
 	NBR_TABLE_REASON_IPV6_ND,
 	NBR_TABLE_REASON_MAC,
-	NBR_TABLE_REASON_LLSEC
+	NBR_TABLE_REASON_LLSEC,
+	NBR_TABLE_REASON_LINK_STATS,
 } nbr_table_reason_t;
 
 /** \name Neighbor tables: register and loop through table elements */

From b42b12d7c8b0c17440e2a0b6e648768ad4685585 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Fri, 22 Apr 2016 23:59:59 +0200
Subject: [PATCH 311/393] Adsjut dao_ack_callback to new OFs

---
 core/net/rpl/rpl-mrhof.c |  4 ++--
 core/net/rpl/rpl-of0.c   | 21 ++++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/core/net/rpl/rpl-mrhof.c b/core/net/rpl/rpl-mrhof.c
index a3f4d2b87..b997b9efa 100644
--- a/core/net/rpl/rpl-mrhof.c
+++ b/core/net/rpl/rpl-mrhof.c
@@ -99,10 +99,10 @@ dao_ack_callback(rpl_parent_t *p, int status)
   PRINTF("RPL: MRHOF - DAO ACK received with status: %d\n", status);
   if(status >= RPL_DAO_ACK_UNABLE_TO_ACCEPT) {
     /* punish the ETX as if this was 10 packets lost */
-    neighbor_link_callback(p, MAC_TX_OK, 10);
+    link_stats_packet_sent(rpl_get_parent_lladdr(p), MAC_TX_OK, 10);
   } else if(status == RPL_DAO_ACK_TIMEOUT) { /* timeout = no ack */
     /* punish the total lack of ACK with a similar punishment */
-    neighbor_link_callback(p, MAC_TX_OK, 10);
+    link_stats_packet_sent(rpl_get_parent_lladdr(p), MAC_TX_OK, 10);
   }
 }
 #endif /* RPL_WITH_DAO_ACK */
diff --git a/core/net/rpl/rpl-of0.c b/core/net/rpl/rpl-of0.c
index 84b14d1ba..16913d8c5 100644
--- a/core/net/rpl/rpl-of0.c
+++ b/core/net/rpl/rpl-of0.c
@@ -90,6 +90,25 @@ reset(rpl_dag_t *dag)
   PRINTF("RPL: Reset OF0\n");
 }
 /*---------------------------------------------------------------------------*/
+#if RPL_WITH_DAO_ACK
+static void
+dao_ack_callback(rpl_parent_t *p, int status)
+{
+  if(status == RPL_DAO_ACK_UNABLE_TO_ADD_ROUTE_AT_ROOT) {
+    return;
+  }
+  /* here we need to handle failed DAO's and other stuff */
+  PRINTF("RPL: OF0 - DAO ACK received with status: %d\n", status);
+  if(status >= RPL_DAO_ACK_UNABLE_TO_ACCEPT) {
+    /* punish the ETX as if this was 10 packets lost */
+    link_stats_packet_sent(rpl_get_parent_lladdr(p), MAC_TX_OK, 10);
+  } else if(status == RPL_DAO_ACK_TIMEOUT) { /* timeout = no ack */
+    /* punish the total lack of ACK with a similar punishment */
+    link_stats_packet_sent(rpl_get_parent_lladdr(p), MAC_TX_OK, 10);
+  }
+}
+#endif /* RPL_WITH_DAO_ACK */
+/*---------------------------------------------------------------------------*/
 static uint16_t
 parent_link_metric(rpl_parent_t *p)
 {
@@ -198,7 +217,7 @@ update_metric_container(rpl_instance_t *instance)
 rpl_of_t rpl_of0 = {
   reset,
 #if RPL_WITH_DAO_ACK
-  NULL,
+  dao_ack_callback,
 #endif
   parent_link_metric,
   parent_path_cost,

From 43b01b323657746ff88c6a49dc8a056e801470b3 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Sat, 23 Apr 2016 00:13:59 +0200
Subject: [PATCH 312/393] RPL: if the best parent is not fresh, use the best
 fresh instead and utilize urgent probing to update link estimates

---
 core/net/rpl/rpl-dag.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index a0f01caaf..c0a616b9d 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -832,7 +832,7 @@ rpl_select_dag(rpl_instance_t *instance, rpl_parent_t *p)
 }
 /*---------------------------------------------------------------------------*/
 static rpl_parent_t *
-best_parent(rpl_dag_t *dag)
+best_parent(rpl_dag_t *dag, int fresh_only)
 {
   rpl_parent_t *p;
   rpl_of_t *of;
@@ -851,6 +851,11 @@ best_parent(rpl_dag_t *dag)
       continue;
     }
 
+    if(fresh_only && !rpl_parent_is_fresh(p)) {
+      /* Filter out non-fresh parents if fresh_only is set */
+      continue;
+    }
+
 #ifndef UIP_CONF_ND6_SEND_NA
     {
     uip_ds6_nbr_t *nbr = rpl_get_nbr(p);
@@ -871,13 +876,23 @@ best_parent(rpl_dag_t *dag)
 rpl_parent_t *
 rpl_select_parent(rpl_dag_t *dag)
 {
-  rpl_parent_t *best = best_parent(dag);
+  /* Look for best parent (regardless of freshness) */
+  rpl_parent_t *best = best_parent(dag, 0);
 
   if(best != NULL) {
     if(rpl_parent_is_fresh(best)) {
       rpl_set_preferred_parent(dag, best);
       dag->rank = rpl_rank_via_parent(dag->preferred_parent);
     } else {
+      /* The best is not fresh. Look for the best fresh now. */
+      rpl_parent_t *best_fresh = best_parent(dag, 1);
+      if(best_fresh == NULL) {
+        /* No fresh parent around, use best (non-fresh) */
+        rpl_set_preferred_parent(dag, best);
+      } else {
+        /* Use best fresh */
+        rpl_set_preferred_parent(dag, best_fresh);
+      }
 #if RPL_WITH_PROBING
       /* Probe the new best parent shortly in order to get a fresh estimate */
       dag->instance->urgent_probing_target = best;

From d008bf8a76c98098cce3264477249b6213cacf56 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Fri, 3 Jun 2016 12:23:56 +0200
Subject: [PATCH 313/393] Fix rpl_select_parent in the non-probing case

---
 core/net/rpl/rpl-dag.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index c0a616b9d..89db83750 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -880,9 +880,9 @@ rpl_select_parent(rpl_dag_t *dag)
   rpl_parent_t *best = best_parent(dag, 0);
 
   if(best != NULL) {
+#if RPL_WITH_PROBING
     if(rpl_parent_is_fresh(best)) {
       rpl_set_preferred_parent(dag, best);
-      dag->rank = rpl_rank_via_parent(dag->preferred_parent);
     } else {
       /* The best is not fresh. Look for the best fresh now. */
       rpl_parent_t *best_fresh = best_parent(dag, 1);
@@ -893,18 +893,20 @@ rpl_select_parent(rpl_dag_t *dag)
         /* Use best fresh */
         rpl_set_preferred_parent(dag, best_fresh);
       }
-#if RPL_WITH_PROBING
-      /* Probe the new best parent shortly in order to get a fresh estimate */
+      /* Probe the best parent shortly in order to get a fresh estimate */
       dag->instance->urgent_probing_target = best;
       rpl_schedule_probing(dag->instance);
+#else /* RPL_WITH_PROBING */
+      rpl_set_preferred_parent(dag, best);
+      dag->rank = rpl_rank_via_parent(dag->preferred_parent);
 #endif /* RPL_WITH_PROBING */
     }
   } else {
-    rpl_set_preferred_parent(dag, best);
-    dag->rank = INFINITE_RANK;
+    rpl_set_preferred_parent(dag, NULL);
   }
 
-  return best;
+  dag->rank = rpl_rank_via_parent(dag->preferred_parent);
+  return dag->preferred_parent;
 }
 /*---------------------------------------------------------------------------*/
 void

From e657ca40e9ed685aa51f3ff956a7c8263c3bcd3e Mon Sep 17 00:00:00 2001
From: Marco Casaroli <marco.casaroli@gmail.com>
Date: Fri, 3 Jun 2016 12:11:51 -0300
Subject: [PATCH 314/393] return error if host does not fit in host string

---
 core/net/http-socket/http-socket.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/net/http-socket/http-socket.c b/core/net/http-socket/http-socket.c
index 1e5ebbb27..ddcebaec1 100644
--- a/core/net/http-socket/http-socket.c
+++ b/core/net/http-socket/http-socket.c
@@ -349,6 +349,11 @@ parse_url(const char *url, char *host, uint16_t *portptr, char *path)
     }
   }
 
+  /* check if host is null terminated */
+  if (!memchr(host, 0, MAX_HOSTLEN)) {
+    return 0;
+  }
+
   /* Find the port. Default is 80. */
   port = 80;
   if(*urlptr == ':') {

From 19e08de0e2d498dc1b8a7fdedffd599420f1d778 Mon Sep 17 00:00:00 2001
From: Marco Casaroli <marco.casaroli@gmail.com>
Date: Fri, 3 Jun 2016 12:12:24 -0300
Subject: [PATCH 315/393] use memchr instead of strchr for checking if host is
 ipv6

---
 core/net/http-socket/http-socket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/net/http-socket/http-socket.c b/core/net/http-socket/http-socket.c
index ddcebaec1..4d78cc276 100644
--- a/core/net/http-socket/http-socket.c
+++ b/core/net/http-socket/http-socket.c
@@ -419,11 +419,11 @@ event(struct tcp_socket *tcps, void *ptr,
       tcp_socket_send_str(tcps, "Host: ");
       /* If we have IPv6 host, add the '[' and the ']' characters
          to the host. As in rfc2732. */
-      if (strchr(host, ':')) {
+      if (memchr(host, ':', MAX_HOSTLEN)) {
         tcp_socket_send_str(tcps, "[");
       }
       tcp_socket_send_str(tcps, host);
-      if (strchr(host, ':')) {
+      if (memchr(host, ':', MAX_HOSTLEN)) {
         tcp_socket_send_str(tcps, "]");
       }
       tcp_socket_send_str(tcps, "\r\n");

From e6cd0290907c6f720801b83d3e54b89294e1ca4b Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Fri, 3 Jun 2016 12:48:02 +0200
Subject: [PATCH 316/393] rpl_remove_routes_by_nexthop: expire routes rather
 than remove then directly. The routes will be removed later and No-path DAOs
 sent accordingly in rpl_purge_routes

---
 core/net/rpl/rpl.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/net/rpl/rpl.c b/core/net/rpl/rpl.c
index 47a3d1bcc..145ec1cd1 100644
--- a/core/net/rpl/rpl.c
+++ b/core/net/rpl/rpl.c
@@ -215,12 +215,10 @@ rpl_remove_routes_by_nexthop(uip_ipaddr_t *nexthop, rpl_dag_t *dag)
 
   while(r != NULL) {
     if(uip_ipaddr_cmp(uip_ds6_route_nexthop(r), nexthop) &&
-       r->state.dag == dag) {
-      uip_ds6_route_rm(r);
-      r = uip_ds6_route_head();
-    } else {
-      r = uip_ds6_route_next(r);
+        r->state.dag == dag) {
+      r->state.lifetime = 0;
     }
+    r = uip_ds6_route_next(r);
   }
   ANNOTATE("#L %u 0\n", nexthop->u8[sizeof(uip_ipaddr_t) - 1]);
 }

From 8ae00caea8b6674a5a05013b97893dd55b1549a9 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Fri, 3 Jun 2016 12:51:39 +0200
Subject: [PATCH 317/393] RPL: more robust configuration of mrhof in the
 squared ETX case

---
 core/net/rpl/rpl-mrhof.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/net/rpl/rpl-mrhof.c b/core/net/rpl/rpl-mrhof.c
index b997b9efa..a818d1c36 100644
--- a/core/net/rpl/rpl-mrhof.c
+++ b/core/net/rpl/rpl-mrhof.c
@@ -70,16 +70,23 @@
 #define RPL_MRHOF_SQUARED_ETX 0
 #endif /* RPL_MRHOF_CONF_SQUARED_ETX */
 
+#if !RPL_MRHOF_SQUARED_ETX
 /* Configuration parameters of RFC6719. Reject parents that have a higher
  * link metric than the following. The default value is 512 but we use 1024. */
-#define MAX_LINK_METRIC     1024   /* Eq ETX of 8 */
-/* Reject parents that have a higher path cost than the following. */
-#define MAX_PATH_COST			 32768   /* Eq path ETX of 256 */
+#define MAX_LINK_METRIC     1024 /* Eq ETX of 8 */
 /* Hysteresis of MRHOF: the rank must differ more than PARENT_SWITCH_THRESHOLD_DIV
  * in order to switch preferred parent. Default in RFC6719: 192, eq ETX of 1.5.
  * We use a more aggressive setting: 96, eq ETX of 0.75.
  */
-#define PARENT_SWITCH_THRESHOLD 96
+#define PARENT_SWITCH_THRESHOLD 96 /* Eq ETX of 0.75 */
+#else /* !RPL_MRHOF_SQUARED_ETX */
+#define MAX_LINK_METRIC     2048 /* Eq ETX of 4 */
+#define PARENT_SWITCH_THRESHOLD 160 /* Eq ETX of 1.25 (results in a churn comparable
+to the threshold of 96 in the non-squared case) */
+#endif /* !RPL_MRHOF_SQUARED_ETX */
+
+/* Reject parents that have a higher path cost than the following. */
+#define MAX_PATH_COST      32768   /* Eq path ETX of 256 */
 
 /*---------------------------------------------------------------------------*/
 static void

From b73b6082fcbe2d2835b7a0ea6f698e1cc64957c7 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Fri, 3 Jun 2016 15:55:51 +0200
Subject: [PATCH 318/393] link_stats_input_callback: do not use EWMA when
 initializing RSSI

---
 core/net/link-stats.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/net/link-stats.c b/core/net/link-stats.c
index e8fd70100..a2f99e729 100644
--- a/core/net/link-stats.c
+++ b/core/net/link-stats.c
@@ -180,9 +180,8 @@ link_stats_input_callback(const linkaddr_t *lladdr)
       /* Initialize */
       stats->rssi = packet_rssi;
       stats->etx = LINK_STATS_INIT_ETX(stats);
-    } else {
-      return; /* No space left, return */
     }
+    return;
   }
 
   /* Update RSSI EWMA */

From 797bead5e54fd07a87cd46d0b9afe0cd38f516e6 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Mon, 30 Nov 2015 19:17:17 +0100
Subject: [PATCH 319/393] RPL: if a neighbor is unreachable, remove routes via
 this neighbor

---
 core/net/rpl/rpl-dag.c   | 24 ++++++++++++++++++++++++
 core/net/rpl/rpl-mrhof.c |  9 +++++++++
 core/net/rpl/rpl-of0.c   |  7 +++++++
 core/net/rpl/rpl.h       |  6 ++++++
 4 files changed, 46 insertions(+)

diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index 89db83750..c4108fd5a 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -210,6 +210,23 @@ rpl_parent_is_fresh(rpl_parent_t *p)
   return link_stats_is_fresh(stats);
 }
 /*---------------------------------------------------------------------------*/
+int
+rpl_parent_is_reachable(rpl_parent_t *p) {
+  if(p == NULL || p->dag == NULL || p->dag->instance == NULL || p->dag->instance->of == NULL) {
+    return 0;
+  } else {
+#ifndef UIP_CONF_ND6_SEND_NA
+    uip_ds6_nbr_t *nbr = rpl_get_nbr(p);
+    /* Exclude links to a neighbor that is not reachable at a NUD level */
+    if(nbr == NULL || nbr->state != NBR_REACHABLE) {
+      return 0;
+    }
+#endif /* UIP_CONF_ND6_SEND_NA */
+    /* If we don't have fresh link information, assume the parent is reachable. */
+    return !rpl_parent_is_fresh(p) || p->dag->instance->of->parent_has_usable_link(p);
+  }
+}
+/*---------------------------------------------------------------------------*/
 static void
 rpl_set_preferred_parent(rpl_dag_t *dag, rpl_parent_t *p)
 {
@@ -1316,6 +1333,13 @@ rpl_process_parent_event(rpl_instance_t *instance, rpl_parent_t *p)
 
   return_value = 1;
 
+  if(uip_ds6_route_is_nexthop(rpl_get_parent_ipaddr(p)) && !rpl_parent_is_reachable(p)) {
+    PRINTF("RPL: Unacceptable link %u, removing routes via: ", rpl_get_parent_link_metric(p));
+    PRINT6ADDR(rpl_get_parent_ipaddr(p));
+    PRINTF("\n");
+    rpl_remove_routes_by_nexthop(rpl_get_parent_ipaddr(p), p->dag);
+  }
+
   if(!acceptable_rank(p->dag, p->rank)) {
     /* The candidate parent is no longer valid: the rank increase resulting
        from the choice of it as a parent would be too high. */
diff --git a/core/net/rpl/rpl-mrhof.c b/core/net/rpl/rpl-mrhof.c
index a818d1c36..c51ac8694 100644
--- a/core/net/rpl/rpl-mrhof.c
+++ b/core/net/rpl/rpl-mrhof.c
@@ -185,6 +185,14 @@ parent_is_acceptable(rpl_parent_t *p)
   return link_metric <= MAX_LINK_METRIC && path_cost <= MAX_PATH_COST;
 }
 /*---------------------------------------------------------------------------*/
+static int
+parent_has_usable_link(rpl_parent_t *p)
+{
+  uint16_t link_metric = parent_link_metric(p);
+  /* Exclude links with too high link metrics  */
+  return link_metric <= MAX_LINK_METRIC;
+}
+/*---------------------------------------------------------------------------*/
 static rpl_parent_t *
 best_parent(rpl_parent_t *p1, rpl_parent_t *p2)
 {
@@ -296,6 +304,7 @@ rpl_of_t rpl_mrhof = {
   dao_ack_callback,
 #endif
   parent_link_metric,
+  parent_has_usable_link,
   parent_path_cost,
   rank_via_parent,
   best_parent,
diff --git a/core/net/rpl/rpl-of0.c b/core/net/rpl/rpl-of0.c
index 16913d8c5..d0bfd1296 100644
--- a/core/net/rpl/rpl-of0.c
+++ b/core/net/rpl/rpl-of0.c
@@ -155,6 +155,12 @@ parent_is_acceptable(rpl_parent_t *p)
       && STEP_OF_RANK(p) <= MAX_STEP_OF_RANK;
 }
 /*---------------------------------------------------------------------------*/
+static int
+parent_has_usable_link(rpl_parent_t *p)
+{
+  return parent_is_acceptable(p);
+}
+/*---------------------------------------------------------------------------*/
 static rpl_parent_t *
 best_parent(rpl_parent_t *p1, rpl_parent_t *p2)
 {
@@ -220,6 +226,7 @@ rpl_of_t rpl_of0 = {
   dao_ack_callback,
 #endif
   parent_link_metric,
+  parent_has_usable_link,
   parent_path_cost,
   rank_via_parent,
   best_parent,
diff --git a/core/net/rpl/rpl.h b/core/net/rpl/rpl.h
index f4efafd50..89bc70ae8 100644
--- a/core/net/rpl/rpl.h
+++ b/core/net/rpl/rpl.h
@@ -162,6 +162,10 @@ typedef struct rpl_instance rpl_instance_t;
  *
  *  Returns the link metric of a parent
  *
+ * parent_has_usable_link(parent)
+ *
+ *  Returns 1 iff we have a usable link to this parent
+ *
  * parent_path_cost(parent)
  *
  *  Returns the path cost of a parent
@@ -200,6 +204,7 @@ struct rpl_of {
   void (*dao_ack_callback)(rpl_parent_t *, int status);
 #endif
   uint16_t (*parent_link_metric)(rpl_parent_t *);
+  int (*parent_has_usable_link)(rpl_parent_t *);
   uint16_t (*parent_path_cost)(rpl_parent_t *);
   rpl_rank_t (*rank_via_parent)(rpl_parent_t *);
   rpl_parent_t *(*best_parent)(rpl_parent_t *, rpl_parent_t *);
@@ -276,6 +281,7 @@ void rpl_remove_header(void);
 uint8_t rpl_invert_header(void);
 const struct link_stats *rpl_get_parent_link_stats(rpl_parent_t *p);
 int rpl_parent_is_fresh(rpl_parent_t *p);
+int rpl_parent_is_reachable(rpl_parent_t *p);
 uint16_t rpl_get_parent_link_metric(rpl_parent_t *p);
 rpl_rank_t rpl_rank_via_parent(rpl_parent_t *p);
 const linkaddr_t *rpl_get_parent_lladdr(rpl_parent_t *p);

From 704ec4e97cad2509d630623474b5922b395d4240 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Fri, 3 Jun 2016 14:14:59 +0200
Subject: [PATCH 320/393] nrf52dk: add test-timer to compile tests

---
 regression-tests/24-compile-nrf52-ports/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/regression-tests/24-compile-nrf52-ports/Makefile b/regression-tests/24-compile-nrf52-ports/Makefile
index c165d569d..bdf5b4a04 100644
--- a/regression-tests/24-compile-nrf52-ports/Makefile
+++ b/regression-tests/24-compile-nrf52-ports/Makefile
@@ -11,7 +11,8 @@ hello-world/nrf52dk \
 nrf52dk/coap-demo/nrf52dk:coap-server \
 nrf52dk/coap-demo/nrf52dk:coap-client:SERVER_IPV6_ADDR=ffff \
 nrf52dk/mqtt-demo/nrf52dk \
-nrf52dk/blink-hello/nrf52dk
+nrf52dk/blink-hello/nrf52dk \
+nrf52dk/timer-test/nrf52dk
 
 TOOLS=
 

From 47df9c4e6ec6402a2be1bbf11c12ca0e63a0a9fc Mon Sep 17 00:00:00 2001
From: Marco Casaroli <marco.casaroli@gmail.com>
Date: Sat, 4 Jun 2016 16:47:52 -0300
Subject: [PATCH 321/393] code style

---
 core/net/http-socket/http-socket.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/net/http-socket/http-socket.c b/core/net/http-socket/http-socket.c
index 4d78cc276..7862790ff 100644
--- a/core/net/http-socket/http-socket.c
+++ b/core/net/http-socket/http-socket.c
@@ -350,7 +350,7 @@ parse_url(const char *url, char *host, uint16_t *portptr, char *path)
   }
 
   /* check if host is null terminated */
-  if (!memchr(host, 0, MAX_HOSTLEN)) {
+  if(!memchr(host, 0, MAX_HOSTLEN)) {
     return 0;
   }
 
@@ -419,11 +419,11 @@ event(struct tcp_socket *tcps, void *ptr,
       tcp_socket_send_str(tcps, "Host: ");
       /* If we have IPv6 host, add the '[' and the ']' characters
          to the host. As in rfc2732. */
-      if (memchr(host, ':', MAX_HOSTLEN)) {
+      if(memchr(host, ':', MAX_HOSTLEN)) {
         tcp_socket_send_str(tcps, "[");
       }
       tcp_socket_send_str(tcps, host);
-      if (memchr(host, ':', MAX_HOSTLEN)) {
+      if(memchr(host, ':', MAX_HOSTLEN)) {
         tcp_socket_send_str(tcps, "]");
       }
       tcp_socket_send_str(tcps, "\r\n");

From 72b4d38ab35e199709ddedd34f93342af2724040 Mon Sep 17 00:00:00 2001
From: Billy Kozak <bkozak@scanimetrics.com>
Date: Tue, 28 Jul 2015 09:24:40 -0600
Subject: [PATCH 322/393] Put some uip6 temporaries on the stack

Some "temporary" variables were declared with static storage duration
for no good reason.

Replaced them with local stack variables wherever they were used.

There are still some variables that are unecesarily given static
duration which I have left alone.
---
 core/net/ipv6/uip6.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/net/ipv6/uip6.c b/core/net/ipv6/uip6.c
index a8caee054..e3f2c6fc0 100644
--- a/core/net/ipv6/uip6.c
+++ b/core/net/ipv6/uip6.c
@@ -207,11 +207,6 @@ uint8_t uip_flags;
 /* uip_conn always points to the current connection (set to NULL for UDP). */
 struct uip_conn *uip_conn;
 
-/* Temporary variables. */
-#if (UIP_TCP || UIP_UDP)
-static uint8_t c;
-#endif
-
 #if UIP_ACTIVE_OPEN || UIP_UDP
 /* Keeps track of the last port used for a new connection. */
 static uint16_t lastport;
@@ -256,8 +251,6 @@ static uint8_t iss[4];
 
 /* Temporary variables. */
 uint8_t uip_acc32[4];
-static uint8_t opt;
-static uint16_t tmp16;
 #endif /* UIP_TCP */
 /** @} */
 
@@ -432,6 +425,7 @@ uip_udpchksum(void)
 void
 uip_init(void)
 {
+  int c;
 
   uip_ds6_init();
   uip_icmp6_init();
@@ -466,6 +460,7 @@ struct uip_conn *
 uip_connect(const uip_ipaddr_t *ripaddr, uint16_t rport)
 {
   register struct uip_conn *conn, *cconn;
+  int c;
 
   /* Find an unused local port. */
   again:
@@ -560,6 +555,7 @@ remove_ext_hdr(void)
 struct uip_udp_conn *
 uip_udp_new(const uip_ipaddr_t *ripaddr, uint16_t rport)
 {
+  int c;
   register struct uip_udp_conn *conn;
 
   /* Find an unused local port. */
@@ -605,6 +601,7 @@ uip_udp_new(const uip_ipaddr_t *ripaddr, uint16_t rport)
 void
 uip_unlisten(uint16_t port)
 {
+  int c;
   for(c = 0; c < UIP_LISTENPORTS; ++c) {
     if(uip_listenports[c] == port) {
       uip_listenports[c] = 0;
@@ -616,6 +613,7 @@ uip_unlisten(uint16_t port)
 void
 uip_listen(uint16_t port)
 {
+  int c;
   for(c = 0; c < UIP_LISTENPORTS; ++c) {
     if(uip_listenports[c] == 0) {
       uip_listenports[c] = port;
@@ -941,6 +939,9 @@ void
 uip_process(uint8_t flag)
 {
 #if UIP_TCP
+  int c;
+  uint16_t tmp16;
+  uint8_t opt;
   register struct uip_conn *uip_connr = uip_conn;
 #endif /* UIP_TCP */
 #if UIP_UDP

From 37360aae515601d333b863b52f2fe9ab05f11441 Mon Sep 17 00:00:00 2001
From: Khaled Qorany <kqorany@users.noreply.github.com>
Date: Mon, 30 May 2016 23:34:11 +0200
Subject: [PATCH 323/393] Implementation of the ESMRF engine

---
 core/net/ipv6/multicast/esmrf.c              | 406 +++++++++++++++++++
 core/net/ipv6/multicast/esmrf.h              |  83 ++++
 core/net/ipv6/multicast/uip-mcast6-engines.h |   1 +
 core/net/ipv6/multicast/uip-mcast6.h         |   7 +
 core/net/ipv6/uip-icmp6.h                    |   1 +
 5 files changed, 498 insertions(+)
 create mode 100644 core/net/ipv6/multicast/esmrf.c
 create mode 100644 core/net/ipv6/multicast/esmrf.h

diff --git a/core/net/ipv6/multicast/esmrf.c b/core/net/ipv6/multicast/esmrf.c
new file mode 100644
index 000000000..284853a9c
--- /dev/null
+++ b/core/net/ipv6/multicast/esmrf.c
@@ -0,0 +1,406 @@
+/*
+ * Copyright (c) 2010, Loughborough University - 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.
+ *
+ * This file is part of the Contiki operating system.
+ */
+
+/**
+ * \file
+ *         This file shows the implementations of the Enhanced Stateless 
+ *	       Multicast RPL Forwarding (ESMRF)
+ *
+ *         It will only work in RPL networks in MOP 3 "Storing with Multicast"
+ *
+ * \author
+ *         Khaled Qorany	kqorany2@gmail.com
+ */
+
+#include "contiki.h"
+#include "contiki-net.h"
+#include "net/ipv6/multicast/uip-mcast6.h"
+#include "net/ipv6/multicast/uip-mcast6-route.h"
+#include "net/ipv6/multicast/uip-mcast6-stats.h"
+#include "net/ipv6/multicast/esmrf.h"
+#include "net/rpl/rpl.h"
+#include "net/ip/uip.h"
+#include "net/netstack.h"
+#include <string.h>
+
+extern uint16_t uip_slen;
+
+#define DEBUG NONE
+#include "net/ip/uip-debug.h"
+
+#define ESMRF_VERBOSE NONE
+
+#if DEBUG && ESMRF_VERBOSE
+#define VERBOSE_PRINTF(...) PRINTF(__VA_ARGS__)
+#define VERBOSE_PRINT_SEED(s) PRINT_SEED(s)
+#else
+#define VERBOSE_PRINTF(...)
+#define VERBOSE_PRINT_SEED(...)
+#endif
+
+/*---------------------------------------------------------------------------*/
+/* Maintain Stats */
+#if UIP_MCAST6_STATS
+static struct esmrf_stats stats;
+
+#define ESMRF_STATS_ADD(x) stats.x++
+#define ESMRF_STATS_INIT() do { memset(&stats, 0, sizeof(stats)); } while(0)
+#else /* UIP_MCAST6_STATS */
+#define ESMRF_STATS_ADD(x)
+#define ESMRF_STATS_INIT()
+#endif
+/*---------------------------------------------------------------------------*/
+/* Macros */
+/*---------------------------------------------------------------------------*/
+/* CCI */
+#define ESMRF_FWD_DELAY()  NETSTACK_RDC.channel_check_interval()
+/* Number of slots in the next 500ms */
+#define ESMRF_INTERVAL_COUNT  ((CLOCK_SECOND >> 2) / fwd_delay)
+/*---------------------------------------------------------------------------*/
+/* Internal Data */
+/*---------------------------------------------------------------------------*/
+static struct ctimer mcast_periodic;
+static uint8_t mcast_len;
+static uip_buf_t mcast_buf;
+static uint8_t fwd_delay;
+static uint8_t fwd_spread;
+static struct uip_udp_conn *c;
+static uip_ipaddr_t src_ip;
+static uip_ipaddr_t des_ip;
+/*---------------------------------------------------------------------------*/
+/* uIPv6 Pointers */
+/*---------------------------------------------------------------------------*/
+#define UIP_IP_BUF        ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
+#define UIP_ICMP_BUF      ((struct uip_icmp_hdr *)&uip_buf[uip_l2_l3_hdr_len])
+#define UIP_ICMP_PAYLOAD  ((unsigned char *)&uip_buf[uip_l2_l3_icmp_hdr_len])
+#define UIP_UDP_BUF       ((struct uip_udp_hdr *)&uip_buf[UIP_LLH_LEN + UIP_IPH_LEN])
+/*---------------------------------------------------------------------------*/
+/* Local function prototypes */
+/*---------------------------------------------------------------------------*/
+static void icmp_input(void);
+static void icmp_output(void);
+static void mcast_fwd(void *p);
+int remove_ext_hdr(void);
+/*---------------------------------------------------------------------------*/
+/* Internal Data Structures */
+/*---------------------------------------------------------------------------*/
+struct multicast_on_behalf{   /*  ICMP message of multicast_on_behalf */
+  uint16_t mcast_port;
+  uip_ipaddr_t mcast_ip;
+  uint8_t mcast_payload[UIP_BUFSIZE - UIP_LLH_LEN - UIP_IPUDPH_LEN];
+};
+#define UIP_ICMP_MOB 18 /* Size of multicast_on_behalf ICMP header */
+/*---------------------------------------------------------------------------*/
+/* Temporary Stores */
+/*---------------------------------------------------------------------------*/
+static struct multicast_on_behalf *locmobptr;
+static int loclen;
+/*---------------------------------------------------------------------------*/
+/* ESMRF ICMPv6 handler declaration */
+UIP_ICMP6_HANDLER(esmrf_icmp_handler, ICMP6_ESMRF,
+                  UIP_ICMP6_HANDLER_CODE_ANY, icmp_input);
+/*---------------------------------------------------------------------------*/
+static void
+icmp_output()
+{
+  uint16_t payload_len=0;
+  rpl_dag_t *dag_t;
+
+  struct multicast_on_behalf *mob;
+  mob = (struct multicast_on_behalf *)UIP_ICMP_PAYLOAD;
+  memcpy(&mob->mcast_payload, &uip_buf[UIP_LLH_LEN + UIP_IPUDPH_LEN], uip_slen);
+
+  UIP_IP_BUF->vtc = 0x60;
+  UIP_IP_BUF->tcflow = 0;
+  UIP_IP_BUF->flow = 0;
+  UIP_IP_BUF->proto = UIP_PROTO_ICMP6;
+  UIP_IP_BUF->ttl = ESMRF_IP_HOP_LIMIT;
+
+  mob->mcast_port = (uint16_t) uip_udp_conn->rport;
+  uip_ipaddr_copy(&mob->mcast_ip, &UIP_IP_BUF->destipaddr);
+
+  payload_len = UIP_ICMP_MOB + uip_slen;
+
+  dag_t = rpl_get_any_dag();
+  uip_ipaddr_copy(&UIP_IP_BUF->destipaddr, &dag_t->dag_id);
+  uip_ds6_select_src(&UIP_IP_BUF->srcipaddr, &UIP_IP_BUF->destipaddr);
+
+  VERBOSE_PRINTF("ESMRF: ICMPv6 Out - Hdr @ %p, payload @ %p to: ", UIP_ICMP_BUF, mob);
+  PRINT6ADDR(&UIP_IP_BUF->destipaddr);
+  PRINTF("\n");
+
+  UIP_IP_BUF->len[0] = (UIP_ICMPH_LEN + payload_len) >> 8;
+  UIP_IP_BUF->len[1] = (UIP_ICMPH_LEN + payload_len) & 0xff;
+
+  UIP_ICMP_BUF->type = ICMP6_ESMRF;
+  UIP_ICMP_BUF->icode = ESMRF_ICMP_CODE;
+
+  UIP_ICMP_BUF->icmpchksum = 0;
+  UIP_ICMP_BUF->icmpchksum = ~uip_icmp6chksum();
+
+  uip_len = UIP_IPH_LEN + UIP_ICMPH_LEN + payload_len;
+
+  VERBOSE_PRINTF("ESMRF: ICMPv6 Out - %u bytes, uip_len %u bytes, uip_ext_len %u bytes\n",
+					payload_len, uip_len, uip_ext_len);
+
+  tcpip_ipv6_output();
+  ESMRF_STATS_ADD(icmp_out);
+  return;
+}
+/*---------------------------------------------------------------------------*/
+static void
+icmp_input()
+{
+#if UIP_CONF_IPV6_CHECKS
+  if(UIP_ICMP_BUF->icode != ESMRF_ICMP_CODE) {
+    PRINTF("ESMRF: ICMPv6 In, bad ICMP code\n");
+    ESMRF_STATS_ADD(icmp_bad);
+    return;
+  }
+  if(UIP_IP_BUF->ttl <= 1) {
+    PRINTF("ESMRF: ICMPv6 In, bad TTL\n");
+    ESMRF_STATS_ADD(icmp_bad);
+    return;
+  }
+#endif
+
+  remove_ext_hdr();
+
+  PRINTF("ESMRF: ICMPv6 In from ");
+  PRINT6ADDR(&UIP_IP_BUF->srcipaddr);
+  PRINTF(" len %u, ext %u\n", uip_len, uip_ext_len);
+
+  ESMRF_STATS_ADD(icmp_in);
+
+  VERBOSE_PRINTF("ESMRF: ICMPv6 In, parse from %p to %p\n",
+                 UIP_ICMP_PAYLOAD,
+                 (uint8_t *)UIP_ICMP_PAYLOAD + uip_len -
+                 uip_l2_l3_icmp_hdr_len);
+
+
+  locmobptr = (struct multicast_on_behalf *) UIP_ICMP_PAYLOAD;
+  loclen = uip_len - (uip_l2_l3_icmp_hdr_len + UIP_ICMP_MOB);
+
+  uip_ipaddr_copy(&src_ip, &UIP_IP_BUF->srcipaddr);
+  uip_ipaddr_copy(&des_ip, &UIP_IP_BUF->destipaddr);
+
+  /* Extract the original multicast message */
+  uip_ipaddr_copy(&c->ripaddr, &locmobptr->mcast_ip);
+  c->rport = locmobptr->mcast_port;
+  uip_slen = loclen;
+  uip_udp_conn=c;
+  memcpy(&uip_buf[UIP_LLH_LEN + UIP_IPUDPH_LEN], locmobptr->mcast_payload,
+         loclen > UIP_BUFSIZE - UIP_LLH_LEN - UIP_IPUDPH_LEN?
+         UIP_BUFSIZE - UIP_LLH_LEN - UIP_IPUDPH_LEN: loclen);
+
+  uip_process(UIP_UDP_SEND_CONN);
+
+  memcpy(&mcast_buf, uip_buf, uip_len);
+  mcast_len = uip_len;
+  /* pass the packet to our uip_process to check if it is allowed to 
+   * accept this packet or not */
+  uip_ipaddr_copy(&UIP_IP_BUF->srcipaddr, &src_ip);
+  uip_ipaddr_copy(&UIP_IP_BUF->destipaddr, &des_ip);
+  UIP_UDP_BUF->udpchksum = 0;
+  
+  uip_process(UIP_DATA);
+
+  memcpy(uip_buf, &mcast_buf, mcast_len);
+  uip_len = mcast_len;
+  /* Return the IP of the original Multicast sender */
+  uip_ipaddr_copy(&UIP_IP_BUF->srcipaddr, &src_ip);
+  UIP_UDP_BUF->udpchksum = 0;
+  /* If we have an entry in the multicast routing table, something with
+   * a higher RPL rank (somewhere down the tree) is a group member */
+  if(uip_mcast6_route_lookup(&UIP_IP_BUF->destipaddr)) {
+    PRINTF("ESMRF: Forward this packet\n");
+    /* If we enter here, we will definitely forward */
+    tcpip_ipv6_output();
+  }
+  uip_clear_buf();
+}
+/*---------------------------------------------------------------------------*/
+static void
+mcast_fwd(void *p)
+{
+  memcpy(uip_buf, &mcast_buf, mcast_len);
+  uip_len = mcast_len;
+  UIP_IP_BUF->ttl--;
+  tcpip_output(NULL);
+  uip_clear_buf();
+}
+/*---------------------------------------------------------------------------*/
+static uint8_t
+in()
+{
+  rpl_dag_t *d;                 /* Our DODAG */
+  uip_ipaddr_t *parent_ipaddr;  /* Our pref. parent's IPv6 address */
+  const uip_lladdr_t *parent_lladdr;  /* Our pref. parent's LL address */
+
+  /*
+   * Fetch a pointer to the LL address of our preferred parent
+   *
+   * ToDo: This rpl_get_any_dag() call is a dirty replacement of the previous
+   *   rpl_get_dag(RPL_DEFAULT_INSTANCE);
+   * so that things can compile with the new RPL code. This needs updated to
+   * read instance ID from the RPL HBHO and use the correct parent accordingly
+   */
+  d = rpl_get_any_dag();
+  if(!d) {
+    PRINTF("ESMRF: No DODAG\n");
+    UIP_MCAST6_STATS_ADD(mcast_dropped);
+    return UIP_MCAST6_DROP;
+  }
+
+  /* Retrieve our preferred parent's LL address */
+  parent_ipaddr = rpl_get_parent_ipaddr(d->preferred_parent);
+  parent_lladdr = uip_ds6_nbr_lladdr_from_ipaddr(parent_ipaddr);
+
+  if(parent_lladdr == NULL) {
+    PRINTF("ESMRF: NO Parent exist \n");
+    UIP_MCAST6_STATS_ADD(mcast_dropped);
+    return UIP_MCAST6_DROP;
+  }
+
+  /*
+   * We accept a datagram if it arrived from our preferred parent, discard
+   * otherwise.
+   */
+  if(memcmp(parent_lladdr, packetbuf_addr(PACKETBUF_ADDR_SENDER),
+            UIP_LLADDR_LEN)) {
+    PRINTF("ESMRF: Routable in but ESMRF ignored it\n");
+    UIP_MCAST6_STATS_ADD(mcast_dropped);
+    return UIP_MCAST6_DROP;
+  }
+
+  if(UIP_IP_BUF->ttl <= 1) {
+    UIP_MCAST6_STATS_ADD(mcast_dropped);
+    return UIP_MCAST6_DROP;
+  }
+
+  UIP_MCAST6_STATS_ADD(mcast_in_all);
+  UIP_MCAST6_STATS_ADD(mcast_in_unique);
+
+  /* If we have an entry in the mcast routing table, something with
+   * a higher RPL rank (somewhere down the tree) is a group member */
+  if(uip_mcast6_route_lookup(&UIP_IP_BUF->destipaddr)) {
+    /* If we enter here, we will definitely forward */
+    UIP_MCAST6_STATS_ADD(mcast_fwd);
+
+    /*
+     * Add a delay (D) of at least ESMRF_FWD_DELAY() to compensate for how
+     * contikimac handles broadcasts. We can't start our TX before the sender
+     * has finished its own.
+     */
+    fwd_delay = ESMRF_FWD_DELAY();
+
+    /* Finalise D: D = min(ESMRF_FWD_DELAY(), ESMRF_MIN_FWD_DELAY) */
+#if ESMRF_MIN_FWD_DELAY
+    if(fwd_delay < ESMRF_MIN_FWD_DELAY) {
+      fwd_delay = ESMRF_MIN_FWD_DELAY;
+    }
+#endif
+
+    if(fwd_delay == 0) {
+      /* No delay required, send it, do it now, why wait? */
+      UIP_IP_BUF->ttl--;
+      tcpip_output(NULL);
+      UIP_IP_BUF->ttl++;        /* Restore before potential upstack delivery */
+    } else {
+      /* Randomise final delay in [D , D*Spread], step D */
+      fwd_spread = ESMRF_INTERVAL_COUNT;
+      if(fwd_spread > ESMRF_MAX_SPREAD) {
+        fwd_spread = ESMRF_MAX_SPREAD;
+      }
+      if(fwd_spread) {
+        fwd_delay = fwd_delay * (1 + ((random_rand() >> 11) % fwd_spread));
+      }
+
+      memcpy(&mcast_buf, uip_buf, uip_len);
+      mcast_len = uip_len;
+      ctimer_set(&mcast_periodic, fwd_delay, mcast_fwd, NULL);
+    }
+    PRINTF("ESMRF: %u bytes: fwd in %u [%u]\n",
+           uip_len, fwd_delay, fwd_spread);
+  }
+
+  /* Done with this packet unless we are a member of the mcast group */
+  if(!uip_ds6_is_my_maddr(&UIP_IP_BUF->destipaddr)) {
+    PRINTF("ESMRF: Not a group member. No further processing\n");
+    return UIP_MCAST6_DROP;
+  } else {
+    PRINTF("ESMRF: Ours. Deliver to upper layers\n");
+    UIP_MCAST6_STATS_ADD(mcast_in_ours);
+    return UIP_MCAST6_ACCEPT;
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+init()
+{
+  UIP_MCAST6_STATS_INIT(NULL);
+  uip_mcast6_route_init();
+  /* Register the ICMPv6 input handler */
+  uip_icmp6_register_input_handler(&esmrf_icmp_handler);
+  c = udp_new(NULL, 0, NULL);
+}
+/*---------------------------------------------------------------------------*/
+static void
+out(void)
+{
+  rpl_dag_t *dag_t;
+  dag_t = rpl_get_any_dag();
+  if (!dag_t){
+    PRINTF("ESMRF: There is no DODAG\n");
+    return;
+  }
+  if(dag_t->rank == 256){
+    PRINTF("ESMRF: I am the Root, thus send the multicast packet normally. \n");
+    return;
+  }
+  else{
+    PRINTF("ESMRF: I am not the Root\n");
+	PRINTF("Send multicast-on-befalf message (ICMPv6) instead to  ");
+    PRINT6ADDR(&dag_t->dag_id);
+    PRINTF("\n");
+    icmp_output();
+    uip_slen=0;
+    return;
+  }
+}
+/*---------------------------------------------------------------------------*/
+const struct uip_mcast6_driver esmrf_driver = {
+  "ESMRF",
+  init,
+  out,
+  in,
+};
+/*---------------------------------------------------------------------------*/
diff --git a/core/net/ipv6/multicast/esmrf.h b/core/net/ipv6/multicast/esmrf.h
new file mode 100644
index 000000000..4a12a38cf
--- /dev/null
+++ b/core/net/ipv6/multicast/esmrf.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2011, Loughborough University - 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.
+ *
+ * This file is part of the Contiki operating system.
+ */
+
+/**
+ * \file
+ *         Header file for the Enhanced Stateless Multicast RPL Forwarding (ESMRF)
+ *
+ * \author
+ *         Khaled Qorany	kqorany2@gmail.com
+ */
+
+#ifndef ESMRF_H_
+#define ESMRF_H_
+
+#include "contiki-conf.h"
+
+#include <stdint.h>
+/*---------------------------------------------------------------------------*/
+/* Protocol Constants */
+/*---------------------------------------------------------------------------*/
+#define ESMRF_ICMP_CODE              0   /* ICMPv6 code field */
+#define ESMRF_IP_HOP_LIMIT        0xFF   /* Hop limit for ICMP messages */
+/*---------------------------------------------------------------------------*/
+/* Configuration */
+/*---------------------------------------------------------------------------*/
+/* Fmin */
+#ifdef ESMRF_CONF_MIN_FWD_DELAY
+#define ESMRF_MIN_FWD_DELAY ESMRF_CONF_MIN_FWD_DELAY
+#else
+#define ESMRF_MIN_FWD_DELAY 4
+#endif
+
+/* Max Spread */
+#ifdef ESMRF_CONF_MAX_SPREAD
+#define ESMRF_MAX_SPREAD ESMRF_CONF_MAX_SPREAD
+#else
+#define ESMRF_MAX_SPREAD 4
+#endif
+/*---------------------------------------------------------------------------*/
+/* Stats datatype */
+/*---------------------------------------------------------------------------*/
+struct esmrf_stats {
+  uint16_t mcast_in_unique;
+  uint16_t mcast_in_all;        /* At layer 3 */
+  uint16_t mcast_in_ours;       /* Unique and we are a group member */
+  uint16_t mcast_fwd;           /* Forwarded by us but we are not the seed */
+  uint16_t mcast_out;           /* We are the seed */
+  uint16_t mcast_bad;
+  uint16_t mcast_dropped;
+  uint16_t icmp_out;
+  uint16_t icmp_in;
+  uint16_t icmp_bad;
+};
+
+#endif /* ESMRF_H_ */
diff --git a/core/net/ipv6/multicast/uip-mcast6-engines.h b/core/net/ipv6/multicast/uip-mcast6-engines.h
index f4bff657a..511029d2f 100644
--- a/core/net/ipv6/multicast/uip-mcast6-engines.h
+++ b/core/net/ipv6/multicast/uip-mcast6-engines.h
@@ -50,6 +50,7 @@
 #define UIP_MCAST6_ENGINE_NONE        0 /**< Selecting this disables mcast */
 #define UIP_MCAST6_ENGINE_SMRF        1 /**< The SMRF engine */
 #define UIP_MCAST6_ENGINE_ROLL_TM     2 /**< The ROLL TM engine */
+#define UIP_MCAST6_ENGINE_ESMRF       3 /**< The ESMRF engine */
 
 #endif /* UIP_MCAST6_ENGINES_H_ */
 /** @} */
diff --git a/core/net/ipv6/multicast/uip-mcast6.h b/core/net/ipv6/multicast/uip-mcast6.h
index de2003839..6884e6d3e 100644
--- a/core/net/ipv6/multicast/uip-mcast6.h
+++ b/core/net/ipv6/multicast/uip-mcast6.h
@@ -63,6 +63,7 @@
 #include "net/ipv6/multicast/uip-mcast6-engines.h"
 #include "net/ipv6/multicast/uip-mcast6-route.h"
 #include "net/ipv6/multicast/smrf.h"
+#include "net/ipv6/multicast/esmrf.h"
 #include "net/ipv6/multicast/roll-tm.h"
 
 #include <string.h>
@@ -154,10 +155,16 @@ struct uip_mcast6_driver {
 #define UIP_CONF_IPV6_ROLL_TM  1        /* ROLL Trickle ICMP type support */
 
 #define UIP_MCAST6             roll_tm_driver
+
 #elif UIP_MCAST6_ENGINE == UIP_MCAST6_ENGINE_SMRF
 #define RPL_CONF_MULTICAST     1
 
 #define UIP_MCAST6             smrf_driver
+
+#elif UIP_MCAST6_ENGINE == UIP_MCAST6_ENGINE_ESMRF
+#define RPL_CONF_MULTICAST     1
+#define UIP_MCAST6             esmrf_driver
+
 #else
 #error "Multicast Enabled with an Unknown Engine."
 #error "Check the value of UIP_MCAST6_CONF_ENGINE in conf files."
diff --git a/core/net/ipv6/uip-icmp6.h b/core/net/ipv6/uip-icmp6.h
index 5633791fd..2fd1c8fbf 100644
--- a/core/net/ipv6/uip-icmp6.h
+++ b/core/net/ipv6/uip-icmp6.h
@@ -69,6 +69,7 @@
 #define ICMP6_PRIV_EXP_200              200  /**< Private Experimentation */
 #define ICMP6_PRIV_EXP_201              201  /**< Private Experimentation */
 #define ICMP6_ROLL_TM    ICMP6_PRIV_EXP_200  /**< ROLL Trickle Multicast */
+#define ICMP6_ESMRF      ICMP6_PRIV_EXP_201  /**< ESMRF Multicast */
 /** @} */
 
 

From a1ea6d311fd10a8d2f95df5df4151b5238416e93 Mon Sep 17 00:00:00 2001
From: xukai <xukai@wsncm.com>
Date: Wed, 8 Jun 2016 15:09:00 +0800
Subject: [PATCH 324/393] Fix i2c bug in sensortag flatform.

---
 platform/srf06-cc26xx/sensortag/board-i2c.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/srf06-cc26xx/sensortag/board-i2c.c b/platform/srf06-cc26xx/sensortag/board-i2c.c
index 7783cf2f0..cf74e2a93 100644
--- a/platform/srf06-cc26xx/sensortag/board-i2c.c
+++ b/platform/srf06-cc26xx/sensortag/board-i2c.c
@@ -221,11 +221,11 @@ board_i2c_read(uint8_t *data, uint8_t len)
   }
 
   if(success) {
+    ti_lib_i2c_master_control(I2C0_BASE, I2C_MASTER_CMD_BURST_RECEIVE_FINISH);
     while(ti_lib_i2c_master_busy(I2C0_BASE));
     success = i2c_status();
     if(success) {
       data[len - 1] = ti_lib_i2c_master_data_get(I2C0_BASE);
-      ti_lib_i2c_master_control(I2C0_BASE, I2C_MASTER_CMD_BURST_RECEIVE_FINISH);
       while(ti_lib_i2c_master_bus_busy(I2C0_BASE));
     }
   }
@@ -285,11 +285,11 @@ board_i2c_write_read(uint8_t *wdata, uint8_t wlen, uint8_t *rdata, uint8_t rlen)
   }
 
   if(success) {
+    ti_lib_i2c_master_control(I2C0_BASE, I2C_MASTER_CMD_BURST_RECEIVE_FINISH);
     while(ti_lib_i2c_master_busy(I2C0_BASE));
     success = i2c_status();
     if(success) {
       rdata[rlen - 1] = ti_lib_i2c_master_data_get(I2C0_BASE);
-      ti_lib_i2c_master_control(I2C0_BASE, I2C_MASTER_CMD_BURST_RECEIVE_FINISH);
       while(ti_lib_i2c_master_bus_busy(I2C0_BASE));
     }
   }

From d14b76d869c24b7696c01bb270c6cfcf921cb1da Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Sun, 29 Nov 2015 21:48:53 +0100
Subject: [PATCH 325/393] RPL: logging fixes

---
 core/net/rpl/rpl-timers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/rpl/rpl-timers.c b/core/net/rpl/rpl-timers.c
index 7ddfbcba9..abb668174 100644
--- a/core/net/rpl/rpl-timers.c
+++ b/core/net/rpl/rpl-timers.c
@@ -459,7 +459,7 @@ handle_probing_timer(void *ptr)
     const struct link_stats *stats = rpl_get_parent_link_stats(probing_target);
     (void)stats;
     PRINTF("RPL: probing %u %s last tx %u min ago\n",
-        rpl_get_parent_llpaddr(probing_target)->u8[7],
+        rpl_get_parent_lladdr(probing_target)->u8[7],
         instance->urgent_probing_target != NULL ? "(urgent)" : "",
         probing_target != NULL ?
         (unsigned)((clock_time() - stats->last_tx_time) / (60 * CLOCK_SECOND)) : 0

From b3e31e14564bf8ceba886178975073e78c559fc0 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Mon, 1 Feb 2016 18:02:33 +0100
Subject: [PATCH 326/393] Implement RPL non-storing mode

---
 core/net/ip/tcpip.c           |  26 +-
 core/net/ip/uip.h             |   7 +
 core/net/ipv6/uip-ds6-route.c |  47 ++-
 core/net/ipv6/uip-ds6-route.h |   2 +-
 core/net/ipv6/uip-icmp6.c     | 122 +++----
 core/net/ipv6/uip6.c          |  20 +-
 core/net/rpl/rpl-conf.h       |  27 +-
 core/net/rpl/rpl-dag-root.c   |  10 +-
 core/net/rpl/rpl-dag.c        |  73 +++--
 core/net/rpl/rpl-ext-header.c | 590 ++++++++++++++++++++++++++--------
 core/net/rpl/rpl-icmp6.c      | 190 ++++++++++-
 core/net/rpl/rpl-ns.c         | 211 ++++++++++++
 core/net/rpl/rpl-ns.h         |  72 +++++
 core/net/rpl/rpl-private.h    |   3 +
 core/net/rpl/rpl-timers.c     |  12 +-
 core/net/rpl/rpl.c            |   5 +
 core/net/rpl/rpl.h            |  10 +-
 17 files changed, 1149 insertions(+), 278 deletions(-)
 create mode 100644 core/net/rpl/rpl-ns.c
 create mode 100644 core/net/rpl/rpl-ns.h

diff --git a/core/net/ip/tcpip.c b/core/net/ip/tcpip.c
index ff514a186..df3f0608d 100644
--- a/core/net/ip/tcpip.c
+++ b/core/net/ip/tcpip.c
@@ -47,6 +47,11 @@
 #include "net/ipv6/uip-ds6.h"
 #endif
 
+#if UIP_CONF_IPV6_RPL
+#include "net/rpl/rpl.h"
+#include "net/rpl/rpl-private.h"
+#endif
+
 #include <string.h>
 
 #define DEBUG DEBUG_NONE
@@ -525,7 +530,7 @@ void
 tcpip_ipv6_output(void)
 {
   uip_ds6_nbr_t *nbr = NULL;
-  uip_ipaddr_t *nexthop;
+  uip_ipaddr_t *nexthop = NULL;
 
   if(uip_len == 0) {
     return;
@@ -545,14 +550,25 @@ tcpip_ipv6_output(void)
 
   if(!uip_is_addr_mcast(&UIP_IP_BUF->destipaddr)) {
     /* Next hop determination */
+
+#if UIP_CONF_IPV6_RPL && RPL_WITH_NON_STORING
+    uip_ipaddr_t ipaddr;
+    /* Look for a RPL Source Route */
+    if(rpl_srh_get_next_hop(&ipaddr)) {
+      nexthop = &ipaddr;
+    }
+#endif /* UIP_CONF_IPV6_RPL && RPL_WITH_NON_STORING */
+
     nbr = NULL;
 
     /* We first check if the destination address is on our immediate
        link. If so, we simply use the destination address as our
        nexthop address. */
-    if(uip_ds6_is_addr_onlink(&UIP_IP_BUF->destipaddr)){
+    if(nexthop == NULL && uip_ds6_is_addr_onlink(&UIP_IP_BUF->destipaddr)){
       nexthop = &UIP_IP_BUF->destipaddr;
-    } else {
+    }
+
+    if(nexthop == NULL) {
       uip_ds6_route_t *route;
       /* Check if we have a route to the destination address. */
       route = uip_ds6_route_lookup(&UIP_IP_BUF->destipaddr);
@@ -636,7 +652,7 @@ tcpip_ipv6_output(void)
     /* End of next hop determination */
 
 #if UIP_CONF_IPV6_RPL
-    if(rpl_update_header_final(nexthop)) {
+    if(!rpl_finalize_header(nexthop)) {
       uip_clear_buf();
       return;
     }
@@ -646,6 +662,7 @@ tcpip_ipv6_output(void)
 #if UIP_ND6_SEND_NA
       if((nbr = uip_ds6_nbr_add(nexthop, NULL, 0, NBR_INCOMPLETE, NBR_TABLE_REASON_IPV6_ND, NULL)) == NULL) {
         uip_clear_buf();
+        PRINTF("tcpip_ipv6_output: failed to add neighbor to cache\n");
         return;
       } else {
 #if UIP_CONF_IPV6_QUEUE_PKT
@@ -672,6 +689,7 @@ tcpip_ipv6_output(void)
         /* Send the first NS try from here (multicast destination IP address). */
       }
 #else /* UIP_ND6_SEND_NA */
+      PRINTF("tcpip_ipv6_output: neighbor not in cache\n");
       uip_len = 0;
       return;  
 #endif /* UIP_ND6_SEND_NA */
diff --git a/core/net/ip/uip.h b/core/net/ip/uip.h
index 900bd45fb..12d77ff10 100644
--- a/core/net/ip/uip.h
+++ b/core/net/ip/uip.h
@@ -1801,6 +1801,13 @@ typedef struct uip_routing_hdr {
   uint8_t seg_left;
 } uip_routing_hdr;
 
+/* RPL Source Routing Header */
+typedef struct uip_rpl_srh_hdr {
+  uint8_t cmpr; /* CmprI and CmprE */
+  uint8_t pad;
+  uint8_t reserved[2];
+} uip_rpl_srh_hdr;
+
 /* fragmentation header */
 typedef struct uip_frag_hdr {
   uint8_t next;
diff --git a/core/net/ipv6/uip-ds6-route.c b/core/net/ipv6/uip-ds6-route.c
index 043ca78d4..bb7b7b18e 100644
--- a/core/net/ipv6/uip-ds6-route.c
+++ b/core/net/ipv6/uip-ds6-route.c
@@ -57,6 +57,7 @@ void NETSTACK_CONF_ROUTING_NEIGHBOR_ADDED_CALLBACK(const linkaddr_t *addr);
 void NETSTACK_CONF_ROUTING_NEIGHBOR_REMOVED_CALLBACK(const linkaddr_t *addr);
 #endif /* NETSTACK_CONF_ROUTING_NEIGHBOR_REMOVED_CALLBACK */
 
+#if (UIP_CONF_MAX_ROUTES != 0)
 /* The nbr_routes holds a neighbor table to be able to maintain
    information about what routes go through what neighbor. This
    neighbor table is registered with the central nbr-table repository
@@ -71,6 +72,11 @@ MEMB(neighborroutememb, struct uip_ds6_route_neighbor_route, UIP_DS6_ROUTE_NB);
 LIST(routelist);
 MEMB(routememb, uip_ds6_route_t, UIP_DS6_ROUTE_NB);
 
+static int num_routes = 0;
+static void rm_routelist_callback(nbr_table_item_t *ptr);
+
+#endif /* (UIP_CONF_MAX_ROUTES != 0) */
+
 /* Default routes are held on the defaultrouterlist and their
    structures are allocated from the defaultroutermemb memory block.*/
 LIST(defaultrouterlist);
@@ -80,13 +86,10 @@ MEMB(defaultroutermemb, uip_ds6_defrt_t, UIP_DS6_DEFRT_NB);
 LIST(notificationlist);
 #endif
 
-static int num_routes = 0;
-
 #undef DEBUG
 #define DEBUG DEBUG_NONE
 #include "net/ip/uip-debug.h"
 
-static void rm_routelist_callback(nbr_table_item_t *ptr);
 /*---------------------------------------------------------------------------*/
 #if DEBUG != DEBUG_NONE
 static void
@@ -156,10 +159,12 @@ uip_ds6_notification_rm(struct uip_ds6_notification *n)
 void
 uip_ds6_route_init(void)
 {
+#if (UIP_CONF_MAX_ROUTES != 0)
   memb_init(&routememb);
   list_init(routelist);
   nbr_table_register(nbr_routes,
                      (nbr_table_callback *)rm_routelist_callback);
+#endif /* (UIP_CONF_MAX_ROUTES != 0) */
 
   memb_init(&defaultroutermemb);
   list_init(defaultrouterlist);
@@ -168,6 +173,7 @@ uip_ds6_route_init(void)
   list_init(notificationlist);
 #endif
 }
+#if (UIP_CONF_MAX_ROUTES != 0)
 /*---------------------------------------------------------------------------*/
 static uip_lladdr_t *
 uip_ds6_route_nexthop_lladdr(uip_ds6_route_t *route)
@@ -179,36 +185,48 @@ uip_ds6_route_nexthop_lladdr(uip_ds6_route_t *route)
     return NULL;
   }
 }
+#endif /* (UIP_CONF_MAX_ROUTES != 0) */
 /*---------------------------------------------------------------------------*/
 uip_ipaddr_t *
 uip_ds6_route_nexthop(uip_ds6_route_t *route)
 {
+#if (UIP_CONF_MAX_ROUTES != 0)
   if(route != NULL) {
     return uip_ds6_nbr_ipaddr_from_lladdr(uip_ds6_route_nexthop_lladdr(route));
   } else {
     return NULL;
   }
+#else /* (UIP_CONF_MAX_ROUTES != 0) */
+  return NULL;
+#endif /* (UIP_CONF_MAX_ROUTES != 0) */
 }
 /*---------------------------------------------------------------------------*/
 uip_ds6_route_t *
 uip_ds6_route_head(void)
 {
+#if (UIP_CONF_MAX_ROUTES != 0)
   return list_head(routelist);
+#else /* (UIP_CONF_MAX_ROUTES != 0) */
+  return NULL;
+#endif /* (UIP_CONF_MAX_ROUTES != 0) */
 }
 /*---------------------------------------------------------------------------*/
 uip_ds6_route_t *
 uip_ds6_route_next(uip_ds6_route_t *r)
 {
+#if (UIP_CONF_MAX_ROUTES != 0)
   if(r != NULL) {
     uip_ds6_route_t *n = list_item_next(r);
     return n;
   }
+#endif /* (UIP_CONF_MAX_ROUTES != 0) */
   return NULL;
 }
 /*---------------------------------------------------------------------------*/
 int
 uip_ds6_route_is_nexthop(const uip_ipaddr_t *ipaddr)
 {
+#if (UIP_CONF_MAX_ROUTES != 0)
   const uip_lladdr_t *lladdr;
   lladdr = uip_ds6_nbr_lladdr_from_ipaddr(ipaddr);
 
@@ -217,17 +235,25 @@ uip_ds6_route_is_nexthop(const uip_ipaddr_t *ipaddr)
   }
 
   return nbr_table_get_from_lladdr(nbr_routes, (linkaddr_t *)lladdr) != NULL;
+#else /* (UIP_CONF_MAX_ROUTES != 0) */
+  return 0;
+#endif /* (UIP_CONF_MAX_ROUTES != 0) */
 }
 /*---------------------------------------------------------------------------*/
 int
 uip_ds6_route_num_routes(void)
 {
+#if (UIP_CONF_MAX_ROUTES != 0)
   return num_routes;
+#else /* (UIP_CONF_MAX_ROUTES != 0) */
+  return 0;
+#endif /* (UIP_CONF_MAX_ROUTES != 0) */
 }
 /*---------------------------------------------------------------------------*/
 uip_ds6_route_t *
 uip_ds6_route_lookup(uip_ipaddr_t *addr)
 {
+#if (UIP_CONF_MAX_ROUTES != 0)
   uip_ds6_route_t *r;
   uip_ds6_route_t *found_route;
   uint8_t longestmatch;
@@ -274,12 +300,16 @@ uip_ds6_route_lookup(uip_ipaddr_t *addr)
   }
 
   return found_route;
+#else /* (UIP_CONF_MAX_ROUTES != 0) */
+  return NULL;
+#endif /* (UIP_CONF_MAX_ROUTES != 0) */
 }
 /*---------------------------------------------------------------------------*/
 uip_ds6_route_t *
 uip_ds6_route_add(uip_ipaddr_t *ipaddr, uint8_t length,
 		  uip_ipaddr_t *nexthop)
 {
+#if (UIP_CONF_MAX_ROUTES != 0)
   uip_ds6_route_t *r;
   struct uip_ds6_route_neighbor_route *nbrr;
 
@@ -426,12 +456,17 @@ uip_ds6_route_add(uip_ipaddr_t *ipaddr, uint8_t length,
   assert_nbr_routes_list_sane();
 #endif /* DEBUG != DEBUG_NONE */
   return r;
+
+#else /* (UIP_CONF_MAX_ROUTES != 0) */
+  return NULL;
+#endif /* (UIP_CONF_MAX_ROUTES != 0) */
 }
 
 /*---------------------------------------------------------------------------*/
 void
 uip_ds6_route_rm(uip_ds6_route_t *route)
 {
+#if (UIP_CONF_MAX_ROUTES != 0)
   struct uip_ds6_route_neighbor_route *neighbor_route;
 #if DEBUG != DEBUG_NONE
   assert_nbr_routes_list_sane();
@@ -488,8 +523,11 @@ uip_ds6_route_rm(uip_ds6_route_t *route)
 #if DEBUG != DEBUG_NONE
   assert_nbr_routes_list_sane();
 #endif /* DEBUG != DEBUG_NONE */
+
+#endif /* (UIP_CONF_MAX_ROUTES != 0) */
   return;
 }
+#if (UIP_CONF_MAX_ROUTES != 0)
 /*---------------------------------------------------------------------------*/
 static void
 rm_routelist(struct uip_ds6_route_neighbor_routes *routes)
@@ -517,10 +555,12 @@ rm_routelist_callback(nbr_table_item_t *ptr)
 {
   rm_routelist((struct uip_ds6_route_neighbor_routes *)ptr);
 }
+#endif /* (UIP_CONF_MAX_ROUTES != 0) */
 /*---------------------------------------------------------------------------*/
 void
 uip_ds6_route_rm_by_nexthop(uip_ipaddr_t *nexthop)
 {
+#if (UIP_CONF_MAX_ROUTES != 0)
   /* Get routing entry list of this neighbor */
   const uip_lladdr_t *nexthop_lladdr;
   struct uip_ds6_route_neighbor_routes *routes;
@@ -529,6 +569,7 @@ uip_ds6_route_rm_by_nexthop(uip_ipaddr_t *nexthop)
   routes = nbr_table_get_from_lladdr(nbr_routes,
                                      (linkaddr_t *)nexthop_lladdr);
   rm_routelist(routes);
+#endif /* (UIP_CONF_MAX_ROUTES != 0) */
 }
 /*---------------------------------------------------------------------------*/
 uip_ds6_defrt_t *
diff --git a/core/net/ipv6/uip-ds6-route.h b/core/net/ipv6/uip-ds6-route.h
index 6ca533c9b..6855fc2cd 100644
--- a/core/net/ipv6/uip-ds6-route.h
+++ b/core/net/ipv6/uip-ds6-route.h
@@ -50,7 +50,7 @@ NBR_TABLE_DECLARE(nbr_routes);
 void uip_ds6_route_init(void);
 
 #ifndef UIP_CONF_UIP_DS6_NOTIFICATIONS
-#define UIP_DS6_NOTIFICATIONS 1
+#define UIP_DS6_NOTIFICATIONS (UIP_CONF_MAX_ROUTES != 0)
 #else
 #define UIP_DS6_NOTIFICATIONS UIP_CONF_UIP_DS6_NOTIFICATIONS
 #endif
diff --git a/core/net/ipv6/uip-icmp6.c b/core/net/ipv6/uip-icmp6.c
index 80d7a5582..fae84b4de 100644
--- a/core/net/ipv6/uip-icmp6.c
+++ b/core/net/ipv6/uip-icmp6.c
@@ -120,9 +120,6 @@ uip_icmp6_register_input_handler(uip_icmp6_input_handler_t *handler)
 static void
 echo_request_input(void)
 {
-#if UIP_CONF_IPV6_RPL
-  uint8_t temp_ext_len;
-#endif /* UIP_CONF_IPV6_RPL */
   /*
    * we send an echo reply. It is trivial if there was no extension
    * headers in the request otherwise we need to remove the extension
@@ -147,44 +144,27 @@ echo_request_input(void)
   }
 
   if(uip_ext_len > 0) {
-#if UIP_CONF_IPV6_RPL
-    if((temp_ext_len = rpl_invert_header())) {
-      /* If there were other extension headers*/
-      UIP_FIRST_EXT_BUF->next = UIP_PROTO_ICMP6;
-      if (uip_ext_len != temp_ext_len) {
-        uip_len -= (uip_ext_len - temp_ext_len);
-        UIP_IP_BUF->len[0] = ((uip_len - UIP_IPH_LEN) >> 8);
-        UIP_IP_BUF->len[1] = ((uip_len - UIP_IPH_LEN) & 0xff);
-        /* move the echo request payload (starting after the icmp header)
-         * to the new location in the reply.
-         * The shift is equal to the length of the remaining extension headers present
-         * Note: UIP_ICMP_BUF still points to the echo request at this stage
-         */
-      memmove((uint8_t *)UIP_ICMP_BUF + UIP_ICMPH_LEN - (uip_ext_len - temp_ext_len),
-              (uint8_t *)UIP_ICMP_BUF + UIP_ICMPH_LEN,
-              (uip_len - UIP_IPH_LEN - temp_ext_len - UIP_ICMPH_LEN));
-      }
-      uip_ext_len = temp_ext_len;
-    } else {
-#endif /* UIP_CONF_IPV6_RPL */
-      /* If there were extension headers*/
-      UIP_IP_BUF->proto = UIP_PROTO_ICMP6;
-      uip_len -= uip_ext_len;
-      UIP_IP_BUF->len[0] = ((uip_len - UIP_IPH_LEN) >> 8);
-      UIP_IP_BUF->len[1] = ((uip_len - UIP_IPH_LEN) & 0xff);
-      /* move the echo request payload (starting after the icmp header)
-       * to the new location in the reply.
-       * The shift is equal to the length of the extension headers present
-       * Note: UIP_ICMP_BUF still points to the echo request at this stage
-       */
-      memmove((uint8_t *)UIP_ICMP_BUF + UIP_ICMPH_LEN - uip_ext_len,
-              (uint8_t *)UIP_ICMP_BUF + UIP_ICMPH_LEN,
-              (uip_len - UIP_IPH_LEN - UIP_ICMPH_LEN));
-      uip_ext_len = 0;
-#if UIP_CONF_IPV6_RPL
-    }
-#endif /* UIP_CONF_IPV6_RPL */
+    /* Remove extension headers if any */
+    UIP_IP_BUF->proto = UIP_PROTO_ICMP6;
+    uip_len -= uip_ext_len;
+    UIP_IP_BUF->len[0] = ((uip_len - UIP_IPH_LEN) >> 8);
+    UIP_IP_BUF->len[1] = ((uip_len - UIP_IPH_LEN) & 0xff);
+    /* move the echo request payload (starting after the icmp header)
+     * to the new location in the reply.
+     * The shift is equal to the length of the extension headers present
+     * Note: UIP_ICMP_BUF still points to the echo request at this stage
+     */
+    memmove((uint8_t *)UIP_ICMP_BUF + UIP_ICMPH_LEN - uip_ext_len,
+        (uint8_t *)UIP_ICMP_BUF + UIP_ICMPH_LEN,
+        (uip_len - UIP_IPH_LEN - UIP_ICMPH_LEN));
+    uip_ext_len = 0;
   }
+
+  /* Insert RPL extension headers */
+#if UIP_CONF_IPV6_RPL
+  rpl_insert_header();
+#endif /* UIP_CONF_IPV6_RPL */
+
   /* Below is important for the correctness of UIP_ICMP_BUF and the
    * checksum
    */
@@ -329,53 +309,31 @@ echo_reply_input(void)
 {
   int ttl;
   uip_ipaddr_t sender;
-#if UIP_CONF_IPV6_RPL
-  uint8_t temp_ext_len;
-#endif /* UIP_CONF_IPV6_RPL */
+
+  PRINTF("Received Echo Reply from ");
+  PRINT6ADDR(&UIP_IP_BUF->srcipaddr);
+  PRINTF(" to ");
+  PRINT6ADDR(&UIP_IP_BUF->destipaddr);
+  PRINTF("\n");
 
   uip_ipaddr_copy(&sender, &UIP_IP_BUF->srcipaddr);
   ttl = UIP_IP_BUF->ttl;
 
   if(uip_ext_len > 0) {
-#if UIP_CONF_IPV6_RPL
-    if((temp_ext_len = rpl_invert_header())) {
-      /* If there were other extension headers*/
-      UIP_FIRST_EXT_BUF->next = UIP_PROTO_ICMP6;
-      if (uip_ext_len != temp_ext_len) {
-        uip_len -= (uip_ext_len - temp_ext_len);
-        UIP_IP_BUF->len[0] = ((uip_len - UIP_IPH_LEN) >> 8);
-        UIP_IP_BUF->len[1] = ((uip_len - UIP_IPH_LEN) & 0xff);
-        /* move the echo reply payload (starting after the icmp
-         * header) to the new location in the reply.  The shift is
-         * equal to the length of the remaining extension headers
-         * present Note: UIP_ICMP_BUF still points to the echo reply
-         * at this stage
-         */
-        memmove((uint8_t *)UIP_ICMP_BUF + UIP_ICMPH_LEN - (uip_ext_len - temp_ext_len),
-                (uint8_t *)UIP_ICMP_BUF + UIP_ICMPH_LEN,
-                (uip_len - UIP_IPH_LEN - temp_ext_len - UIP_ICMPH_LEN));
-      }
-      uip_ext_len = temp_ext_len;
-      uip_len -= uip_ext_len;
-    } else {
-#endif /* UIP_CONF_IPV6_RPL */
-      /* If there were extension headers*/
-      UIP_IP_BUF->proto = UIP_PROTO_ICMP6;
-      uip_len -= uip_ext_len;
-      UIP_IP_BUF->len[0] = ((uip_len - UIP_IPH_LEN) >> 8);
-      UIP_IP_BUF->len[1] = ((uip_len - UIP_IPH_LEN) & 0xff);
-      /* move the echo reply payload (starting after the icmp header)
-       * to the new location in the reply.  The shift is equal to the
-       * length of the extension headers present Note: UIP_ICMP_BUF
-       * still points to the echo request at this stage
-       */
-      memmove((uint8_t *)UIP_ICMP_BUF + UIP_ICMPH_LEN - uip_ext_len,
-              (uint8_t *)UIP_ICMP_BUF + UIP_ICMPH_LEN,
-              (uip_len - UIP_IPH_LEN - UIP_ICMPH_LEN));
-      uip_ext_len = 0;
-#if UIP_CONF_IPV6_RPL
-    }
-#endif /* UIP_CONF_IPV6_RPL */
+    /* Remove extension headers if any */
+    UIP_IP_BUF->proto = UIP_PROTO_ICMP6;
+    uip_len -= uip_ext_len;
+    UIP_IP_BUF->len[0] = ((uip_len - UIP_IPH_LEN) >> 8);
+    UIP_IP_BUF->len[1] = ((uip_len - UIP_IPH_LEN) & 0xff);
+    /* move the echo reply payload (starting after the icmp header)
+     * to the new location in the reply.  The shift is equal to the
+     * length of the extension headers present Note: UIP_ICMP_BUF
+     * still points to the echo request at this stage
+     */
+    memmove((uint8_t *)UIP_ICMP_BUF + UIP_ICMPH_LEN - uip_ext_len,
+        (uint8_t *)UIP_ICMP_BUF + UIP_ICMPH_LEN,
+        (uip_len - UIP_IPH_LEN - UIP_ICMPH_LEN));
+    uip_ext_len = 0;
   }
 
   /* Call all registered applications to let them know an echo reply
diff --git a/core/net/ipv6/uip6.c b/core/net/ipv6/uip6.c
index e3f2c6fc0..a54754371 100644
--- a/core/net/ipv6/uip6.c
+++ b/core/net/ipv6/uip6.c
@@ -79,6 +79,11 @@
 #include "net/ipv6/uip-ds6.h"
 #include "net/ipv6/multicast/uip-mcast6.h"
 
+#if UIP_CONF_IPV6_RPL
+#include "rpl/rpl.h"
+#include "rpl/rpl-private.h"
+#endif
+
 #include <string.h>
 
 /*---------------------------------------------------------------------------*/
@@ -88,10 +93,6 @@
 #define DEBUG DEBUG_NONE
 #include "net/ip/uip-debug.h"
 
-#if UIP_CONF_IPV6_RPL
-#include "rpl/rpl.h"
-#endif /* UIP_CONF_IPV6_RPL */
-
 #if UIP_LOGGING == 1
 #include <stdio.h>
 void uip_log(char *msg);
@@ -889,7 +890,7 @@ ext_hdr_options_process(void)
        */
 #if UIP_CONF_IPV6_RPL
       PRINTF("Processing RPL option\n");
-      if(rpl_verify_header(uip_ext_opt_offset)) {
+      if(rpl_verify_hbh_header(uip_ext_opt_offset)) {
         PRINTF("RPL Option Error: Dropping Packet\n");
         return 1;
       }
@@ -1228,9 +1229,9 @@ uip_process(uint8_t flag)
       }
 
 #if UIP_CONF_IPV6_RPL
-      if(rpl_update_header_empty()) {
+      if(!rpl_update_header()) {
         /* Packet can not be forwarded */
-        PRINTF("RPL Forward Option Error\n");
+        PRINTF("RPL header update error\n");
         goto drop;
       }
 #endif /* UIP_CONF_IPV6_RPL */
@@ -1368,6 +1369,11 @@ uip_process(uint8_t flag)
 
           PRINTF("Processing Routing header\n");
           if(UIP_ROUTING_BUF->seg_left > 0) {
+#if UIP_CONF_IPV6_RPL && RPL_WITH_NON_STORING
+            if(rpl_process_srh_header()) {
+              goto send; /* Proceed to forwarding */
+            }
+#endif /* UIP_CONF_IPV6_RPL && RPL_WITH_NON_STORING */
             uip_icmp6_error_output(ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER, UIP_IPH_LEN + uip_ext_len + 2);
             UIP_STAT(++uip_stat.ip.drop);
             UIP_LOG("ip6: unrecognized routing type");
diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h
index 1da6c5ea8..0148e11e5 100644
--- a/core/net/rpl/rpl-conf.h
+++ b/core/net/rpl/rpl-conf.h
@@ -236,16 +236,25 @@
 #endif
 
 /*
- * Hop-by-hop option
- * This option control the insertion of the RPL Hop-by-Hop extension header
- * into packets originating from this node. Incoming Hop-by-hop extension
- * header are still processed and forwarded.
+ * Embed support for storing mode
  */
-#ifdef RPL_CONF_INSERT_HBH_OPTION
-#define RPL_INSERT_HBH_OPTION       RPL_CONF_INSERT_HBH_OPTION
-#else
-#define RPL_INSERT_HBH_OPTION       1
-#endif
+#ifdef RPL_CONF_WITH_STORING
+#define RPL_WITH_STORING RPL_CONF_WITH_STORING
+#else /* RPL_CONF_WITH_STORING */
+#define RPL_WITH_STORING 1
+#endif /* RPL_CONF_WITH_STORING */
+
+/*
+ * Embed support for non-storing mode
+ */
+#ifdef RPL_CONF_WITH_NON_STORING
+#define RPL_WITH_NON_STORING RPL_CONF_WITH_NON_STORING
+#else /* RPL_CONF_WITH_NON_STORING */
+#define RPL_WITH_NON_STORING 0
+#endif /* RPL_CONF_WITH_NON_STORING */
+
+#define RPL_IS_STORING(instance) (RPL_WITH_STORING && ((instance) != NULL) && ((instance)->mop > RPL_MOP_NON_STORING))
+#define RPL_IS_NON_STORING(instance) (RPL_WITH_NON_STORING && ((instance) != NULL) && ((instance)->mop == RPL_MOP_NON_STORING))
 
 /*
  * RPL DAO ACK support. When enabled, DAO ACK will be sent and requested.
diff --git a/core/net/rpl/rpl-dag-root.c b/core/net/rpl/rpl-dag-root.c
index d053a1a13..57a10ef80 100644
--- a/core/net/rpl/rpl-dag-root.c
+++ b/core/net/rpl/rpl-dag-root.c
@@ -43,7 +43,9 @@
 
 #define RPL_DAG_GRACE_PERIOD (CLOCK_SECOND * 20 * 1)
 
+#if (UIP_CONF_MAX_ROUTES != 0)
 static struct uip_ds6_notification n;
+#endif /* (UIP_CONF_MAX_ROUTES != 0) */
 static uint8_t to_become_root;
 static struct ctimer c;
 /*---------------------------------------------------------------------------*/
@@ -121,6 +123,7 @@ create_dag_callback(void *ptr)
     ctimer_set(&c, RPL_DAG_GRACE_PERIOD, create_dag_callback, NULL);
   }
 }
+#if (UIP_CONF_MAX_ROUTES != 0)
 /*---------------------------------------------------------------------------*/
 static void
 route_callback(int event, uip_ipaddr_t *route, uip_ipaddr_t *ipaddr,
@@ -136,6 +139,7 @@ route_callback(int event, uip_ipaddr_t *route, uip_ipaddr_t *ipaddr,
     }
   }
 }
+#endif /* (UIP_CONF_MAX_ROUTES != 0) */
 /*---------------------------------------------------------------------------*/
 static uip_ipaddr_t *
 set_global_address(void)
@@ -171,7 +175,9 @@ rpl_dag_root_init(void)
   if(!initialized) {
     to_become_root = 0;
     set_global_address();
+#if (UIP_CONF_MAX_ROUTES != 0)
     uip_ds6_notification_add(&n, route_callback);
+#endif /* (UIP_CONF_MAX_ROUTES != 0) */
     initialized = 1;
   }
 }
@@ -206,7 +212,9 @@ rpl_dag_root_init_dag_immediately(void)
 
       /* If there are routes in this dag, we remove them all as we are
          from now on the new dag root and the old routes are wrong */
-      rpl_remove_routes(dag);
+      if(RPL_IS_STORING(dag->instance)) {
+        rpl_remove_routes(dag);
+      }
       if(dag->instance != NULL &&
          dag->instance->def_route != NULL) {
 	uip_ds6_defrt_rm(dag->instance->def_route);
diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index c4108fd5a..ced73990f 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -98,8 +98,8 @@ rpl_print_neighbor_list(void)
     rpl_parent_t *p = nbr_table_head(rpl_parents);
     clock_time_t clock_now = clock_time();
 
-    printf("RPL: OCP %u rank %u dioint %u, nbr count %u\n",
-        default_instance->of->ocp, curr_rank, curr_dio_interval, uip_ds6_nbr_num());
+    printf("RPL: MOP %u OCP %u rank %u dioint %u, nbr count %u\n",
+        default_instance->mop, default_instance->of->ocp, curr_rank, curr_dio_interval, uip_ds6_nbr_num());
     while(p != NULL) {
       const struct link_stats *stats = rpl_get_parent_link_stats(p);
       printf("RPL: nbr %3u %5u, %5u => %5u -- %2u %c%c (last tx %u min ago)\n",
@@ -418,7 +418,9 @@ rpl_set_root(uint8_t instance_id, uip_ipaddr_t *dag_id)
 
   if(instance->current_dag != dag && instance->current_dag != NULL) {
     /* Remove routes installed by DAOs. */
-    rpl_remove_routes(instance->current_dag);
+    if(RPL_IS_STORING(instance)) {
+      rpl_remove_routes(instance->current_dag);
+    }
 
     instance->current_dag->joined = 0;
   }
@@ -667,7 +669,9 @@ rpl_free_dag(rpl_dag_t *dag)
     dag->joined = 0;
 
     /* Remove routes installed by DAOs. */
-    rpl_remove_routes(dag);
+    if(RPL_IS_STORING(dag->instance)) {
+      rpl_remove_routes(dag);
+    }
 
    /* Remove autoconfigured address */
     if((dag->prefix_info.flags & UIP_ND6_RA_FLAG_AUTONOMOUS)) {
@@ -787,7 +791,9 @@ rpl_select_dag(rpl_instance_t *instance, rpl_parent_t *p)
 
   if(instance->current_dag != best_dag) {
     /* Remove routes installed by DAOs. */
-    rpl_remove_routes(instance->current_dag);
+    if(RPL_IS_STORING(instance)) {
+      rpl_remove_routes(instance->current_dag);
+    }
 
     PRINTF("RPL: New preferred DAG: ");
     PRINT6ADDR(&best_dag->dag_id);
@@ -816,7 +822,7 @@ rpl_select_dag(rpl_instance_t *instance, rpl_parent_t *p)
   if(!acceptable_rank(best_dag, best_dag->rank)) {
     PRINTF("RPL: New rank unacceptable!\n");
     rpl_set_preferred_parent(instance->current_dag, NULL);
-    if(instance->mop != RPL_MOP_NO_DOWNWARD_ROUTES && last_parent != NULL) {
+    if(RPL_IS_STORING(instance) && last_parent != NULL) {
       /* Send a No-Path DAO to the removed preferred parent. */
       dao_output(last_parent, RPL_ZERO_LIFETIME);
     }
@@ -828,15 +834,13 @@ rpl_select_dag(rpl_instance_t *instance, rpl_parent_t *p)
     PRINTF("RPL: Changed preferred parent, rank changed from %u to %u\n",
   	(unsigned)old_rank, best_dag->rank);
     RPL_STAT(rpl_stats.parent_switch++);
-    if(instance->mop != RPL_MOP_NO_DOWNWARD_ROUTES) {
-      if(last_parent != NULL) {
-        /* Send a No-Path DAO to the removed preferred parent. */
-        dao_output(last_parent, RPL_ZERO_LIFETIME);
-      }
-      /* The DAO parent set changed - schedule a DAO transmission. */
-      RPL_LOLLIPOP_INCREMENT(instance->dtsn_out);
-      rpl_schedule_dao(instance);
+    if(RPL_IS_STORING(instance) && last_parent != NULL) {
+      /* Send a No-Path DAO to the removed preferred parent. */
+      dao_output(last_parent, RPL_ZERO_LIFETIME);
     }
+    /* The DAO parent set changed - schedule a DAO transmission. */
+    RPL_LOLLIPOP_INCREMENT(instance->dtsn_out);
+    rpl_schedule_dao(instance);
     rpl_reset_dio_timer(instance);
 #if DEBUG
     rpl_print_neighbor_list();
@@ -954,9 +958,11 @@ rpl_nullify_parent(rpl_parent_t *parent)
         uip_ds6_defrt_rm(dag->instance->def_route);
         dag->instance->def_route = NULL;
       }
-      /* Send No-Path DAO only to preferred parent, if any */
+      /* Send No-Path DAO only when nullifying preferred parent */
       if(parent == dag->preferred_parent) {
-        dao_output(parent, RPL_ZERO_LIFETIME);
+        if(RPL_IS_STORING(dag->instance)) {
+          dao_output(parent, RPL_ZERO_LIFETIME);
+        }
         rpl_set_preferred_parent(dag, NULL);
       }
     }
@@ -982,8 +988,10 @@ rpl_move_parent(rpl_dag_t *dag_src, rpl_dag_t *dag_dst, rpl_parent_t *parent)
       dag_src->instance->def_route = NULL;
     }
   } else if(dag_src->joined) {
-    /* Remove uIPv6 routes that have this parent as the next hop. */
-    rpl_remove_routes_by_nexthop(rpl_get_parent_ipaddr(parent), dag_src);
+    if(RPL_IS_STORING(dag_src->instance)) {
+      /* Remove uIPv6 routes that have this parent as the next hop. */
+      rpl_remove_routes_by_nexthop(rpl_get_parent_ipaddr(parent), dag_src);
+    }
   }
 
   PRINTF("RPL: Moving parent ");
@@ -1006,6 +1014,25 @@ rpl_has_downward_route(void)
 }
 /*---------------------------------------------------------------------------*/
 rpl_dag_t *
+rpl_get_dag(const uip_ipaddr_t *addr)
+{
+  int i, j;
+
+  for(i = 0; i < RPL_MAX_INSTANCES; ++i) {
+    if(instance_table[i].used) {
+      for(j = 0; j < RPL_MAX_DAG_PER_INSTANCE; ++j) {
+        if(instance_table[i].dag_table[j].joined
+            && uip_ipaddr_prefixcmp(&instance_table[i].dag_table[j].dag_id, addr,
+                instance_table[i].dag_table[j].prefix_info.length)) {
+          return &instance_table[i].dag_table[j];
+        }
+      }
+    }
+  }
+  return NULL;
+}
+/*---------------------------------------------------------------------------*/
+rpl_dag_t *
 rpl_get_any_dag(void)
 {
   int i;
@@ -1055,6 +1082,12 @@ rpl_join_instance(uip_ipaddr_t *from, rpl_dio_t *dio)
   rpl_parent_t *p;
   rpl_of_t *of;
 
+  if((!RPL_WITH_NON_STORING && dio->mop == RPL_MOP_NON_STORING)
+      || (!RPL_WITH_STORING && (dio->mop == RPL_MOP_STORING_NO_MULTICAST
+          || dio->mop == RPL_MOP_STORING_MULTICAST))) {
+    PRINTF("RPL: DIO advertising a non-supported MOP %u\n", dio->mop);
+  }
+
   /* Determine the objective function by using the
      objective code point of the DIO. */
   of = rpl_find_of(dio->ocp);
@@ -1333,7 +1366,9 @@ rpl_process_parent_event(rpl_instance_t *instance, rpl_parent_t *p)
 
   return_value = 1;
 
-  if(uip_ds6_route_is_nexthop(rpl_get_parent_ipaddr(p)) && !rpl_parent_is_reachable(p)) {
+  if(RPL_IS_STORING(instance)
+      && uip_ds6_route_is_nexthop(rpl_get_parent_ipaddr(p))
+      && !rpl_parent_is_reachable(p) && instance->mop > RPL_MOP_NON_STORING) {
     PRINTF("RPL: Unacceptable link %u, removing routes via: ", rpl_get_parent_link_metric(p));
     PRINT6ADDR(rpl_get_parent_ipaddr(p));
     PRINTF("\n");
diff --git a/core/net/rpl/rpl-ext-header.c b/core/net/rpl/rpl-ext-header.c
index fd7cf8604..85f770dfc 100644
--- a/core/net/rpl/rpl-ext-header.c
+++ b/core/net/rpl/rpl-ext-header.c
@@ -48,6 +48,7 @@
 #include "net/ip/tcpip.h"
 #include "net/ipv6/uip-ds6.h"
 #include "net/rpl/rpl-private.h"
+#include "net/rpl/rpl-ns.h"
 #include "net/packetbuf.h"
 
 #define DEBUG DEBUG_NONE
@@ -61,12 +62,14 @@
 #define UIP_EXT_BUF               ((struct uip_ext_hdr *)&uip_buf[uip_l2_l3_hdr_len])
 #define UIP_HBHO_BUF              ((struct uip_hbho_hdr *)&uip_buf[uip_l2_l3_hdr_len])
 #define UIP_HBHO_NEXT_BUF         ((struct uip_ext_hdr *)&uip_buf[uip_l2_l3_hdr_len + RPL_HOP_BY_HOP_LEN])
+#define UIP_RH_BUF                ((struct uip_routing_hdr *)&uip_buf[uip_l2_l3_hdr_len])
+#define UIP_RPL_SRH_BUF           ((struct uip_rpl_srh_hdr *)&uip_buf[uip_l2_l3_hdr_len + RPL_RH_LEN])
 #define UIP_EXT_HDR_OPT_BUF       ((struct uip_ext_hdr_opt *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset])
 #define UIP_EXT_HDR_OPT_PADN_BUF  ((struct uip_ext_hdr_opt_padn *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset])
 #define UIP_EXT_HDR_OPT_RPL_BUF   ((struct uip_ext_hdr_opt_rpl *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset])
 /*---------------------------------------------------------------------------*/
 int
-rpl_verify_header(int uip_ext_opt_offset)
+rpl_verify_hbh_header(int uip_ext_opt_offset)
 {
   rpl_instance_t *instance;
   int down;
@@ -100,12 +103,14 @@ rpl_verify_header(int uip_ext_opt_offset)
   if(UIP_EXT_HDR_OPT_RPL_BUF->flags & RPL_HDR_OPT_FWD_ERR) {
     PRINTF("RPL: Forward error!\n");
     /* We should try to repair it by removing the neighbor that caused
-       the packet to be forwareded in the first place. We drop any
-       routes that go through the neighbor that sent the packet to
-       us. */
-    route = uip_ds6_route_lookup(&UIP_IP_BUF->destipaddr);
-    if(route != NULL) {
-      uip_ds6_route_rm(route);
+         the packet to be forwareded in the first place. We drop any
+         routes that go through the neighbor that sent the packet to
+         us. */
+    if(RPL_IS_STORING(instance)) {
+      route = uip_ds6_route_lookup(&UIP_IP_BUF->destipaddr);
+      if(route != NULL) {
+        uip_ds6_route_rm(route);
+      }
     }
     RPL_STAT(rpl_stats.forward_errors++);
     /* Trigger DAO retransmission */
@@ -166,35 +171,299 @@ rpl_verify_header(int uip_ext_opt_offset)
   }
 
   PRINTF("RPL: Rank OK\n");
-
   return 0;
 }
 /*---------------------------------------------------------------------------*/
-static void
-set_rpl_opt(unsigned uip_ext_opt_offset)
+#if RPL_WITH_NON_STORING
+int
+rpl_srh_get_next_hop(uip_ipaddr_t *ipaddr)
 {
-  uint8_t temp_len;
+  uint8_t *uip_next_hdr;
+  int last_uip_ext_len = uip_ext_len;
 
-  memmove(UIP_HBHO_NEXT_BUF, UIP_EXT_BUF, uip_len - UIP_IPH_LEN);
-  memset(UIP_HBHO_BUF, 0, RPL_HOP_BY_HOP_LEN);
-  UIP_HBHO_BUF->next = UIP_IP_BUF->proto;
-  UIP_IP_BUF->proto = UIP_PROTO_HBHO;
-  UIP_HBHO_BUF->len = RPL_HOP_BY_HOP_LEN - 8;
-  UIP_EXT_HDR_OPT_RPL_BUF->opt_type = UIP_EXT_HDR_OPT_RPL;
-  UIP_EXT_HDR_OPT_RPL_BUF->opt_len = RPL_HDR_OPT_LEN;
-  UIP_EXT_HDR_OPT_RPL_BUF->flags = 0;
-  UIP_EXT_HDR_OPT_RPL_BUF->instance = 0;
-  UIP_EXT_HDR_OPT_RPL_BUF->senderrank = 0;
-  uip_len += RPL_HOP_BY_HOP_LEN;
-  temp_len = UIP_IP_BUF->len[1];
-  UIP_IP_BUF->len[1] += UIP_HBHO_BUF->len + 8;
-  if(UIP_IP_BUF->len[1] < temp_len) {
-    UIP_IP_BUF->len[0]++;
+  uip_ext_len = 0;
+  uip_next_hdr = &UIP_IP_BUF->proto;
+
+  /* Look for routing header */
+  while(uip_next_hdr != NULL && *uip_next_hdr != UIP_PROTO_ROUTING) {
+    switch(*uip_next_hdr) {
+      case UIP_PROTO_TCP:
+      case UIP_PROTO_UDP:
+      case UIP_PROTO_ICMP6:
+      case UIP_PROTO_NONE:
+        uip_next_hdr = NULL;
+        break;
+      case UIP_PROTO_HBHO:
+      case UIP_PROTO_DESTO:
+      case UIP_PROTO_FRAG:
+        /* Move to next header */
+        if(uip_next_hdr != &UIP_IP_BUF->proto) {
+          uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
+        }
+        uip_next_hdr = &UIP_EXT_BUF->next;
+        break;
+      default:
+        break;
+    }
   }
+
+  if(uip_next_hdr != NULL && *uip_next_hdr == UIP_PROTO_ROUTING
+      && UIP_RH_BUF->routing_type == RPL_RH_TYPE_SRH) {
+    /* Routing header found. The next hop should be already copied as the IPv6 destination
+     * address, via rpl_process_srh_header. We turn this address into a link-local to enable
+     * forwarding to next hop */
+    uip_ipaddr_copy(ipaddr, &UIP_IP_BUF->destipaddr);
+    uip_create_linklocal_prefix(ipaddr);
+    uip_ext_len = last_uip_ext_len;
+    return 1;
+  }
+
+  uip_ext_len = last_uip_ext_len;
+  return 0;
 }
 /*---------------------------------------------------------------------------*/
 int
-rpl_update_header_empty(void)
+rpl_process_srh_header(void)
+{
+  uint8_t *uip_next_hdr;
+  int last_uip_ext_len = uip_ext_len;
+
+  uip_ext_len = 0;
+  uip_next_hdr = &UIP_IP_BUF->proto;
+
+  /* Look for routing header */
+  while(uip_next_hdr != NULL && *uip_next_hdr != UIP_PROTO_ROUTING) {
+    switch(*uip_next_hdr) {
+      case UIP_PROTO_TCP:
+      case UIP_PROTO_UDP:
+      case UIP_PROTO_ICMP6:
+      case UIP_PROTO_NONE:
+        uip_next_hdr = NULL;
+        break;
+      case UIP_PROTO_HBHO:
+      case UIP_PROTO_DESTO:
+      case UIP_PROTO_FRAG:
+        /* Move to next header */
+        if(uip_next_hdr != &UIP_IP_BUF->proto) {
+          uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
+        }
+        uip_next_hdr = &UIP_EXT_BUF->next;
+        break;
+      default:
+        break;
+    }
+  }
+
+  if(uip_next_hdr != NULL && *uip_next_hdr == UIP_PROTO_ROUTING
+      && UIP_RH_BUF->routing_type == RPL_RH_TYPE_SRH) {
+    /* SRH found, now look for next hop */
+    uint8_t cmpri, cmpre;
+    uint8_t ext_len;
+    uint8_t padding;
+    uint8_t path_len;
+    uint8_t segments_left;
+    uip_ipaddr_t current_dest_addr;
+
+    segments_left = UIP_RH_BUF->seg_left;
+    ext_len = (UIP_RH_BUF->len * 8) + 8;
+    cmpri = UIP_RPL_SRH_BUF->cmpr >> 4;
+    cmpre = UIP_RPL_SRH_BUF->cmpr & 0x0f;
+    padding = UIP_RPL_SRH_BUF->pad >> 4;
+    path_len = ((ext_len - padding - RPL_RH_LEN - RPL_SRH_LEN - (16 - cmpre)) / (16 - cmpri)) + 1;
+    (void)path_len;
+
+    PRINTF("RPL: read SRH, path len %u, segments left %u, Cmpri %u, Cmpre %u, ext len %u (padding %u)\n",
+        path_len, segments_left, cmpri, cmpre, ext_len, padding);
+
+    if(segments_left == 0) {
+      /* We are the final destination, do nothing */
+    } else {
+      uint8_t i = path_len - segments_left; /* The index of the next address to be visited */
+      uint8_t *addr_ptr = ((uint8_t *)UIP_RH_BUF) + RPL_RH_LEN + RPL_SRH_LEN + (i * (16 - cmpri));
+      uint8_t cmpr = segments_left == 1 ? cmpre : cmpri;
+
+      /* As per RFC6554: swap the IPv6 destination address and address[i] */
+
+      /* First, copy the current IPv6 destination address */
+      uip_ipaddr_copy(&current_dest_addr, &UIP_IP_BUF->destipaddr);
+      /* Second, update the IPv6 destination address with addresses[i] */
+      memcpy(((uint8_t *)&UIP_IP_BUF->destipaddr) + cmpr, addr_ptr, 16 - cmpr);
+      /* Third, write current_dest_addr to addresses[i] */
+      memcpy(addr_ptr, ((uint8_t *)&current_dest_addr) + cmpr, 16 - cmpr);
+
+      /* Update segments left field */
+      UIP_RH_BUF->seg_left--;
+
+      PRINTF("RPL: SRH next hop ");
+      PRINT6ADDR(&UIP_IP_BUF->destipaddr);
+      PRINTF("\n");
+    }
+    uip_ext_len = last_uip_ext_len;
+    return 1;
+  }
+
+  uip_ext_len = last_uip_ext_len;
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static int
+count_matching_bytes(const void *p1, const void *p2, size_t n)
+{
+  int i = 0;
+  for(i = 0; i < n; i++) {
+    if(((uint8_t *)p1)[i] != ((uint8_t *)p2)[i]) {
+      return i;
+    }
+  }
+  return n;
+}
+/*---------------------------------------------------------------------------*/
+static int
+insert_srh_header(void)
+{
+  /* Implementation of RFC6554 */
+  uint8_t temp_len;
+  uint8_t path_len;
+  uint8_t ext_len;
+  uint8_t cmpri, cmpre; /* ComprI and ComprE fields of the RPL Source Routing Header */
+  uint8_t *hop_ptr;
+  uint8_t padding;
+  rpl_ns_node_t *dest_node;
+  rpl_ns_node_t *root_node;
+  rpl_ns_node_t *node;
+  rpl_dag_t *dag;
+  uip_ipaddr_t node_addr;
+
+  PRINTF("RPL: SRH creating source routing header with destination ");
+  PRINT6ADDR(&UIP_IP_BUF->destipaddr);
+  PRINTF(" \n");
+
+  /* Construct source route. We do not do this recursively to keep the runtime stack usage constant. */
+
+  /* Get link of the destination and root */
+  dag = rpl_get_dag(&UIP_IP_BUF->destipaddr);
+
+  if(dag == NULL) {
+    PRINTF("RPL: SRH DAG not found\n");
+    return 0;
+  }
+
+  dest_node = rpl_ns_get_node(dag, &UIP_IP_BUF->destipaddr);
+  if(dest_node == NULL) {
+    /* The destination is not found, skip SRH insertion */
+    return 1;
+  }
+
+  root_node = rpl_ns_get_node(dag, &dag->dag_id);
+  if(root_node == NULL) {
+    PRINTF("RPL: SRH root node not found\n");
+    return 0;
+  }
+
+  if(!rpl_ns_is_node_reachable(dag, &UIP_IP_BUF->destipaddr)) {
+    PRINTF("RPL: SRH no path found to destination\n");
+    return 0;
+  }
+
+  /* Compute path length and compression factors (we use cmpri == cmpre) */
+  path_len = 0;
+  node = dest_node->parent;
+  /* For simplicity, we use cmpri = cmpre */
+  cmpri = 15;
+  cmpre = 15;
+  while(node != NULL && node != root_node) {
+
+    rpl_ns_get_node_global_addr(&node_addr, node);
+
+    /* How many bytes in common between all nodes in the path? */
+    cmpri = MIN(cmpri, count_matching_bytes(&node_addr, &UIP_IP_BUF->destipaddr, 16));
+    cmpre = cmpri;
+
+    PRINTF("RPL: SRH Hop ");
+    PRINT6ADDR(&node_addr);
+    PRINTF("\n");
+    node = node->parent;
+    path_len++;
+  }
+
+  if(((DEBUG) & DEBUG_PRINT) && node != NULL) {
+    rpl_ns_get_node_global_addr(&node_addr, node);
+    PRINTF("RPL: SRH Next Hop ");
+    PRINT6ADDR(&node_addr);
+    PRINTF("\n");
+  }
+
+  /* Extension header length: fixed headers + (n-1) * (16-ComprI) + (16-ComprE)*/
+  ext_len = RPL_RH_LEN + RPL_SRH_LEN
+      + (path_len - 1) * (16 - cmpre)
+      + (16 - cmpri);
+
+  padding = ext_len % 8 == 0 ? 0 : (8 - (ext_len % 8));
+  ext_len += padding;
+
+  PRINTF("RPL: SRH Path len: %u, ComprI %u, ComprE %u, ext len %u (padding %u)\n",
+      path_len, cmpri, cmpre, ext_len, padding);
+
+  /* Check if there is enough space to store the extension header */
+  if(uip_len + ext_len > UIP_BUFSIZE) {
+    PRINTF("RPL: Packet too long: impossible to add source routing header (%u bytes)\n", ext_len);
+    return 1;
+  }
+
+  /* Move existing ext headers and payload uip_ext_len further */
+  memmove(uip_buf + uip_l2_l3_hdr_len + ext_len,
+      uip_buf + uip_l2_l3_hdr_len, uip_len - UIP_IPH_LEN);
+  memset(uip_buf + uip_l2_l3_hdr_len, 0, ext_len);
+
+  /* Insert source routing header */
+  UIP_RH_BUF->next = UIP_IP_BUF->proto;
+  UIP_IP_BUF->proto = UIP_PROTO_ROUTING;
+
+  /* Initialize IPv6 Routing Header */
+  UIP_RH_BUF->len = (ext_len - 8) / 8;
+  UIP_RH_BUF->routing_type = RPL_RH_TYPE_SRH;
+  UIP_RH_BUF->seg_left = path_len;
+
+  /* Initialize RPL Source Routing Header */
+  UIP_RPL_SRH_BUF->cmpr = (cmpri << 4) + cmpre;
+  UIP_RPL_SRH_BUF->pad = padding << 4;
+
+  /* Initialize addresses field (the actual source route).
+   * From last to first. */
+  node = dest_node;
+  hop_ptr = ((uint8_t *)UIP_RH_BUF) + ext_len - padding; /* Pointer where to write the next hop compressed address */
+
+  while(node != NULL && node->parent != root_node) {
+    rpl_ns_get_node_global_addr(&node_addr, node);
+
+    hop_ptr -= (16 - cmpri);
+    memcpy(hop_ptr, ((uint8_t*)&node_addr) + cmpri, 16 - cmpri);
+
+    node = node->parent;
+  }
+
+  /* The next hop (i.e. node whose parent is the root) is placed as the current IPv6 destination */
+  rpl_ns_get_node_global_addr(&node_addr, node);
+  uip_ipaddr_copy(&UIP_IP_BUF->destipaddr, &node_addr);
+
+  /* In-place update of IPv6 length field */
+  temp_len = UIP_IP_BUF->len[1];
+  UIP_IP_BUF->len[1] += ext_len;
+  if(UIP_IP_BUF->len[1] < temp_len) {
+    UIP_IP_BUF->len[0]++;
+  }
+
+  uip_ext_len += ext_len;
+  uip_len += ext_len;
+
+  return 1;
+}
+#else /* RPL_WITH_NON_STORING */
+int insert_srh_header(void);
+#endif /* RPL_WITH_NON_STORING */
+/*---------------------------------------------------------------------------*/
+static int
+update_hbh_header(void)
 {
   rpl_instance_t *instance;
   int uip_ext_opt_offset;
@@ -212,36 +481,27 @@ rpl_update_header_empty(void)
     if(UIP_HBHO_BUF->len != RPL_HOP_BY_HOP_LEN - 8) {
       PRINTF("RPL: Hop-by-hop extension header has wrong size\n");
       uip_ext_len = last_uip_ext_len;
-      return 0;
+      return 1;
     }
     if(UIP_EXT_HDR_OPT_RPL_BUF->opt_type != UIP_EXT_HDR_OPT_RPL) {
       PRINTF("RPL: Non RPL Hop-by-hop option support not implemented\n");
       uip_ext_len = last_uip_ext_len;
-      return 0;
+      return 1;
     }
     if(UIP_EXT_HDR_OPT_RPL_BUF->opt_len != RPL_HDR_OPT_LEN) {
       PRINTF("RPL: RPL Hop-by-hop option has wrong length\n");
       uip_ext_len = last_uip_ext_len;
-      return 0;
+      return 1;
     }
     instance = rpl_get_instance(UIP_EXT_HDR_OPT_RPL_BUF->instance);
     if(instance == NULL || !instance->used || !instance->current_dag->joined) {
       PRINTF("RPL: Unable to add hop-by-hop extension header: incorrect instance\n");
-      return 0;
+      return 1;
     }
     break;
   default:
-#if RPL_INSERT_HBH_OPTION
-    PRINTF("RPL: No hop-by-hop option found, creating it\n");
-    if(uip_len + RPL_HOP_BY_HOP_LEN > UIP_BUFSIZE) {
-      PRINTF("RPL: Packet too long: impossible to add hop-by-hop option\n");
-      uip_ext_len = last_uip_ext_len;
-      return 0;
-    }
-    set_rpl_opt(uip_ext_opt_offset);
-    uip_ext_len = last_uip_ext_len + RPL_HOP_BY_HOP_LEN;
-#endif
-    return 0;
+    PRINTF("RPL: No hop-by-hop option found\n");
+    return 1;
   }
 
   switch(UIP_EXT_HDR_OPT_BUF->type) {
@@ -249,51 +509,98 @@ rpl_update_header_empty(void)
     PRINTF("RPL: Updating RPL option\n");
     UIP_EXT_HDR_OPT_RPL_BUF->senderrank = UIP_HTONS(instance->current_dag->rank);
 
-    /* Check the direction of the down flag, as per Section 11.2.2.3,
-       which states that if a packet is going down it should in
-       general not go back up again. If this happens, a
-       RPL_HDR_OPT_FWD_ERR should be flagged. */
-    if((UIP_EXT_HDR_OPT_RPL_BUF->flags & RPL_HDR_OPT_DOWN)) {
-      if(uip_ds6_route_lookup(&UIP_IP_BUF->destipaddr) == NULL) {
-        UIP_EXT_HDR_OPT_RPL_BUF->flags |= RPL_HDR_OPT_FWD_ERR;
-        PRINTF("RPL forwarding error\n");
-        /* We should send back the packet to the originating parent,
-           but it is not feasible yet, so we send a No-Path DAO instead */
-        PRINTF("RPL generate No-Path DAO\n");
-        parent = rpl_get_parent((uip_lladdr_t *)packetbuf_addr(PACKETBUF_ADDR_SENDER));
-        if(parent != NULL) {
-          dao_output_target(parent, &UIP_IP_BUF->destipaddr, RPL_ZERO_LIFETIME);
+    if(RPL_IS_STORING(instance)) { /* In non-storing mode, downwards traffic does not have the HBH option */
+      /* Check the direction of the down flag, as per Section 11.2.2.3,
+         which states that if a packet is going down it should in
+         general not go back up again. If this happens, a
+         RPL_HDR_OPT_FWD_ERR should be flagged. */
+      if((UIP_EXT_HDR_OPT_RPL_BUF->flags & RPL_HDR_OPT_DOWN)) {
+        if(uip_ds6_route_lookup(&UIP_IP_BUF->destipaddr) == NULL) {
+          UIP_EXT_HDR_OPT_RPL_BUF->flags |= RPL_HDR_OPT_FWD_ERR;
+          PRINTF("RPL forwarding error\n");
+          /* We should send back the packet to the originating parent,
+             but it is not feasible yet, so we send a No-Path DAO instead */
+          PRINTF("RPL generate No-Path DAO\n");
+          parent = rpl_get_parent((uip_lladdr_t *)packetbuf_addr(PACKETBUF_ADDR_SENDER));
+          if(parent != NULL) {
+            dao_output_target(parent, &UIP_IP_BUF->destipaddr, RPL_ZERO_LIFETIME);
+          }
+          /* Drop packet */
+          return 0;
         }
-        /* Drop packet */
-        return 1;
-      }
-    } else {
-      /* Set the down extension flag correctly as described in Section
-         11.2 of RFC6550. If the packet progresses along a DAO route,
-         the down flag should be set. */
-      if(uip_ds6_route_lookup(&UIP_IP_BUF->destipaddr) == NULL) {
-        /* No route was found, so this packet will go towards the RPL
-           root. If so, we should not set the down flag. */
-        UIP_EXT_HDR_OPT_RPL_BUF->flags &= ~RPL_HDR_OPT_DOWN;
-        PRINTF("RPL option going up\n");
       } else {
-        /* A DAO route was found so we set the down flag. */
-        UIP_EXT_HDR_OPT_RPL_BUF->flags |= RPL_HDR_OPT_DOWN;
-        PRINTF("RPL option going down\n");
+        /* Set the down extension flag correctly as described in Section
+           11.2 of RFC6550. If the packet progresses along a DAO route,
+           the down flag should be set. */
+        if(uip_ds6_route_lookup(&UIP_IP_BUF->destipaddr) == NULL) {
+          /* No route was found, so this packet will go towards the RPL
+             root. If so, we should not set the down flag. */
+          UIP_EXT_HDR_OPT_RPL_BUF->flags &= ~RPL_HDR_OPT_DOWN;
+          PRINTF("RPL option going up\n");
+        } else {
+          /* A DAO route was found so we set the down flag. */
+          UIP_EXT_HDR_OPT_RPL_BUF->flags |= RPL_HDR_OPT_DOWN;
+          PRINTF("RPL option going down\n");
+        }
       }
     }
 
     uip_ext_len = last_uip_ext_len;
-    return 0;
+    return 1;
   default:
     PRINTF("RPL: Multi Hop-by-hop options not implemented\n");
     uip_ext_len = last_uip_ext_len;
-    return 0;
+    return 1;
   }
 }
 /*---------------------------------------------------------------------------*/
+static int
+insert_hbh_header(void)
+{
+  int uip_ext_opt_offset;
+  int last_uip_ext_len;
+  uint8_t temp_len;
+
+  last_uip_ext_len = uip_ext_len;
+  uip_ext_len = 0;
+  uip_ext_opt_offset = 2;
+
+  /* Insert hop-by-hop header */
+  PRINTF("RPL: Creating hop-by-hop option\n");
+  if(uip_len + RPL_HOP_BY_HOP_LEN > UIP_BUFSIZE) {
+    PRINTF("RPL: Packet too long: impossible to add hop-by-hop option\n");
+    uip_ext_len = last_uip_ext_len;
+    return 0;
+  }
+
+  /* Move existing ext headers and payload UIP_EXT_BUF further */
+  memmove(UIP_HBHO_NEXT_BUF, UIP_EXT_BUF, uip_len - UIP_IPH_LEN);
+  memset(UIP_HBHO_BUF, 0, RPL_HOP_BY_HOP_LEN);
+
+  /* Update IP and HBH protocol and fields */
+  UIP_HBHO_BUF->next = UIP_IP_BUF->proto;
+  UIP_IP_BUF->proto = UIP_PROTO_HBHO;
+
+  /* Initialize HBH option */
+  UIP_HBHO_BUF->len = (RPL_HOP_BY_HOP_LEN - 8) / 8;
+  UIP_EXT_HDR_OPT_RPL_BUF->opt_type = UIP_EXT_HDR_OPT_RPL;
+  UIP_EXT_HDR_OPT_RPL_BUF->opt_len = RPL_HDR_OPT_LEN;
+  UIP_EXT_HDR_OPT_RPL_BUF->flags = 0;
+  UIP_EXT_HDR_OPT_RPL_BUF->instance = 0;
+  UIP_EXT_HDR_OPT_RPL_BUF->senderrank = 0;
+  uip_len += RPL_HOP_BY_HOP_LEN;
+  temp_len = UIP_IP_BUF->len[1];
+  UIP_IP_BUF->len[1] += UIP_HBHO_BUF->len + 8;
+  if(UIP_IP_BUF->len[1] < temp_len) {
+    UIP_IP_BUF->len[0]++;
+  }
+
+  uip_ext_len = last_uip_ext_len + RPL_HOP_BY_HOP_LEN;
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
 int
-rpl_update_header_final(uip_ipaddr_t *addr)
+rpl_finalize_header(uip_ipaddr_t *addr)
 {
   rpl_parent_t *parent;
   int uip_ext_opt_offset;
@@ -307,7 +614,7 @@ rpl_update_header_final(uip_ipaddr_t *addr)
     if(UIP_HBHO_BUF->len != RPL_HOP_BY_HOP_LEN - 8) {
       PRINTF("RPL: Non RPL Hop-by-hop options support not implemented\n");
       uip_ext_len = last_uip_ext_len;
-      return 0;
+      return 1;
     }
 
     if(UIP_EXT_HDR_OPT_BUF->type == UIP_EXT_HDR_OPT_RPL) {
@@ -315,7 +622,7 @@ rpl_update_header_final(uip_ipaddr_t *addr)
         PRINTF("RPL: Updating RPL option\n");
         if(default_instance == NULL || !default_instance->used || !default_instance->current_dag->joined) {
           PRINTF("RPL: Unable to add hop-by-hop extension header: incorrect default instance\n");
-          return 1;
+          return 0;
         }
         parent = rpl_find_parent(default_instance->current_dag, addr);
         if(parent == NULL || parent != parent->dag->preferred_parent) {
@@ -326,78 +633,101 @@ rpl_update_header_final(uip_ipaddr_t *addr)
       }
     }
   }
-  return 0;
+  return 1;
 }
 /*---------------------------------------------------------------------------*/
 void
 rpl_remove_header(void)
 {
   uint8_t temp_len;
+  uint8_t rpl_ext_hdr_len;
+  uint8_t *uip_next_hdr;
 
   uip_ext_len = 0;
+  uip_next_hdr = &UIP_IP_BUF->proto;
 
-  PRINTF("RPL: Verifying the presence of the RPL header option\n");
-  switch(UIP_IP_BUF->proto){
-  case UIP_PROTO_HBHO:
-    PRINTF("RPL: Removing the RPL header option\n");
-    UIP_IP_BUF->proto = UIP_HBHO_BUF->next;
-    temp_len = UIP_IP_BUF->len[1];
-    uip_len -= UIP_HBHO_BUF->len + 8;
-    UIP_IP_BUF->len[1] -= UIP_HBHO_BUF->len + 8;
-    if(UIP_IP_BUF->len[1] > temp_len) {
-      UIP_IP_BUF->len[0]--;
+  PRINTF("RPL: Verifying the presence of RPL extension headers\n");
+
+  /* Look for hop-by-hop and routing headers */
+  while(uip_next_hdr != NULL) {
+    switch(*uip_next_hdr) {
+      case UIP_PROTO_TCP:
+      case UIP_PROTO_UDP:
+      case UIP_PROTO_ICMP6:
+      case UIP_PROTO_NONE:
+        return;
+      case UIP_PROTO_HBHO:
+      case UIP_PROTO_ROUTING:
+        /* Remove hop-by-hop and routing headers */
+        *uip_next_hdr = UIP_EXT_BUF->next;
+        rpl_ext_hdr_len = (UIP_EXT_BUF->len * 8) + 8;
+        temp_len = UIP_IP_BUF->len[1];
+        uip_len -= rpl_ext_hdr_len;
+        UIP_IP_BUF->len[1] -= rpl_ext_hdr_len;
+        if(UIP_IP_BUF->len[1] > temp_len) {
+          UIP_IP_BUF->len[0]--;
+        }
+        PRINTF("RPL: Removing RPL extension header (type %u, len %u)\n", *uip_next_hdr, rpl_ext_hdr_len);
+        memmove(UIP_EXT_BUF, ((uint8_t *)UIP_EXT_BUF) + rpl_ext_hdr_len, uip_len - UIP_IPH_LEN);
+        break;
+      default:
+        /* Move to next header */
+        if(uip_next_hdr != &UIP_IP_BUF->proto) {
+          uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
+        }
+        uip_next_hdr = &UIP_EXT_BUF->next;
+        break;
     }
-    memmove(UIP_EXT_BUF, UIP_HBHO_NEXT_BUF, uip_len - UIP_IPH_LEN);
-    break;
-  default:
-    PRINTF("RPL: No hop-by-hop Option found\n");
-  }
-}
-/*---------------------------------------------------------------------------*/
-uint8_t
-rpl_invert_header(void)
-{
-  uint8_t uip_ext_opt_offset;
-  uint8_t last_uip_ext_len;
-
-  last_uip_ext_len = uip_ext_len;
-  uip_ext_len = 0;
-  uip_ext_opt_offset = 2;
-
-  PRINTF("RPL: Verifying the presence of the RPL header option\n");
-  switch(UIP_IP_BUF->proto) {
-  case UIP_PROTO_HBHO:
-    break;
-  default:
-    PRINTF("RPL: No hop-by-hop Option found\n");
-    uip_ext_len = last_uip_ext_len;
-    return 0;
-  }
-
-  switch (UIP_EXT_HDR_OPT_BUF->type) {
-  case UIP_EXT_HDR_OPT_RPL:
-    PRINTF("RPL: Updating RPL option (switching direction)\n");
-    UIP_EXT_HDR_OPT_RPL_BUF->flags &= RPL_HDR_OPT_DOWN;
-    UIP_EXT_HDR_OPT_RPL_BUF->flags ^= RPL_HDR_OPT_DOWN;
-    UIP_EXT_HDR_OPT_RPL_BUF->senderrank = UIP_HTONS(rpl_get_instance(UIP_EXT_HDR_OPT_RPL_BUF->instance)->current_dag->rank);
-    uip_ext_len = last_uip_ext_len;
-    return RPL_HOP_BY_HOP_LEN;
-  default:
-    PRINTF("RPL: Multi Hop-by-hop options not implemented\n");
-    uip_ext_len = last_uip_ext_len;
-    return 0;
   }
 }
 /*---------------------------------------------------------------------------*/
 void
 rpl_insert_header(void)
 {
-#if RPL_INSERT_HBH_OPTION
-  if(default_instance != NULL && !uip_is_addr_mcast(&UIP_IP_BUF->destipaddr)) {
-    rpl_update_header_empty();
+  if(default_instance == NULL) {
+    return;
+  }
+
+  if(RPL_IS_STORING(default_instance)) {
+    if(!uip_is_addr_mcast(&UIP_IP_BUF->destipaddr)) {
+      insert_hbh_header();
+    }
+  }
+
+  if(RPL_IS_NON_STORING(default_instance)) {
+    if(default_instance->current_dag != NULL) {
+      if(default_instance->current_dag->rank == ROOT_RANK(default_instance)) {
+        insert_srh_header();
+      } else {
+        insert_hbh_header();
+      }
+    }
   }
-#endif
 }
 /*---------------------------------------------------------------------------*/
+int
+rpl_update_header(void)
+{
+  if(default_instance == NULL) {
+    return 0;
+  }
+
+  if(default_instance->current_dag != NULL) {
+    if(default_instance->current_dag->rank == ROOT_RANK(default_instance)) {
+      /* At the root, remove headers if any, and insert SRH or HBH
+       * (SRH is inserted only if the destination is in the DODAG) */
+      rpl_remove_header();
+      if(RPL_IS_NON_STORING(default_instance)) {
+        return insert_srh_header();
+      } else {
+        return insert_hbh_header();
+      }
+    } else {
+      return update_hbh_header();
+    }
+  } else {
+    return 0;
+  }
+}
 
 /** @}*/
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 6ea9b3e02..02f1d2244 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -51,6 +51,7 @@
 #include "net/ipv6/uip-nd6.h"
 #include "net/ipv6/uip-icmp6.h"
 #include "net/rpl/rpl-private.h"
+#include "net/rpl/rpl-ns.h"
 #include "net/packetbuf.h"
 #include "net/ipv6/multicast/uip-mcast6.h"
 #include "random.h"
@@ -119,6 +120,7 @@ find_route_entry_by_dao_ack(uint8_t seq)
 }
 #endif /* RPL_WITH_DAO_ACK */
 
+#if RPL_WITH_STORING
 /* prepare for forwarding of DAO */
 static uint8_t
 prepare_for_dao_fwd(uint8_t sequence, uip_ds6_route_t *rep)
@@ -132,6 +134,7 @@ prepare_for_dao_fwd(uint8_t sequence, uip_ds6_route_t *rep)
   RPL_ROUTE_SET_DAO_PENDING(rep);
   return dao_sequence;
 }
+#endif /* RPL_WITH_STORING */
 /*---------------------------------------------------------------------------*/
 static int
 get_global_addr(uip_ipaddr_t *addr)
@@ -626,8 +629,9 @@ dio_output(rpl_instance_t *instance, uip_ipaddr_t *uc_addr)
 }
 /*---------------------------------------------------------------------------*/
 static void
-dao_input(void)
+dao_input_storing(void)
 {
+#if RPL_WITH_STORING
   uip_ipaddr_t dao_sender_addr;
   rpl_dag_t *dag;
   rpl_instance_t *instance;
@@ -665,11 +669,6 @@ dao_input(void)
   instance_id = buffer[pos++];
 
   instance = rpl_get_instance(instance_id);
-  if(instance == NULL) {
-    PRINTF("RPL: Ignoring a DAO for an unknown RPL instance(%u)\n",
-           instance_id);
-    goto discard;
-  }
 
   lifetime = instance->default_lifetime;
 
@@ -685,7 +684,7 @@ dao_input(void)
   if(flags & RPL_DAO_D_FLAG) {
     if(memcmp(&dag->dag_id, &buffer[pos], sizeof(dag->dag_id))) {
       PRINTF("RPL: Ignoring a DAO for a DAG different from ours\n");
-      goto discard;
+      return;
     }
     pos += 16;
   }
@@ -710,7 +709,7 @@ dao_input(void)
           DAG_RANK(parent->rank, instance), DAG_RANK(dag->rank, instance));
       parent->rank = INFINITE_RANK;
       parent->flags |= RPL_PARENT_FLAG_UPDATED;
-      goto discard;
+      return;
     }
 
     /* If we get the DAO from our parent, we also have a loop. */
@@ -718,7 +717,7 @@ dao_input(void)
       PRINTF("RPL: Loop detected when receiving a unicast DAO from our parent\n");
       parent->rank = INFINITE_RANK;
       parent->flags |= RPL_PARENT_FLAG_UPDATED;
-      goto discard;
+      return;
     }
   }
 
@@ -805,7 +804,7 @@ dao_input(void)
       dao_ack_output(instance, &dao_sender_addr, sequence,
                      RPL_DAO_ACK_UNCONDITIONAL_ACCEPT);
     }
-    goto discard;
+    return;
   }
 
   PRINTF("RPL: Adding DAO route\n");
@@ -823,7 +822,7 @@ dao_input(void)
 		     is_root ? RPL_DAO_ACK_UNABLE_TO_ADD_ROUTE_AT_ROOT :
 		     RPL_DAO_ACK_UNABLE_TO_ACCEPT);
     }
-    goto discard;
+    return;
   }
 
   rep = rpl_add_route(dag, &prefix, prefixlen, &dao_sender_addr);
@@ -836,7 +835,7 @@ dao_input(void)
 		     is_root ? RPL_DAO_ACK_UNABLE_TO_ADD_ROUTE_AT_ROOT :
 		     RPL_DAO_ACK_UNABLE_TO_ACCEPT);
     }
-    goto discard;
+    return;
   }
 
   /* set lifetime and clear NOPATH bit */
@@ -892,6 +891,141 @@ fwd_dao:
                      RPL_DAO_ACK_UNCONDITIONAL_ACCEPT);
     }
   }
+#endif /* RPL_WITH_STORING */
+}
+/*---------------------------------------------------------------------------*/
+static void
+dao_input_nonstoring(void)
+{
+#if RPL_WITH_NON_STORING
+  uip_ipaddr_t dao_sender_addr;
+  uip_ipaddr_t dao_parent_addr;
+  rpl_dag_t *dag;
+  rpl_instance_t *instance;
+  unsigned char *buffer;
+  uint16_t sequence;
+  uint8_t instance_id;
+  uint8_t lifetime;
+  uint8_t prefixlen;
+  uint8_t flags;
+  uint8_t subopt_type;
+  uip_ipaddr_t prefix;
+  uint8_t buffer_length;
+  int pos;
+  int len;
+  int i;
+
+  prefixlen = 0;
+
+  uip_ipaddr_copy(&dao_sender_addr, &UIP_IP_BUF->srcipaddr);
+  memset(&dao_parent_addr, 0, 16);
+
+  buffer = UIP_ICMP_PAYLOAD;
+  buffer_length = uip_len - uip_l3_icmp_hdr_len;
+
+  pos = 0;
+  instance_id = buffer[pos++];
+  instance = rpl_get_instance(instance_id);
+  lifetime = instance->default_lifetime;
+
+  flags = buffer[pos++];
+  /* reserved */
+  pos++;
+  sequence = buffer[pos++];
+
+  dag = instance->current_dag;
+  /* Is the DAG ID present? */
+  if(flags & RPL_DAO_D_FLAG) {
+    if(memcmp(&dag->dag_id, &buffer[pos], sizeof(dag->dag_id))) {
+      PRINTF("RPL: Ignoring a DAO for a DAG different from ours\n");
+      return;
+    }
+    pos += 16;
+  }
+
+  /* Check if there are any RPL options present. */
+  for(i = pos; i < buffer_length; i += len) {
+    subopt_type = buffer[i];
+    if(subopt_type == RPL_OPTION_PAD1) {
+      len = 1;
+    } else {
+      /* The option consists of a two-byte header and a payload. */
+      len = 2 + buffer[i + 1];
+    }
+
+    switch(subopt_type) {
+    case RPL_OPTION_TARGET:
+      /* Handle the target option. */
+      prefixlen = buffer[i + 3];
+      memset(&prefix, 0, sizeof(prefix));
+      memcpy(&prefix, buffer + i + 4, (prefixlen + 7) / CHAR_BIT);
+      break;
+    case RPL_OPTION_TRANSIT:
+      /* The path sequence and control are ignored. */
+      /*      pathcontrol = buffer[i + 3];
+              pathsequence = buffer[i + 4];*/
+      lifetime = buffer[i + 5];
+      if(len >= 20) {
+        memcpy(&dao_parent_addr, buffer + i + 6, 16);
+      }
+      break;
+    }
+  }
+
+  PRINTF("RPL: DAO lifetime: %u, prefix length: %u prefix: ",
+          (unsigned)lifetime, (unsigned)prefixlen);
+  PRINT6ADDR(&prefix);
+  PRINTF(", parent: ");
+  PRINT6ADDR(&dao_parent_addr);
+  PRINTF(" \n");
+
+  if(lifetime == RPL_ZERO_LIFETIME) {
+    PRINTF("RPL: No-Path DAO received\n");
+    rpl_ns_expire_parent(dag, &prefix, &dao_parent_addr);
+  } else {
+    if(rpl_ns_update_node(dag, &prefix, &dao_parent_addr, RPL_LIFETIME(instance, lifetime)) == NULL) {
+      PRINTF("RPL: failed to add link\n");
+      return;
+    }
+  }
+
+  if(flags & RPL_DAO_K_FLAG) {
+    PRINTF("RPL: Sending DAO ACK\n");
+    uip_clear_buf();
+    dao_ack_output(instance, &dao_sender_addr, sequence,
+        RPL_DAO_ACK_UNCONDITIONAL_ACCEPT);
+  }
+#endif /* RPL_WITH_NON_STORING */
+}
+/*---------------------------------------------------------------------------*/
+static void
+dao_input(void)
+{
+  rpl_instance_t *instance;
+  uint8_t instance_id;
+
+  /* Destination Advertisement Object */
+  PRINTF("RPL: Received a DAO from ");
+  PRINT6ADDR(&UIP_IP_BUF->srcipaddr);
+  PRINTF("\n");
+
+  instance_id = UIP_ICMP_PAYLOAD[0];
+  instance = rpl_get_instance(instance_id);
+  if(instance == NULL) {
+    PRINTF("RPL: Ignoring a DAO for an unknown RPL instance(%u)\n",
+           instance_id);
+    goto discard;
+  }
+
+  if(instance->mop != RPL_MOP_NON_STORING) {
+    if(RPL_IS_STORING(instance)) {
+      dao_input_storing();
+    }
+  } else {
+    if(RPL_IS_NON_STORING(instance)) {
+      dao_input_nonstoring();
+    }
+  }
 
  discard:
   uip_clear_buf();
@@ -1006,6 +1140,8 @@ dao_output_target_seq(rpl_parent_t *parent, uip_ipaddr_t *prefix,
   unsigned char *buffer;
   uint8_t prefixlen;
   int pos;
+  uip_ipaddr_t *parent_ipaddr = NULL;
+  uip_ipaddr_t *dest_ipaddr = NULL;
 
   /* Destination Advertisement Object */
 
@@ -1019,6 +1155,12 @@ dao_output_target_seq(rpl_parent_t *parent, uip_ipaddr_t *prefix,
     return;
   }
 
+  parent_ipaddr = rpl_get_parent_ipaddr(parent);
+  if(parent_ipaddr == NULL) {
+    PRINTF("RPL dao_output_target error parent IP address NULL\n");
+    return;
+  }
+
   dag = parent->dag;
   if(dag == NULL) {
     PRINTF("RPL dao_output_target error dag NULL\n");
@@ -1071,21 +1213,37 @@ dao_output_target_seq(rpl_parent_t *parent, uip_ipaddr_t *prefix,
 
   /* Create a transit information sub-option. */
   buffer[pos++] = RPL_OPTION_TRANSIT;
-  buffer[pos++] = 4;
+  buffer[pos++] = (instance->mop != RPL_MOP_NON_STORING) ? 4 : 20;
   buffer[pos++] = 0; /* flags - ignored */
   buffer[pos++] = 0; /* path control - ignored */
   buffer[pos++] = 0; /* path seq - ignored */
   buffer[pos++] = lifetime;
 
+  if(instance->mop != RPL_MOP_NON_STORING) {
+    /* Send DAO to parent */
+    dest_ipaddr = parent_ipaddr;
+  } else {
+    /* Include parent global IP address */
+    memcpy(buffer + pos, &parent->dag->dag_id, 8); /* Prefix */
+    pos += 8;
+    memcpy(buffer + pos, ((const unsigned char *)parent_ipaddr) + 8, 8); /* Interface identifier */
+    pos += 8;
+    /* Send DAO to root */
+    dest_ipaddr = &parent->dag->dag_id;
+  }
+
   PRINTF("RPL: Sending a %sDAO with sequence number %u, lifetime %u, prefix ",
       lifetime == RPL_ZERO_LIFETIME ? "No-Path " : "", seq_no, lifetime);
+
   PRINT6ADDR(prefix);
   PRINTF(" to ");
-  PRINT6ADDR(rpl_get_parent_ipaddr(parent));
+  PRINT6ADDR(dest_ipaddr);
+  PRINTF(" , parent ");
+  PRINT6ADDR(parent_ipaddr);
   PRINTF("\n");
 
-  if(rpl_get_parent_ipaddr(parent) != NULL) {
-    uip_icmp6_send(rpl_get_parent_ipaddr(parent), ICMP6_RPL, RPL_CODE_DAO, pos);
+  if(dest_ipaddr != NULL) {
+    uip_icmp6_send(dest_ipaddr, ICMP6_RPL, RPL_CODE_DAO, pos);
   }
 }
 /*---------------------------------------------------------------------------*/
diff --git a/core/net/rpl/rpl-ns.c b/core/net/rpl/rpl-ns.c
new file mode 100644
index 000000000..fecd6767e
--- /dev/null
+++ b/core/net/rpl/rpl-ns.c
@@ -0,0 +1,211 @@
+/*
+ * Copyright (c) 2016, Inria.
+ * 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
+ *         RPL non-storing mode specific functions. Includes support for
+ *         source routing.
+ *
+ * \author Simon Duquennoy <simon.duquennoy@inria.fr>
+ */
+
+#include "net/rpl/rpl-conf.h"
+
+#include "net/ip/uip.h"
+#include "net/ip/tcpip.h"
+#include "net/ipv6/uip-ds6.h"
+#include "net/ipv6/uip-icmp6.h"
+#include "net/rpl/rpl-private.h"
+#include "net/rpl/rpl-ns.h"
+#include "lib/list.h"
+#include "lib/memb.h"
+
+#if RPL_WITH_NON_STORING
+
+#define DEBUG DEBUG_NONE
+#include "net/ip/uip-debug.h"
+
+#include <limits.h>
+#include <string.h>
+
+/* Total number of nodes */
+static int num_nodes;
+
+/* Every known node in the network */
+LIST(nodelist);
+MEMB(nodememb, rpl_ns_node_t, RPL_NS_LINK_NUM);
+
+/*---------------------------------------------------------------------------*/
+int
+rpl_ns_num_nodes()
+{
+  return num_nodes;
+}
+/*---------------------------------------------------------------------------*/
+static int
+node_matches_address(const rpl_dag_t *dag, const rpl_ns_node_t *node, const uip_ipaddr_t *addr)
+{
+  return addr != NULL
+      && node != NULL
+      && dag != NULL
+      && dag == node->dag
+      && !memcmp(addr, &node->dag->dag_id, 8)
+      && !memcmp(((const unsigned char *)addr) + 8, node->link_identifier, 8);
+}
+/*---------------------------------------------------------------------------*/
+rpl_ns_node_t *
+rpl_ns_get_node(const rpl_dag_t *dag, const uip_ipaddr_t *addr)
+{
+  rpl_ns_node_t *l;
+  for(l = list_head(nodelist); l != NULL; l = list_item_next(l)) {
+    /* Compare prefix and node identifier */
+    if(node_matches_address(dag, l, addr)) {
+      return l;
+    }
+  }
+  return NULL;
+}
+/*---------------------------------------------------------------------------*/
+int
+rpl_ns_is_node_reachable(const rpl_dag_t *dag, const uip_ipaddr_t *addr)
+{
+  int max_depth = RPL_NS_LINK_NUM;
+  rpl_ns_node_t *node = rpl_ns_get_node(dag, addr);
+  rpl_ns_node_t *root_node = rpl_ns_get_node(dag, dag != NULL ? &dag->dag_id : NULL);
+  while(node != NULL && node != root_node && max_depth > 0) {
+    node = node->parent;
+    max_depth--;
+  }
+  return node != NULL && node == root_node;
+}
+/*---------------------------------------------------------------------------*/
+void
+rpl_ns_expire_parent(rpl_dag_t *dag, const uip_ipaddr_t *child, const uip_ipaddr_t *parent)
+{
+  rpl_ns_node_t *l = rpl_ns_get_node(dag, child);
+  /* Check if parent matches */
+  if(l != NULL && node_matches_address(dag, l->parent, parent)) {
+    l->lifetime = RPL_NOPATH_REMOVAL_DELAY;
+  }
+}
+/*---------------------------------------------------------------------------*/
+rpl_ns_node_t *
+rpl_ns_update_node(rpl_dag_t *dag, const uip_ipaddr_t *child, const uip_ipaddr_t *parent, uint32_t lifetime)
+{
+  rpl_ns_node_t *child_node = rpl_ns_get_node(dag, child);
+  rpl_ns_node_t *parent_node = rpl_ns_get_node(dag, parent);
+
+  if(parent != NULL) {
+    /* No node for the parent, add one with infinite lifetime */
+    if(parent_node == NULL) {
+      parent_node = rpl_ns_update_node(dag, parent, NULL, 0xffffffff);
+      if(parent_node == NULL) {
+        return NULL;
+      }
+    }
+  }
+
+  /* No node for this child, add one */
+  if(child_node == NULL) {
+    child_node = memb_alloc(&nodememb);
+    /* No space left, abort */
+    if(child_node == NULL) {
+      return NULL;
+    }
+    list_add(nodelist, child_node);
+    num_nodes++;
+  }
+
+  /* Initialize node */
+  child_node->dag = dag;
+  child_node->lifetime = lifetime;
+  child_node->parent = parent_node;
+  memcpy(child_node->link_identifier, ((const unsigned char *)child) + 8, 8);
+
+  return child_node;
+}
+/*---------------------------------------------------------------------------*/
+void
+rpl_ns_init()
+{
+  num_nodes = 0;
+  memb_init(&nodememb);
+  list_init(nodelist);
+}
+/*---------------------------------------------------------------------------*/
+rpl_ns_node_t *rpl_ns_node_head()
+{
+  return list_head(nodelist);
+}
+/*---------------------------------------------------------------------------*/
+rpl_ns_node_t *rpl_ns_node_next(rpl_ns_node_t *item)
+{
+  return list_item_next(item);
+}
+/*---------------------------------------------------------------------------*/
+void
+rpl_ns_get_node_global_addr(uip_ipaddr_t *addr, rpl_ns_node_t *node)
+{
+  if(addr != NULL && node != NULL && node->dag != NULL) {
+    memcpy(addr, &node->dag->dag_id, 8);
+    memcpy(((unsigned char *)addr) + 8, &node->link_identifier, 8);
+  }
+}
+/*---------------------------------------------------------------------------*/
+void
+rpl_ns_periodic()
+{
+  rpl_ns_node_t *l;
+  /* First pass, decrement lifetime for all nodes with non-infinite lifetime */
+  for(l = list_head(nodelist); l != NULL; l = list_item_next(l)) {
+    /* Don't touch infinite lifetime nodes */
+    if(l->lifetime != 0xffffffff && l->lifetime > 0) {
+      l->lifetime--;
+    }
+  }
+  /* Second pass, for all expire nodes, deallocate them iff no child points to them */
+  for(l = list_head(nodelist); l != NULL; l = list_item_next(l)) {
+    if(l->lifetime == 0) {
+      rpl_ns_node_t *l2;
+      for(l2 = list_head(nodelist); l2 != NULL; l2 = list_item_next(l2)) {
+        if(l2->parent == l) {
+          break;
+        }
+      }
+      /* No child found, deallocate node */
+      list_remove(nodelist, l);
+      memb_free(&nodememb, l);
+      num_nodes--;
+    }
+  }
+}
+
+#endif /* RPL_WITH_NON_STORING */
diff --git a/core/net/rpl/rpl-ns.h b/core/net/rpl/rpl-ns.h
new file mode 100644
index 000000000..8abc68df2
--- /dev/null
+++ b/core/net/rpl/rpl-ns.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2016, Inria.
+ * 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
+ *         RPL non-storing mode specific functions. Includes support for
+ *         source routing.
+ *
+ * \author Simon Duquennoy <simon.duquennoy@inria.fr>
+ */
+
+
+#ifndef RPL_NS_H
+#define RPL_NS_H
+
+#include "rpl-conf.h"
+
+#ifdef RPL_NS_CONF_LINK_NUM
+#define RPL_NS_LINK_NUM RPL_NS_CONF_LINK_NUM
+#else /* RPL_NS_CONF_LINK_NUM */
+#define RPL_NS_LINK_NUM 32
+#endif /* RPL_NS_CONF_LINK_NUM */
+
+typedef struct rpl_ns_node {
+  struct rpl_ns_node *next;
+  uint32_t lifetime;
+  rpl_dag_t *dag;
+  /* Store only IPv6 link identifiers as all nodes in the DAG share the same prefix */
+  unsigned char link_identifier[8];
+  struct rpl_ns_node *parent;
+} rpl_ns_node_t;
+
+int rpl_ns_num_nodes();
+void rpl_ns_expire_parent(rpl_dag_t *dag, const uip_ipaddr_t *child, const uip_ipaddr_t *parent);
+rpl_ns_node_t *rpl_ns_update_node(rpl_dag_t *dag, const uip_ipaddr_t *child, const uip_ipaddr_t *parent, uint32_t lifetime);
+void rpl_ns_init();
+rpl_ns_node_t *rpl_ns_node_head();
+rpl_ns_node_t *rpl_ns_node_next(rpl_ns_node_t *item);
+rpl_ns_node_t *rpl_ns_get_node(const rpl_dag_t *dag, const uip_ipaddr_t *addr);
+int rpl_ns_is_node_reachable(const rpl_dag_t *dag, const uip_ipaddr_t *addr);
+void rpl_ns_get_node_global_addr(uip_ipaddr_t *addr, rpl_ns_node_t *node);
+void rpl_ns_periodic();
+
+#endif /* RPL_NS_H */
diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h
index b127bb9c4..72ac12198 100644
--- a/core/net/rpl/rpl-private.h
+++ b/core/net/rpl/rpl-private.h
@@ -102,6 +102,9 @@
 /* RPL IPv6 extension header option. */
 #define RPL_HDR_OPT_LEN			4
 #define RPL_HOP_BY_HOP_LEN		(RPL_HDR_OPT_LEN + 2 + 2)
+#define RPL_RH_LEN     4
+#define RPL_SRH_LEN    4
+#define RPL_RH_TYPE_SRH   3
 #define RPL_HDR_OPT_DOWN		0x80
 #define RPL_HDR_OPT_DOWN_SHIFT  	7
 #define RPL_HDR_OPT_RANK_ERR		0x40
diff --git a/core/net/rpl/rpl-timers.c b/core/net/rpl/rpl-timers.c
index abb668174..1a159e5bb 100644
--- a/core/net/rpl/rpl-timers.c
+++ b/core/net/rpl/rpl-timers.c
@@ -43,6 +43,7 @@
 
 #include "contiki-conf.h"
 #include "net/rpl/rpl-private.h"
+#include "net/rpl/rpl-ns.h"
 #include "net/link-stats.h"
 #include "net/ipv6/multicast/uip-mcast6.h"
 #include "lib/random.h"
@@ -80,14 +81,21 @@ static uint8_t dio_send_ok;
 static void
 handle_periodic_timer(void *ptr)
 {
+  rpl_dag_t *dag = rpl_get_any_dag();
+
   rpl_purge_dags();
-  rpl_purge_routes();
+  if(dag != NULL && RPL_IS_STORING(dag->instance)) {
+    rpl_purge_routes();
+  }
+  if(dag != NULL && RPL_IS_NON_STORING(dag->instance)) {
+    rpl_ns_periodic();
+  }
   rpl_recalculate_ranks();
 
   /* handle DIS */
 #if RPL_DIS_SEND
   next_dis++;
-  if(rpl_get_any_dag() == NULL && next_dis >= RPL_DIS_INTERVAL) {
+  if(dag == NULL && next_dis >= RPL_DIS_INTERVAL) {
     next_dis = 0;
     dis_output(NULL);
   }
diff --git a/core/net/rpl/rpl.c b/core/net/rpl/rpl.c
index 145ec1cd1..fd03e3cb6 100644
--- a/core/net/rpl/rpl.c
+++ b/core/net/rpl/rpl.c
@@ -47,6 +47,7 @@
 #include "net/ipv6/uip-ds6.h"
 #include "net/ipv6/uip-icmp6.h"
 #include "net/rpl/rpl-private.h"
+#include "net/rpl/rpl-ns.h"
 #include "net/ipv6/multicast/uip-mcast6.h"
 
 #define DEBUG DEBUG_NONE
@@ -344,6 +345,10 @@ rpl_init(void)
 #if RPL_CONF_STATS
   memset(&rpl_stats, 0, sizeof(rpl_stats));
 #endif
+
+#if RPL_WITH_NON_STORING
+  rpl_ns_init();
+#endif /* RPL_WITH_NON_STORING */
 }
 /*---------------------------------------------------------------------------*/
 
diff --git a/core/net/rpl/rpl.h b/core/net/rpl/rpl.h
index 89bc70ae8..26ee71edc 100644
--- a/core/net/rpl/rpl.h
+++ b/core/net/rpl/rpl.h
@@ -271,14 +271,14 @@ rpl_dag_t *rpl_set_root(uint8_t instance_id, uip_ipaddr_t *dag_id);
 int rpl_set_prefix(rpl_dag_t *dag, uip_ipaddr_t *prefix, unsigned len);
 int rpl_repair_root(uint8_t instance_id);
 int rpl_set_default_route(rpl_instance_t *instance, uip_ipaddr_t *from);
+rpl_dag_t *rpl_get_dag(const uip_ipaddr_t *addr);
 rpl_dag_t *rpl_get_any_dag(void);
 rpl_instance_t *rpl_get_instance(uint8_t instance_id);
-int rpl_update_header_empty(void);
-int rpl_update_header_final(uip_ipaddr_t *addr);
-int rpl_verify_header(int);
+int rpl_update_header(void);
+int rpl_finalize_header(uip_ipaddr_t *addr);
+int rpl_verify_hbh_header(int);
 void rpl_insert_header(void);
 void rpl_remove_header(void);
-uint8_t rpl_invert_header(void);
 const struct link_stats *rpl_get_parent_link_stats(rpl_parent_t *p);
 int rpl_parent_is_fresh(rpl_parent_t *p);
 int rpl_parent_is_reachable(rpl_parent_t *p);
@@ -291,6 +291,8 @@ rpl_rank_t rpl_get_parent_rank(uip_lladdr_t *addr);
 void rpl_dag_init(void);
 uip_ds6_nbr_t *rpl_get_nbr(rpl_parent_t *parent);
 void rpl_print_neighbor_list(void);
+int rpl_process_srh_header(void);
+int rpl_srh_get_next_hop(uip_ipaddr_t *ipaddr);
 
 /* Per-parent RPL information */
 NBR_TABLE_DECLARE(rpl_parents);

From ed11320dc30e1ea7c228a663868ae90fa75d17dc Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Thu, 4 Feb 2016 23:00:03 +0100
Subject: [PATCH 327/393] Platform cooja: provision 300 links for RPL
 non-storing mode

---
 platform/cooja/contiki-conf.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform/cooja/contiki-conf.h b/platform/cooja/contiki-conf.h
index f4972d28f..91c93a3b4 100644
--- a/platform/cooja/contiki-conf.h
+++ b/platform/cooja/contiki-conf.h
@@ -136,6 +136,9 @@
 #ifndef UIP_CONF_MAX_ROUTES
 #define UIP_CONF_MAX_ROUTES   300
 #endif /* UIP_CONF_MAX_ROUTES */
+#ifndef RPL_NS_CONF_LINK_NUM
+#define RPL_NS_CONF_LINK_NUM 300
+#endif /* RPL_NS_CONF_LINK_NUM */
 
 #define TCPIP_CONF_ANNOTATE_TRANSMISSIONS 1
 

From 0be30628ce1be67ef75d731160081237c21e63b6 Mon Sep 17 00:00:00 2001
From: Yasuyuki Tanaka <yasuyuki.tanaka@inf.ethz.ch>
Date: Mon, 15 Feb 2016 19:04:40 +0100
Subject: [PATCH 328/393] Enable the root to send back a DAO-ACK

---
 core/net/rpl/rpl-ext-header.c | 34 ++++++++++++++++++++++------------
 core/net/rpl/rpl-icmp6.c      |  1 +
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/core/net/rpl/rpl-ext-header.c b/core/net/rpl/rpl-ext-header.c
index 85f770dfc..da38bce07 100644
--- a/core/net/rpl/rpl-ext-header.c
+++ b/core/net/rpl/rpl-ext-header.c
@@ -180,9 +180,11 @@ rpl_srh_get_next_hop(uip_ipaddr_t *ipaddr)
 {
   uint8_t *uip_next_hdr;
   int last_uip_ext_len = uip_ext_len;
+  rpl_dag_t *dag;
 
   uip_ext_len = 0;
   uip_next_hdr = &UIP_IP_BUF->proto;
+  dag = rpl_get_dag(&UIP_IP_BUF->destipaddr);
 
   /* Look for routing header */
   while(uip_next_hdr != NULL && *uip_next_hdr != UIP_PROTO_ROUTING) {
@@ -207,8 +209,10 @@ rpl_srh_get_next_hop(uip_ipaddr_t *ipaddr)
     }
   }
 
-  if(uip_next_hdr != NULL && *uip_next_hdr == UIP_PROTO_ROUTING
-      && UIP_RH_BUF->routing_type == RPL_RH_TYPE_SRH) {
+  if((uip_next_hdr != NULL && *uip_next_hdr == UIP_PROTO_ROUTING
+      && UIP_RH_BUF->routing_type == RPL_RH_TYPE_SRH) ||
+     (default_instance->current_dag->rank == ROOT_RANK(default_instance) &&
+      rpl_ns_get_node(dag, &UIP_IP_BUF->destipaddr) != NULL)) {
     /* Routing header found. The next hop should be already copied as the IPv6 destination
      * address, via rpl_process_srh_header. We turn this address into a link-local to enable
      * forwarding to next hop */
@@ -371,6 +375,12 @@ insert_srh_header(void)
   /* For simplicity, we use cmpri = cmpre */
   cmpri = 15;
   cmpre = 15;
+
+  if(node != NULL && node == root_node) {
+    PRINTF("RPL: SRH no need to insert SRH\n");
+    return 0;
+  }
+
   while(node != NULL && node != root_node) {
 
     rpl_ns_get_node_global_addr(&node_addr, node);
@@ -379,20 +389,20 @@ insert_srh_header(void)
     cmpri = MIN(cmpri, count_matching_bytes(&node_addr, &UIP_IP_BUF->destipaddr, 16));
     cmpre = cmpri;
 
-    PRINTF("RPL: SRH Hop ");
-    PRINT6ADDR(&node_addr);
-    PRINTF("\n");
+    if(node->parent != root_node) {
+      PRINTF("RPL: SRH Hop ");
+      PRINT6ADDR(&node_addr);
+      PRINTF("\n");
+    } else if(((DEBUG) & DEBUG_PRINT)) {
+      rpl_ns_get_node_global_addr(&node_addr, node);
+      PRINTF("RPL: SRH Next Hop ");
+      PRINT6ADDR(&node_addr);
+      PRINTF("\n");
+    }
     node = node->parent;
     path_len++;
   }
 
-  if(((DEBUG) & DEBUG_PRINT) && node != NULL) {
-    rpl_ns_get_node_global_addr(&node_addr, node);
-    PRINTF("RPL: SRH Next Hop ");
-    PRINT6ADDR(&node_addr);
-    PRINTF("\n");
-  }
-
   /* Extension header length: fixed headers + (n-1) * (16-ComprI) + (16-ComprE)*/
   ext_len = RPL_RH_LEN + RPL_SRH_LEN
       + (path_len - 1) * (16 - cmpre)
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 02f1d2244..f31fd616f 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -1348,6 +1348,7 @@ dao_ack_output(rpl_instance_t *instance, uip_ipaddr_t *dest, uint8_t sequence,
   PRINT6ADDR(dest);
   PRINTF(" with status %d\n", status);
 
+  uip_ext_len = 0;
   buffer = UIP_ICMP_PAYLOAD;
 
   buffer[0] = instance->instance_id;

From 97a362acdcf737606a33b1e52cf5c284fe0d0fd9 Mon Sep 17 00:00:00 2001
From: Yasuyuki Tanaka <yasuyuki.tanaka@inf.ethz.ch>
Date: Tue, 16 Feb 2016 15:11:37 +0100
Subject: [PATCH 329/393] Use a stricter check in rpl_srh_get_next_hop()

---
 core/net/rpl/rpl-ext-header.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/net/rpl/rpl-ext-header.c b/core/net/rpl/rpl-ext-header.c
index da38bce07..e0804bbf1 100644
--- a/core/net/rpl/rpl-ext-header.c
+++ b/core/net/rpl/rpl-ext-header.c
@@ -181,10 +181,11 @@ rpl_srh_get_next_hop(uip_ipaddr_t *ipaddr)
   uint8_t *uip_next_hdr;
   int last_uip_ext_len = uip_ext_len;
   rpl_dag_t *dag;
+  rpl_ns_node_t *dest_node;
+  rpl_ns_node_t *root_node;
 
   uip_ext_len = 0;
   uip_next_hdr = &UIP_IP_BUF->proto;
-  dag = rpl_get_dag(&UIP_IP_BUF->destipaddr);
 
   /* Look for routing header */
   while(uip_next_hdr != NULL && *uip_next_hdr != UIP_PROTO_ROUTING) {
@@ -209,11 +210,15 @@ rpl_srh_get_next_hop(uip_ipaddr_t *ipaddr)
     }
   }
 
+  dag = rpl_get_dag(&IP_IP_BUF->destipaddr);
+  root_node = rpl_ns_get_node(dag, &dag->dag_id);
+  dest_node = rpl_ns_get_node(dag, &UIP_IP_BUF->destipaddr);
+
   if((uip_next_hdr != NULL && *uip_next_hdr == UIP_PROTO_ROUTING
       && UIP_RH_BUF->routing_type == RPL_RH_TYPE_SRH) ||
-     (default_instance->current_dag->rank == ROOT_RANK(default_instance) &&
-      rpl_ns_get_node(dag, &UIP_IP_BUF->destipaddr) != NULL)) {
-    /* Routing header found. The next hop should be already copied as the IPv6 destination
+     (dest_node != NULL && root_node != NULL && node->parent == root_node)) {
+    /* Routing header found or the packet destined for a direct child of the root.
+     * The next hop should be already copied as the IPv6 destination
      * address, via rpl_process_srh_header. We turn this address into a link-local to enable
      * forwarding to next hop */
     uip_ipaddr_copy(ipaddr, &UIP_IP_BUF->destipaddr);

From 2abf27a6f73c7f8381dfcdb60e3ccb639beeddf4 Mon Sep 17 00:00:00 2001
From: Yasuyuki Tanaka <yasuyuki.tanaka@inf.ethz.ch>
Date: Tue, 16 Feb 2016 15:14:06 +0100
Subject: [PATCH 330/393] Remove an unnecessary NULL-check in
 insert_srh_header()

---
 core/net/rpl/rpl-ext-header.c | 2 +-
 core/net/rpl/rpl-icmp6.c      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/net/rpl/rpl-ext-header.c b/core/net/rpl/rpl-ext-header.c
index e0804bbf1..171f75722 100644
--- a/core/net/rpl/rpl-ext-header.c
+++ b/core/net/rpl/rpl-ext-header.c
@@ -381,7 +381,7 @@ insert_srh_header(void)
   cmpri = 15;
   cmpre = 15;
 
-  if(node != NULL && node == root_node) {
+  if(node == root_node) {
     PRINTF("RPL: SRH no need to insert SRH\n");
     return 0;
   }
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index f31fd616f..02f1d2244 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -1348,7 +1348,6 @@ dao_ack_output(rpl_instance_t *instance, uip_ipaddr_t *dest, uint8_t sequence,
   PRINT6ADDR(dest);
   PRINTF(" with status %d\n", status);
 
-  uip_ext_len = 0;
   buffer = UIP_ICMP_PAYLOAD;
 
   buffer[0] = instance->instance_id;

From f53bae6225802f85774a341bb42438712405f4be Mon Sep 17 00:00:00 2001
From: Yasuyuki Tanaka <yasuyuki.tanaka@inf.ethz.ch>
Date: Tue, 16 Feb 2016 15:34:34 +0100
Subject: [PATCH 331/393] Remove a debug message showing "SRH Next Hop" in
 insert_srh_header()

---
 core/net/rpl/rpl-ext-header.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/core/net/rpl/rpl-ext-header.c b/core/net/rpl/rpl-ext-header.c
index 171f75722..e51ab2742 100644
--- a/core/net/rpl/rpl-ext-header.c
+++ b/core/net/rpl/rpl-ext-header.c
@@ -394,16 +394,9 @@ insert_srh_header(void)
     cmpri = MIN(cmpri, count_matching_bytes(&node_addr, &UIP_IP_BUF->destipaddr, 16));
     cmpre = cmpri;
 
-    if(node->parent != root_node) {
-      PRINTF("RPL: SRH Hop ");
-      PRINT6ADDR(&node_addr);
-      PRINTF("\n");
-    } else if(((DEBUG) & DEBUG_PRINT)) {
-      rpl_ns_get_node_global_addr(&node_addr, node);
-      PRINTF("RPL: SRH Next Hop ");
-      PRINT6ADDR(&node_addr);
-      PRINTF("\n");
-    }
+    PRINTF("RPL: SRH Hop ");
+    PRINT6ADDR(&node_addr);
+    PRINTF("\n");
     node = node->parent;
     path_len++;
   }

From bb69e35c76d1db0f18351c088f2413f5a6d754f2 Mon Sep 17 00:00:00 2001
From: Yasuyuki Tanaka <yasuyuki.tanaka@inf.ethz.ch>
Date: Tue, 16 Feb 2016 16:02:20 +0100
Subject: [PATCH 332/393] Fix typos causing compilation errors in
 rpl_srh_get_next_hop()

---
 core/net/rpl/rpl-ext-header.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/net/rpl/rpl-ext-header.c b/core/net/rpl/rpl-ext-header.c
index e51ab2742..72e2c4f18 100644
--- a/core/net/rpl/rpl-ext-header.c
+++ b/core/net/rpl/rpl-ext-header.c
@@ -210,13 +210,14 @@ rpl_srh_get_next_hop(uip_ipaddr_t *ipaddr)
     }
   }
 
-  dag = rpl_get_dag(&IP_IP_BUF->destipaddr);
+  dag = rpl_get_dag(&UIP_IP_BUF->destipaddr);
   root_node = rpl_ns_get_node(dag, &dag->dag_id);
   dest_node = rpl_ns_get_node(dag, &UIP_IP_BUF->destipaddr);
 
   if((uip_next_hdr != NULL && *uip_next_hdr == UIP_PROTO_ROUTING
       && UIP_RH_BUF->routing_type == RPL_RH_TYPE_SRH) ||
-     (dest_node != NULL && root_node != NULL && node->parent == root_node)) {
+     (dest_node != NULL && root_node != NULL &&
+      dest_node->parent == root_node)) {
     /* Routing header found or the packet destined for a direct child of the root.
      * The next hop should be already copied as the IPv6 destination
      * address, via rpl_process_srh_header. We turn this address into a link-local to enable

From eef233ceab3b5ed140ce48d10e49c17bbb645bb1 Mon Sep 17 00:00:00 2001
From: Yasuyuki Tanaka <yasuyuki.tanaka@inf.ethz.ch>
Date: Tue, 29 Mar 2016 20:05:28 +0200
Subject: [PATCH 333/393] Clear the uIP buffer before calling dao_ack_output()

---
 core/net/rpl/rpl-icmp6.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 02f1d2244..b900c6d5b 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -797,10 +797,11 @@ dao_input_storing(void)
         uip_icmp6_send(rpl_get_parent_ipaddr(dag->preferred_parent),
                        ICMP6_RPL, RPL_CODE_DAO, buffer_length);
       }
-    } 
+    }
     /* independent if we remove or not - ACK the request */
     if(flags & RPL_DAO_K_FLAG) {
       /* indicate that we accepted the no-path DAO */
+      uip_clear_buf();
       dao_ack_output(instance, &dao_sender_addr, sequence,
                      RPL_DAO_ACK_UNCONDITIONAL_ACCEPT);
     }
@@ -884,9 +885,9 @@ fwd_dao:
       uip_icmp6_send(rpl_get_parent_ipaddr(dag->preferred_parent),
                      ICMP6_RPL, RPL_CODE_DAO, buffer_length);
     }
-
     if(should_ack) {
       PRINTF("RPL: Sending DAO ACK\n");
+      uip_clear_buf();
       dao_ack_output(instance, &dao_sender_addr, sequence,
                      RPL_DAO_ACK_UNCONDITIONAL_ACCEPT);
     }

From 2fe2a28439221620f64917aa163f1a54798e0eff Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Wed, 3 Feb 2016 19:08:00 +0100
Subject: [PATCH 334/393] Make some of the rpl examples configurable in
 non-storing mode

---
 examples/ipv6/rpl-border-router/project-conf.h | 11 +++++++++++
 examples/ipv6/rpl-collect/project-conf.h       | 11 +++++++++++
 examples/ipv6/rpl-udp/project-conf.h           | 13 ++++++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/examples/ipv6/rpl-border-router/project-conf.h b/examples/ipv6/rpl-border-router/project-conf.h
index 9d9116795..c73735be6 100644
--- a/examples/ipv6/rpl-border-router/project-conf.h
+++ b/examples/ipv6/rpl-border-router/project-conf.h
@@ -31,6 +31,17 @@
 #ifndef PROJECT_ROUTER_CONF_H_
 #define PROJECT_ROUTER_CONF_H_
 
+#ifndef RPL_CONF_WITH_NON_STORING
+#define RPL_CONF_WITH_NON_STORING 0 /* Set this to run with non-storing mode */
+#endif /* RPL_CONF_WITH_NON_STORING */
+
+#if RPL_CONF_WITH_NON_STORING
+#undef RPL_CONF_WITH_STORING
+#define RPL_CONF_WITH_STORING 0
+#undef RPL_CONF_MOP
+#define RPL_CONF_MOP RPL_MOP_NON_STORING
+#endif /* RPL_CONF_WITH_NON_STORING */
+
 #ifndef UIP_FALLBACK_INTERFACE
 #define UIP_FALLBACK_INTERFACE rpl_interface
 #endif
diff --git a/examples/ipv6/rpl-collect/project-conf.h b/examples/ipv6/rpl-collect/project-conf.h
index c33ca27fb..e45518b73 100644
--- a/examples/ipv6/rpl-collect/project-conf.h
+++ b/examples/ipv6/rpl-collect/project-conf.h
@@ -63,4 +63,15 @@
 #undef SICSLOWPAN_CONF_FRAG
 #define SICSLOWPAN_CONF_FRAG           0
 
+#ifndef RPL_CONF_WITH_NON_STORING
+#define RPL_CONF_WITH_NON_STORING 0 /* Set this to run with non-storing mode */
+#endif /* RPL_CONF_WITH_NON_STORING */
+
+#if RPL_CONF_WITH_NON_STORING
+#undef RPL_CONF_WITH_STORING
+#define RPL_CONF_WITH_STORING 0
+#undef RPL_CONF_MOP
+#define RPL_CONF_MOP RPL_MOP_NON_STORING
+#endif /* RPL_CONF_WITH_NON_STORING */
+
 #endif /* PROJECT_CONF_H_ */
diff --git a/examples/ipv6/rpl-udp/project-conf.h b/examples/ipv6/rpl-udp/project-conf.h
index 4b39f7de9..0217200b4 100644
--- a/examples/ipv6/rpl-udp/project-conf.h
+++ b/examples/ipv6/rpl-udp/project-conf.h
@@ -56,4 +56,15 @@
 
 #define RPL_CONF_DEFAULT_ROUTE_INFINITE_LIFETIME 1
 
-#endif /* PROJECT_CONF_H_ */
+#ifndef RPL_CONF_WITH_NON_STORING
+#define RPL_CONF_WITH_NON_STORING 0 /* Set this to run with non-storing mode */
+#endif /* RPL_CONF_WITH_NON_STORING */
+
+#if RPL_CONF_WITH_NON_STORING
+#undef RPL_CONF_WITH_STORING
+#define RPL_CONF_WITH_STORING 0
+#undef RPL_CONF_MOP
+#define RPL_CONF_MOP RPL_MOP_NON_STORING
+#endif /* RPL_CONF_WITH_NON_STORING */
+
+#endif

From f26ea34c61a1e90016bf18848f37446e3d632752 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Wed, 3 Feb 2016 19:12:48 +0100
Subject: [PATCH 335/393] Run RPL regression tests in non-storing mode

---
 .travis.yml                                   |    1 +
 core/net/ipv6/uip-icmp6.c                     |    1 +
 core/net/rpl/rpl-ext-header.c                 |    7 +-
 .../23-rpl-non-storing/01-rpl-up-route.csc    |  344 +
 .../23-rpl-non-storing/02-rpl-root-reboot.csc |  344 +
 .../23-rpl-non-storing/03-rpl-28-hours.csc    |  293 +
 .../04-rpl-large-network.csc                  | 7058 +++++++++++++++++
 .../05-rpl-up-and-down-routes.csc             |  342 +
 .../06-rpl-temporary-root-loss.csc            |  348 +
 .../07-rpl-random-rearrangement.csc           |  647 ++
 .../08-rpl-dao-route-loss-0.csc               |  360 +
 .../08-rpl-dao-route-loss-1.csc               |  360 +
 .../08-rpl-dao-route-loss-2.csc               |  360 +
 .../08-rpl-dao-route-loss-3.csc               |  360 +
 .../08-rpl-dao-route-loss-4.csc               |  360 +
 .../08-rpl-dao-route-loss-5.csc               |  360 +
 .../23-rpl-non-storing/09-rpl-probing.csc     |  256 +
 .../23-rpl-non-storing/10-rpl-multi-dodag.csc |  389 +
 regression-tests/23-rpl-non-storing/Makefile  |    1 +
 .../23-rpl-non-storing/code/Makefile          |    7 +
 .../23-rpl-non-storing/code/project-conf.h    |   42 +
 .../23-rpl-non-storing/code/receiver-node.c   |  131 +
 .../23-rpl-non-storing/code/root-node.c       |  135 +
 .../23-rpl-non-storing/code/sender-node.c     |  129 +
 24 files changed, 12631 insertions(+), 4 deletions(-)
 create mode 100644 regression-tests/23-rpl-non-storing/01-rpl-up-route.csc
 create mode 100644 regression-tests/23-rpl-non-storing/02-rpl-root-reboot.csc
 create mode 100644 regression-tests/23-rpl-non-storing/03-rpl-28-hours.csc
 create mode 100644 regression-tests/23-rpl-non-storing/04-rpl-large-network.csc
 create mode 100644 regression-tests/23-rpl-non-storing/05-rpl-up-and-down-routes.csc
 create mode 100644 regression-tests/23-rpl-non-storing/06-rpl-temporary-root-loss.csc
 create mode 100644 regression-tests/23-rpl-non-storing/07-rpl-random-rearrangement.csc
 create mode 100644 regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-0.csc
 create mode 100644 regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-1.csc
 create mode 100644 regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-2.csc
 create mode 100644 regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-3.csc
 create mode 100644 regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-4.csc
 create mode 100644 regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-5.csc
 create mode 100644 regression-tests/23-rpl-non-storing/09-rpl-probing.csc
 create mode 100644 regression-tests/23-rpl-non-storing/10-rpl-multi-dodag.csc
 create mode 100644 regression-tests/23-rpl-non-storing/Makefile
 create mode 100644 regression-tests/23-rpl-non-storing/code/Makefile
 create mode 100644 regression-tests/23-rpl-non-storing/code/project-conf.h
 create mode 100644 regression-tests/23-rpl-non-storing/code/receiver-node.c
 create mode 100644 regression-tests/23-rpl-non-storing/code/root-node.c
 create mode 100644 regression-tests/23-rpl-non-storing/code/sender-node.c

diff --git a/.travis.yml b/.travis.yml
index 02659d5c1..1a76347bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -135,6 +135,7 @@ env:
   - BUILD_TYPE='collect'
   - BUILD_TYPE='collect-lossy'
   - BUILD_TYPE='rpl'
+  - BUILD_TYPE='rpl-non-storing'
   - BUILD_TYPE='large-rpl'
   - BUILD_TYPE='rime'
   - BUILD_TYPE='ipv6'
diff --git a/core/net/ipv6/uip-icmp6.c b/core/net/ipv6/uip-icmp6.c
index fae84b4de..582f49ba3 100644
--- a/core/net/ipv6/uip-icmp6.c
+++ b/core/net/ipv6/uip-icmp6.c
@@ -301,6 +301,7 @@ uip_icmp6_send(const uip_ipaddr_t *dest, int type, int code, int payload_len)
   UIP_STAT(++uip_stat.icmp.sent);
   UIP_STAT(++uip_stat.ip.sent);
 
+  rpl_insert_header();
   tcpip_ipv6_output();
 }
 /*---------------------------------------------------------------------------*/
diff --git a/core/net/rpl/rpl-ext-header.c b/core/net/rpl/rpl-ext-header.c
index 72e2c4f18..6015fcb57 100644
--- a/core/net/rpl/rpl-ext-header.c
+++ b/core/net/rpl/rpl-ext-header.c
@@ -693,14 +693,13 @@ rpl_remove_header(void)
 void
 rpl_insert_header(void)
 {
-  if(default_instance == NULL) {
+  if(default_instance == NULL || default_instance->current_dag == NULL
+      || uip_is_addr_linklocal(&UIP_IP_BUF->destipaddr) || uip_is_addr_mcast(&UIP_IP_BUF->destipaddr)) {
     return;
   }
 
   if(RPL_IS_STORING(default_instance)) {
-    if(!uip_is_addr_mcast(&UIP_IP_BUF->destipaddr)) {
-      insert_hbh_header();
-    }
+    insert_hbh_header();
   }
 
   if(RPL_IS_NON_STORING(default_instance)) {
diff --git a/regression-tests/23-rpl-non-storing/01-rpl-up-route.csc b/regression-tests/23-rpl-non-storing/01-rpl-up-route.csc
new file mode 100644
index 000000000..fc79cfc27
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/01-rpl-up-route.csc
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype488</identifier>
+      <description>Sender</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/sender-node.c</source>
+      <commands>make TARGET=cooja clean
+make sender-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype32</identifier>
+      <description>RPL root</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/root-node.c</source>
+      <commands>make TARGET=cooja clean
+make root-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype352</identifier>
+      <description>Receiver</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/receiver-node.c</source>
+      <commands>make TARGET=cooja clean
+make receiver-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>6.9596575829049145</x>
+        <y>-25.866060090958513</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype352</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>132.8019872469463</x>
+        <y>146.1533406452311</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>2</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype488</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>0.026556260457749753</x>
+        <y>39.54055615854325</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>4</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype352</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>95.52021598473031</x>
+        <y>148.11553913271615</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>5</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype352</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>62.81690785997944</x>
+        <y>127.1854219328756</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>6</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype352</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>32.07579822271361</x>
+        <y>102.33090775806494</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>7</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype352</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>5.913151722912886</x>
+        <y>73.55199660828417</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>8</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype352</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>0.0</x>
+        <y>0.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>3</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype32</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>280</width>
+    <z>2</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <viewport>0.9555608221893928 0.0 0.0 0.9555608221893928 177.34962387792274 139.71659364731656</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>1</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>1184</width>
+    <z>3</z>
+    <height>240</height>
+    <location_x>402</location_x>
+    <location_y>162</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>904</width>
+    <z>4</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>GENERATE_MSG(0000000, "add-sink");&#xD;
+//GENERATE_MSG(1000000, "remove-sink");&#xD;
+//GENERATE_MSG(1020000, "add-sink");&#xD;
+&#xD;
+lostMsgs = 0;&#xD;
+&#xD;
+TIMEOUT(1000000, if(lastMsg != -1 &amp;&amp; lostMsgs == 0) { log.testOK(); } );&#xD;
+&#xD;
+lastMsg = -1;&#xD;
+packets = "_________";&#xD;
+hops = 0;&#xD;
+&#xD;
+while(true) {&#xD;
+    YIELD();&#xD;
+    if(msg.equals("remove-sink")) {&#xD;
+        m = sim.getMoteWithID(3);&#xD;
+        sim.removeMote(m);&#xD;
+        log.log("removed sink\n");&#xD;
+    } else if(msg.equals("add-sink")) {&#xD;
+        if(!sim.getMoteWithID(3)) {&#xD;
+            m = sim.getMoteTypes()[1].generateMote(sim);&#xD;
+            m.getInterfaces().getMoteID().setMoteID(3);&#xD;
+            sim.addMote(m);&#xD;
+            log.log("added sink\n");&#xD;
+         } else {&#xD;
+            log.log("did not add sink as it was already there\n");      &#xD;
+         }&#xD;
+    } else if(msg.startsWith("Sending")) {&#xD;
+        hops = 0;&#xD;
+    } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
+        hops++;&#xD;
+    } else if(msg.startsWith("Data")) {&#xD;
+        data = msg.split(" ");&#xD;
+        num = parseInt(data[14]);&#xD;
+        if(lastMsg != -1) {&#xD;
+          if(num != lastMsg + 1) {&#xD;
+            numMissed = num - lastMsg - 1;&#xD;
+            lostMsgs += numMissed;           &#xD;
+            log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
+            for(i = 0; i &lt; numMissed; i++) {&#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+            }&#xD;
+          }    &#xD;
+        }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
+        lastMsg = num;&#xD;
+    }&#xD;
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>962</width>
+    <z>0</z>
+    <height>596</height>
+    <location_x>603</location_x>
+    <location_y>43</location_y>
+  </plugin>
+</simconf>
+
diff --git a/regression-tests/23-rpl-non-storing/02-rpl-root-reboot.csc b/regression-tests/23-rpl-non-storing/02-rpl-root-reboot.csc
new file mode 100644
index 000000000..14f87c7a9
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/02-rpl-root-reboot.csc
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype958</identifier>
+      <description>Sender</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/sender-node.c</source>
+      <commands>make TARGET=cooja clean
+make sender-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype837</identifier>
+      <description>RPL root</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/root-node.c</source>
+      <commands>make TARGET=cooja clean
+make root-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype358</identifier>
+      <description>Receiver</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/receiver-node.c</source>
+      <commands>make TARGET=cooja clean
+make receiver-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-22.5728586847096</x>
+        <y>123.9358664968653</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype358</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>116.13379149678028</x>
+        <y>88.36698920455684</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>2</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype958</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-1.39303771455413</x>
+        <y>100.21446701029119</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>4</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype358</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>95.25095618820441</x>
+        <y>63.14998053005015</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>5</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype358</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>66.09378990830604</x>
+        <y>38.32698761608261</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>6</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype358</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>29.05630841762433</x>
+        <y>30.840688165838436</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>7</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype358</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>10.931583432822638</x>
+        <y>69.848248459216</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>8</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype358</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>0.0</x>
+        <y>0.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>3</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype837</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>280</width>
+    <z>0</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <viewport>2.5379695437350276 0.0 0.0 2.5379695437350276 75.2726010197627 15.727272727272757</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>2</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>1184</width>
+    <z>3</z>
+    <height>240</height>
+    <location_x>402</location_x>
+    <location_y>162</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>904</width>
+    <z>4</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>GENERATE_MSG(0000000, "add-sink");&#xD;
+GENERATE_MSG(1000000, "remove-sink");&#xD;
+GENERATE_MSG(1000000, "add-sink");&#xD;
+&#xD;
+lostMsgs = 0;&#xD;
+&#xD;
+TIMEOUT(10000000, if(lastMsg != -1 &amp;&amp; lostMsgs == 0) { log.testOK(); } );&#xD;
+&#xD;
+lastMsg = -1;&#xD;
+packets = "_________";&#xD;
+hops = 0;&#xD;
+&#xD;
+while(true) {&#xD;
+    YIELD();&#xD;
+    if(msg.equals("remove-sink")) {&#xD;
+        m = sim.getMoteWithID(3);&#xD;
+        sim.removeMote(m);&#xD;
+        log.log("removed sink\n");&#xD;
+    } else if(msg.equals("add-sink")) {&#xD;
+        if(!sim.getMoteWithID(3)) {&#xD;
+            m = sim.getMoteTypes()[1].generateMote(sim);&#xD;
+            m.getInterfaces().getMoteID().setMoteID(3);&#xD;
+            sim.addMote(m);&#xD;
+            log.log("added sink\n");&#xD;
+         } else {&#xD;
+            log.log("did not add sink as it was already there\n");      &#xD;
+         }&#xD;
+    } else if(msg.startsWith("Sending")) {&#xD;
+        hops = 0;&#xD;
+    } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
+        hops++;&#xD;
+    } else if(msg.startsWith("Data")) {&#xD;
+        data = msg.split(" ");&#xD;
+        num = parseInt(data[14]);&#xD;
+        if(lastMsg != -1) {&#xD;
+          if(num != lastMsg + 1) {&#xD;
+            numMissed = num - lastMsg - 1;&#xD;
+            lostMsgs += numMissed;           &#xD;
+            log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
+            for(i = 0; i &lt; numMissed; i++) {&#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+            }&#xD;
+          }    &#xD;
+        }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
+        lastMsg = num;&#xD;
+    }&#xD;
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>962</width>
+    <z>1</z>
+    <height>596</height>
+    <location_x>603</location_x>
+    <location_y>43</location_y>
+  </plugin>
+</simconf>
+
diff --git a/regression-tests/23-rpl-non-storing/03-rpl-28-hours.csc b/regression-tests/23-rpl-non-storing/03-rpl-28-hours.csc
new file mode 100644
index 000000000..1cf2c5e43
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/03-rpl-28-hours.csc
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype110</identifier>
+      <description>Sender</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/sender-node.c</source>
+      <commands>make TARGET=cooja clean
+make sender-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype792</identifier>
+      <description>RPL root</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/root-node.c</source>
+      <commands>make TARGET=cooja clean
+make root-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype964</identifier>
+      <description>Receiver</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/receiver-node.c</source>
+      <commands>make TARGET=cooja clean
+make receiver-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>7.772906112657773</x>
+        <y>86.396910401861</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype964</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>75.54361692539452</x>
+        <y>14.292026223193414</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>2</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype110</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>47.962513687652844</x>
+        <y>7.199742533488408</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>6</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype964</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>1.8626697045702818</x>
+        <y>47.783365869022624</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>8</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype964</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>0.0</x>
+        <y>0.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>3</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype792</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>280</width>
+    <z>0</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <viewport>2.5379695437350276 0.0 0.0 2.5379695437350276 78.27260101976275 40.72727272727276</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>2</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>1184</width>
+    <z>3</z>
+    <height>240</height>
+    <location_x>402</location_x>
+    <location_y>162</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>904</width>
+    <z>4</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>GENERATE_MSG(0000000, "add-sink");&#xD;
+//GENERATE_MSG(1000000, "remove-sink");&#xD;
+//GENERATE_MSG(2000000, "add-sink");&#xD;
+&#xD;
+lostMsgs = 0;&#xD;
+&#xD;
+TIMEOUT(100000000, if(lastMsg != -1 &amp;&amp; lostMsgs == 0) { log.testOK(); } );&#xD;
+&#xD;
+lastMsg = -1;&#xD;
+packets = "_________";&#xD;
+hops = 0;&#xD;
+&#xD;
+while(true) {&#xD;
+    YIELD();&#xD;
+    if(msg.equals("remove-sink")) {&#xD;
+        m = sim.getMoteWithID(3);&#xD;
+        sim.removeMote(m);&#xD;
+        log.log("removed sink\n");&#xD;
+    } else if(msg.equals("add-sink")) {&#xD;
+        if(!sim.getMoteWithID(3)) {&#xD;
+            m = sim.getMoteTypes()[1].generateMote(sim);&#xD;
+            m.getInterfaces().getMoteID().setMoteID(3);&#xD;
+            sim.addMote(m);&#xD;
+            log.log("added sink\n");&#xD;
+         } else {&#xD;
+            log.log("did not add sink as it was already there\n");      &#xD;
+         }&#xD;
+    } else if(msg.startsWith("Sending")) {&#xD;
+        hops = 0;&#xD;
+    } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
+        hops++;&#xD;
+    } else if(msg.startsWith("Data")) {&#xD;
+        data = msg.split(" ");&#xD;
+        num = parseInt(data[14]);&#xD;
+        if(lastMsg != -1) {&#xD;
+          if(num != lastMsg + 1) {&#xD;
+            numMissed = num - lastMsg - 1;&#xD;
+            lostMsgs += numMissed;           &#xD;
+            log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
+            for(i = 0; i &lt; numMissed; i++) {&#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+            }&#xD;
+          }    &#xD;
+        }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
+        lastMsg = num;&#xD;
+    }&#xD;
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>962</width>
+    <z>1</z>
+    <height>596</height>
+    <location_x>603</location_x>
+    <location_y>43</location_y>
+  </plugin>
+</simconf>
+
diff --git a/regression-tests/23-rpl-non-storing/04-rpl-large-network.csc b/regression-tests/23-rpl-non-storing/04-rpl-large-network.csc
new file mode 100644
index 000000000..e40b7a339
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/04-rpl-large-network.csc
@@ -0,0 +1,7058 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype710</identifier>
+      <description>Sender</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/sender-node.c</source>
+      <commands>make TARGET=cooja clean
+make sender-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype709</identifier>
+      <description>RPL root</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/root-node.c</source>
+      <commands>make TARGET=cooja clean
+make root-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype332</identifier>
+      <description>Receiver</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/receiver-node.c</source>
+      <commands>make TARGET=cooja clean
+make receiver-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-15.604889524290883</x>
+        <y>-27.272920930192623</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>218.29521040499824</x>
+        <y>216.70287561143516</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>2</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype710</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>0.0</x>
+        <y>0.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>3</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype709</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>27.44274795318258</x>
+        <y>36.980443988209856</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>4</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>185.6055859234863</x>
+        <y>192.99166984979271</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>5</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>7.827315175624361</x>
+        <y>107.95833747378225</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>6</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>82.49199862549197</x>
+        <y>34.72851022020231</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>7</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>35.671428723363064</x>
+        <y>125.82590119075962</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>8</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>33.044376889885754</x>
+        <y>62.443378727185774</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>9</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>152.53659733643553</x>
+        <y>165.87608708149403</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>10</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>22.023077232445942</x>
+        <y>18.41094139254531</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>11</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>41.19368867821842</x>
+        <y>49.201157808285224</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>12</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>114.62128502432532</x>
+        <y>88.58807114217633</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>13</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>61.21405469314478</x>
+        <y>188.6851979777661</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>14</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>104.78326932115709</x>
+        <y>100.84889281105585</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>15</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>90.26861048950052</x>
+        <y>40.550864496421404</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>16</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>137.39112328314076</x>
+        <y>126.5333637365394</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>17</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>14.07616766247768</x>
+        <y>99.85572366133869</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>18</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>192.30563307960443</x>
+        <y>66.83563821262344</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>19</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>129.08253247651874</x>
+        <y>117.20437669309078</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>20</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>21.82717410659969</x>
+        <y>47.523771402541335</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>21</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>35.95102103988239</x>
+        <y>21.74677482276881</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>22</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>61.71108896268191</x>
+        <y>79.91617509627334</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>23</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>16.029809485043288</x>
+        <y>171.05935835280616</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>24</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>138.8418552766128</x>
+        <y>61.418703448852185</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>25</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>151.23299942414673</x>
+        <y>92.41820871538522</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>26</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>197.33157775573343</x>
+        <y>20.6013482653864</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>27</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>121.20762229879878</x>
+        <y>184.81107462083565</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>28</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>102.32432527534694</x>
+        <y>91.9912435435037</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>29</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>88.10909646999544</x>
+        <y>191.21251904898142</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>30</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>72.19774934085703</x>
+        <y>113.58131529956069</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>31</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>53.49967737007204</x>
+        <y>72.45172156882643</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>32</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>172.07186411958625</x>
+        <y>51.47715718716961</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>33</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>185.41983532466634</x>
+        <y>85.60078269414</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>34</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>83.34993971740548</x>
+        <y>193.98111239532744</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>35</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>105.03752362550378</x>
+        <y>131.24078026424087</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>36</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>176.09318670322102</x>
+        <y>41.46760901468247</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>37</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>76.80689915307215</x>
+        <y>47.13815728542057</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>38</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>155.907739287817</x>
+        <y>15.24009422994106</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>39</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>45.992463430523436</x>
+        <y>124.573811024683</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>40</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>159.11361032671832</x>
+        <y>81.65319598335425</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>41</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>41.838657583001314</x>
+        <y>163.47591213471193</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>42</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>25.560001904073125</x>
+        <y>147.48610852243928</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>43</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>139.56489350213488</x>
+        <y>191.15379557180913</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>44</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>105.71342550700061</x>
+        <y>136.09089690661503</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>45</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>122.59378462201298</x>
+        <y>196.22862961645998</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>46</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>147.61372446125088</x>
+        <y>55.314287700435536</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>47</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>77.70218628780312</x>
+        <y>95.59561907133107</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>48</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>71.88244578562713</x>
+        <y>168.57963926907163</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>49</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>6.722298767036894</x>
+        <y>101.09668965729898</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>50</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>62.96680217979964</x>
+        <y>77.66951408660954</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>51</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>162.49011735601982</x>
+        <y>199.07086470932003</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>52</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>87.87526390617558</x>
+        <y>114.39424478293958</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>53</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>74.29230372180815</x>
+        <y>36.995699473573836</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>54</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>77.34619341407321</x>
+        <y>60.070446577058576</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>55</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>76.32695571818826</x>
+        <y>135.82669004433725</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>56</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>68.10326013650814</x>
+        <y>5.04157445893032</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>57</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>95.76993029214962</x>
+        <y>45.046282401332945</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>58</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>79.87963205080952</x>
+        <y>110.7023948653882</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>59</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>195.90349780899223</x>
+        <y>132.38904172009444</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>60</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>80.40108440304007</x>
+        <y>25.86673418569547</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>61</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>52.268877618080744</x>
+        <y>176.12888723955277</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>62</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>40.545541404899765</x>
+        <y>166.9450252729589</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>63</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>10.676184465528205</x>
+        <y>0.9871174057552334</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>64</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>87.35673216830257</x>
+        <y>23.25131234780027</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>65</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>26.745126931691352</x>
+        <y>87.3101256645554</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>66</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>183.2724008541638</x>
+        <y>167.69026002459069</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>67</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>5.934720840855223</x>
+        <y>77.21248812623693</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>68</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>76.49604470599058</x>
+        <y>108.80963795015302</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>69</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>86.10145414955488</x>
+        <y>12.798582653303603</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>70</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>32.435370110193816</x>
+        <y>29.344591306898813</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>71</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>163.72950518161596</x>
+        <y>154.15283820759655</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>72</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>143.96396308843373</x>
+        <y>132.40312602892786</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>73</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>139.20530179839795</x>
+        <y>144.18958011498225</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>74</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>75.22453368236212</x>
+        <y>119.69913560274786</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>75</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>21.83836116635087</x>
+        <y>191.21696522067728</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>76</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>187.94640511976667</x>
+        <y>113.95684826994561</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>77</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>114.61289565250618</x>
+        <y>27.61001303446735</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>78</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>70.83569869750504</x>
+        <y>113.88992677636021</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>79</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>11.616059362048992</x>
+        <y>45.59401384110464</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>80</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>3.4282454263252937</x>
+        <y>35.97653370545284</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>81</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>54.33122057405715</x>
+        <y>1.9759087814547494</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>82</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>69.6612091444155</x>
+        <y>0.45982758130533874</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>83</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>169.98417155202168</x>
+        <y>87.76678058442593</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>84</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>148.98441194234616</x>
+        <y>104.32820155415494</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>85</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>66.23883124891583</x>
+        <y>162.92685536074129</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>86</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>181.6348837921769</x>
+        <y>183.07267240808343</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>87</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>88.9829570206748</x>
+        <y>119.72520333459575</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>88</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>179.1527012143494</x>
+        <y>84.25685075020328</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>89</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>117.82537007493707</x>
+        <y>41.10319533518651</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>90</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>52.611633540398486</x>
+        <y>94.71918054798351</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>91</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>128.22088664324633</x>
+        <y>115.50290142480077</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>92</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>102.53841128002531</x>
+        <y>11.784449645612295</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>93</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>187.69871925603667</x>
+        <y>131.28317666772048</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>94</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>71.13897508938263</x>
+        <y>106.29335632876602</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>95</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>71.2216469861295</x>
+        <y>148.38612859488788</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>96</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>36.152562577928784</x>
+        <y>67.541796718348</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>97</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>118.84793016344604</x>
+        <y>0.49906433835273933</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>98</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>135.20417096106954</x>
+        <y>170.20704631856816</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>99</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>156.082359043526</x>
+        <y>57.62103450217495</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>100</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>180.58695188377737</x>
+        <y>80.75266645775669</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>101</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>38.93889890269273</x>
+        <y>138.60259660238856</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>102</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>159.5172788118917</x>
+        <y>192.24950143209503</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>103</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>154.02096825135868</x>
+        <y>139.67175722659056</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>104</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>38.480826888323904</x>
+        <y>5.502866276505292</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>105</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>27.95908088015704</x>
+        <y>193.85188308665965</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>106</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>198.61700949829074</x>
+        <y>171.1877312716402</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>107</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>106.30468818084609</x>
+        <y>25.058380770654654</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>108</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>40.335672117825624</x>
+        <y>179.59080234641004</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>109</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>22.316357638510897</x>
+        <y>158.94323888090028</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>110</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>99.56281553229194</x>
+        <y>85.64260133077535</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>111</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>60.71556414510035</x>
+        <y>121.53040248649711</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>112</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>27.08600745576586</x>
+        <y>38.17025720346818</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>113</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>147.03642509910586</x>
+        <y>39.51320588416096</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>114</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>180.2031547656297</x>
+        <y>141.5646561330238</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>115</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>73.12314629214424</x>
+        <y>167.80783320779847</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>116</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>167.93567452922767</x>
+        <y>10.060141001139144</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>117</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>163.99198875105768</x>
+        <y>147.48735207074026</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>118</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>154.98654737808127</x>
+        <y>121.17266324007643</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>119</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>57.898499791676386</x>
+        <y>149.3487194893122</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>120</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>64.82082963563904</x>
+        <y>174.0100480348673</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>121</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>114.13623920898752</x>
+        <y>15.754246175503095</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>122</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>0.00848902940355778</x>
+        <y>195.50701335573908</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>123</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>182.81764401709623</x>
+        <y>78.57837811285111</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>124</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>11.462145876504714</x>
+        <y>95.37444120802225</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>125</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>115.5020283241771</x>
+        <y>28.49431396939579</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>126</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>62.463952359877275</x>
+        <y>77.78913013330184</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>127</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>9.766778039117696</x>
+        <y>136.7421944039438</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>128</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>35.320514349220055</x>
+        <y>100.56248258192493</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>129</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>56.26732169234614</x>
+        <y>3.095097140731262</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>130</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>76.90164393617998</x>
+        <y>3.5671096386384216</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>131</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>81.97549075841862</x>
+        <y>13.020422155003475</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>132</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>54.87200208203389</x>
+        <y>77.29445717372947</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>133</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>193.47651032749548</x>
+        <y>144.9357554583657</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>134</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>51.65288193591992</x>
+        <y>126.16687604535504</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>135</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>151.66849746442173</x>
+        <y>158.7699863850836</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>136</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>32.469410974826005</x>
+        <y>113.10993021698361</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>137</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>33.04622512107349</x>
+        <y>25.425445944702794</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>138</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>33.53444748873715</x>
+        <y>112.25721598241579</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>139</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>128.9401580272291</x>
+        <y>100.73482184242926</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>140</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>194.6592727528704</x>
+        <y>102.73664509470841</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>141</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>125.47343036050516</x>
+        <y>106.53155237731285</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>142</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>147.40129296416038</x>
+        <y>12.37607345376115</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>143</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>113.32045045397959</x>
+        <y>126.79285457987103</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>144</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>27.174837677715825</x>
+        <y>66.84349985536826</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>145</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>164.20252670136998</x>
+        <y>51.635539499142524</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>146</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>39.351673884988394</x>
+        <y>65.05462325698123</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>147</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>143.91486202542433</x>
+        <y>171.28435110465497</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>148</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>30.926988343440186</x>
+        <y>130.3647571119649</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>149</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>19.897357003413617</x>
+        <y>22.905473451246785</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>150</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>128.36369031733133</x>
+        <y>170.71462512320227</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>151</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>172.1648617546042</x>
+        <y>184.1928317689217</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>152</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>148.16672573170842</x>
+        <y>107.99684523382686</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>153</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>83.90300186263724</x>
+        <y>169.4761782218257</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>154</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>90.86887922361453</x>
+        <y>142.8036645841288</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>155</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>23.18966921326753</x>
+        <y>69.42635534680753</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>156</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>134.59433377860168</x>
+        <y>37.633119904417796</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>157</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>127.97132285920065</x>
+        <y>158.57917470101572</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>158</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>166.2450456558778</x>
+        <y>108.67197275397042</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>159</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>167.334034200758</x>
+        <y>22.173554305333166</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>160</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>163.54194527237107</x>
+        <y>189.41605447848966</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>161</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>14.863357513573018</x>
+        <y>93.36644051662617</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>162</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>178.4370382798651</x>
+        <y>191.48348446587636</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>163</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>172.96087703915273</x>
+        <y>183.78535300027013</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>164</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>2.45779137738229</x>
+        <y>58.750309492130114</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>165</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>15.730601618735495</x>
+        <y>96.52335072173565</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>166</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>19.890833428932165</x>
+        <y>56.993000152370364</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>167</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>154.69166608840504</x>
+        <y>164.8598339150269</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>168</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>199.77196118880582</x>
+        <y>26.034321005016903</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>169</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>5.216343266336931</x>
+        <y>17.867912968799615</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>170</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>138.71273406283296</x>
+        <y>55.31024592694844</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>171</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>168.21144361519595</x>
+        <y>163.1843284579423</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>172</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>61.82504434646854</x>
+        <y>134.03197926926038</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>173</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>14.007317972338473</x>
+        <y>146.98475859141027</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>174</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>108.44210606040488</x>
+        <y>127.81076428732186</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>175</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>133.41957560864708</x>
+        <y>122.91534078890439</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>176</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>184.89266828168118</x>
+        <y>195.7201293014503</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>177</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>121.10492556426465</x>
+        <y>78.54418709376823</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>178</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>42.05271519544296</x>
+        <y>183.14259881514795</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>179</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>92.12119616387746</x>
+        <y>44.853464007589714</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>180</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>136.44039199596196</x>
+        <y>1.111619893261917</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>181</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>64.37440878278696</x>
+        <y>188.3078368775181</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>182</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>37.774149552594594</x>
+        <y>73.81683900641865</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>183</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>24.618589360988175</x>
+        <y>164.89708336795567</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>184</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>152.5950797265111</x>
+        <y>140.96774353352123</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>185</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>37.96933854365052</x>
+        <y>131.92434845994435</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>186</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>14.05145808951862</x>
+        <y>26.159084136809916</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>187</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>61.47558158857349</x>
+        <y>68.73507104275693</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>188</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>35.420404733112385</x>
+        <y>108.47794695541302</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>189</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>129.0179255565185</x>
+        <y>176.46977408461998</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>190</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>4.437687657989087</x>
+        <y>191.43801818673953</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>191</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>132.39232886927158</x>
+        <y>105.56546037448346</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>192</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>193.9356389936735</x>
+        <y>76.8987220921185</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>193</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>123.49672189705024</x>
+        <y>16.28922647444049</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>194</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>40.44058024960566</x>
+        <y>94.77629608096818</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>195</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>93.54168452285269</x>
+        <y>102.10342793159373</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>196</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>176.91858637781746</x>
+        <y>81.80773827257306</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>197</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>182.5062159995403</x>
+        <y>10.047631291589564</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>198</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>151.3211952231698</x>
+        <y>160.98807517681706</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>199</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>167.8826595707132</x>
+        <y>160.3686256248768</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>200</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>93.38491122055773</x>
+        <y>61.04322963139093</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>201</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>155.20211039479165</x>
+        <y>104.99915002371228</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>202</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>154.56882959476744</x>
+        <y>192.77647809954323</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>203</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>119.88029558288524</x>
+        <y>48.71837870038327</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>204</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>8.237800167806908</x>
+        <y>123.56280331420268</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>205</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>53.424877837249696</x>
+        <y>87.33638375233281</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>206</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>199.25320093864096</x>
+        <y>66.76343110330383</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>207</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>166.7255674935148</x>
+        <y>165.31992478582075</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>208</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>135.9334286576811</x>
+        <y>130.36986226660702</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>209</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>65.60950768388696</x>
+        <y>14.081940005079275</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>210</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>56.68133966983844</x>
+        <y>196.61338214776293</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>211</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>2.562777529582072</x>
+        <y>66.73129709411079</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>212</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>34.10919172462936</x>
+        <y>176.31986637140767</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>213</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>33.846173186403306</x>
+        <y>142.33660392777279</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>214</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>128.76326079790124</x>
+        <y>90.05136184351706</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>215</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>80.39617891964872</x>
+        <y>111.48714907972395</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>216</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>21.97338508940303</x>
+        <y>61.032785792453815</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>217</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>158.00182839254427</x>
+        <y>175.79991821384095</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>218</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>64.21702017661488</x>
+        <y>197.8650659620092</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>219</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>58.261430108425174</x>
+        <y>69.56229252260285</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>220</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>114.85635789777962</x>
+        <y>130.3021189977344</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>221</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>24.601661057872736</x>
+        <y>196.33046445845073</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>222</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>136.22037670133446</x>
+        <y>18.019579846123435</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>223</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>71.91168973841357</x>
+        <y>193.3123397692768</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>224</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>76.67497322258676</x>
+        <y>156.30488619961912</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>225</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>85.70841880772959</x>
+        <y>39.914700874835106</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>226</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>142.3427145819395</x>
+        <y>76.80244108802334</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>227</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>45.6821653485997</x>
+        <y>33.96733547026549</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>228</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>146.16353499121948</x>
+        <y>5.58117117441268</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>229</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>34.32680631388174</x>
+        <y>111.76495490887346</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>230</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>138.5676204843924</x>
+        <y>161.4559204389253</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>231</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>196.36096598095253</x>
+        <y>19.9809316402896</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>232</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>190.5761031572042</x>
+        <y>118.16570999859783</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>233</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>137.89894164409372</x>
+        <y>114.36842366282201</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>234</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>13.942927177934262</x>
+        <y>25.042265908173977</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>235</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>21.808225381827363</x>
+        <y>89.51408500063611</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>236</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>82.1665299576559</x>
+        <y>89.41818802221223</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>237</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>100.24631818801446</x>
+        <y>85.16089691564225</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>238</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>150.87166478995505</x>
+        <y>124.32687790892683</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>239</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>196.72953604773366</x>
+        <y>89.0589559016778</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>240</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>178.10423185724105</x>
+        <y>108.01295472332721</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>241</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>24.852336661830865</x>
+        <y>107.10027825925053</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>242</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>198.2838988728342</x>
+        <y>185.2533889301396</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>243</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>122.42366366542863</x>
+        <y>13.685145107609165</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>244</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>113.58516359448151</x>
+        <y>59.212889358544054</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>245</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>148.6689453992514</x>
+        <y>65.76664113968091</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>246</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>110.90604811956779</x>
+        <y>118.12368970120251</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>247</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>195.48877933255176</x>
+        <y>71.61703558744803</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>248</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>90.74911177135543</x>
+        <y>151.9662290090636</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>249</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>5.669662023293154</x>
+        <y>80.71705944385323</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>250</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>77.57071934873466</x>
+        <y>25.884947016521597</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>251</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>172.38535892291588</x>
+        <y>6.827522113737539</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>252</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>62.61595677732154</x>
+        <y>171.52926299696654</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>253</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>163.1605182212256</x>
+        <y>136.67511261098457</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>254</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>174.98684717123461</x>
+        <y>163.9648526025463</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>255</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>112.4179766207543</x>
+        <y>108.05999669756379</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>256</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>71.60510656526031</x>
+        <y>96.23183516652448</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>257</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>51.39949089302518</x>
+        <y>181.73639564248649</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>258</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>140.61625635482116</x>
+        <y>118.88528060437326</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>259</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>81.11235868256772</x>
+        <y>71.16703221921186</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>260</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>106.30383323544051</x>
+        <y>47.66664077552125</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>261</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>78.36392430481997</x>
+        <y>145.12300889005226</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>262</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>159.2795584664916</x>
+        <y>175.42365153724947</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>263</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>89.12806123792214</x>
+        <y>163.88074620615808</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>264</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>188.00194321004403</x>
+        <y>167.99738752402368</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>265</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>186.544702443713</x>
+        <y>156.12158395696437</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>266</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>2.8406717287810412</x>
+        <y>38.380349570314664</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>267</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>28.76119804764801</x>
+        <y>168.10637626762275</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>268</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>190.1115654346047</x>
+        <y>36.24498374070968</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>269</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>67.43484884843447</x>
+        <y>118.69086680825731</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>270</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>50.7959234692023</x>
+        <y>165.04960719272802</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>271</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>50.75575271798458</x>
+        <y>144.55723570362358</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>272</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>128.94257968083764</x>
+        <y>47.32490472068322</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>273</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>1.9193343221312942</x>
+        <y>112.82658785936086</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>274</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>51.82023785974064</x>
+        <y>148.28034473499338</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>275</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>98.55603081185546</x>
+        <y>178.02566808501155</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>276</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>143.40572664084078</x>
+        <y>183.27302398341982</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>277</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>141.0619733646239</x>
+        <y>54.122738136324955</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>278</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>162.29942916334053</x>
+        <y>67.55247227617933</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>279</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>185.29686875363197</x>
+        <y>118.81126461905944</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>280</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>104.06690998854779</x>
+        <y>5.511220514887172</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>281</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>181.82429252421596</x>
+        <y>47.0700962247878</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>282</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>17.604228655775245</x>
+        <y>96.78328313290936</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>283</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>60.74231839144737</x>
+        <y>136.8041677309854</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>284</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>158.57791000335715</x>
+        <y>90.16811700419458</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>285</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>26.040369760119475</x>
+        <y>115.48428978095157</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>286</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>155.33825554510548</x>
+        <y>122.61758874267335</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>287</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>171.04754637183774</x>
+        <y>49.44780022857469</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>288</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>130.8601631228818</x>
+        <y>115.38443324744807</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>289</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>138.51066172926747</x>
+        <y>85.05731662406394</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>290</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>17.01860916014879</x>
+        <y>85.74431631403492</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>291</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>63.632763185894994</x>
+        <y>73.28193598294403</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>292</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>145.51992557600448</x>
+        <y>190.19645657449914</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>293</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>141.3669225587347</x>
+        <y>128.37798094188392</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>294</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>5.624436269305666</x>
+        <y>10.321359475496084</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>295</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>32.62210104212715</x>
+        <y>80.99365929301005</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>296</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>146.82462375206796</x>
+        <y>189.00512676494264</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>297</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>96.89937776974169</x>
+        <y>61.868257009019125</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>298</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>71.17532023107206</x>
+        <y>32.87953533289934</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>299</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>37.21430187397199</x>
+        <y>21.880189704400976</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>300</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>123.17178528937387</x>
+        <y>23.802492560334287</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>301</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>139.8264101859233</x>
+        <y>106.93416114169838</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>302</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>34.97792194896952</x>
+        <y>182.11554692137054</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>303</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>156.016327676095</x>
+        <y>83.35423896139108</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>304</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>33.33352678715003</x>
+        <y>148.24111721535743</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>305</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>22.525965053498552</x>
+        <y>94.23130431241577</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>306</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>145.40586007739483</x>
+        <y>194.77296443866655</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>307</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>64.78487058910738</x>
+        <y>34.59908782949142</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>308</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>59.86114357954142</x>
+        <y>143.29623794752337</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>309</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>133.03711837762597</x>
+        <y>0.29677881350260726</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>310</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>184.05437940334514</x>
+        <y>80.34917749334691</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>311</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>43.18494391360306</x>
+        <y>0.7070568470557648</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>312</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>87.88579984985796</x>
+        <y>183.6845166360299</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>313</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>35.679149788796785</x>
+        <y>59.900754257451624</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>314</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>10.837936713278706</x>
+        <y>68.65555543408139</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>315</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>28.088726188466005</x>
+        <y>66.6117410256945</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>316</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>24.15305881985441</x>
+        <y>127.36722357863377</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>317</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>167.92463302345024</x>
+        <y>95.32246240241238</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>318</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>150.07537910034364</x>
+        <y>189.29680149689028</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>319</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>36.60193942102408</x>
+        <y>4.850860928459388</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>320</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>131.4804357164766</x>
+        <y>107.37981261172979</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>321</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>4.702056299253576</x>
+        <y>145.3571381517292</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>322</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>76.83393335740108</x>
+        <y>40.92489706855471</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>323</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>81.41902810900726</x>
+        <y>59.67311069186907</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>324</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>157.9286881274713</x>
+        <y>35.89390157980119</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>325</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>172.59261547136273</x>
+        <y>162.21173966194792</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>326</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>63.77983240079481</x>
+        <y>110.66181735649987</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>327</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>94.27259269172448</x>
+        <y>102.22907067171563</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>328</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>87.82927755519094</x>
+        <y>154.83172363042706</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>329</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>61.424763006386954</x>
+        <y>73.54903523332621</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>330</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>193.50994444846046</x>
+        <y>100.37438735826956</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>331</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>160.15646353486886</x>
+        <y>197.56265442862397</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>332</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>33.41179410209567</x>
+        <y>85.51716211010236</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>333</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>39.55932830334419</x>
+        <y>79.79114070992594</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>334</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>29.81531743952457</x>
+        <y>106.52370973616816</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>335</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>145.66591758403607</x>
+        <y>93.84627277397392</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>336</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>121.12689025085304</x>
+        <y>141.7616054105135</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>337</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>31.696932817539736</x>
+        <y>73.39512842700171</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>338</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>73.55413175311341</x>
+        <y>184.10063535264334</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>339</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>179.21266954315877</x>
+        <y>157.77936426661222</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>340</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>5.861701400590658</x>
+        <y>176.44679868441557</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>341</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>164.32858198885157</x>
+        <y>127.1649251930171</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>342</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>104.78813885934602</x>
+        <y>2.6978015525372934</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>343</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>9.036210189825722</x>
+        <y>37.29651951364714</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>344</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>69.09633192708777</x>
+        <y>131.08113653458605</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>345</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>23.989325789242024</x>
+        <y>102.76529191595212</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>346</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>32.563144827068456</x>
+        <y>174.05783874991164</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>347</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>26.84717981820497</x>
+        <y>33.708035418260465</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>348</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>23.651571274100892</x>
+        <y>150.9696150146202</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>349</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>7.263970263317554</x>
+        <y>178.4551746541966</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>350</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>137.19080046610807</x>
+        <y>195.47642758858956</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>351</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>100.60258790901588</x>
+        <y>10.122226122279043</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>352</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>158.02955707421086</x>
+        <y>15.552042272281575</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>353</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>69.03288347183658</x>
+        <y>86.65939835169405</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>354</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>197.11534487465465</x>
+        <y>12.227887489891408</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>355</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>109.32664513099861</x>
+        <y>51.47545505189106</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>356</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>7.450618560323541</x>
+        <y>114.12792666368863</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>357</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>96.73499758330652</x>
+        <y>87.34903664585806</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>358</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>143.42568088659735</x>
+        <y>154.7201550387036</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>359</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>16.055115327242596</x>
+        <y>23.72235108907279</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>360</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>36.54118641672248</x>
+        <y>71.60060131854802</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>361</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>153.4641555525212</x>
+        <y>182.30266241969497</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>362</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>179.79961054026052</x>
+        <y>52.374917374947486</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>363</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>51.89511924887278</x>
+        <y>55.715278818289924</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>364</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>160.22911392558143</x>
+        <y>197.03727711739174</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>365</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>141.50401865962175</x>
+        <y>198.17183635084353</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>366</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>144.1436553724308</x>
+        <y>66.26788567722302</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>367</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>114.85639238072662</x>
+        <y>187.02866922391485</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>368</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>14.754418142216963</x>
+        <y>189.75568091879705</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>369</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>40.445861020644756</x>
+        <y>132.87622199437286</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>370</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>70.41846318684537</x>
+        <y>16.353121961748673</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>371</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>11.524098377391411</x>
+        <y>188.46037552576104</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>372</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>19.80490164758435</x>
+        <y>193.31200682922997</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>373</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>170.32256510777594</x>
+        <y>170.204813941954</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>374</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>35.11638379627671</x>
+        <y>106.63452905636245</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>375</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>87.80726944100199</x>
+        <y>69.16884374165753</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>376</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>45.63781115512378</x>
+        <y>137.1790704392972</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>377</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>120.23124867416645</x>
+        <y>21.60172442725463</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>378</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>42.584241021086264</x>
+        <y>172.9365035614701</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>379</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>106.9111221907689</x>
+        <y>35.38132573733432</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>380</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>115.65012523180343</x>
+        <y>149.06748739273075</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>381</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>66.70597176653999</x>
+        <y>151.96624665556067</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>382</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>116.86108695969573</x>
+        <y>92.96503821223025</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>383</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>138.3454858274232</x>
+        <y>60.335069940591254</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>384</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>35.21169262537829</x>
+        <y>57.75683948274251</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>385</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>183.64109836494706</x>
+        <y>187.89865943504947</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>386</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>124.92709985349823</x>
+        <y>7.139364140447135</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>387</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>121.19563498360651</x>
+        <y>163.5898829983739</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>388</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>141.67701483198246</x>
+        <y>36.967824799613645</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>389</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>116.85490603618803</x>
+        <y>192.1746914581395</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>390</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>157.23646122348265</x>
+        <y>101.21354943885676</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>391</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>58.04596641555313</x>
+        <y>180.0770488919343</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>392</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>118.342960728573</x>
+        <y>65.22048911724025</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>393</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>61.42203823259405</x>
+        <y>117.333210601775</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>394</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>136.13358028390385</x>
+        <y>97.99627507346685</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>395</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>82.86089860898949</x>
+        <y>25.22615052347874</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>396</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>6.721379593879373</x>
+        <y>94.78763681182285</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>397</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>38.69266957378596</x>
+        <y>24.113141554020046</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>398</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>111.22857295130957</x>
+        <y>95.51634459331788</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>399</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>126.7915415569141</x>
+        <y>32.23798771734878</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>400</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>186.84699461455236</x>
+        <y>34.76662976923288</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>401</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>122.45497909139493</x>
+        <y>167.0773654715768</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>402</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>33.03449972907999</x>
+        <y>172.77024458531486</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>403</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype332</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>280</width>
+    <z>3</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <viewport>1.1671649566739442 0.0 0.0 1.1671649566739442 66.21348020552065 40.83199757586018</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>2</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>1184</width>
+    <z>0</z>
+    <height>240</height>
+    <location_x>402</location_x>
+    <location_y>162</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>904</width>
+    <z>4</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>GENERATE_MSG(0000000, "add-sink");&#xD;
+//GENERATE_MSG(1000000, "remove-sink");&#xD;
+//GENERATE_MSG(1020000, "add-sink");&#xD;
+&#xD;
+lostMsgs = 0;&#xD;
+&#xD;
+TIMEOUT(1000000, if(lastMsg != -1 &amp;&amp; lostMsgs == 0) { log.testOK(); } );&#xD;
+&#xD;
+lastMsg = -1;&#xD;
+packets = "_________";&#xD;
+hops = 0;&#xD;
+&#xD;
+while(true) {&#xD;
+    YIELD();&#xD;
+    if(msg.equals("remove-sink")) {&#xD;
+        m = sim.getMoteWithID(3);&#xD;
+        sim.removeMote(m);&#xD;
+        log.log("removed sink\n");&#xD;
+    } else if(msg.equals("add-sink")) {&#xD;
+        if(!sim.getMoteWithID(3)) {&#xD;
+            m = sim.getMoteTypes()[1].generateMote(sim);&#xD;
+            m.getInterfaces().getMoteID().setMoteID(3);&#xD;
+            sim.addMote(m);&#xD;
+            log.log("added sink\n");&#xD;
+         } else {&#xD;
+            log.log("did not add sink as it was already there\n");      &#xD;
+         }&#xD;
+    } else if(msg.startsWith("Sending")) {&#xD;
+        hops = 0;&#xD;
+    } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
+        hops++;&#xD;
+    } else if(msg.startsWith("Data")) {&#xD;
+        data = msg.split(" ");&#xD;
+        num = parseInt(data[14]);&#xD;
+        if(lastMsg != -1) {&#xD;
+          if(num != lastMsg + 1) {&#xD;
+            numMissed = num - lastMsg - 1;&#xD;
+            lostMsgs += numMissed;           &#xD;
+            log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
+            for(i = 0; i &lt; numMissed; i++) {&#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+            }&#xD;
+          }    &#xD;
+        }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
+        lastMsg = num;&#xD;
+    }&#xD;
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>962</width>
+    <z>1</z>
+    <height>596</height>
+    <location_x>603</location_x>
+    <location_y>43</location_y>
+  </plugin>
+</simconf>
\ No newline at end of file
diff --git a/regression-tests/23-rpl-non-storing/05-rpl-up-and-down-routes.csc b/regression-tests/23-rpl-non-storing/05-rpl-up-and-down-routes.csc
new file mode 100644
index 000000000..c2b3cb506
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/05-rpl-up-and-down-routes.csc
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype743</identifier>
+      <description>Sender</description>
+      <source>[CONFIG_DIR]/code/sender-node.c</source>
+      <commands>make clean TARGET=cooja
+make sender-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype452</identifier>
+      <description>RPL root</description>
+      <source>[CONFIG_DIR]/code/root-node.c</source>
+      <commands>make clean TARGET=cooja
+make root-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype782</identifier>
+      <description>Receiver</description>
+      <source>[CONFIG_DIR]/code/receiver-node.c</source>
+      <commands>make clean TARGET=cooja
+make receiver-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-22.5728586847096</x>
+        <y>123.9358664968653</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype782</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>116.13379149678028</x>
+        <y>88.36698920455684</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>2</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype743</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-1.39303771455413</x>
+        <y>100.21446701029119</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>4</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype782</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>95.25095618820441</x>
+        <y>63.14998053005015</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>5</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype782</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>66.09378990830604</x>
+        <y>38.32698761608261</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>6</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype782</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>29.05630841762433</x>
+        <y>30.840688165838436</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>7</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype782</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>10.931583432822638</x>
+        <y>69.848248459216</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>8</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype782</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>0.0</x>
+        <y>0.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>3</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype452</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>280</width>
+    <z>1</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <viewport>2.5379695437350276 0.0 0.0 2.5379695437350276 75.2726010197627 15.727272727272757</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>2</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+    </plugin_config>
+    <width>1184</width>
+    <z>3</z>
+    <height>240</height>
+    <location_x>402</location_x>
+    <location_y>162</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>904</width>
+    <z>4</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>GENERATE_MSG(0000000, "add-sink");&#xD;
+//GENERATE_MSG(1000000, "remove-sink");&#xD;
+//GENERATE_MSG(1020000, "add-sink");&#xD;
+&#xD;
+lostMsgs = 0;&#xD;
+&#xD;
+TIMEOUT(1000000, if(lostMsgs == 0) { log.testOK(); } );&#xD;
+&#xD;
+lastMsg = -1;&#xD;
+packets = "_________";&#xD;
+hops = 0;&#xD;
+&#xD;
+while(true) {&#xD;
+    YIELD();&#xD;
+    if(msg.equals("remove-sink")) {&#xD;
+        m = sim.getMoteWithID(3);&#xD;
+        sim.removeMote(m);&#xD;
+        log.log("removed sink\n");&#xD;
+    } else if(msg.equals("add-sink")) {&#xD;
+        if(!sim.getMoteWithID(3)) {&#xD;
+            m = sim.getMoteTypes()[1].generateMote(sim);&#xD;
+            m.getInterfaces().getMoteID().setMoteID(3);&#xD;
+            sim.addMote(m);&#xD;
+            log.log("added sink\n");&#xD;
+         } else {&#xD;
+            log.log("did not add sink as it was already there\n");      &#xD;
+         }&#xD;
+    } else if(msg.startsWith("Sending")) {&#xD;
+        hops = 0;&#xD;
+    } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
+        hops++;&#xD;
+    } else if(msg.startsWith("Data")) {&#xD;
+        data = msg.split(" ");&#xD;
+        num = parseInt(data[14]);&#xD;
+        if(lastMsg != -1) {&#xD;
+          if(num != lastMsg + 1) {&#xD;
+            numMissed = num - lastMsg - 1;&#xD;
+            lostMsgs += numMissed;           &#xD;
+            log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
+            for(i = 0; i &lt; numMissed; i++) {&#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+            }&#xD;
+          }    &#xD;
+        }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
+        lastMsg = num;&#xD;
+    }&#xD;
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>962</width>
+    <z>0</z>
+    <height>596</height>
+    <location_x>603</location_x>
+    <location_y>43</location_y>
+  </plugin>
+</simconf>
+
diff --git a/regression-tests/23-rpl-non-storing/06-rpl-temporary-root-loss.csc b/regression-tests/23-rpl-non-storing/06-rpl-temporary-root-loss.csc
new file mode 100644
index 000000000..6b5c91e54
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/06-rpl-temporary-root-loss.csc
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype951</identifier>
+      <description>Sender</description>
+      <source>[CONFIG_DIR]/code/sender-node.c</source>
+      <commands>make clean TARGET=cooja
+make sender-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype170</identifier>
+      <description>RPL root</description>
+      <source>[CONFIG_DIR]/code/root-node.c</source>
+      <commands>make clean TARGET=cooja
+make root-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype767</identifier>
+      <description>Receiver</description>
+      <source>[CONFIG_DIR]/code/receiver-node.c</source>
+      <commands>make clean TARGET=cooja
+make receiver-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-22.5728586847096</x>
+        <y>123.9358664968653</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype767</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>116.13379149678028</x>
+        <y>88.36698920455684</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>2</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype951</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-1.39303771455413</x>
+        <y>100.21446701029119</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>4</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype767</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>95.25095618820441</x>
+        <y>63.14998053005015</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>5</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype767</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>66.09378990830604</x>
+        <y>38.32698761608261</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>6</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype767</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>29.05630841762433</x>
+        <y>30.840688165838436</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>7</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype767</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>10.931583432822638</x>
+        <y>69.848248459216</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>8</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype767</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>0.0</x>
+        <y>0.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>3</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype170</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>280</width>
+    <z>0</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <viewport>2.5379695437350276 0.0 0.0 2.5379695437350276 75.2726010197627 15.727272727272757</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>2</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+    </plugin_config>
+    <width>1184</width>
+    <z>3</z>
+    <height>240</height>
+    <location_x>402</location_x>
+    <location_y>162</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>904</width>
+    <z>4</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>GENERATE_MSG(0000000, "add-sink");&#xD;
+GENERATE_MSG(1000000, "remove-sink");&#xD;
+GENERATE_MSG(2000000, "add-sink");&#xD;
+&#xD;
+lostMsgs = 0;&#xD;
+&#xD;
+// we check that we got up to at least message 62 and&#xD;
+// (the simulation is 4000000ms = 66 minutes long)&#xD;
+// that we did not lose anything since 45&#xD;
+// (the sink is back at 2000000ms = 33 minutes)&#xD;
+TIMEOUT(4000000, if(lastMsg &gt;= 62 &amp;&amp; lastMissed &lt;= 45) { log.testOK(); } );&#xD;
+&#xD;
+lastMsg = -1;&#xD;
+lastMissed = -1;&#xD;
+packets = "_________";&#xD;
+hops = 0;&#xD;
+&#xD;
+while(true) {&#xD;
+    YIELD();&#xD;
+    if(msg.equals("remove-sink")) {&#xD;
+        m = sim.getMoteWithID(3);&#xD;
+        sim.removeMote(m);&#xD;
+        log.log("removed sink\n");&#xD;
+    } else if(msg.equals("add-sink")) {&#xD;
+        if(!sim.getMoteWithID(3)) {&#xD;
+            m = sim.getMoteTypes()[1].generateMote(sim);&#xD;
+            m.getInterfaces().getMoteID().setMoteID(3);&#xD;
+            sim.addMote(m);&#xD;
+            log.log("added sink\n");&#xD;
+         } else {&#xD;
+            log.log("did not add sink as it was already there\n");      &#xD;
+         }&#xD;
+    } else if(msg.startsWith("Sending")) {&#xD;
+        hops = 0;&#xD;
+    } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
+        hops++;&#xD;
+    } else if(msg.startsWith("Data")) {&#xD;
+        data = msg.split(" ");&#xD;
+        num = parseInt(data[14]);&#xD;
+        if(lastMsg != -1) {&#xD;
+          if(num != lastMsg + 1) {&#xD;
+            lastMissed = num;&#xD;
+            numMissed = num - lastMsg - 1;&#xD;
+            lostMsgs += numMissed;           &#xD;
+            log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
+            for(i = 0; i &lt; numMissed; i++) {&#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+            }&#xD;
+          }    &#xD;
+        }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
+        lastMsg = num;&#xD;
+    }&#xD;
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>962</width>
+    <z>1</z>
+    <height>596</height>
+    <location_x>603</location_x>
+    <location_y>43</location_y>
+  </plugin>
+</simconf>
+
diff --git a/regression-tests/23-rpl-non-storing/07-rpl-random-rearrangement.csc b/regression-tests/23-rpl-non-storing/07-rpl-random-rearrangement.csc
new file mode 100644
index 000000000..cdb62c420
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/07-rpl-random-rearrangement.csc
@@ -0,0 +1,647 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype419</identifier>
+      <description>Sender</description>
+      <source>[CONFIG_DIR]/code/sender-node.c</source>
+      <commands>make clean TARGET=cooja
+make sender-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype484</identifier>
+      <description>RPL root</description>
+      <source>[CONFIG_DIR]/code/root-node.c</source>
+      <commands>make clean TARGET=cooja
+make root-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype718</identifier>
+      <description>Receiver</description>
+      <source>[CONFIG_DIR]/code/receiver-node.c</source>
+      <commands>make clean TARGET=cooja
+make receiver-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-0.4799968467515439</x>
+        <y>98.79087181374759</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>99.56423154395364</x>
+        <y>50.06466731257512</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>2</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype419</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-0.4799968467515439</x>
+        <y>0.30173505605854883</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>3</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype484</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>12.779318616702257</x>
+        <y>8.464865358169643</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>4</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>9.391922400291703</x>
+        <y>49.22878206790311</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>5</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>48.16367625505583</x>
+        <y>33.27520746599595</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>6</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>16.582742473429345</x>
+        <y>24.932911331640646</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>7</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>8.445564421140666</x>
+        <y>6.770205395698742</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>8</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>87.04968129458189</x>
+        <y>34.46536562612724</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>9</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>94.47123252519145</x>
+        <y>18.275940194868184</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>10</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>95.28044254364556</x>
+        <y>17.683438211793558</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>11</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>56.124622439456076</x>
+        <y>33.88966252832571</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>12</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>98.33149749474546</x>
+        <y>37.448034626592744</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>13</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>58.75337436025891</x>
+        <y>68.64082018992522</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>14</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>66.83816496627988</x>
+        <y>68.38008376830592</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>15</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>90.88648665466316</x>
+        <y>50.942053906416575</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>16</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>68.80089833632896</x>
+        <y>84.17294684073734</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>17</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>73.6760846183129</x>
+        <y>81.76699743886633</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>18</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>0.2960103456537466</x>
+        <y>98.5587829617092</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>19</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>8.130479493904208</x>
+        <y>57.642099520821645</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>20</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>30.550120982984865</x>
+        <y>85.58346736403402</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>21</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>29.65300377698182</x>
+        <y>63.50257213104861</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>22</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>34.92110687576687</x>
+        <y>70.71381297232249</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>23</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype718</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>280</width>
+    <z>1</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <viewport>1.92914676942954 0.0 0.0 1.92914676942954 75.9259843662471 55.41790879138101</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>2</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>1184</width>
+    <z>3</z>
+    <height>500</height>
+    <location_x>402</location_x>
+    <location_y>162</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>904</width>
+    <z>4</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>function place(id, x, y) {&#xD;
+    var node = sim.getMoteWithID(id);&#xD;
+    node.getInterfaces().getPosition().setCoordinates(x, y, 0);&#xD;
+}&#xD;
+&#xD;
+function getRandom(min, max) {&#xD;
+  return Math.random() * (max - min) + min;&#xD;
+}&#xD;
+&#xD;
+// From: http://bost.ocks.org/mike/shuffle/&#xD;
+function shuffle(array) {&#xD;
+  var m = array.length, t, i;&#xD;
+&#xD;
+  // While there remain elements to shuffle…&#xD;
+  while (m) {&#xD;
+&#xD;
+    // Pick a remaining element…&#xD;
+    i = Math.floor(Math.random() * m--);&#xD;
+&#xD;
+    // And swap it with the current element.&#xD;
+    t = array[m];&#xD;
+    array[m] = array[i];&#xD;
+    array[i] = t;&#xD;
+  }&#xD;
+&#xD;
+  return array;&#xD;
+}&#xD;
+&#xD;
+GENERATE_MSG(000000, 'randomize-nodes');&#xD;
+GENERATE_MSG(1200000, 'randomize-nodes');&#xD;
+GENERATE_MSG(2400000, 'randomize-nodes');&#xD;
+GENERATE_MSG(3600000, 'randomize-nodes');&#xD;
+&#xD;
+var numForwarders = 20;&#xD;
+var forwardIDStart = 4;&#xD;
+packetsReceived = [];&#xD;
+var hops;&#xD;
+&#xD;
+TIMEOUT(6000000, if(packetsReceived.length &gt; 50) { log.testOK(); } );&#xD;
+&#xD;
+while(true) {&#xD;
+    YIELD();&#xD;
+    if(msg.equals("randomize-nodes")) {&#xD;
+        log.log('Rearranging network\n');&#xD;
+        var allnodes = [];&#xD;
+        for(var i = 0; i &lt; numForwarders; i++) {&#xD;
+            allnodes.push(i);&#xD;
+        }&#xD;
+        shuffle(allnodes);&#xD;
+        /* Place 1/4 of the nodes in the first quadrant. */&#xD;
+        var i = 0;&#xD;
+        for(; i &lt; numForwarders / 4; i++) {&#xD;
+                place(i + forwardIDStart, &#xD;
+                      getRandom(0, 50),&#xD;
+                      getRandom(0, 50));&#xD;
+        }&#xD;
+        /* Place 1/4 of the nodes in the second quadrant. */&#xD;
+        for(; i &lt; 2 * numForwarders / 4; i++) {&#xD;
+                place(i + forwardIDStart, &#xD;
+                      getRandom(50, 100),&#xD;
+                      getRandom(0, 50));&#xD;
+        }&#xD;
+        /* Place 1/4 of the nodes in the third quadrant. */&#xD;
+        for(; i &lt; 3 * numForwarders / 4; i++) {&#xD;
+                place(i + forwardIDStart, &#xD;
+                      getRandom(50, 100),&#xD;
+                      getRandom(50, 100));&#xD;
+        }        &#xD;
+        /* Place 1/4 of the nodes in the fourth quadrant. */&#xD;
+        for(; i &lt; 4 * numForwarders / 4; i++) {&#xD;
+                place(i + forwardIDStart, &#xD;
+                      getRandom(0, 50),&#xD;
+                      getRandom(50, 100));&#xD;
+        }        &#xD;
+    } else if(msg.startsWith("Sending")) {&#xD;
+        hops = 0;&#xD;
+    } else if(msg.startsWith("#L")) {&#xD;
+        hops++;&#xD;
+    } else if(msg.startsWith("Data")) {&#xD;
+        var data = msg.split(" ");&#xD;
+        var num = parseInt(data[14]);&#xD;
+        packetsReceived.push(num);&#xD;
+        &#xD;
+        /* Copy packetsReceived array to the packets array. */&#xD;
+        var packets = packetsReceived.slice();&#xD;
+        var recvstr = '';&#xD;
+        for(var i = 0; i &lt; num; i++) {&#xD;
+            if(packets[0] == i) {&#xD;
+                recvstr += '*';&#xD;
+                packets.shift();&#xD;
+            } else {&#xD;
+                recvstr += '_';   &#xD;
+            }    &#xD;
+        }&#xD;
+        log.log(packetsReceived.length + ' packets received: ' + recvstr + '\n');&#xD;
+    }&#xD;
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>612</width>
+    <z>0</z>
+    <height>726</height>
+    <location_x>953</location_x>
+    <location_y>43</location_y>
+  </plugin>
+</simconf>
+
diff --git a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-0.csc b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-0.csc
new file mode 100644
index 000000000..b5aeac9b2
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-0.csc
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype921</identifier>
+      <description>Sender</description>
+      <source>[CONFIG_DIR]/code/sender-node.c</source>
+      <commands>make clean TARGET=cooja
+make sender-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype873</identifier>
+      <description>RPL root</description>
+      <source>[CONFIG_DIR]/code/root-node.c</source>
+      <commands>make clean TARGET=cooja
+make root-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype812</identifier>
+      <description>Receiver</description>
+      <source>[CONFIG_DIR]/code/receiver-node.c</source>
+      <commands>make clean TARGET=cooja
+make receiver-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-7.199692787830563</x>
+        <y>98.21738321803603</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype812</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>116.13379149678028</x>
+        <y>88.36698920455684</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>2</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype921</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>12.0</x>
+        <y>68.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>4</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype812</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>95.25095618820441</x>
+        <y>63.14998053005015</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>5</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype812</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>66.09378990830604</x>
+        <y>38.32698761608261</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>6</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype812</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>29.05630841762433</x>
+        <y>30.840688165838436</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>7</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype812</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>58.0</x>
+        <y>108.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>8</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype812</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-40.352178879596096</x>
+        <y>102.66976131212861</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>3</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype873</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>280</width>
+    <z>3</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <viewport>1.6480321712565114 0.0 0.0 1.6480321712565114 98.5016889738719 55.796930342384904</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>0</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>1184</width>
+    <z>2</z>
+    <height>500</height>
+    <location_x>402</location_x>
+    <location_y>162</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>904</width>
+    <z>4</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>GENERATE_MSG(0000000, "add-sink");&#xD;
+//GENERATE_MSG(1000000, "remove-sink");&#xD;
+//GENERATE_MSG(1020000, "add-sink");&#xD;
+GENERATE_MSG(000000, 'init-8-and-4');&#xD;
+GENERATE_MSG(600000, 'move-8-and-4');&#xD;
+&#xD;
+&#xD;
+lostMsgs = 0;&#xD;
+seenMsgs = 0;&#xD;
+&#xD;
+TIMEOUT(2000000, if(seenMsgs &gt; 15) { log.testOK(); } );&#xD;
+&#xD;
+lastMsg = -1;&#xD;
+packets = "_________";&#xD;
+hops = 0;&#xD;
+&#xD;
+while(true) {&#xD;
+    YIELD();&#xD;
+    if(msg.equals("remove-sink")) {&#xD;
+        m = sim.getMoteWithID(3);&#xD;
+        sim.removeMote(m);&#xD;
+        log.log("removed sink\n");&#xD;
+    } else if(msg.equals("add-sink")) {&#xD;
+        if(!sim.getMoteWithID(3)) {&#xD;
+            m = sim.getMoteTypes()[1].generateMote(sim);&#xD;
+            m.getInterfaces().getMoteID().setMoteID(3);&#xD;
+            sim.addMote(m);&#xD;
+            log.log("added sink\n");&#xD;
+         } else {&#xD;
+            log.log("did not add sink as it was already there\n");      &#xD;
+         }&#xD;
+    } else if(msg.equals("init-8-and-4")) {         &#xD;
+         var node4 = sim.getMoteWithID(4);&#xD;
+         var node8 = sim.getMoteWithID(8);&#xD;
+         node8.getInterfaces().getPosition().setCoordinates(12, 68, 0);&#xD;
+         node4.getInterfaces().getPosition().setCoordinates(58, 108, 0);&#xD;
+    } else if(msg.equals("move-8-and-4")) {&#xD;
+         log.log('Moving nodes 8 and 4\n');&#xD;
+         var node4 = sim.getMoteWithID(4);&#xD;
+         var node8 = sim.getMoteWithID(8);&#xD;
+         node4.getInterfaces().getPosition().setCoordinates(12, 68, 0);&#xD;
+         node8.getInterfaces().getPosition().setCoordinates(58, 108, 0);&#xD;
+    } else if(msg.startsWith("Sending")) {&#xD;
+        hops = 0;&#xD;
+    } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
+        hops++;&#xD;
+    } else if(msg.startsWith("Data")) {&#xD;
+        data = msg.split(" ");&#xD;
+        num = parseInt(data[14]);&#xD;
+        seenMsgs++;&#xD;
+        if(lastMsg != -1) {&#xD;
+          if(num != lastMsg + 1) {&#xD;
+            numMissed = num - lastMsg - 1;&#xD;
+            lostMsgs += numMissed;           &#xD;
+            log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
+            for(i = 0; i &lt; numMissed; i++) {&#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+            }&#xD;
+          }    &#xD;
+        }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
+        lastMsg = num;&#xD;
+    }&#xD;
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>612</width>
+    <z>1</z>
+    <height>726</height>
+    <location_x>953</location_x>
+    <location_y>43</location_y>
+  </plugin>
+</simconf>
+
diff --git a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-1.csc b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-1.csc
new file mode 100644
index 000000000..d17bc193c
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-1.csc
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype672</identifier>
+      <description>Sender</description>
+      <source>[CONFIG_DIR]/code/sender-node.c</source>
+      <commands>make clean TARGET=cooja
+make sender-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype780</identifier>
+      <description>RPL root</description>
+      <source>[CONFIG_DIR]/code/root-node.c</source>
+      <commands>make clean TARGET=cooja
+make root-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype36</identifier>
+      <description>Receiver</description>
+      <source>[CONFIG_DIR]/code/receiver-node.c</source>
+      <commands>make clean TARGET=cooja
+make receiver-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-7.199692787830563</x>
+        <y>98.21738321803603</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>116.13379149678028</x>
+        <y>88.36698920455684</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>2</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype672</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>12.0</x>
+        <y>68.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>4</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>95.25095618820441</x>
+        <y>63.14998053005015</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>5</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>66.09378990830604</x>
+        <y>38.32698761608261</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>6</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>29.05630841762433</x>
+        <y>30.840688165838436</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>7</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>58.0</x>
+        <y>108.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>8</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-25.71843353317142</x>
+        <y>43.05517674255262</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>3</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype780</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>280</width>
+    <z>3</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <viewport>2.5379695437350276 0.0 0.0 2.5379695437350276 75.2726010197627 15.727272727272757</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>2</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>1184</width>
+    <z>1</z>
+    <height>500</height>
+    <location_x>402</location_x>
+    <location_y>162</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>904</width>
+    <z>4</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>GENERATE_MSG(0000000, "add-sink");&#xD;
+//GENERATE_MSG(1000000, "remove-sink");&#xD;
+//GENERATE_MSG(1020000, "add-sink");&#xD;
+GENERATE_MSG(000000, 'init-8-and-4');&#xD;
+GENERATE_MSG(600000, 'move-8-and-4');&#xD;
+&#xD;
+&#xD;
+lostMsgs = 0;&#xD;
+seenMsgs = 0;&#xD;
+&#xD;
+TIMEOUT(2000000, if(seenMsgs &gt; 15) { log.testOK(); } );&#xD;
+&#xD;
+lastMsg = -1;&#xD;
+packets = "_________";&#xD;
+hops = 0;&#xD;
+&#xD;
+while(true) {&#xD;
+    YIELD();&#xD;
+    if(msg.equals("remove-sink")) {&#xD;
+        m = sim.getMoteWithID(3);&#xD;
+        sim.removeMote(m);&#xD;
+        log.log("removed sink\n");&#xD;
+    } else if(msg.equals("add-sink")) {&#xD;
+        if(!sim.getMoteWithID(3)) {&#xD;
+            m = sim.getMoteTypes()[1].generateMote(sim);&#xD;
+            m.getInterfaces().getMoteID().setMoteID(3);&#xD;
+            sim.addMote(m);&#xD;
+            log.log("added sink\n");&#xD;
+         } else {&#xD;
+            log.log("did not add sink as it was already there\n");      &#xD;
+         }&#xD;
+    } else if(msg.equals("init-8-and-4")) {         &#xD;
+         var node4 = sim.getMoteWithID(4);&#xD;
+         var node8 = sim.getMoteWithID(8);&#xD;
+         node8.getInterfaces().getPosition().setCoordinates(12, 68, 0);&#xD;
+         node4.getInterfaces().getPosition().setCoordinates(58, 108, 0);&#xD;
+    } else if(msg.equals("move-8-and-4")) {&#xD;
+         log.log('Moving nodes 8 and 4\n');&#xD;
+         var node4 = sim.getMoteWithID(4);&#xD;
+         var node8 = sim.getMoteWithID(8);&#xD;
+         node4.getInterfaces().getPosition().setCoordinates(12, 68, 0);&#xD;
+         node8.getInterfaces().getPosition().setCoordinates(58, 108, 0);&#xD;
+    } else if(msg.startsWith("Sending")) {&#xD;
+        hops = 0;&#xD;
+    } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
+        hops++;&#xD;
+    } else if(msg.startsWith("Data")) {&#xD;
+        data = msg.split(" ");&#xD;
+        num = parseInt(data[14]);&#xD;
+        seenMsgs++;&#xD;
+        if(lastMsg != -1) {&#xD;
+          if(num != lastMsg + 1) {&#xD;
+            numMissed = num - lastMsg - 1;&#xD;
+            lostMsgs += numMissed;           &#xD;
+            log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
+            for(i = 0; i &lt; numMissed; i++) {&#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+            }&#xD;
+          }    &#xD;
+        }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
+        lastMsg = num;&#xD;
+    }&#xD;
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>612</width>
+    <z>0</z>
+    <height>726</height>
+    <location_x>953</location_x>
+    <location_y>43</location_y>
+  </plugin>
+</simconf>
+
diff --git a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-2.csc b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-2.csc
new file mode 100644
index 000000000..fe3db3dc3
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-2.csc
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype672</identifier>
+      <description>Sender</description>
+      <source>[CONFIG_DIR]/code/sender-node.c</source>
+      <commands>make clean TARGET=cooja
+make sender-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype780</identifier>
+      <description>RPL root</description>
+      <source>[CONFIG_DIR]/code/root-node.c</source>
+      <commands>make clean TARGET=cooja
+make root-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype36</identifier>
+      <description>Receiver</description>
+      <source>[CONFIG_DIR]/code/receiver-node.c</source>
+      <commands>make clean TARGET=cooja
+make receiver-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-7.199692787830563</x>
+        <y>98.21738321803603</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>116.13379149678028</x>
+        <y>88.36698920455684</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>2</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype672</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>12.0</x>
+        <y>68.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>4</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>95.25095618820441</x>
+        <y>63.14998053005015</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>5</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>66.09378990830604</x>
+        <y>38.32698761608261</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>6</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>29.05630841762433</x>
+        <y>30.840688165838436</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>7</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>58.0</x>
+        <y>108.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>8</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>16.0472370839803</x>
+        <y>6.017695251870905</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>3</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype780</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>280</width>
+    <z>3</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <viewport>2.5379695437350276 0.0 0.0 2.5379695437350276 75.2726010197627 15.727272727272757</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>0</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>1184</width>
+    <z>2</z>
+    <height>500</height>
+    <location_x>402</location_x>
+    <location_y>162</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>904</width>
+    <z>4</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>GENERATE_MSG(0000000, "add-sink");&#xD;
+//GENERATE_MSG(1000000, "remove-sink");&#xD;
+//GENERATE_MSG(1020000, "add-sink");&#xD;
+GENERATE_MSG(000000, 'init-8-and-4');&#xD;
+GENERATE_MSG(600000, 'move-8-and-4');&#xD;
+&#xD;
+&#xD;
+lostMsgs = 0;&#xD;
+seenMsgs = 0;&#xD;
+&#xD;
+TIMEOUT(2000000, if(seenMsgs &gt; 15) { log.testOK(); } );&#xD;
+&#xD;
+lastMsg = -1;&#xD;
+packets = "_________";&#xD;
+hops = 0;&#xD;
+&#xD;
+while(true) {&#xD;
+    YIELD();&#xD;
+    if(msg.equals("remove-sink")) {&#xD;
+        m = sim.getMoteWithID(3);&#xD;
+        sim.removeMote(m);&#xD;
+        log.log("removed sink\n");&#xD;
+    } else if(msg.equals("add-sink")) {&#xD;
+        if(!sim.getMoteWithID(3)) {&#xD;
+            m = sim.getMoteTypes()[1].generateMote(sim);&#xD;
+            m.getInterfaces().getMoteID().setMoteID(3);&#xD;
+            sim.addMote(m);&#xD;
+            log.log("added sink\n");&#xD;
+         } else {&#xD;
+            log.log("did not add sink as it was already there\n");      &#xD;
+         }&#xD;
+    } else if(msg.equals("init-8-and-4")) {         &#xD;
+         var node4 = sim.getMoteWithID(4);&#xD;
+         var node8 = sim.getMoteWithID(8);&#xD;
+         node8.getInterfaces().getPosition().setCoordinates(12, 68, 0);&#xD;
+         node4.getInterfaces().getPosition().setCoordinates(58, 108, 0);&#xD;
+    } else if(msg.equals("move-8-and-4")) {&#xD;
+         log.log('Moving nodes 8 and 4\n');&#xD;
+         var node4 = sim.getMoteWithID(4);&#xD;
+         var node8 = sim.getMoteWithID(8);&#xD;
+         node4.getInterfaces().getPosition().setCoordinates(12, 68, 0);&#xD;
+         node8.getInterfaces().getPosition().setCoordinates(58, 108, 0);&#xD;
+    } else if(msg.startsWith("Sending")) {&#xD;
+        hops = 0;&#xD;
+    } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
+        hops++;&#xD;
+    } else if(msg.startsWith("Data")) {&#xD;
+        data = msg.split(" ");&#xD;
+        num = parseInt(data[14]);&#xD;
+        seenMsgs++;&#xD;
+        if(lastMsg != -1) {&#xD;
+          if(num != lastMsg + 1) {&#xD;
+            numMissed = num - lastMsg - 1;&#xD;
+            lostMsgs += numMissed;           &#xD;
+            log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
+            for(i = 0; i &lt; numMissed; i++) {&#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+            }&#xD;
+          }    &#xD;
+        }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
+        lastMsg = num;&#xD;
+    }&#xD;
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>612</width>
+    <z>1</z>
+    <height>726</height>
+    <location_x>953</location_x>
+    <location_y>43</location_y>
+  </plugin>
+</simconf>
+
diff --git a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-3.csc b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-3.csc
new file mode 100644
index 000000000..7ee838b2c
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-3.csc
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype672</identifier>
+      <description>Sender</description>
+      <source>[CONFIG_DIR]/code/sender-node.c</source>
+      <commands>make clean TARGET=cooja
+make sender-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype780</identifier>
+      <description>RPL root</description>
+      <source>[CONFIG_DIR]/code/root-node.c</source>
+      <commands>make clean TARGET=cooja
+make root-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype36</identifier>
+      <description>Receiver</description>
+      <source>[CONFIG_DIR]/code/receiver-node.c</source>
+      <commands>make clean TARGET=cooja
+make receiver-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-7.199692787830563</x>
+        <y>98.21738321803603</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>116.13379149678028</x>
+        <y>88.36698920455684</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>2</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype672</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>12.0</x>
+        <y>68.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>4</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>95.25095618820441</x>
+        <y>63.14998053005015</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>5</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>66.09378990830604</x>
+        <y>38.32698761608261</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>6</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>29.05630841762433</x>
+        <y>30.840688165838436</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>7</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>58.0</x>
+        <y>108.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>8</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype36</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>79.48377453078622</x>
+        <y>4.835647970253402</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>3</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype780</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>280</width>
+    <z>3</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <viewport>2.5379695437350276 0.0 0.0 2.5379695437350276 70.27260101976269 60.72727272727276</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>0</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>1184</width>
+    <z>2</z>
+    <height>500</height>
+    <location_x>402</location_x>
+    <location_y>162</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>904</width>
+    <z>4</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>GENERATE_MSG(0000000, "add-sink");&#xD;
+//GENERATE_MSG(1000000, "remove-sink");&#xD;
+//GENERATE_MSG(1020000, "add-sink");&#xD;
+GENERATE_MSG(000000, 'init-8-and-4');&#xD;
+GENERATE_MSG(600000, 'move-8-and-4');&#xD;
+&#xD;
+&#xD;
+lostMsgs = 0;&#xD;
+seenMsgs = 0;&#xD;
+&#xD;
+TIMEOUT(2000000, if(seenMsgs &gt; 15) { log.testOK(); } );&#xD;
+&#xD;
+lastMsg = -1;&#xD;
+packets = "_________";&#xD;
+hops = 0;&#xD;
+&#xD;
+while(true) {&#xD;
+    YIELD();&#xD;
+    if(msg.equals("remove-sink")) {&#xD;
+        m = sim.getMoteWithID(3);&#xD;
+        sim.removeMote(m);&#xD;
+        log.log("removed sink\n");&#xD;
+    } else if(msg.equals("add-sink")) {&#xD;
+        if(!sim.getMoteWithID(3)) {&#xD;
+            m = sim.getMoteTypes()[1].generateMote(sim);&#xD;
+            m.getInterfaces().getMoteID().setMoteID(3);&#xD;
+            sim.addMote(m);&#xD;
+            log.log("added sink\n");&#xD;
+         } else {&#xD;
+            log.log("did not add sink as it was already there\n");      &#xD;
+         }&#xD;
+    } else if(msg.equals("init-8-and-4")) {         &#xD;
+         var node4 = sim.getMoteWithID(4);&#xD;
+         var node8 = sim.getMoteWithID(8);&#xD;
+         node8.getInterfaces().getPosition().setCoordinates(12, 68, 0);&#xD;
+         node4.getInterfaces().getPosition().setCoordinates(58, 108, 0);&#xD;
+    } else if(msg.equals("move-8-and-4")) {&#xD;
+         log.log('Moving nodes 8 and 4\n');&#xD;
+         var node4 = sim.getMoteWithID(4);&#xD;
+         var node8 = sim.getMoteWithID(8);&#xD;
+         node4.getInterfaces().getPosition().setCoordinates(12, 68, 0);&#xD;
+         node8.getInterfaces().getPosition().setCoordinates(58, 108, 0);&#xD;
+    } else if(msg.startsWith("Sending")) {&#xD;
+        hops = 0;&#xD;
+    } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
+        hops++;&#xD;
+    } else if(msg.startsWith("Data")) {&#xD;
+        data = msg.split(" ");&#xD;
+        num = parseInt(data[14]);&#xD;
+        seenMsgs++;&#xD;
+        if(lastMsg != -1) {&#xD;
+          if(num != lastMsg + 1) {&#xD;
+            numMissed = num - lastMsg - 1;&#xD;
+            lostMsgs += numMissed;           &#xD;
+            log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
+            for(i = 0; i &lt; numMissed; i++) {&#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+            }&#xD;
+          }    &#xD;
+        }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
+        lastMsg = num;&#xD;
+    }&#xD;
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>612</width>
+    <z>1</z>
+    <height>726</height>
+    <location_x>953</location_x>
+    <location_y>43</location_y>
+  </plugin>
+</simconf>
+
diff --git a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-4.csc b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-4.csc
new file mode 100644
index 000000000..35c5bd753
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-4.csc
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype192</identifier>
+      <description>Sender</description>
+      <source>[CONFIG_DIR]/code/sender-node.c</source>
+      <commands>make clean TARGET=cooja
+make sender-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype575</identifier>
+      <description>RPL root</description>
+      <source>[CONFIG_DIR]/code/root-node.c</source>
+      <commands>make clean TARGET=cooja
+make root-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype912</identifier>
+      <description>Receiver</description>
+      <source>[CONFIG_DIR]/code/receiver-node.c</source>
+      <commands>make clean TARGET=cooja
+make receiver-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-7.199692787830563</x>
+        <y>98.21738321803603</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype912</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>116.13379149678028</x>
+        <y>88.36698920455684</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>2</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype192</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>12.0</x>
+        <y>68.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>4</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype912</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>95.25095618820441</x>
+        <y>63.14998053005015</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>5</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype912</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>66.09378990830604</x>
+        <y>38.32698761608261</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>6</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype912</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>29.05630841762433</x>
+        <y>30.840688165838436</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>7</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype912</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>58.0</x>
+        <y>108.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>8</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype912</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>122.82550819009461</x>
+        <y>29.658640884220933</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>3</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype575</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>280</width>
+    <z>3</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <viewport>2.5379695437350276 0.0 0.0 2.5379695437350276 70.27260101976269 60.72727272727276</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>0</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>1184</width>
+    <z>2</z>
+    <height>500</height>
+    <location_x>402</location_x>
+    <location_y>162</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>904</width>
+    <z>4</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>GENERATE_MSG(0000000, "add-sink");&#xD;
+//GENERATE_MSG(1000000, "remove-sink");&#xD;
+//GENERATE_MSG(1020000, "add-sink");&#xD;
+GENERATE_MSG(000000, 'init-8-and-4');&#xD;
+GENERATE_MSG(600000, 'move-8-and-4');&#xD;
+&#xD;
+&#xD;
+lostMsgs = 0;&#xD;
+seenMsgs = 0;&#xD;
+&#xD;
+TIMEOUT(2000000, if(seenMsgs &gt; 15) { log.testOK(); } );&#xD;
+&#xD;
+lastMsg = -1;&#xD;
+packets = "_________";&#xD;
+hops = 0;&#xD;
+&#xD;
+while(true) {&#xD;
+    YIELD();&#xD;
+    if(msg.equals("remove-sink")) {&#xD;
+        m = sim.getMoteWithID(3);&#xD;
+        sim.removeMote(m);&#xD;
+        log.log("removed sink\n");&#xD;
+    } else if(msg.equals("add-sink")) {&#xD;
+        if(!sim.getMoteWithID(3)) {&#xD;
+            m = sim.getMoteTypes()[1].generateMote(sim);&#xD;
+            m.getInterfaces().getMoteID().setMoteID(3);&#xD;
+            sim.addMote(m);&#xD;
+            log.log("added sink\n");&#xD;
+         } else {&#xD;
+            log.log("did not add sink as it was already there\n");      &#xD;
+         }&#xD;
+    } else if(msg.equals("init-8-and-4")) {         &#xD;
+         var node4 = sim.getMoteWithID(4);&#xD;
+         var node8 = sim.getMoteWithID(8);&#xD;
+         node8.getInterfaces().getPosition().setCoordinates(12, 68, 0);&#xD;
+         node4.getInterfaces().getPosition().setCoordinates(58, 108, 0);&#xD;
+    } else if(msg.equals("move-8-and-4")) {&#xD;
+         log.log('Moving nodes 8 and 4\n');&#xD;
+         var node4 = sim.getMoteWithID(4);&#xD;
+         var node8 = sim.getMoteWithID(8);&#xD;
+         node4.getInterfaces().getPosition().setCoordinates(12, 68, 0);&#xD;
+         node8.getInterfaces().getPosition().setCoordinates(58, 108, 0);&#xD;
+    } else if(msg.startsWith("Sending")) {&#xD;
+        hops = 0;&#xD;
+    } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
+        hops++;&#xD;
+    } else if(msg.startsWith("Data")) {&#xD;
+        data = msg.split(" ");&#xD;
+        num = parseInt(data[14]);&#xD;
+        seenMsgs++;&#xD;
+        if(lastMsg != -1) {&#xD;
+          if(num != lastMsg + 1) {&#xD;
+            numMissed = num - lastMsg - 1;&#xD;
+            lostMsgs += numMissed;           &#xD;
+            log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
+            for(i = 0; i &lt; numMissed; i++) {&#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+            }&#xD;
+          }    &#xD;
+        }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
+        lastMsg = num;&#xD;
+    }&#xD;
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>612</width>
+    <z>1</z>
+    <height>726</height>
+    <location_x>953</location_x>
+    <location_y>43</location_y>
+  </plugin>
+</simconf>
+
diff --git a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-5.csc b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-5.csc
new file mode 100644
index 000000000..4dc5038bc
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-5.csc
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype372</identifier>
+      <description>Sender</description>
+      <source>[CONFIG_DIR]/code/sender-node.c</source>
+      <commands>make clean TARGET=cooja
+make sender-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype229</identifier>
+      <description>RPL root</description>
+      <source>[CONFIG_DIR]/code/root-node.c</source>
+      <commands>make clean TARGET=cooja
+make root-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype424</identifier>
+      <description>Receiver</description>
+      <source>[CONFIG_DIR]/code/receiver-node.c</source>
+      <commands>make clean TARGET=cooja
+make receiver-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-7.199692787830563</x>
+        <y>98.21738321803603</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype424</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>116.13379149678028</x>
+        <y>88.36698920455684</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>2</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype372</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>12.0</x>
+        <y>68.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>4</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype424</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>95.25095618820441</x>
+        <y>63.14998053005015</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>5</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype424</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>66.09378990830604</x>
+        <y>38.32698761608261</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>6</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype424</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>29.05630841762433</x>
+        <y>30.840688165838436</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>7</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype424</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>58.0</x>
+        <y>108.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>8</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype424</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>145.93059238811136</x>
+        <y>111.16474110935306</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>3</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype229</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>280</width>
+    <z>3</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <viewport>1.6480321712565114 0.0 0.0 1.6480321712565114 98.5016889738719 55.796930342384904</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>0</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>1184</width>
+    <z>2</z>
+    <height>500</height>
+    <location_x>402</location_x>
+    <location_y>162</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>904</width>
+    <z>4</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>GENERATE_MSG(0000000, "add-sink");&#xD;
+//GENERATE_MSG(1000000, "remove-sink");&#xD;
+//GENERATE_MSG(1020000, "add-sink");&#xD;
+GENERATE_MSG(000000, 'init-8-and-4');&#xD;
+GENERATE_MSG(600000, 'move-8-and-4');&#xD;
+&#xD;
+&#xD;
+lostMsgs = 0;&#xD;
+seenMsgs = 0;&#xD;
+&#xD;
+TIMEOUT(2000000, if(seenMsgs &gt; 15) { log.testOK(); } );&#xD;
+&#xD;
+lastMsg = -1;&#xD;
+packets = "_________";&#xD;
+hops = 0;&#xD;
+&#xD;
+while(true) {&#xD;
+    YIELD();&#xD;
+    if(msg.equals("remove-sink")) {&#xD;
+        m = sim.getMoteWithID(3);&#xD;
+        sim.removeMote(m);&#xD;
+        log.log("removed sink\n");&#xD;
+    } else if(msg.equals("add-sink")) {&#xD;
+        if(!sim.getMoteWithID(3)) {&#xD;
+            m = sim.getMoteTypes()[1].generateMote(sim);&#xD;
+            m.getInterfaces().getMoteID().setMoteID(3);&#xD;
+            sim.addMote(m);&#xD;
+            log.log("added sink\n");&#xD;
+         } else {&#xD;
+            log.log("did not add sink as it was already there\n");      &#xD;
+         }&#xD;
+    } else if(msg.equals("init-8-and-4")) {         &#xD;
+         var node4 = sim.getMoteWithID(4);&#xD;
+         var node8 = sim.getMoteWithID(8);&#xD;
+         node8.getInterfaces().getPosition().setCoordinates(12, 68, 0);&#xD;
+         node4.getInterfaces().getPosition().setCoordinates(58, 108, 0);&#xD;
+    } else if(msg.equals("move-8-and-4")) {&#xD;
+         log.log('Moving nodes 8 and 4\n');&#xD;
+         var node4 = sim.getMoteWithID(4);&#xD;
+         var node8 = sim.getMoteWithID(8);&#xD;
+         node4.getInterfaces().getPosition().setCoordinates(12, 68, 0);&#xD;
+         node8.getInterfaces().getPosition().setCoordinates(58, 108, 0);&#xD;
+    } else if(msg.startsWith("Sending")) {&#xD;
+        hops = 0;&#xD;
+    } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
+        hops++;&#xD;
+    } else if(msg.startsWith("Data")) {&#xD;
+        data = msg.split(" ");&#xD;
+        num = parseInt(data[14]);&#xD;
+        seenMsgs++;&#xD;
+        if(lastMsg != -1) {&#xD;
+          if(num != lastMsg + 1) {&#xD;
+            numMissed = num - lastMsg - 1;&#xD;
+            lostMsgs += numMissed;           &#xD;
+            log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
+            for(i = 0; i &lt; numMissed; i++) {&#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+            }&#xD;
+          }    &#xD;
+        }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
+        lastMsg = num;&#xD;
+    }&#xD;
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>612</width>
+    <z>1</z>
+    <height>726</height>
+    <location_x>953</location_x>
+    <location_y>43</location_y>
+  </plugin>
+</simconf>
+
diff --git a/regression-tests/23-rpl-non-storing/09-rpl-probing.csc b/regression-tests/23-rpl-non-storing/09-rpl-probing.csc
new file mode 100644
index 000000000..5206f1cfd
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/09-rpl-probing.csc
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype190</identifier>
+      <description>Sender</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/sender-node.c</source>
+      <commands>make clean TARGET=cooja
+make sender-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype481</identifier>
+      <description>RPL root</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/root-node.c</source>
+      <commands>make clean TARGET=cooja
+make root-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype692</identifier>
+      <description>Receiver</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/receiver-node.c</source>
+      <commands>make clean TARGET=cooja
+make receiver-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>8.0</x>
+        <y>2.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype481</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-7.19071602882406</x>
+        <y>34.96668248624779</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>2</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype190</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-17.870288882812428</x>
+        <y>4.581754854333804</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>3</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype692</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>280</width>
+    <z>2</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <moterelations>true</moterelations>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <viewport>2.494541140753371 0.0 0.0 2.494541140753371 168.25302383129448 116.2254386098645</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>3</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>597</width>
+    <z>0</z>
+    <height>428</height>
+    <location_x>402</location_x>
+    <location_y>162</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>904</width>
+    <z>4</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>GENERATE_MSG(1000000, "moving root 2 hops away");&#xD;
+GENERATE_MSG(1500000, "moving root back");&#xD;
+&#xD;
+lostMsgs = 0;&#xD;
+&#xD;
+TIMEOUT(6000000, if(lastMsg != -1 &amp;&amp; lastMsgHops == 1 &amp;&amp; lostMsgs &lt;= 2  &amp;&amp; num &gt; 20) { log.testOK(); } );&#xD;
+&#xD;
+lastMsg = -1;&#xD;
+packets = "_________";&#xD;
+hops = 0;&#xD;
+lastMsgHops = -1;&#xD;
+&#xD;
+while(true) {&#xD;
+    YIELD();&#xD;
+    if(msg.equals("moving root 2 hops away")) {&#xD;
+        var root = sim.getMoteWithID(1);&#xD;
+        root.getInterfaces().getPosition().setCoordinates(5, -20, 0);&#xD;
+        log.log("moving root 2 hops away\n");&#xD;
+    } else if(msg.equals("moving root back")) {&#xD;
+        var root = sim.getMoteWithID(1);&#xD;
+        root.getInterfaces().getPosition().setCoordinates(8, 2, 0);&#xD;
+        log.log("moving root back\n");&#xD;
+    } else if(msg.startsWith("Sending")) {&#xD;
+        hops = 0;&#xD;
+    } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
+        hops++;&#xD;
+    } else if(msg.startsWith("Data")) {&#xD;
+        data = msg.split(" ");&#xD;
+        num = parseInt(data[14]);&#xD;
+        if(lastMsg != -1) {&#xD;
+          if(num != lastMsg + 1) {&#xD;
+            numMissed = num - lastMsg - 1;&#xD;
+            lostMsgs += numMissed;           &#xD;
+            log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
+            for(i = 0; i &lt; numMissed; i++) {&#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+            }&#xD;
+          }    &#xD;
+        }&#xD;
+        lastMsgHops = hops;&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
+        lastMsg = num;&#xD;
+    }&#xD;
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>605</width>
+    <z>1</z>
+    <height>684</height>
+    <location_x>604</location_x>
+    <location_y>14</location_y>
+  </plugin>
+</simconf>
+
diff --git a/regression-tests/23-rpl-non-storing/10-rpl-multi-dodag.csc b/regression-tests/23-rpl-non-storing/10-rpl-multi-dodag.csc
new file mode 100644
index 000000000..fa015e8d9
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/10-rpl-multi-dodag.csc
@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <project EXPORT="discard">[APPS_DIR]/serial2pty</project>
+  <project EXPORT="discard">[APPS_DIR]/radiologger-headless</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype301</identifier>
+      <description>Sender</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/sender-node.c</source>
+      <commands>make sender-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype820</identifier>
+      <description>RPL root</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/root-node.c</source>
+      <commands>make root-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype306</identifier>
+      <description>Receiver</description>
+      <source>[CONTIKI_DIR]/regression-tests/12-rpl/code/receiver-node.c</source>
+      <commands>make receiver-node.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>9.767954940345236</x>
+        <y>88.75813939592845</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype306</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>63.36720084537501</x>
+        <y>75.88456991067605</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>2</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype301</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-20.684049350551753</x>
+        <y>60.49767834794315</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>6</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype306</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>64.61229064867878</x>
+        <y>39.88729002781773</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>3</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype306</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>37.157272454309606</x>
+        <y>19.60335867526139</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>4</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype306</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>-21.976612887408603</x>
+        <y>30.69884249204435</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>5</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype306</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>43</x>
+        <y>98</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>7</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype820</motetype_identifier>
+    </mote>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>0.0</x>
+        <y>0.0</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>8</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <motetype_identifier>mtype820</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>280</width>
+    <z>3</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <viewport>1.7624788498159916 0.0 0.0 1.7624788498159916 97.6893062637241 8.72727272727273</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>0</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>1184</width>
+    <z>2</z>
+    <height>240</height>
+    <location_x>402</location_x>
+    <location_y>162</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>904</width>
+    <z>4</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <script>GENERATE_MSG(0000000, "add-sink-1");&#xD;
+GENERATE_MSG(0000000, "add-sink-2");&#xD;
+GENERATE_MSG(0000000, "remove-sink-3");&#xD;
+&#xD;
+GENERATE_MSG(2000000, "remove-sink-1");&#xD;
+GENERATE_MSG(4000000, "remove-sink-2");&#xD;
+GENERATE_MSG(4000000, "add-sink-3");&#xD;
+&#xD;
+lostMsgs = 0;&#xD;
+newDagOk = 0;&#xD;
+&#xD;
+TIMEOUT(6000000, if(newDagOk == 2) { log.testOK(); } );&#xD;
+&#xD;
+lastMsg = -1;&#xD;
+newSink = 0;&#xD;
+packets = "_________";&#xD;
+hops = 0;&#xD;
+&#xD;
+while(true) {&#xD;
+    YIELD();&#xD;
+    if(msg.equals("remove-sink-1")) {&#xD;
+        m = sim.getMoteWithID(7);&#xD;
+        if(m) {&#xD;
+            sim.removeMote(m);&#xD;
+            log.log("removed sink 1\n");&#xD;
+        }&#xD;
+    } else if(msg.equals("remove-sink-2")) {&#xD;
+        m = sim.getMoteWithID(8);&#xD;
+        if(m) {&#xD;
+            sim.removeMote(m);&#xD;
+            log.log("removed sink 2\n");&#xD;
+        }&#xD;
+    } else if(msg.equals("remove-sink-3")) {&#xD;
+        m = sim.getMoteWithID(9);&#xD;
+        if(m) {&#xD;
+            sim.removeMote(m);&#xD;
+            log.log("removed sink 3\n");&#xD;
+        }&#xD;
+    } else if(msg.equals("add-sink-1")) {&#xD;
+        newSink = 1;&#xD;
+        if(!sim.getMoteWithID(7)) {&#xD;
+            m = sim.getMoteTypes()[1].generateMote(sim);&#xD;
+            m.getInterfaces().getMoteID().setMoteID(7);&#xD;
+            sim.addMote(m);&#xD;
+            m.getInterfaces().getPosition().setCoordinates(43, 98, 0);&#xD;
+            log.log("added sink 1\n");&#xD;
+         } else {&#xD;
+            log.log("did not add sink 1 as it was already there\n");      &#xD;
+         }&#xD;
+    } else if(msg.equals("add-sink-2")) {&#xD;
+        newSink = 1;&#xD;
+        if(!sim.getMoteWithID(8)) {&#xD;
+            m = sim.getMoteTypes()[1].generateMote(sim);&#xD;
+            m.getInterfaces().getMoteID().setMoteID(8);&#xD;
+            sim.addMote(m);&#xD;
+            log.log("added sink 2\n");&#xD;
+         } else {&#xD;
+            log.log("did not add sink 2 as it was already there\n");      &#xD;
+         }&#xD;
+    } else if(msg.equals("add-sink-3")) {&#xD;
+        newSink = 1;&#xD;
+        if(!sim.getMoteWithID(9)) {&#xD;
+            m = sim.getMoteTypes()[1].generateMote(sim);&#xD;
+            m.getInterfaces().getMoteID().setMoteID(9);&#xD;
+            sim.addMote(m);&#xD;
+            log.log("added sink 3\n");&#xD;
+         } else {&#xD;
+            log.log("did not add sink 3 as it was already there\n");      &#xD;
+         }&#xD;
+    } else if(msg.startsWith("Sending")) {&#xD;
+        hops = 0;&#xD;
+    } else if(msg.startsWith("#L") &amp;&amp; msg.endsWith("1; red")) {&#xD;
+        hops++;&#xD;
+    } else if(msg.startsWith("Data")) {&#xD;
+        data = msg.split(" ");&#xD;
+        num = parseInt(data[14]);&#xD;
+        if(newSink) {&#xD;
+          newDagOk++;&#xD;
+          newSink = 0;&#xD;
+        }&#xD;
+        if(lastMsg != -1) {&#xD;
+          if(num != lastMsg + 1) {&#xD;
+            numMissed = num - lastMsg - 1;&#xD;
+            lostMsgs += numMissed;           &#xD;
+            log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
+            for(i = 0; i &lt; numMissed; i++) {&#xD;
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+            }&#xD;
+          }    &#xD;
+        }&#xD;
+        packets = packets.substr(0, num) + "*";&#xD;
+        log.log("" + hops + " " + packets + "\n");&#xD;
+        lastMsg = num;&#xD;
+    }&#xD;
+}</script>
+      <active>true</active>
+    </plugin_config>
+    <width>962</width>
+    <z>1</z>
+    <height>596</height>
+    <location_x>603</location_x>
+    <location_y>43</location_y>
+  </plugin>
+</simconf>
+
diff --git a/regression-tests/23-rpl-non-storing/Makefile b/regression-tests/23-rpl-non-storing/Makefile
new file mode 100644
index 000000000..272bc7da1
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/Makefile
@@ -0,0 +1 @@
+include ../Makefile.simulation-test
diff --git a/regression-tests/23-rpl-non-storing/code/Makefile b/regression-tests/23-rpl-non-storing/code/Makefile
new file mode 100644
index 000000000..616341592
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/code/Makefile
@@ -0,0 +1,7 @@
+all: sender-node receiver-node root-node
+CONTIKI=../../..
+
+CFLAGS+=-DPROJECT_CONF_H=\"project-conf.h\"
+
+CONTIKI_WITH_IPV6 = 1
+include $(CONTIKI)/Makefile.include
diff --git a/regression-tests/23-rpl-non-storing/code/project-conf.h b/regression-tests/23-rpl-non-storing/code/project-conf.h
new file mode 100644
index 000000000..2097e5f67
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/code/project-conf.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016, Inria.
+ * 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.
+ */
+#define TCPIP_CONF_ANNOTATE_TRANSMISSIONS 1
+
+#undef RPL_CONF_WITH_NON_STORING
+#define RPL_CONF_WITH_NON_STORING 1
+
+#undef RPL_CONF_WITH_STORING
+#define RPL_CONF_WITH_STORING 0
+
+#undef RPL_CONF_MOP
+#define RPL_CONF_MOP RPL_MOP_NON_STORING
+
+/* Add a bit of extra probing in the non-storing case to compensate for reduced DAO traffic */
+#undef RPL_CONF_PROBING_INTERVAL
+#define RPL_CONF_PROBING_INTERVAL (60 * CLOCK_SECOND)
diff --git a/regression-tests/23-rpl-non-storing/code/receiver-node.c b/regression-tests/23-rpl-non-storing/code/receiver-node.c
new file mode 100644
index 000000000..4ba3cb148
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/code/receiver-node.c
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2012, Thingsquare, www.thingsquare.com.
+ * 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.
+ */
+
+#include "contiki.h"
+#include "lib/random.h"
+#include "sys/ctimer.h"
+#include "sys/etimer.h"
+#include "net/ip/uip.h"
+#include "net/ipv6/uip-ds6.h"
+#include "net/ip/uip-debug.h"
+
+#include "simple-udp.h"
+
+#include "net/rpl/rpl.h"
+#include "dev/leds.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#define UDP_PORT 1234
+
+static struct simple_udp_connection unicast_connection;
+
+/*---------------------------------------------------------------------------*/
+PROCESS(receiver_node_process, "Receiver node");
+AUTOSTART_PROCESSES(&receiver_node_process);
+/*---------------------------------------------------------------------------*/
+static void
+receiver(struct simple_udp_connection *c,
+         const uip_ipaddr_t *sender_addr,
+         uint16_t sender_port,
+         const uip_ipaddr_t *receiver_addr,
+         uint16_t receiver_port,
+         const uint8_t *data,
+         uint16_t datalen)
+{
+  printf("Data received from ");
+  uip_debug_ipaddr_print(sender_addr);
+  printf(" on port %d from port %d with length %d: '%s'\n",
+         receiver_port, sender_port, datalen, data);
+}
+/*---------------------------------------------------------------------------*/
+static uip_ipaddr_t *
+set_global_address(void)
+{
+  static uip_ipaddr_t ipaddr;
+  int i;
+  uint8_t state;
+
+  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
+  uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
+
+  printf("IPv6 addresses: ");
+  for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
+    state = uip_ds6_if.addr_list[i].state;
+    if(uip_ds6_if.addr_list[i].isused &&
+       (state == ADDR_TENTATIVE || state == ADDR_PREFERRED)) {
+      uip_debug_ipaddr_print(&uip_ds6_if.addr_list[i].ipaddr);
+      printf("\n");
+    }
+  }
+
+  return &ipaddr;
+}
+/*---------------------------------------------------------------------------*/
+uint8_t should_blink = 1;
+static void
+route_callback(int event, uip_ipaddr_t *route, uip_ipaddr_t *ipaddr, int num_routes)
+{
+  if(event == UIP_DS6_NOTIFICATION_DEFRT_ADD) {
+    should_blink = 0;
+  } else if(event == UIP_DS6_NOTIFICATION_DEFRT_RM) {
+    should_blink = 1;
+  }
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(receiver_node_process, ev, data)
+{
+  static struct etimer et;
+  static struct uip_ds6_notification n;
+
+  PROCESS_BEGIN();
+
+  set_global_address();
+
+  uip_ds6_notification_add(&n, route_callback);
+
+  simple_udp_register(&unicast_connection, UDP_PORT,
+                      NULL, UDP_PORT, receiver);
+
+  etimer_set(&et, CLOCK_SECOND);
+  while(1) {
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+    etimer_reset(&et);
+    if(should_blink) {
+      leds_on(LEDS_ALL);
+      PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+      etimer_reset(&et);
+      leds_off(LEDS_ALL);
+    }
+  }
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
diff --git a/regression-tests/23-rpl-non-storing/code/root-node.c b/regression-tests/23-rpl-non-storing/code/root-node.c
new file mode 100644
index 000000000..0609e1bd8
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/code/root-node.c
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2012, Thingsquare, www.thingsquare.com.
+ * 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.
+ */
+
+
+#include "contiki.h"
+#include "lib/random.h"
+#include "sys/ctimer.h"
+#include "sys/etimer.h"
+#include "net/ip/uip.h"
+#include "net/ipv6/uip-ds6.h"
+#include "net/ip/uip-debug.h"
+
+#include "simple-udp.h"
+
+#include "net/rpl/rpl.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#define UDP_PORT 1234
+#define SERVICE_ID 190
+
+#define SEND_INTERVAL		(10 * CLOCK_SECOND)
+#define SEND_TIME		(random_rand() % (SEND_INTERVAL))
+
+static struct simple_udp_connection unicast_connection;
+
+/*---------------------------------------------------------------------------*/
+PROCESS(unicast_receiver_process, "Unicast receiver example process");
+AUTOSTART_PROCESSES(&unicast_receiver_process);
+/*---------------------------------------------------------------------------*/
+static void
+receiver(struct simple_udp_connection *c,
+         const uip_ipaddr_t *sender_addr,
+         uint16_t sender_port,
+         const uip_ipaddr_t *receiver_addr,
+         uint16_t receiver_port,
+         const uint8_t *data,
+         uint16_t datalen)
+{
+  printf("Data received from ");
+  uip_debug_ipaddr_print(sender_addr);
+  printf(" on port %d from port %d with length %d: '%s'\n",
+         receiver_port, sender_port, datalen, data);
+}
+/*---------------------------------------------------------------------------*/
+static uip_ipaddr_t *
+set_global_address(void)
+{
+  static uip_ipaddr_t ipaddr;
+  int i;
+  uint8_t state;
+
+  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
+  uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
+
+  printf("IPv6 addresses: ");
+  for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
+    state = uip_ds6_if.addr_list[i].state;
+    if(uip_ds6_if.addr_list[i].isused &&
+       (state == ADDR_TENTATIVE || state == ADDR_PREFERRED)) {
+      uip_debug_ipaddr_print(&uip_ds6_if.addr_list[i].ipaddr);
+      printf("\n");
+    }
+  }
+
+  return &ipaddr;
+}
+/*---------------------------------------------------------------------------*/
+static void
+create_rpl_dag(uip_ipaddr_t *ipaddr)
+{
+  struct uip_ds6_addr *root_if;
+
+  root_if = uip_ds6_addr_lookup(ipaddr);
+  if(root_if != NULL) {
+    rpl_dag_t *dag;
+    uip_ipaddr_t prefix;
+    
+    rpl_set_root(RPL_DEFAULT_INSTANCE, ipaddr);
+    dag = rpl_get_any_dag();
+    uip_ip6addr(&prefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    rpl_set_prefix(dag, &prefix, 64);
+    PRINTF("created a new RPL dag\n");
+  } else {
+    PRINTF("failed to create a new RPL DAG\n");
+  }
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(unicast_receiver_process, ev, data)
+{
+  uip_ipaddr_t *ipaddr;
+
+  PROCESS_BEGIN();
+
+  ipaddr = set_global_address();
+
+  create_rpl_dag(ipaddr);
+
+  simple_udp_register(&unicast_connection, UDP_PORT,
+                      NULL, UDP_PORT, receiver);
+
+  while(1) {
+    PROCESS_WAIT_EVENT();
+  }
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
diff --git a/regression-tests/23-rpl-non-storing/code/sender-node.c b/regression-tests/23-rpl-non-storing/code/sender-node.c
new file mode 100644
index 000000000..08d81b62d
--- /dev/null
+++ b/regression-tests/23-rpl-non-storing/code/sender-node.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2012, Thingsquare, www.thingsquare.com.
+ * 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.
+ */
+
+
+#include "contiki.h"
+#include "lib/random.h"
+#include "sys/ctimer.h"
+#include "sys/etimer.h"
+#include "net/ip/uip.h"
+#include "net/ipv6/uip-ds6.h"
+#include "net/ip/uip-debug.h"
+
+#include "simple-udp.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#define UDP_PORT 1234
+
+#define SEND_INTERVAL		(60 * CLOCK_SECOND)
+#define SEND_TIME		(random_rand() % (SEND_INTERVAL))
+
+static struct simple_udp_connection unicast_connection;
+
+/*---------------------------------------------------------------------------*/
+PROCESS(sender_node_process, "Sender node process");
+AUTOSTART_PROCESSES(&sender_node_process);
+/*---------------------------------------------------------------------------*/
+static void
+receiver(struct simple_udp_connection *c,
+         const uip_ipaddr_t *sender_addr,
+         uint16_t sender_port,
+         const uip_ipaddr_t *receiver_addr,
+         uint16_t receiver_port,
+         const uint8_t *data,
+         uint16_t datalen)
+{
+  printf("Sender received data on port %d from port %d with length %d\n",
+         receiver_port, sender_port, datalen);
+}
+/*---------------------------------------------------------------------------*/
+static void
+set_global_address(void)
+{
+  uip_ipaddr_t ipaddr;
+  int i;
+  uint8_t state;
+
+  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
+  uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
+
+  printf("IPv6 addresses: ");
+  for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
+    state = uip_ds6_if.addr_list[i].state;
+    if(uip_ds6_if.addr_list[i].isused &&
+       (state == ADDR_TENTATIVE || state == ADDR_PREFERRED)) {
+      uip_debug_ipaddr_print(&uip_ds6_if.addr_list[i].ipaddr);
+      printf("\n");
+    }
+  }
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(sender_node_process, ev, data)
+{
+  static struct etimer periodic_timer;
+  static struct etimer send_timer;
+  uip_ipaddr_t addr;
+
+  PROCESS_BEGIN();
+
+  set_global_address();
+
+  simple_udp_register(&unicast_connection, UDP_PORT,
+                      NULL, UDP_PORT, receiver);
+
+  etimer_set(&periodic_timer, SEND_INTERVAL);
+  while(1) {
+
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&periodic_timer));
+    etimer_reset(&periodic_timer);
+    etimer_set(&send_timer, SEND_TIME);
+
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&send_timer));
+
+    uip_ip6addr(&addr, 0xaaaa, 0, 0, 0, 0x0201, 0x001, 0x001, 0x001);
+
+    {
+      static unsigned int message_number;
+      char buf[20];
+
+      printf("Sending unicast to ");
+      uip_debug_ipaddr_print(&addr);
+      printf("\n");
+      sprintf(buf, "Message %d", message_number);
+      message_number++;
+      simple_udp_sendto(&unicast_connection, buf, strlen(buf) + 1, &addr);
+    }
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/

From 1a7133bbf28058393dca9450b8d91da7b2c28ac1 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Mon, 25 Apr 2016 14:51:25 +0200
Subject: [PATCH 336/393] Simplified configuration of RPL non-storing mode

---
 core/contiki-default-conf.h                   | 13 ++++++
 core/net/rpl/rpl-conf.h                       | 21 ----------
 core/net/rpl/rpl-private.h                    | 40 +++++++++++++++++++
 .../ipv6/rpl-border-router/project-conf.h     | 18 +++++----
 examples/ipv6/rpl-collect/project-conf.h      | 20 +++++-----
 examples/ipv6/rpl-udp/project-conf.h          | 16 +++++---
 .../23-rpl-non-storing/code/project-conf.h    |  6 ---
 7 files changed, 85 insertions(+), 49 deletions(-)

diff --git a/core/contiki-default-conf.h b/core/contiki-default-conf.h
index 36bf6afe1..c26a2b8df 100644
--- a/core/contiki-default-conf.h
+++ b/core/contiki-default-conf.h
@@ -148,12 +148,25 @@
 #endif /* NBR_TABLE_FIND_REMOVABLE */
 #endif /* UIP_CONF_IPV6_RPL */
 
+/* RPL_CONF_MOP specifies the RPL mode of operation that will be
+ * advertised by the RPL root. Possible values: RPL_MOP_NO_DOWNWARD_ROUTES,
+ * RPL_MOP_NON_STORING, RPL_MOP_STORING_NO_MULTICAST, RPL_MOP_STORING_MULTICAST */
+#ifndef RPL_CONF_MOP
+#define RPL_CONF_MOP RPL_MOP_STORING_NO_MULTICAST
+#endif /* RPL_CONF_MOP */
+
 /* UIP_CONF_MAX_ROUTES specifies the maximum number of routes that each
    node will be able to handle. */
 #ifndef UIP_CONF_MAX_ROUTES
 #define UIP_CONF_MAX_ROUTES 20
 #endif /* UIP_CONF_MAX_ROUTES */
 
+/* RPL_NS_CONF_LINK_NUM specifies the maximum number of links a RPL root
+ * will maintain in non-storing mode. */
+#ifndef RPL_NS_CONF_LINK_NUM
+#define RPL_NS_CONF_LINK_NUM 20
+#endif /* RPL_NS_CONF_LINK_NUM */
+
 /* UIP_CONF_UDP specifies if UDP support should be included or
    not. Disabling UDP saves memory but breaks a lot of stuff. */
 #ifndef UIP_CONF_UDP
diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h
index 0148e11e5..6479dd374 100644
--- a/core/net/rpl/rpl-conf.h
+++ b/core/net/rpl/rpl-conf.h
@@ -235,27 +235,6 @@
 #define RPL_PREFERENCE              0
 #endif
 
-/*
- * Embed support for storing mode
- */
-#ifdef RPL_CONF_WITH_STORING
-#define RPL_WITH_STORING RPL_CONF_WITH_STORING
-#else /* RPL_CONF_WITH_STORING */
-#define RPL_WITH_STORING 1
-#endif /* RPL_CONF_WITH_STORING */
-
-/*
- * Embed support for non-storing mode
- */
-#ifdef RPL_CONF_WITH_NON_STORING
-#define RPL_WITH_NON_STORING RPL_CONF_WITH_NON_STORING
-#else /* RPL_CONF_WITH_NON_STORING */
-#define RPL_WITH_NON_STORING 0
-#endif /* RPL_CONF_WITH_NON_STORING */
-
-#define RPL_IS_STORING(instance) (RPL_WITH_STORING && ((instance) != NULL) && ((instance)->mop > RPL_MOP_NON_STORING))
-#define RPL_IS_NON_STORING(instance) (RPL_WITH_NON_STORING && ((instance) != NULL) && ((instance)->mop == RPL_MOP_NON_STORING))
-
 /*
  * RPL DAO ACK support. When enabled, DAO ACK will be sent and requested.
  * This will also enable retransmission of DAO when no ack is received.
diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h
index 72ac12198..34d2e4445 100644
--- a/core/net/rpl/rpl-private.h
+++ b/core/net/rpl/rpl-private.h
@@ -44,6 +44,8 @@
 #include "sys/clock.h"
 #include "sys/ctimer.h"
 #include "net/ipv6/uip-ds6.h"
+#include "net/ipv6/uip-ds6-route.h"
+#include "net/rpl/rpl-ns.h"
 #include "net/ipv6/multicast/uip-mcast6.h"
 
 /*---------------------------------------------------------------------------*/
@@ -197,6 +199,7 @@
 #define RPL_MOP_STORING_NO_MULTICAST    2
 #define RPL_MOP_STORING_MULTICAST       3
 
+/* RPL Mode of operation */
 #ifdef  RPL_CONF_MOP
 #define RPL_MOP_DEFAULT                 RPL_CONF_MOP
 #else /* RPL_CONF_MOP */
@@ -207,6 +210,43 @@
 #endif /* UIP_IPV6_MULTICAST_RPL */
 #endif /* RPL_CONF_MOP */
 
+/*
+ * Embed support for storing mode
+ */
+#ifdef RPL_CONF_WITH_STORING
+#define RPL_WITH_STORING RPL_CONF_WITH_STORING
+#else /* RPL_CONF_WITH_STORING */
+/* By default: embed support for non-storing if and only if the configured MOP is not non-storing */
+#define RPL_WITH_STORING (RPL_MOP_DEFAULT != RPL_MOP_NON_STORING)
+#endif /* RPL_CONF_WITH_STORING */
+
+/*
+ * Embed support for non-storing mode
+ */
+#ifdef RPL_CONF_WITH_NON_STORING
+#define RPL_WITH_NON_STORING RPL_CONF_WITH_NON_STORING
+#else /* RPL_CONF_WITH_NON_STORING */
+/* By default: embed support for non-storing if and only if the configured MOP is non-storing */
+#define RPL_WITH_NON_STORING (RPL_MOP_DEFAULT == RPL_MOP_NON_STORING)
+#endif /* RPL_CONF_WITH_NON_STORING */
+
+#if RPL_WITH_STORING && (UIP_DS6_ROUTE_NB == 0)
+#error "RPL with storing mode included but #routes == 0. Set UIP_CONF_MAX_ROUTES accordingly."
+#if !RPL_WITH_NON_STORING && (RPL_NS_LINK_NUM > 0)
+#error "You might also want to set RPL_NS_CONF_LINK_NUM to 0."
+#endif
+#endif
+
+#if RPL_WITH_NON_STORING && (RPL_NS_LINK_NUM == 0)
+#error "RPL with non-storing mode included but #links == 0. Set RPL_NS_CONF_LINK_NUM accordingly."
+#if !RPL_WITH_STORING && (UIP_DS6_ROUTE_NB > 0)
+#error "You might also want to set UIP_CONF_MAX_ROUTES to 0."
+#endif
+#endif
+
+#define RPL_IS_STORING(instance) (RPL_WITH_STORING && ((instance) != NULL) && ((instance)->mop > RPL_MOP_NON_STORING))
+#define RPL_IS_NON_STORING(instance) (RPL_WITH_NON_STORING && ((instance) != NULL) && ((instance)->mop == RPL_MOP_NON_STORING))
+
 /* Emit a pre-processor error if the user configured multicast with bad MOP */
 #if RPL_CONF_MULTICAST && (RPL_MOP_DEFAULT != RPL_MOP_STORING_MULTICAST)
 #error "RPL Multicast requires RPL_MOP_DEFAULT==3. Check contiki-conf.h"
diff --git a/examples/ipv6/rpl-border-router/project-conf.h b/examples/ipv6/rpl-border-router/project-conf.h
index c73735be6..ec3eb3f00 100644
--- a/examples/ipv6/rpl-border-router/project-conf.h
+++ b/examples/ipv6/rpl-border-router/project-conf.h
@@ -31,16 +31,18 @@
 #ifndef PROJECT_ROUTER_CONF_H_
 #define PROJECT_ROUTER_CONF_H_
 
-#ifndef RPL_CONF_WITH_NON_STORING
-#define RPL_CONF_WITH_NON_STORING 0 /* Set this to run with non-storing mode */
-#endif /* RPL_CONF_WITH_NON_STORING */
+#ifndef WITH_NON_STORING
+#define WITH_NON_STORING 0 /* Set this to run with non-storing mode */
+#endif /* WITH_NON_STORING */
 
-#if RPL_CONF_WITH_NON_STORING
-#undef RPL_CONF_WITH_STORING
-#define RPL_CONF_WITH_STORING 0
+#if WITH_NON_STORING
+#undef RPL_NS_CONF_LINK_NUM
+#define RPL_NS_CONF_LINK_NUM 40 /* Number of links maintained at the root */
+#undef UIP_CONF_MAX_ROUTES
+#define UIP_CONF_MAX_ROUTES 0 /* No need for routes */
 #undef RPL_CONF_MOP
-#define RPL_CONF_MOP RPL_MOP_NON_STORING
-#endif /* RPL_CONF_WITH_NON_STORING */
+#define RPL_CONF_MOP RPL_MOP_NON_STORING /* Mode of operation*/
+#endif /* WITH_NON_STORING */
 
 #ifndef UIP_FALLBACK_INTERFACE
 #define UIP_FALLBACK_INTERFACE rpl_interface
diff --git a/examples/ipv6/rpl-collect/project-conf.h b/examples/ipv6/rpl-collect/project-conf.h
index e45518b73..a143b07cd 100644
--- a/examples/ipv6/rpl-collect/project-conf.h
+++ b/examples/ipv6/rpl-collect/project-conf.h
@@ -30,6 +30,10 @@
 #ifndef PROJECT_CONF_H_
 #define PROJECT_CONF_H_
 
+#ifndef WITH_NON_STORING
+#define WITH_NON_STORING 0 /* Set this to run with non-storing mode */
+#endif /* WITH_NON_STORING */
+
 #undef NBR_TABLE_CONF_MAX_NEIGHBORS
 #undef UIP_CONF_MAX_ROUTES
 
@@ -63,15 +67,13 @@
 #undef SICSLOWPAN_CONF_FRAG
 #define SICSLOWPAN_CONF_FRAG           0
 
-#ifndef RPL_CONF_WITH_NON_STORING
-#define RPL_CONF_WITH_NON_STORING 0 /* Set this to run with non-storing mode */
-#endif /* RPL_CONF_WITH_NON_STORING */
-
-#if RPL_CONF_WITH_NON_STORING
-#undef RPL_CONF_WITH_STORING
-#define RPL_CONF_WITH_STORING 0
+#if WITH_NON_STORING
+#undef RPL_NS_CONF_LINK_NUM
+#define RPL_NS_CONF_LINK_NUM 40 /* Number of links maintained at the root. Can be set to 0 at non-root nodes. */
+#undef UIP_CONF_MAX_ROUTES
+#define UIP_CONF_MAX_ROUTES 0 /* No need for routes */
 #undef RPL_CONF_MOP
-#define RPL_CONF_MOP RPL_MOP_NON_STORING
-#endif /* RPL_CONF_WITH_NON_STORING */
+#define RPL_CONF_MOP RPL_MOP_NON_STORING /* Mode of operation*/
+#endif /* WITH_NON_STORING */
 
 #endif /* PROJECT_CONF_H_ */
diff --git a/examples/ipv6/rpl-udp/project-conf.h b/examples/ipv6/rpl-udp/project-conf.h
index 0217200b4..794897a46 100644
--- a/examples/ipv6/rpl-udp/project-conf.h
+++ b/examples/ipv6/rpl-udp/project-conf.h
@@ -30,6 +30,10 @@
 #ifndef PROJECT_CONF_H_
 #define PROJECT_CONF_H_
 
+#ifndef WITH_NON_STORING
+#define WITH_NON_STORING 0 /* Set this to run with non-storing mode */
+#endif /* WITH_NON_STORING */
+
 #undef NBR_TABLE_CONF_MAX_NEIGHBORS
 #undef UIP_CONF_MAX_ROUTES
 
@@ -60,11 +64,13 @@
 #define RPL_CONF_WITH_NON_STORING 0 /* Set this to run with non-storing mode */
 #endif /* RPL_CONF_WITH_NON_STORING */
 
-#if RPL_CONF_WITH_NON_STORING
-#undef RPL_CONF_WITH_STORING
-#define RPL_CONF_WITH_STORING 0
+#if WITH_NON_STORING
+#undef RPL_NS_CONF_LINK_NUM
+#define RPL_NS_CONF_LINK_NUM 40 /* Number of links maintained at the root. Can be set to 0 at non-root nodes. */
+#undef UIP_CONF_MAX_ROUTES
+#define UIP_CONF_MAX_ROUTES 0 /* No need for routes */
 #undef RPL_CONF_MOP
-#define RPL_CONF_MOP RPL_MOP_NON_STORING
-#endif /* RPL_CONF_WITH_NON_STORING */
+#define RPL_CONF_MOP RPL_MOP_NON_STORING /* Mode of operation*/
+#endif /* WITH_NON_STORING */
 
 #endif
diff --git a/regression-tests/23-rpl-non-storing/code/project-conf.h b/regression-tests/23-rpl-non-storing/code/project-conf.h
index 2097e5f67..9270334fb 100644
--- a/regression-tests/23-rpl-non-storing/code/project-conf.h
+++ b/regression-tests/23-rpl-non-storing/code/project-conf.h
@@ -28,12 +28,6 @@
  */
 #define TCPIP_CONF_ANNOTATE_TRANSMISSIONS 1
 
-#undef RPL_CONF_WITH_NON_STORING
-#define RPL_CONF_WITH_NON_STORING 1
-
-#undef RPL_CONF_WITH_STORING
-#define RPL_CONF_WITH_STORING 0
-
 #undef RPL_CONF_MOP
 #define RPL_CONF_MOP RPL_MOP_NON_STORING
 

From b32b3f66660b12020d632f069e2e500b6c32f5a4 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Mon, 25 Apr 2016 14:55:18 +0200
Subject: [PATCH 337/393] RPL non-storing: add compile-test to also check for
 warnings

---
 examples/ipv6/rpl-border-router/Makefile       | 4 ++++
 examples/ipv6/rpl-collect/Makefile             | 4 ++++
 examples/ipv6/rpl-udp/Makefile                 | 4 ++++
 regression-tests/18-compile-arm-ports/Makefile | 1 +
 4 files changed, 13 insertions(+)

diff --git a/examples/ipv6/rpl-border-router/Makefile b/examples/ipv6/rpl-border-router/Makefile
index 6595186be..d325918ec 100644
--- a/examples/ipv6/rpl-border-router/Makefile
+++ b/examples/ipv6/rpl-border-router/Makefile
@@ -21,6 +21,10 @@ PROJECT_SOURCEFILES += slip-bridge.c
 #of the slip connection. Large MSS together with low baud rates without flow
 #control will overrun the transmit buffer when the style sheet is requested.
 
+ifeq ($(MAKE_WITH_NON_STORING),1)
+CFLAGS += -DWITH_NON_STORING=1
+endif
+
 WITH_WEBSERVER=1
 ifeq ($(WITH_WEBSERVER),1)
 CFLAGS += -DUIP_CONF_TCP=1
diff --git a/examples/ipv6/rpl-collect/Makefile b/examples/ipv6/rpl-collect/Makefile
index e2a1021a0..13813ed44 100644
--- a/examples/ipv6/rpl-collect/Makefile
+++ b/examples/ipv6/rpl-collect/Makefile
@@ -5,6 +5,10 @@ PROJECT_SOURCEFILES += collect-common.c
 
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
+ifeq ($(MAKE_WITH_NON_STORING),1)
+CFLAGS += -DWITH_NON_STORING=1
+endif
+
 ifdef PERIOD
 CFLAGS=-DPERIOD=$(PERIOD)
 endif
diff --git a/examples/ipv6/rpl-udp/Makefile b/examples/ipv6/rpl-udp/Makefile
index fbf9a589e..d7330821a 100644
--- a/examples/ipv6/rpl-udp/Makefile
+++ b/examples/ipv6/rpl-udp/Makefile
@@ -15,5 +15,9 @@ ifdef PERIOD
 CFLAGS+=-DPERIOD=$(PERIOD)
 endif
 
+ifeq ($(MAKE_WITH_NON_STORING),1)
+CFLAGS += -DWITH_NON_STORING=1
+endif
+
 CONTIKI_WITH_IPV6 = 1
 include $(CONTIKI)/Makefile.include
diff --git a/regression-tests/18-compile-arm-ports/Makefile b/regression-tests/18-compile-arm-ports/Makefile
index 826365828..e0addfa9f 100644
--- a/regression-tests/18-compile-arm-ports/Makefile
+++ b/regression-tests/18-compile-arm-ports/Makefile
@@ -16,6 +16,7 @@ cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1310 \
 cc26xx/very-sleepy-demo/srf06-cc26xx \
 hello-world/cc2538dk \
 ipv6/rpl-border-router/cc2538dk \
+ipv6/rpl-border-router/cc2538dk:MAKE_WITH_NON_STORING=1 \
 er-rest-example/cc2538dk \
 ipso-objects/cc2538dk \
 webserver-ipv6/cc2538dk \

From ded71a7400ec312bfbbf85c8971fcc9bfdd17fca Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Mon, 25 Apr 2016 17:13:10 +0200
Subject: [PATCH 338/393] RPL: add neighbor to cache on incoming DIO also at
 the root

---
 core/net/rpl/rpl-dag.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index ced73990f..2077c4eb4 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -1527,6 +1527,11 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
     }
   }
 
+  if(!add_nbr_from_dio(from, dio)) {
+    PRINTF("RPL: Could not add parent based on DIO\n");
+    return;
+  }
+
   if(dag->rank == ROOT_RANK(instance)) {
     if(dio->rank != INFINITE_RANK) {
       instance->dio_counter++;
@@ -1547,11 +1552,6 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
    * whether to keep it in the set.
    */
 
-  if(!add_nbr_from_dio(from, dio)) {
-    PRINTF("RPL: Could not add parent based on DIO\n");
-    return;
-  }
-
   p = rpl_find_parent(dag, from);
   if(p == NULL) {
     previous_dag = find_parent_dag(instance, from);

From c3ea1f9fc6689992a8b833cd80b2eb1bf181fce2 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Fri, 29 Apr 2016 22:12:06 +0200
Subject: [PATCH 339/393] Orchestra: added support for RPL non-storing mode

---
 apps/orchestra/Makefile.orchestra             |   2 +-
 apps/orchestra/orchestra-conf.h               |   8 +-
 ...chestra-rule-unicast-per-neighbor-rpl-ns.c | 119 ++++++++++++++++++
 ...a-rule-unicast-per-neighbor-rpl-storing.c} |  10 +-
 apps/orchestra/orchestra.h                    |   3 +-
 5 files changed, 132 insertions(+), 10 deletions(-)
 create mode 100644 apps/orchestra/orchestra-rule-unicast-per-neighbor-rpl-ns.c
 rename apps/orchestra/{orchestra-rule-unicast-per-neighbor.c => orchestra-rule-unicast-per-neighbor-rpl-storing.c} (96%)

diff --git a/apps/orchestra/Makefile.orchestra b/apps/orchestra/Makefile.orchestra
index 314fdac23..8c30a816e 100644
--- a/apps/orchestra/Makefile.orchestra
+++ b/apps/orchestra/Makefile.orchestra
@@ -1 +1 @@
-orchestra_src = orchestra.c orchestra-rule-default-common.c orchestra-rule-eb-per-time-source.c orchestra-rule-unicast-per-neighbor.c
+orchestra_src = orchestra.c orchestra-rule-default-common.c orchestra-rule-eb-per-time-source.c orchestra-rule-unicast-per-neighbor-rpl-storing.c orchestra-rule-unicast-per-neighbor-rpl-ns.c
diff --git a/apps/orchestra/orchestra-conf.h b/apps/orchestra/orchestra-conf.h
index 910917620..d8116ff16 100644
--- a/apps/orchestra/orchestra-conf.h
+++ b/apps/orchestra/orchestra-conf.h
@@ -46,10 +46,10 @@
  * - a sender-based or receiver-based slotframe for unicast to RPL parents and children
  * - a common shared slotframe for any other traffic (mostly broadcast)
  *  */
-#define ORCHESTRA_RULES { &eb_per_time_source, \
-                          &unicast_per_neighbor, \
-                          &default_common, \
-                        }
+#define ORCHESTRA_RULES { &eb_per_time_source, &unicast_per_neighbor_rpl_storing, &default_common }
+/* Example configuration for RPL non-storing mode: */
+/* #define ORCHESTRA_RULES { &eb_per_time_source, &unicast_per_neighbor_rpl_ns, &default_common } */
+
 #endif /* ORCHESTRA_CONF_RULES */
 
 /* Length of the various slotframes. Tune to balance network capacity,
diff --git a/apps/orchestra/orchestra-rule-unicast-per-neighbor-rpl-ns.c b/apps/orchestra/orchestra-rule-unicast-per-neighbor-rpl-ns.c
new file mode 100644
index 000000000..d72646e1d
--- /dev/null
+++ b/apps/orchestra/orchestra-rule-unicast-per-neighbor-rpl-ns.c
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2016, Inria.
+ * 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.
+ *
+ */
+/**
+ * \file
+ *         Orchestra: a slotframe dedicated to unicast data transmission. Designed primarily
+ *         for RPL non-storing mode but would work with any mode-of-operation. Does not require
+ *         any knowledge of the children. Works only as received-base, and as follows:
+ *           Nodes listen at a timeslot defined as hash(MAC) % ORCHESTRA_SB_UNICAST_PERIOD
+ *           Nodes transmit at: for any neighbor, hash(nbr.MAC) % ORCHESTRA_SB_UNICAST_PERIOD
+ *
+ * \author Simon Duquennoy <simon.duquennoy@inria.fr>
+ */
+
+#include "contiki.h"
+#include "orchestra.h"
+#include "net/ipv6/uip-ds6-route.h"
+#include "net/packetbuf.h"
+
+static uint16_t slotframe_handle = 0;
+static uint16_t channel_offset = 0;
+static struct tsch_slotframe *sf_unicast;
+
+/*---------------------------------------------------------------------------*/
+static uint16_t
+get_node_timeslot(const linkaddr_t *addr)
+{
+  if(addr != NULL && ORCHESTRA_UNICAST_PERIOD > 0) {
+    return ORCHESTRA_LINKADDR_HASH(addr) % ORCHESTRA_UNICAST_PERIOD;
+  } else {
+    return 0xffff;
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+child_added(const linkaddr_t *linkaddr)
+{
+}
+/*---------------------------------------------------------------------------*/
+static void
+child_removed(const linkaddr_t *linkaddr)
+{
+}
+/*---------------------------------------------------------------------------*/
+static int
+select_packet(uint16_t *slotframe, uint16_t *timeslot)
+{
+  /* Select data packets we have a unicast link to */
+  const linkaddr_t *dest = packetbuf_addr(PACKETBUF_ADDR_RECEIVER);
+  if(packetbuf_attr(PACKETBUF_ATTR_FRAME_TYPE) == FRAME802154_DATAFRAME
+     && !linkaddr_cmp(dest, &linkaddr_null)) {
+    if(slotframe != NULL) {
+      *slotframe = slotframe_handle;
+    }
+    if(timeslot != NULL) {
+      *timeslot = get_node_timeslot(dest);
+    }
+    return 1;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static void
+new_time_source(const struct tsch_neighbor *old, const struct tsch_neighbor *new)
+{
+}
+/*---------------------------------------------------------------------------*/
+static void
+init(uint16_t sf_handle)
+{
+  int i;
+  uint16_t rx_timeslot;
+  slotframe_handle = sf_handle;
+  channel_offset = sf_handle;
+  /* Slotframe for unicast transmissions */
+  sf_unicast = tsch_schedule_add_slotframe(slotframe_handle, ORCHESTRA_UNICAST_PERIOD);
+  rx_timeslot = get_node_timeslot(&linkaddr_node_addr);
+  /* Add a Tx link at each available timeslot. Make the link Rx at our own timeslot. */
+  for(i = 0; i < ORCHESTRA_UNICAST_PERIOD; i++) {
+    tsch_schedule_add_link(sf_unicast,
+        LINK_OPTION_SHARED | LINK_OPTION_TX | ( i == rx_timeslot ? LINK_OPTION_RX : 0 ),
+        LINK_TYPE_NORMAL, &tsch_broadcast_address,
+        i, channel_offset);
+  }
+}
+/*---------------------------------------------------------------------------*/
+struct orchestra_rule unicast_per_neighbor_rpl_ns = {
+  init,
+  new_time_source,
+  select_packet,
+  child_added,
+  child_removed,
+};
diff --git a/apps/orchestra/orchestra-rule-unicast-per-neighbor.c b/apps/orchestra/orchestra-rule-unicast-per-neighbor-rpl-storing.c
similarity index 96%
rename from apps/orchestra/orchestra-rule-unicast-per-neighbor.c
rename to apps/orchestra/orchestra-rule-unicast-per-neighbor-rpl-storing.c
index 58f5dcc42..76e039f09 100644
--- a/apps/orchestra/orchestra-rule-unicast-per-neighbor.c
+++ b/apps/orchestra/orchestra-rule-unicast-per-neighbor-rpl-storing.c
@@ -29,12 +29,13 @@
  */
 /**
  * \file
- *         Orchestra: a slotframe dedicated to unicast data transmission.
- *         If sender-based:
+ *         Orchestra: a slotframe dedicated to unicast data transmission. Designed for
+ *         RPL storing mode only, as this is based on the knowledge of the children (and parent).
+ *         If receiver-based:
  *           Nodes listen at a timeslot defined as hash(MAC) % ORCHESTRA_SB_UNICAST_PERIOD
  *           Nodes transmit at: for each nbr in RPL children and RPL preferred parent,
  *                                             hash(nbr.MAC) % ORCHESTRA_SB_UNICAST_PERIOD
- *         If receiver-based: the opposite
+ *         If sender-based: the opposite
  *
  * \author Simon Duquennoy <simonduq@sics.se>
  */
@@ -43,6 +44,7 @@
 #include "orchestra.h"
 #include "net/ipv6/uip-ds6-route.h"
 #include "net/packetbuf.h"
+#include "net/rpl/rpl-conf.h"
 
 #if ORCHESTRA_UNICAST_SENDER_BASED && ORCHESTRA_COLLISION_FREE_HASH
 #define UNICAST_SLOT_SHARED_FLAG    ((ORCHESTRA_UNICAST_PERIOD < (ORCHESTRA_MAX_HASH + 1)) ? LINK_OPTION_SHARED : 0)
@@ -202,7 +204,7 @@ init(uint16_t sf_handle)
             timeslot, channel_offset);
 }
 /*---------------------------------------------------------------------------*/
-struct orchestra_rule unicast_per_neighbor = {
+struct orchestra_rule unicast_per_neighbor_rpl_storing = {
   init,
   new_time_source,
   select_packet,
diff --git a/apps/orchestra/orchestra.h b/apps/orchestra/orchestra.h
index a895335b5..b948a2985 100644
--- a/apps/orchestra/orchestra.h
+++ b/apps/orchestra/orchestra.h
@@ -53,7 +53,8 @@ struct orchestra_rule {
 };
 
 struct orchestra_rule eb_per_time_source;
-struct orchestra_rule unicast_per_neighbor;
+struct orchestra_rule unicast_per_neighbor_rpl_storing;
+struct orchestra_rule unicast_per_neighbor_rpl_ns;
 struct orchestra_rule default_common;
 
 extern linkaddr_t orchestra_parent_linkaddr;

From 343c2743599f8b88ad53c4335551496dd39afd6c Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Fri, 3 Jun 2016 21:17:05 +0200
Subject: [PATCH 340/393] RPL: re-enable RPL_DIO_REFRESH_DAO_ROUTES by default
 as it is needed with DAO-ACK disabled. Now increments the DTSN only at the
 root

---
 core/net/rpl/rpl-conf.h  | 11 ++++++-----
 core/net/rpl/rpl-icmp6.c |  4 +++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h
index 6479dd374..97ab8f49d 100644
--- a/core/net/rpl/rpl-conf.h
+++ b/core/net/rpl/rpl-conf.h
@@ -257,15 +257,16 @@
 #endif /* RPL_CONF_RPL_REPAIR_ON_DAO_NACK */
 
 /*
- * Setting the DIO_REFRESH_DAO_ROUTES will make RPL always increase
- * the DTSN (Destination Advertisement Trigger Sequence Number) when
- * sending broadcast DIO. This is to get all children to re-register
- * their DAO route.
+ * Setting the DIO_REFRESH_DAO_ROUTES will make the RPL root always
+ * increase the DTSN (Destination Advertisement Trigger Sequence Number)
+ * when sending multicast DIO. This is to get all children to re-register
+ * their DAO route. This is needed when DAO-ACK is not enabled to add
+ * reliability to route maintenance.
  * */
 #ifdef RPL_CONF_DIO_REFRESH_DAO_ROUTES
 #define RPL_DIO_REFRESH_DAO_ROUTES RPL_CONF_DIO_REFRESH_DAO_ROUTES
 #else
-#define RPL_DIO_REFRESH_DAO_ROUTES 0
+#define RPL_DIO_REFRESH_DAO_ROUTES 1
 #endif /* RPL_CONF_DIO_REFRESH_DAO_ROUTES */
 
 /*
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index b900c6d5b..5bf4fc3d1 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -479,6 +479,7 @@ dio_output(rpl_instance_t *instance, uip_ipaddr_t *uc_addr)
 {
   unsigned char *buffer;
   int pos;
+  int is_root;
   rpl_dag_t *dag = instance->current_dag;
 #if !RPL_LEAF_ONLY
   uip_ipaddr_t addr;
@@ -499,6 +500,7 @@ dio_output(rpl_instance_t *instance, uip_ipaddr_t *uc_addr)
   buffer = UIP_ICMP_PAYLOAD;
   buffer[pos++] = instance->instance_id;
   buffer[pos++] = dag->version;
+  is_root = (dag->rank == ROOT_RANK(instance));
 
 #if RPL_LEAF_ONLY
   PRINTF("RPL: LEAF ONLY DIO rank set to INFINITE_RANK\n");
@@ -519,7 +521,7 @@ dio_output(rpl_instance_t *instance, uip_ipaddr_t *uc_addr)
 
   buffer[pos++] = instance->dtsn_out;
 
-  if(RPL_DIO_REFRESH_DAO_ROUTES && uc_addr == NULL) {
+  if(RPL_DIO_REFRESH_DAO_ROUTES && is_root && uc_addr == NULL) {
     /* Request new DAO to refresh route. We do not do this for unicast DIO
      * in order to avoid DAO messages after a DIS-DIO update,
      * or upon unicast DIO probing. */

From 6cdec707985f6a5e2272271370bf533a6f323e35 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Fri, 3 Jun 2016 21:18:15 +0200
Subject: [PATCH 341/393] rpl_verify_header: do not select DAG in storing mode
 after updating neighbor rank, as this may result in a No-Path DAO being sent,
 which will drop the current packet.

---
 core/net/rpl/rpl-ext-header.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/net/rpl/rpl-ext-header.c b/core/net/rpl/rpl-ext-header.c
index 6015fcb57..41da2149e 100644
--- a/core/net/rpl/rpl-ext-header.c
+++ b/core/net/rpl/rpl-ext-header.c
@@ -136,7 +136,12 @@ rpl_verify_hbh_header(int uip_ext_opt_offset)
     /* A rank error was signalled, attempt to repair it by updating
      * the sender's rank from ext header */
     sender->rank = sender_rank;
-    rpl_select_dag(instance, sender);
+    if(RPL_IS_NON_STORING(instance)) {
+      /* Select DAG and preferred parent only in non-storing mode. In storing mode,
+       * a parent switch would result in an immediate No-path DAO transmission, dropping
+       * current incoming packet. */
+      rpl_select_dag(instance, sender);
+    }
   }
 
   sender_closer = sender_rank < instance->current_dag->rank;

From 4208973017fe64fecf3b1c57188a005238a76337 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Fri, 3 Jun 2016 21:19:08 +0200
Subject: [PATCH 342/393] Fix DAO-ACK support for non-storing

---
 core/net/rpl/rpl-icmp6.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 5bf4fc3d1..5531f6100 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -1061,7 +1061,7 @@ handle_dao_retransmission(void *ptr)
       return;
     }
 
-    if(instance->of->dao_ack_callback) {
+    if(RPL_IS_STORING(instance) && instance->of->dao_ack_callback) {
       /* Inform the objective function about the timeout. */
       instance->of->dao_ack_callback(parent, RPL_DAO_ACK_TIMEOUT);
     }
@@ -1274,11 +1274,15 @@ dao_ack_input(void)
     return;
   }
 
-  parent = rpl_find_parent(instance->current_dag, &UIP_IP_BUF->srcipaddr);
-  if(parent == NULL) {
-    /* not a known instance - drop the packet and ignore */
-    uip_clear_buf();
-    return;
+  if(RPL_IS_STORING(instance)) {
+    parent = rpl_find_parent(instance->current_dag, &UIP_IP_BUF->srcipaddr);
+    if(parent == NULL) {
+      /* not a known instance - drop the packet and ignore */
+      uip_clear_buf();
+      return;
+    }
+  } else {
+    parent = NULL;
   }
 
   PRINTF("RPL: Received a DAO %s with sequence number %d (%d) and status %d from ",
@@ -1294,7 +1298,7 @@ dao_ack_input(void)
     ctimer_stop(&instance->dao_retransmit_timer);
 
     /* Inform objective function on status of the DAO ACK */
-    if(instance->of->dao_ack_callback) {
+    if(RPL_IS_STORING(instance) && instance->of->dao_ack_callback) {
       instance->of->dao_ack_callback(parent, status);
     }
 
@@ -1308,7 +1312,7 @@ dao_ack_input(void)
     }
 #endif
 
-  } else {
+  } else if(RPL_IS_STORING(instance)) {
     /* this DAO ACK should be forwarded to another recently registered route */
     uip_ds6_route_t *re;
     uip_ipaddr_t *nexthop;

From 6c4d5312aef77c9e952d2b6e5cbefc88e59db0ec Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simonduq@sics.se>
Date: Fri, 3 Jun 2016 22:06:05 +0200
Subject: [PATCH 343/393] uip-icmp6.c: call rpl_insert_header only when
 UIP_CONF_IPV6_RPL is set

---
 core/net/ipv6/uip-icmp6.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/net/ipv6/uip-icmp6.c b/core/net/ipv6/uip-icmp6.c
index 582f49ba3..d246a4d58 100644
--- a/core/net/ipv6/uip-icmp6.c
+++ b/core/net/ipv6/uip-icmp6.c
@@ -301,7 +301,9 @@ uip_icmp6_send(const uip_ipaddr_t *dest, int type, int code, int payload_len)
   UIP_STAT(++uip_stat.icmp.sent);
   UIP_STAT(++uip_stat.ip.sent);
 
+#if UIP_CONF_IPV6_RPL
   rpl_insert_header();
+#endif /* UIP_CONF_IPV6_RPL */
   tcpip_ipv6_output();
 }
 /*---------------------------------------------------------------------------*/

From 0f5e3413fadc1fe581ff4291ea641a60beaf0bcc Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Wed, 8 Jun 2016 14:04:47 +0200
Subject: [PATCH 344/393] Simplify dao_input

---
 core/net/rpl/rpl-icmp6.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 5531f6100..9ffc61dea 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -1020,14 +1020,10 @@ dao_input(void)
     goto discard;
   }
 
-  if(instance->mop != RPL_MOP_NON_STORING) {
-    if(RPL_IS_STORING(instance)) {
-      dao_input_storing();
-    }
-  } else {
-    if(RPL_IS_NON_STORING(instance)) {
-      dao_input_nonstoring();
-    }
+  if(RPL_IS_STORING(instance)) {
+    dao_input_storing();
+  } else if(RPL_IS_NON_STORING(instance)) {
+    dao_input_nonstoring();
   }
 
  discard:

From d5e74b9579bd323997350d37fb03a3569f7637f9 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Wed, 8 Jun 2016 14:05:37 +0200
Subject: [PATCH 345/393] Code style

---
 core/net/rpl/rpl-ns.c | 12 +++++++-----
 core/net/rpl/rpl-ns.h |  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/net/rpl/rpl-ns.c b/core/net/rpl/rpl-ns.c
index fecd6767e..221abefc3 100644
--- a/core/net/rpl/rpl-ns.c
+++ b/core/net/rpl/rpl-ns.c
@@ -65,7 +65,7 @@ MEMB(nodememb, rpl_ns_node_t, RPL_NS_LINK_NUM);
 
 /*---------------------------------------------------------------------------*/
 int
-rpl_ns_num_nodes()
+rpl_ns_num_nodes(void)
 {
   return num_nodes;
 }
@@ -154,19 +154,21 @@ rpl_ns_update_node(rpl_dag_t *dag, const uip_ipaddr_t *child, const uip_ipaddr_t
 }
 /*---------------------------------------------------------------------------*/
 void
-rpl_ns_init()
+rpl_ns_init(void)
 {
   num_nodes = 0;
   memb_init(&nodememb);
   list_init(nodelist);
 }
 /*---------------------------------------------------------------------------*/
-rpl_ns_node_t *rpl_ns_node_head()
+rpl_ns_node_t *
+rpl_ns_node_head(void)
 {
   return list_head(nodelist);
 }
 /*---------------------------------------------------------------------------*/
-rpl_ns_node_t *rpl_ns_node_next(rpl_ns_node_t *item)
+rpl_ns_node_t *
+rpl_ns_node_next(rpl_ns_node_t *item)
 {
   return list_item_next(item);
 }
@@ -181,7 +183,7 @@ rpl_ns_get_node_global_addr(uip_ipaddr_t *addr, rpl_ns_node_t *node)
 }
 /*---------------------------------------------------------------------------*/
 void
-rpl_ns_periodic()
+rpl_ns_periodic(void)
 {
   rpl_ns_node_t *l;
   /* First pass, decrement lifetime for all nodes with non-infinite lifetime */
diff --git a/core/net/rpl/rpl-ns.h b/core/net/rpl/rpl-ns.h
index 8abc68df2..66f911f77 100644
--- a/core/net/rpl/rpl-ns.h
+++ b/core/net/rpl/rpl-ns.h
@@ -58,11 +58,11 @@ typedef struct rpl_ns_node {
   struct rpl_ns_node *parent;
 } rpl_ns_node_t;
 
-int rpl_ns_num_nodes();
+int rpl_ns_num_nodes(void);
 void rpl_ns_expire_parent(rpl_dag_t *dag, const uip_ipaddr_t *child, const uip_ipaddr_t *parent);
 rpl_ns_node_t *rpl_ns_update_node(rpl_dag_t *dag, const uip_ipaddr_t *child, const uip_ipaddr_t *parent, uint32_t lifetime);
-void rpl_ns_init();
-rpl_ns_node_t *rpl_ns_node_head();
+void rpl_ns_init(void);
+rpl_ns_node_t *rpl_ns_node_head(void);
 rpl_ns_node_t *rpl_ns_node_next(rpl_ns_node_t *item);
 rpl_ns_node_t *rpl_ns_get_node(const rpl_dag_t *dag, const uip_ipaddr_t *addr);
 int rpl_ns_is_node_reachable(const rpl_dag_t *dag, const uip_ipaddr_t *addr);

From 819916668e277aef5438780d5d8915e9d0ee9884 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Wed, 8 Jun 2016 14:09:43 +0200
Subject: [PATCH 346/393] Incorporate latest changes on rpl tests to
 23-rpl-non-storing

---
 regression-tests/23-rpl-non-storing/01-rpl-up-route.csc       | 4 ++--
 regression-tests/23-rpl-non-storing/02-rpl-root-reboot.csc    | 4 ++--
 regression-tests/23-rpl-non-storing/03-rpl-28-hours.csc       | 4 ++--
 regression-tests/23-rpl-non-storing/04-rpl-large-network.csc  | 4 ++--
 .../23-rpl-non-storing/05-rpl-up-and-down-routes.csc          | 4 ++--
 .../23-rpl-non-storing/06-rpl-temporary-root-loss.csc         | 4 ++--
 .../23-rpl-non-storing/08-rpl-dao-route-loss-0.csc            | 4 ++--
 .../23-rpl-non-storing/08-rpl-dao-route-loss-1.csc            | 4 ++--
 .../23-rpl-non-storing/08-rpl-dao-route-loss-2.csc            | 4 ++--
 .../23-rpl-non-storing/08-rpl-dao-route-loss-3.csc            | 4 ++--
 .../23-rpl-non-storing/08-rpl-dao-route-loss-4.csc            | 4 ++--
 .../23-rpl-non-storing/08-rpl-dao-route-loss-5.csc            | 4 ++--
 regression-tests/23-rpl-non-storing/09-rpl-probing.csc        | 4 ++--
 regression-tests/23-rpl-non-storing/10-rpl-multi-dodag.csc    | 4 ++--
 regression-tests/23-rpl-non-storing/code/receiver-node.c      | 2 +-
 regression-tests/23-rpl-non-storing/code/root-node.c          | 4 ++--
 regression-tests/23-rpl-non-storing/code/sender-node.c        | 4 ++--
 17 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/regression-tests/23-rpl-non-storing/01-rpl-up-route.csc b/regression-tests/23-rpl-non-storing/01-rpl-up-route.csc
index fc79cfc27..da4743d44 100644
--- a/regression-tests/23-rpl-non-storing/01-rpl-up-route.csc
+++ b/regression-tests/23-rpl-non-storing/01-rpl-up-route.csc
@@ -323,11 +323,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/23-rpl-non-storing/02-rpl-root-reboot.csc b/regression-tests/23-rpl-non-storing/02-rpl-root-reboot.csc
index 14f87c7a9..6c4ce9d28 100644
--- a/regression-tests/23-rpl-non-storing/02-rpl-root-reboot.csc
+++ b/regression-tests/23-rpl-non-storing/02-rpl-root-reboot.csc
@@ -323,11 +323,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/23-rpl-non-storing/03-rpl-28-hours.csc b/regression-tests/23-rpl-non-storing/03-rpl-28-hours.csc
index 1cf2c5e43..3ebc7adda 100644
--- a/regression-tests/23-rpl-non-storing/03-rpl-28-hours.csc
+++ b/regression-tests/23-rpl-non-storing/03-rpl-28-hours.csc
@@ -272,11 +272,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/23-rpl-non-storing/04-rpl-large-network.csc b/regression-tests/23-rpl-non-storing/04-rpl-large-network.csc
index e40b7a339..f4ea0fda8 100644
--- a/regression-tests/23-rpl-non-storing/04-rpl-large-network.csc
+++ b/regression-tests/23-rpl-non-storing/04-rpl-large-network.csc
@@ -7038,11 +7038,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/23-rpl-non-storing/05-rpl-up-and-down-routes.csc b/regression-tests/23-rpl-non-storing/05-rpl-up-and-down-routes.csc
index c2b3cb506..0dd110738 100644
--- a/regression-tests/23-rpl-non-storing/05-rpl-up-and-down-routes.csc
+++ b/regression-tests/23-rpl-non-storing/05-rpl-up-and-down-routes.csc
@@ -321,11 +321,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/23-rpl-non-storing/06-rpl-temporary-root-loss.csc b/regression-tests/23-rpl-non-storing/06-rpl-temporary-root-loss.csc
index 6b5c91e54..6c29c643f 100644
--- a/regression-tests/23-rpl-non-storing/06-rpl-temporary-root-loss.csc
+++ b/regression-tests/23-rpl-non-storing/06-rpl-temporary-root-loss.csc
@@ -327,11 +327,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-0.csc b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-0.csc
index b5aeac9b2..0fc6e032d 100644
--- a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-0.csc
+++ b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-0.csc
@@ -339,11 +339,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-1.csc b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-1.csc
index d17bc193c..2c0ce41ff 100644
--- a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-1.csc
+++ b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-1.csc
@@ -339,11 +339,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-2.csc b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-2.csc
index fe3db3dc3..cdb2bd748 100644
--- a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-2.csc
+++ b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-2.csc
@@ -339,11 +339,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-3.csc b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-3.csc
index 7ee838b2c..34b930c0d 100644
--- a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-3.csc
+++ b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-3.csc
@@ -339,11 +339,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-4.csc b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-4.csc
index 35c5bd753..ff9a400c1 100644
--- a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-4.csc
+++ b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-4.csc
@@ -339,11 +339,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-5.csc b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-5.csc
index 4dc5038bc..e491b666f 100644
--- a/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-5.csc
+++ b/regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-5.csc
@@ -339,11 +339,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/23-rpl-non-storing/09-rpl-probing.csc b/regression-tests/23-rpl-non-storing/09-rpl-probing.csc
index 5206f1cfd..66a156e9c 100644
--- a/regression-tests/23-rpl-non-storing/09-rpl-probing.csc
+++ b/regression-tests/23-rpl-non-storing/09-rpl-probing.csc
@@ -234,12 +234,12 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
         lastMsgHops = hops;&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/23-rpl-non-storing/10-rpl-multi-dodag.csc b/regression-tests/23-rpl-non-storing/10-rpl-multi-dodag.csc
index fa015e8d9..0f446cc65 100644
--- a/regression-tests/23-rpl-non-storing/10-rpl-multi-dodag.csc
+++ b/regression-tests/23-rpl-non-storing/10-rpl-multi-dodag.csc
@@ -368,11 +368,11 @@ while(true) {&#xD;
             lostMsgs += numMissed;           &#xD;
             log.log("Missed messages " + numMissed + " before " + num + "\n");            &#xD;
             for(i = 0; i &lt; numMissed; i++) {&#xD;
-                packets = packets.substr(0, lastMsg + i + 1) + "_";    &#xD;
+                packets = packets.substr(0, lastMsg + i + 1).concat("_");    &#xD;
             }&#xD;
           }    &#xD;
         }&#xD;
-        packets = packets.substr(0, num) + "*";&#xD;
+        packets = packets.substr(0, num).concat("*");&#xD;
         log.log("" + hops + " " + packets + "\n");&#xD;
         lastMsg = num;&#xD;
     }&#xD;
diff --git a/regression-tests/23-rpl-non-storing/code/receiver-node.c b/regression-tests/23-rpl-non-storing/code/receiver-node.c
index 4ba3cb148..727a23f84 100644
--- a/regression-tests/23-rpl-non-storing/code/receiver-node.c
+++ b/regression-tests/23-rpl-non-storing/code/receiver-node.c
@@ -73,7 +73,7 @@ set_global_address(void)
   int i;
   uint8_t state;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
diff --git a/regression-tests/23-rpl-non-storing/code/root-node.c b/regression-tests/23-rpl-non-storing/code/root-node.c
index 0609e1bd8..fdea828f8 100644
--- a/regression-tests/23-rpl-non-storing/code/root-node.c
+++ b/regression-tests/23-rpl-non-storing/code/root-node.c
@@ -77,7 +77,7 @@ set_global_address(void)
   int i;
   uint8_t state;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
@@ -106,7 +106,7 @@ create_rpl_dag(uip_ipaddr_t *ipaddr)
     
     rpl_set_root(RPL_DEFAULT_INSTANCE, ipaddr);
     dag = rpl_get_any_dag();
-    uip_ip6addr(&prefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&prefix, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     rpl_set_prefix(dag, &prefix, 64);
     PRINTF("created a new RPL dag\n");
   } else {
diff --git a/regression-tests/23-rpl-non-storing/code/sender-node.c b/regression-tests/23-rpl-non-storing/code/sender-node.c
index 08d81b62d..55dfdd15f 100644
--- a/regression-tests/23-rpl-non-storing/code/sender-node.c
+++ b/regression-tests/23-rpl-non-storing/code/sender-node.c
@@ -72,7 +72,7 @@ set_global_address(void)
   int i;
   uint8_t state;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
@@ -109,7 +109,7 @@ PROCESS_THREAD(sender_node_process, ev, data)
 
     PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&send_timer));
 
-    uip_ip6addr(&addr, 0xaaaa, 0, 0, 0, 0x0201, 0x001, 0x001, 0x001);
+    uip_ip6addr(&addr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0x0201, 0x001, 0x001, 0x001);
 
     {
       static unsigned int message_number;

From 535ff25da2a38fcc63b8e4513c5ec09e492b5c36 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Wed, 8 Jun 2016 14:14:03 +0200
Subject: [PATCH 347/393] RPL non-storing defensive link update: make sure the
 topology is loop-free at all times

---
 core/net/rpl/rpl-ns.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/core/net/rpl/rpl-ns.c b/core/net/rpl/rpl-ns.c
index 221abefc3..68969cef4 100644
--- a/core/net/rpl/rpl-ns.c
+++ b/core/net/rpl/rpl-ns.c
@@ -122,6 +122,7 @@ rpl_ns_update_node(rpl_dag_t *dag, const uip_ipaddr_t *child, const uip_ipaddr_t
 {
   rpl_ns_node_t *child_node = rpl_ns_get_node(dag, child);
   rpl_ns_node_t *parent_node = rpl_ns_get_node(dag, parent);
+  rpl_ns_node_t *old_parent_node;
 
   if(parent != NULL) {
     /* No node for the parent, add one with infinite lifetime */
@@ -140,6 +141,7 @@ rpl_ns_update_node(rpl_dag_t *dag, const uip_ipaddr_t *child, const uip_ipaddr_t
     if(child_node == NULL) {
       return NULL;
     }
+    child_node->parent = NULL;
     list_add(nodelist, child_node);
     num_nodes++;
   }
@@ -147,9 +149,24 @@ rpl_ns_update_node(rpl_dag_t *dag, const uip_ipaddr_t *child, const uip_ipaddr_t
   /* Initialize node */
   child_node->dag = dag;
   child_node->lifetime = lifetime;
-  child_node->parent = parent_node;
   memcpy(child_node->link_identifier, ((const unsigned char *)child) + 8, 8);
 
+  /* Is the node reachable before the update? */
+  if(rpl_ns_is_node_reachable(dag, child)) {
+    old_parent_node = child_node->parent;
+    /* Update node */
+    child_node->parent = parent_node;
+    /* Has the node become unreachable? May happen if we create a loop. */
+    if(!rpl_ns_is_node_reachable(dag, child)) {
+      /* The new parent makes the node unreachable, restore old parent.
+       * We will take the update next time, with chances we know more of
+       * the topology and the loop is gone. */
+      child_node->parent = old_parent_node;
+    }
+  } else {
+    child_node->parent = parent_node;
+  }
+
   return child_node;
 }
 /*---------------------------------------------------------------------------*/

From 27cceda1e87a75b4bfa9fff471f649c2538663af Mon Sep 17 00:00:00 2001
From: Tommy Sparber <tommy@sparber.net>
Date: Mon, 30 May 2016 10:30:43 +0200
Subject: [PATCH 348/393] rpl-ext-header: Use 8-octet unit for HBHO length

According to RFC 2460 the length field of the Hop-by-Hop options header
should use a 8-octet unit (multiple of 8 byte).

In a normal configuration the RPL_HOP_BY_HOP_LEN define is 8, so the
current implementation works, but if RPL_HOP_BY_HOP_LEN is a multiple
of 8 the length is not calculated correctly.
---
 core/net/rpl/rpl-ext-header.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/net/rpl/rpl-ext-header.c b/core/net/rpl/rpl-ext-header.c
index 41da2149e..b6d17d4a9 100644
--- a/core/net/rpl/rpl-ext-header.c
+++ b/core/net/rpl/rpl-ext-header.c
@@ -78,7 +78,7 @@ rpl_verify_hbh_header(int uip_ext_opt_offset)
   uip_ds6_route_t *route;
   rpl_parent_t *sender = NULL;
 
-  if(UIP_HBHO_BUF->len != RPL_HOP_BY_HOP_LEN - 8) {
+  if(UIP_HBHO_BUF->len != ((RPL_HOP_BY_HOP_LEN - 8) / 8)) {
     PRINTF("RPL: Hop-by-hop extension header has wrong size\n");
     return 1;
   }
@@ -492,7 +492,7 @@ update_hbh_header(void)
 
   switch(UIP_IP_BUF->proto) {
   case UIP_PROTO_HBHO:
-    if(UIP_HBHO_BUF->len != RPL_HOP_BY_HOP_LEN - 8) {
+    if(UIP_HBHO_BUF->len != ((RPL_HOP_BY_HOP_LEN - 8) / 8)) {
       PRINTF("RPL: Hop-by-hop extension header has wrong size\n");
       uip_ext_len = last_uip_ext_len;
       return 1;
@@ -604,7 +604,7 @@ insert_hbh_header(void)
   UIP_EXT_HDR_OPT_RPL_BUF->senderrank = 0;
   uip_len += RPL_HOP_BY_HOP_LEN;
   temp_len = UIP_IP_BUF->len[1];
-  UIP_IP_BUF->len[1] += UIP_HBHO_BUF->len + 8;
+  UIP_IP_BUF->len[1] += RPL_HOP_BY_HOP_LEN;
   if(UIP_IP_BUF->len[1] < temp_len) {
     UIP_IP_BUF->len[0]++;
   }
@@ -625,7 +625,7 @@ rpl_finalize_header(uip_ipaddr_t *addr)
   uip_ext_opt_offset = 2;
 
   if(UIP_IP_BUF->proto == UIP_PROTO_HBHO) {
-    if(UIP_HBHO_BUF->len != RPL_HOP_BY_HOP_LEN - 8) {
+    if(UIP_HBHO_BUF->len != ((RPL_HOP_BY_HOP_LEN - 8) / 8)) {
       PRINTF("RPL: Non RPL Hop-by-hop options support not implemented\n");
       uip_ext_len = last_uip_ext_len;
       return 1;

From 092f0e62fe28e51e2d32ecc1a82deb7002bf0202 Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Thu, 9 Jun 2016 15:53:25 +0200
Subject: [PATCH 349/393] Added generic relay driver for the zoul-based
 platforms

---
 examples/zolertia/zoul/Makefile     |   2 +-
 examples/zolertia/zoul/test-relay.c |  89 ++++++++++++++++++++
 platform/zoul/dev/relay.c           | 124 ++++++++++++++++++++++++++++
 platform/zoul/dev/relay.h           |  92 +++++++++++++++++++++
 4 files changed, 306 insertions(+), 1 deletion(-)
 create mode 100644 examples/zolertia/zoul/test-relay.c
 create mode 100644 platform/zoul/dev/relay.c
 create mode 100644 platform/zoul/dev/relay.h

diff --git a/examples/zolertia/zoul/Makefile b/examples/zolertia/zoul/Makefile
index 2b70773d9..ddd89f4ca 100644
--- a/examples/zolertia/zoul/Makefile
+++ b/examples/zolertia/zoul/Makefile
@@ -9,7 +9,7 @@ CONTIKI_PROJECT += test-zonik
 
 CONTIKI_TARGET_SOURCEFILES += tsl2563.c sht25.c bmpx8x.c motion-sensor.c
 CONTIKI_TARGET_SOURCEFILES += adc-sensors.c weather-meter.c grove-gyro.c
-CONTIKI_TARGET_SOURCEFILES += rgb-bl-lcd.c pm10-sensor.c iaq.c zonik.c
+CONTIKI_TARGET_SOURCEFILES += rgb-bl-lcd.c pm10-sensor.c iaq.c zonik.c relay.c
 
 all: $(CONTIKI_PROJECT)
 
diff --git a/examples/zolertia/zoul/test-relay.c b/examples/zolertia/zoul/test-relay.c
new file mode 100644
index 000000000..cd743919d
--- /dev/null
+++ b/examples/zolertia/zoul/test-relay.c
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2016, Zolertia <http://www.zolertia.com>
+ * 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.
+ *
+ */
+/**
+ * \addtogroup zoul-examples
+ * @{
+ *
+ * \defgroup zoul-relay-test A simple program to test a generic relay
+ *
+ * Demonstrates the use of a generic relay, connected by default at the ADC1
+ * connector of the RE-Mote
+ *
+ * @{
+ *
+ * \file
+ *         A quick program to test a generic relay
+ * \author
+ *         Antonio Lignan <alinan@zolertia.com>
+ */
+/*---------------------------------------------------------------------------*/
+#include <stdio.h>
+#include "contiki.h"
+#include "dev/relay.h"
+#include "lib/sensors.h"
+/*---------------------------------------------------------------------------*/
+PROCESS(remote_relay_process, "Generic relay test");
+AUTOSTART_PROCESSES(&remote_relay_process);
+/*---------------------------------------------------------------------------*/
+static struct etimer et;
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(remote_relay_process, ev, data)
+{
+  PROCESS_BEGIN();
+  SENSORS_ACTIVATE(relay);
+
+  /* Activate the relay and wait for 5 seconds */
+  relay.value(RELAY_ON);
+  etimer_set(&et, CLOCK_SECOND * 5);
+  printf("\nRelay: switch should be ON --> %u\n", relay.status(SENSORS_ACTIVE));
+  PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+
+  /* Now turn off and wait 5 seconds more */
+  relay.value(RELAY_OFF);
+  etimer_set(&et, CLOCK_SECOND * 5);
+  printf("Relay: switch should be OFF --> %u\n\n", relay.status(SENSORS_ACTIVE));
+  PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+
+  /* Let it spin and toggle each second */
+  while(1) {
+    etimer_set(&et, CLOCK_SECOND);
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+    relay.value(RELAY_TOGGLE);
+    printf("Relay: switch is now --> %u\n", relay.status(SENSORS_ACTIVE));
+  }
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
diff --git a/platform/zoul/dev/relay.c b/platform/zoul/dev/relay.c
new file mode 100644
index 000000000..aa4f88dd5
--- /dev/null
+++ b/platform/zoul/dev/relay.c
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2016, Zolertia - http://www.zolertia.com
+ * 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.
+ *
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup zoul-relay
+ * @{
+ *
+ * \file
+ *  Driver for a relay actuator
+ */
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+#include "relay.h"
+#include "dev/gpio.h"
+#include "lib/sensors.h"
+#include "dev/ioc.h"
+/*---------------------------------------------------------------------------*/
+#define RELAY_PORT_BASE          GPIO_PORT_TO_BASE(RELAY_PORT)
+#define RELAY_PIN_MASK           GPIO_PIN_MASK(RELAY_PIN)
+/*---------------------------------------------------------------------------*/
+static uint8_t enabled;
+/*---------------------------------------------------------------------------*/
+static int
+relay_on(void)
+{
+  if(enabled) {
+    GPIO_SET_PIN(RELAY_PORT_BASE, RELAY_PIN_MASK);
+    return RELAY_SUCCESS;
+  }
+  return RELAY_ERROR;
+}
+/*---------------------------------------------------------------------------*/
+static int
+relay_off(void)
+{
+  if(enabled) {
+    GPIO_CLR_PIN(RELAY_PORT_BASE, RELAY_PIN_MASK);
+    return RELAY_SUCCESS;
+  }
+  return RELAY_ERROR;
+}
+/*---------------------------------------------------------------------------*/
+static int
+status(int type)
+{
+  switch(type) {
+  case SENSORS_ACTIVE:
+    return GPIO_READ_PIN(RELAY_PORT_BASE, RELAY_PIN_MASK);
+  case SENSORS_READY:
+    return enabled;
+  }
+  return RELAY_ERROR;
+}
+/*---------------------------------------------------------------------------*/
+static int
+value(int type)
+{
+  switch(type) {
+    case RELAY_OFF:
+      return relay_on();
+    case RELAY_ON:
+      return relay_off();
+    case RELAY_TOGGLE:
+      if(status(SENSORS_ACTIVE)) {
+        return relay_off();
+      } else {
+        return relay_on();
+      }
+    default:
+      return RELAY_ERROR;
+  }
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, int value)
+{
+  if(type != SENSORS_ACTIVE) {
+    return RELAY_ERROR;
+  }
+
+  if(value) {
+    GPIO_SOFTWARE_CONTROL(RELAY_PORT_BASE, RELAY_PIN_MASK);
+    GPIO_SET_OUTPUT(RELAY_PORT_BASE, RELAY_PIN_MASK);
+    ioc_set_over(RELAY_PORT, RELAY_PIN, IOC_OVERRIDE_OE);
+    GPIO_CLR_PIN(RELAY_PORT_BASE, RELAY_PIN_MASK);
+    enabled = 1;
+    return RELAY_SUCCESS;
+  }
+
+  GPIO_SET_INPUT(RELAY_PORT_BASE, RELAY_PIN_MASK);
+  enabled = 0;
+  return RELAY_SUCCESS;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(relay, RELAY_ACTUATOR, value, configure, status);
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/platform/zoul/dev/relay.h b/platform/zoul/dev/relay.h
new file mode 100644
index 000000000..4123f9e99
--- /dev/null
+++ b/platform/zoul/dev/relay.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2016, Zolertia - http://www.zolertia.com
+ * 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.
+ *
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup zoul-sensors
+ * @{
+ *
+ * \defgroup zoul-relay Generic relay driver
+ *
+ * Driver for a generic relay driver
+ * @{
+ *
+ * \file
+ * Header file for the generic relay driver
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef RELAY_H_
+#define RELAY_H_
+/* -------------------------------------------------------------------------- */
+/**
+ * \name Relay default pin and port
+ * @{
+ */
+#ifdef RELAY_CONF_PIN
+#define RELAY_PIN        RELAY_CONF_PIN
+#else
+#define RELAY_PIN        5
+#endif
+#ifdef RELAY_CONF_PORT
+#define RELAY_PORT       RELAY_CONF_PORT
+#else
+#define RELAY_PORT       GPIO_A_NUM
+#endif
+/** @} */
+/* -------------------------------------------------------------------------- */
+/**
+ * \name Relay available commands
+ * @{
+ */
+#define RELAY_OFF          0x00
+#define RELAY_ON           0x01
+#define RELAY_TOGGLE       0x02
+/** @} */
+/* -------------------------------------------------------------------------- */
+/**
+ * \name Relay return types
+ * @{
+ */
+#define RELAY_ERROR             (-1)
+#define RELAY_SUCCESS           0x00
+/** @} */
+/* -------------------------------------------------------------------------- */
+#define RELAY_ACTUATOR "Generic Relay"
+/* -------------------------------------------------------------------------- */
+extern const struct sensors_sensor relay;
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+#endif /* RELAY_H_ */
+/* -------------------------------------------------------------------------- */
+/**
+ * @}
+ * @}
+ */

From 0cb222e6e1faa99bc40889408841cd401d672044 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 17:09:42 +0300
Subject: [PATCH 350/393] add 2-channel TSCH hopping sequence

---
 core/net/mac/tsch/tsch-conf.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/net/mac/tsch/tsch-conf.h b/core/net/mac/tsch/tsch-conf.h
index 8e091a235..83fde5a71 100644
--- a/core/net/mac/tsch/tsch-conf.h
+++ b/core/net/mac/tsch/tsch-conf.h
@@ -53,6 +53,8 @@
 #define TSCH_HOPPING_SEQUENCE_4_16 (uint8_t[]){ 20, 26, 25, 26, 15, 15, 25, 20, 26, 15, 26, 25, 20, 15, 20, 25 }
 /* 4 channels, sequence length 4 */
 #define TSCH_HOPPING_SEQUENCE_4_4 (uint8_t[]){ 15, 25, 26, 20 }
+/* 2 channels, sequence length 2 */
+#define TSCH_HOPPING_SEQUENCE_2_2 (uint8_t[]){ 20, 25 }
 /* 1 channel, sequence length 1 */
 #define TSCH_HOPPING_SEQUENCE_1_1 (uint8_t[]){ 20 }
 

From b3afd65b1dbc9feed793883b18fb2afab46eb4be Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 17:13:46 +0300
Subject: [PATCH 351/393] fix a few comments in TSCH

---
 core/net/mac/tsch/tsch-conf.h | 2 +-
 core/net/mac/tsch/tsch-rpl.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/net/mac/tsch/tsch-conf.h b/core/net/mac/tsch/tsch-conf.h
index 83fde5a71..ffd99dc98 100644
--- a/core/net/mac/tsch/tsch-conf.h
+++ b/core/net/mac/tsch/tsch-conf.h
@@ -122,7 +122,7 @@
 #define TSCH_DEFAULT_TS_TIMESLOT_LENGTH    10000
 
 #elif TSCH_CONF_DEFAULT_TIMESLOT_LENGTH == 15000
-/* Default timeslot timing for platfroms requiring 15ms slots */
+/* Default timeslot timing for platforms requiring 15ms slots */
 
 #define TSCH_DEFAULT_TS_CCA_OFFSET         1800
 #define TSCH_DEFAULT_TS_CCA                128
diff --git a/core/net/mac/tsch/tsch-rpl.c b/core/net/mac/tsch/tsch-rpl.c
index 960f757f6..4558c4366 100644
--- a/core/net/mac/tsch/tsch-rpl.c
+++ b/core/net/mac/tsch/tsch-rpl.c
@@ -73,7 +73,7 @@ tsch_rpl_callback_leaving_network(void)
 }
 /*---------------------------------------------------------------------------*/
 /* Set TSCH EB period based on current RPL DIO period.
- * To use, set #define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_new_dio_interval */
+ * To use, set #define RPL_CALLBACK_NEW_DIO_INTERVAL tsch_rpl_callback_new_dio_interval */
 void
 tsch_rpl_callback_new_dio_interval(uint8_t dio_interval)
 {

From 723c7e1117e7505145f3f69b362b03889e577f21 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 17:15:10 +0300
Subject: [PATCH 352/393] print TSCH clock drift ppm whenever updated

---
 core/net/mac/tsch/tsch-adaptive-timesync.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/net/mac/tsch/tsch-adaptive-timesync.c b/core/net/mac/tsch/tsch-adaptive-timesync.c
index 0b4601621..6677c690d 100644
--- a/core/net/mac/tsch/tsch-adaptive-timesync.c
+++ b/core/net/mac/tsch/tsch-adaptive-timesync.c
@@ -92,6 +92,10 @@ timesync_learn_drift_ticks(uint32_t time_delta_asn, int32_t drift_ticks)
   int32_t last_drift_ppm = (int32_t)((int64_t)real_drift_ticks * TSCH_DRIFT_UNIT / time_delta_ticks);
 
   drift_ppm = timesync_entry_add(last_drift_ppm, time_delta_ticks);
+
+  TSCH_LOG_ADD(tsch_log_message,
+      snprintf(log->message, sizeof(log->message),
+          "drift %ld", drift_ppm / 256));
 }
 /*---------------------------------------------------------------------------*/
 /* Either reset or update the neighbor's drift */

From 45510f57fa817fce541b6fbadfefb42f3adecff0 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 17:40:36 +0300
Subject: [PATCH 353/393] TSCH: add option to not to turn off radio during
 active TSCH timeslots

---
 core/net/mac/tsch/tsch-conf.h           |   7 ++
 core/net/mac/tsch/tsch-slot-operation.c | 152 ++++++++++++++++++------
 2 files changed, 125 insertions(+), 34 deletions(-)

diff --git a/core/net/mac/tsch/tsch-conf.h b/core/net/mac/tsch/tsch-conf.h
index ffd99dc98..631f47d03 100644
--- a/core/net/mac/tsch/tsch-conf.h
+++ b/core/net/mac/tsch/tsch-conf.h
@@ -184,4 +184,11 @@
 #define TSCH_HW_FRAME_FILTERING 1
 #endif /* TSCH_CONF_HW_FRAME_FILTERING */
 
+/* Keep radio always on within TSCH timeslot (1) or turn it off between packet and ACK? (0) */
+#ifdef TSCH_CONF_RADIO_ON_DURING_TIMESLOT
+#define TSCH_RADIO_ON_DURING_TIMESLOT TSCH_CONF_RADIO_ON_DURING_TIMESLOT
+#else
+#define TSCH_RADIO_ON_DURING_TIMESLOT 0
+#endif
+
 #endif /* __TSCH_CONF_H__ */
diff --git a/core/net/mac/tsch/tsch-slot-operation.c b/core/net/mac/tsch/tsch-slot-operation.c
index 5f0701895..54f1b7e65 100644
--- a/core/net/mac/tsch/tsch-slot-operation.c
+++ b/core/net/mac/tsch/tsch-slot-operation.c
@@ -36,6 +36,7 @@
  * \author
  *         Simon Duquennoy <simonduq@sics.se>
  *         Beshr Al Nahas <beshr@sics.se>
+ *         Atis Elsts <atis.elsts@bristol.ac.uk>
  *
  */
 
@@ -109,6 +110,18 @@
 #define RTIMER_GUARD 2u
 #endif
 
+enum tsch_radio_state_on_cmd {
+  TSCH_RADIO_CMD_ON_START_OF_TIMESLOT,
+  TSCH_RADIO_CMD_ON_WITHIN_TIMESLOT,
+  TSCH_RADIO_CMD_ON_FORCE,
+};
+
+enum tsch_radio_state_off_cmd {
+  TSCH_RADIO_CMD_OFF_END_OF_TIMESLOT,
+  TSCH_RADIO_CMD_OFF_WITHIN_TIMESLOT,
+  TSCH_RADIO_CMD_OFF_FORCE,
+};
+
 /* A ringbuf storing outgoing packets after they were dequeued.
  * Will be processed layer by tsch_tx_process_pending */
 struct ringbufindex dequeued_ringbuf;
@@ -370,6 +383,68 @@ update_neighbor_state(struct tsch_neighbor *n, struct tsch_packet *p,
   return in_queue;
 }
 /*---------------------------------------------------------------------------*/
+/**
+ * This function turns on the radio. Its semantics is dependent on
+ * the value of TSCH_RADIO_ON_DURING_TIMESLOT constant:
+ * - if enabled, the radio is turned on at the start of the slot
+ * - if disabled, the radio is turned on within the slot,
+ *   directly before the packet Rx guard time and ACK Rx guard time.
+ */
+static void
+tsch_radio_on(enum tsch_radio_state_on_cmd command)
+{
+  int do_it = 0;
+  switch(command) {
+  case TSCH_RADIO_CMD_ON_START_OF_TIMESLOT:
+    if(TSCH_RADIO_ON_DURING_TIMESLOT) {
+      do_it = 1;
+    }
+    break;
+  case TSCH_RADIO_CMD_ON_WITHIN_TIMESLOT:
+    if(!TSCH_RADIO_ON_DURING_TIMESLOT) {
+      do_it = 1;
+    }
+    break;
+  case TSCH_RADIO_CMD_ON_FORCE:
+    do_it = 1;
+    break;
+  }
+  if(do_it) {
+    NETSTACK_RADIO.on();
+  }
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * This function turns off the radio. In the same way as for tsch_radio_on(),
+ * it depends on the value of TSCH_RADIO_ON_DURING_TIMESLOT constant:
+ * - if enabled, the radio is turned off at the end of the slot
+ * - if disabled, the radio is turned off within the slot,
+ *   directly after Tx'ing or Rx'ing a packet or Tx'ing an ACK.
+ */
+static void
+tsch_radio_off(enum tsch_radio_state_off_cmd command)
+{
+  int do_it = 0;
+  switch(command) {
+  case TSCH_RADIO_CMD_OFF_END_OF_TIMESLOT:
+    if(TSCH_RADIO_ON_DURING_TIMESLOT) {
+      do_it = 1;
+    }
+    break;
+  case TSCH_RADIO_CMD_OFF_WITHIN_TIMESLOT:
+    if(!TSCH_RADIO_ON_DURING_TIMESLOT) {
+      do_it = 1;
+    }
+    break;
+  case TSCH_RADIO_CMD_OFF_FORCE:
+    do_it = 1;
+    break;
+  }
+  if(do_it) {
+    NETSTACK_RADIO.off();
+  }
+}
+/*---------------------------------------------------------------------------*/
 static
 PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
 {
@@ -456,7 +531,7 @@ PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
         /* delay before CCA */
         TSCH_SCHEDULE_AND_YIELD(pt, t, current_slot_start, TS_CCA_OFFSET, "cca");
         TSCH_DEBUG_TX_EVENT();
-        NETSTACK_RADIO.on();
+        tsch_radio_on(TSCH_RADIO_CMD_ON_WITHIN_TIMESLOT);
         /* CCA */
         BUSYWAIT_UNTIL_ABS(!(cca_status |= NETSTACK_RADIO.channel_clear()),
                            current_slot_start, TS_CCA_OFFSET + TS_CCA);
@@ -480,7 +555,7 @@ PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
           /* limit tx_time to its max value */
           tx_duration = MIN(tx_duration, tsch_timing[tsch_ts_max_tx]);
           /* turn tadio off -- will turn on again to wait for ACK if needed */
-          NETSTACK_RADIO.off();
+          tsch_radio_off(TSCH_RADIO_CMD_OFF_WITHIN_TIMESLOT);
 
           if(mac_tx_status == RADIO_TX_OK) {
             if(!is_broadcast) {
@@ -502,7 +577,7 @@ PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
               TSCH_SCHEDULE_AND_YIELD(pt, t, current_slot_start,
                   tsch_timing[tsch_ts_tx_offset] + tx_duration + tsch_timing[tsch_ts_rx_ack_delay] - RADIO_DELAY_BEFORE_RX, "TxBeforeAck");
               TSCH_DEBUG_TX_EVENT();
-              NETSTACK_RADIO.on();
+              tsch_radio_on(TSCH_RADIO_CMD_ON_WITHIN_TIMESLOT);
               /* Wait for ACK to come */
               BUSYWAIT_UNTIL_ABS(NETSTACK_RADIO.receiving_packet(),
                   tx_start_time, tx_duration + tsch_timing[tsch_ts_rx_ack_delay] + tsch_timing[tsch_ts_ack_wait]);
@@ -514,7 +589,7 @@ PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
               BUSYWAIT_UNTIL_ABS(!NETSTACK_RADIO.receiving_packet(),
                                  ack_start_time, tsch_timing[tsch_ts_max_ack]);
               TSCH_DEBUG_TX_EVENT();
-              NETSTACK_RADIO.off();
+              tsch_radio_off(TSCH_RADIO_CMD_OFF_WITHIN_TIMESLOT);
 
 #if TSCH_HW_FRAME_FILTERING
               /* Leaving promiscuous mode */
@@ -588,6 +663,8 @@ PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
       }
     }
 
+    tsch_radio_off(TSCH_RADIO_CMD_OFF_END_OF_TIMESLOT);
+
     current_packet->transmissions++;
     current_packet->ret = mac_tx_status;
 
@@ -671,27 +748,26 @@ PT_THREAD(tsch_rx_slot(struct pt *pt, struct rtimer *t))
     TSCH_DEBUG_RX_EVENT();
 
     /* Start radio for at least guard time */
-    NETSTACK_RADIO.on();
-    packet_seen = NETSTACK_RADIO.receiving_packet();
+    tsch_radio_on(TSCH_RADIO_CMD_ON_WITHIN_TIMESLOT);
+    packet_seen = NETSTACK_RADIO.receiving_packet() || NETSTACK_RADIO.pending_packet();
     if(!packet_seen) {
       /* Check if receiving within guard time */
       BUSYWAIT_UNTIL_ABS((packet_seen = NETSTACK_RADIO.receiving_packet()),
           current_slot_start, tsch_timing[tsch_ts_rx_offset] + tsch_timing[tsch_ts_rx_wait]);
     }
-    if(packet_seen) {
+    if(!packet_seen) {
+      /* no packets on air */
+      tsch_radio_off(TSCH_RADIO_CMD_OFF_FORCE);
+    } else {
       TSCH_DEBUG_RX_EVENT();
       /* Save packet timestamp */
       rx_start_time = RTIMER_NOW() - RADIO_DELAY_BEFORE_DETECT;
-    }
-    if(!NETSTACK_RADIO.receiving_packet() && !NETSTACK_RADIO.pending_packet()) {
-      NETSTACK_RADIO.off();
-      /* no packets on air */
-    } else {
+
       /* Wait until packet is received, turn radio off */
       BUSYWAIT_UNTIL_ABS(!NETSTACK_RADIO.receiving_packet(),
           current_slot_start, tsch_timing[tsch_ts_rx_offset] + tsch_timing[tsch_ts_rx_wait] + tsch_timing[tsch_ts_max_tx]);
       TSCH_DEBUG_RX_EVENT();
-      NETSTACK_RADIO.off();
+      tsch_radio_off(TSCH_RADIO_CMD_OFF_WITHIN_TIMESLOT);
 
 #if TSCH_RESYNC_WITH_SFD_TIMESTAMPS
       /* At the end of the reception, get an more accurate estimate of SFD arrival time */
@@ -784,7 +860,7 @@ PT_THREAD(tsch_rx_slot(struct pt *pt, struct rtimer *t))
                   packet_duration + tsch_timing[tsch_ts_tx_ack_delay] - RADIO_DELAY_BEFORE_TX, "RxBeforeAck");
               TSCH_DEBUG_RX_EVENT();
               NETSTACK_RADIO.transmit(ack_len);
-              NETSTACK_RADIO.off();
+              tsch_radio_off(TSCH_RADIO_CMD_OFF_WITHIN_TIMESLOT);
             }
 
             /* If the sender is a time source, proceed to clock drift compensation */
@@ -820,6 +896,8 @@ PT_THREAD(tsch_rx_slot(struct pt *pt, struct rtimer *t))
           process_poll(&tsch_pending_events_process);
         }
       }
+
+      tsch_radio_off(TSCH_RADIO_CMD_OFF_END_OF_TIMESLOT);
     }
 
     if(input_queue_drop != 0) {
@@ -860,8 +938,12 @@ PT_THREAD(tsch_slot_operation(struct rtimer *t, void *ptr))
 
     } else {
       uint8_t current_channel;
+      int is_active_slot;
       TSCH_DEBUG_SLOT_START();
       tsch_in_slot_operation = 1;
+      /* Reset drift correction */
+      drift_correction = 0;
+      is_drift_correction_used = 0;
       /* Get a packet ready to be sent */
       current_packet = get_packet_and_neighbor_for_link(current_link, &current_neighbor);
       /* There is no packet to send, and this link does not have Rx flag. Instead of doing
@@ -870,26 +952,28 @@ PT_THREAD(tsch_slot_operation(struct rtimer *t, void *ptr))
         current_link = backup_link;
         current_packet = get_packet_and_neighbor_for_link(current_link, &current_neighbor);
       }
-      /* Hop channel */
-      current_channel = tsch_calculate_channel(&current_asn, current_link->channel_offset);
-      NETSTACK_RADIO.set_value(RADIO_PARAM_CHANNEL, current_channel);
-      /* Reset drift correction */
-      drift_correction = 0;
-      is_drift_correction_used = 0;
-      /* Decide whether it is a TX/RX/IDLE or OFF slot */
-      /* Actual slot operation */
-      if(current_packet != NULL) {
-        /* We have something to transmit, do the following:
-         * 1. send
-         * 2. update_backoff_state(current_neighbor)
-         * 3. post tx callback
-         **/
-        static struct pt slot_tx_pt;
-        PT_SPAWN(&slot_operation_pt, &slot_tx_pt, tsch_tx_slot(&slot_tx_pt, t));
-      } else if((current_link->link_options & LINK_OPTION_RX)) {
-        /* Listen */
-        static struct pt slot_rx_pt;
-        PT_SPAWN(&slot_operation_pt, &slot_rx_pt, tsch_rx_slot(&slot_rx_pt, t));
+      is_active_slot = current_packet != NULL || (current_link->link_options & LINK_OPTION_RX);
+      if(is_active_slot) {
+        /* Hop channel */
+        current_channel = tsch_calculate_channel(&current_asn, current_link->channel_offset);
+        NETSTACK_RADIO.set_value(RADIO_PARAM_CHANNEL, current_channel);
+        /* Turn the radio on already here if configured so; necessary for radios with slow startup */
+        tsch_radio_on(TSCH_RADIO_CMD_ON_START_OF_TIMESLOT);
+        /* Decide whether it is a TX/RX/IDLE or OFF slot */
+        /* Actual slot operation */
+        if(current_packet != NULL) {
+          /* We have something to transmit, do the following:
+           * 1. send
+           * 2. update_backoff_state(current_neighbor)
+           * 3. post tx callback
+           **/
+          static struct pt slot_tx_pt;
+          PT_SPAWN(&slot_operation_pt, &slot_tx_pt, tsch_tx_slot(&slot_tx_pt, t));
+        } else {
+          /* Listen */
+          static struct pt slot_rx_pt;
+          PT_SPAWN(&slot_operation_pt, &slot_rx_pt, tsch_rx_slot(&slot_rx_pt, t));
+        }
       }
       TSCH_DEBUG_SLOT_END();
     }

From f6967c1f58abde06dd5e5d44d36e69c3041498c0 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 17:41:56 +0300
Subject: [PATCH 354/393] read RADIO_PARAM_LAST_RSSI and
 RADIO_PARAM_LAST_PACKET_TIMESTAMP only after the last packet has been read in
 TSCH: reading the packet might update these values

---
 core/net/mac/tsch/tsch-slot-operation.c | 12 ++++++------
 core/net/mac/tsch/tsch.c                |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/net/mac/tsch/tsch-slot-operation.c b/core/net/mac/tsch/tsch-slot-operation.c
index 54f1b7e65..9f51210a7 100644
--- a/core/net/mac/tsch/tsch-slot-operation.c
+++ b/core/net/mac/tsch/tsch-slot-operation.c
@@ -769,20 +769,15 @@ PT_THREAD(tsch_rx_slot(struct pt *pt, struct rtimer *t))
       TSCH_DEBUG_RX_EVENT();
       tsch_radio_off(TSCH_RADIO_CMD_OFF_WITHIN_TIMESLOT);
 
-#if TSCH_RESYNC_WITH_SFD_TIMESTAMPS
-      /* At the end of the reception, get an more accurate estimate of SFD arrival time */
-      NETSTACK_RADIO.get_object(RADIO_PARAM_LAST_PACKET_TIMESTAMP, &rx_start_time, sizeof(rtimer_clock_t));
-#endif
-
       if(NETSTACK_RADIO.pending_packet()) {
         static int frame_valid;
         static int header_len;
         static frame802154_t frame;
         radio_value_t radio_last_rssi;
 
-        NETSTACK_RADIO.get_value(RADIO_PARAM_LAST_RSSI, &radio_last_rssi);
         /* Read packet */
         current_input->len = NETSTACK_RADIO.read((void *)current_input->payload, TSCH_PACKET_MAX_LEN);
+        NETSTACK_RADIO.get_value(RADIO_PARAM_LAST_RSSI, &radio_last_rssi);
         current_input->rx_asn = current_asn;
         current_input->rssi = (signed)radio_last_rssi;
         header_len = frame802154_parse((uint8_t *)current_input->payload, current_input->len, &frame);
@@ -790,6 +785,11 @@ PT_THREAD(tsch_rx_slot(struct pt *pt, struct rtimer *t))
           frame802154_check_dest_panid(&frame) &&
           frame802154_extract_linkaddr(&frame, &source_address, &destination_address);
 
+#if TSCH_RESYNC_WITH_SFD_TIMESTAMPS
+        /* At the end of the reception, get an more accurate estimate of SFD arrival time */
+        NETSTACK_RADIO.get_object(RADIO_PARAM_LAST_PACKET_TIMESTAMP, &rx_start_time, sizeof(rtimer_clock_t));
+#endif
+
         packet_duration = TSCH_PACKET_DURATION(current_input->len);
 
 #if LLSEC802154_ENABLED
diff --git a/core/net/mac/tsch/tsch.c b/core/net/mac/tsch/tsch.c
index 2085f39ff..de6619dc5 100644
--- a/core/net/mac/tsch/tsch.c
+++ b/core/net/mac/tsch/tsch.c
@@ -649,12 +649,12 @@ PT_THREAD(tsch_scan(struct pt *pt))
     }
 
     if(is_packet_pending) {
-      /* Save packet timestamp */
-      NETSTACK_RADIO.get_object(RADIO_PARAM_LAST_PACKET_TIMESTAMP, &t0, sizeof(rtimer_clock_t));
-
       /* Read packet */
       input_eb.len = NETSTACK_RADIO.read(input_eb.payload, TSCH_PACKET_MAX_LEN);
 
+      /* Save packet timestamp */
+      NETSTACK_RADIO.get_object(RADIO_PARAM_LAST_PACKET_TIMESTAMP, &t0, sizeof(rtimer_clock_t));
+
       /* Parse EB and attempt to associate */
       PRINTF("TSCH: association: received packet (%u bytes) on channel %u\n", input_eb.len, current_channel);
 

From 03d511c2be6f59249b58436b2141ef29ab1dcf94 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 17:47:38 +0300
Subject: [PATCH 355/393] tsch-slot-operation.c: use ABS() instead of abs() for
 consistency with the rest of Contiki

---
 core/net/mac/tsch/tsch-slot-operation.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/mac/tsch/tsch-slot-operation.c b/core/net/mac/tsch/tsch-slot-operation.c
index 9f51210a7..36c841ea4 100644
--- a/core/net/mac/tsch/tsch-slot-operation.c
+++ b/core/net/mac/tsch/tsch-slot-operation.c
@@ -821,7 +821,7 @@ PT_THREAD(tsch_rx_slot(struct pt *pt, struct rtimer *t))
 
 #if TSCH_TIMESYNC_REMOVE_JITTER
             /* remove jitter due to measurement errors */
-            if(abs(estimated_drift) <= TSCH_TIMESYNC_MEASUREMENT_ERROR) {
+            if(ABS(estimated_drift) <= TSCH_TIMESYNC_MEASUREMENT_ERROR) {
               estimated_drift = 0;
             } else if(estimated_drift > 0) {
               estimated_drift -= TSCH_TIMESYNC_MEASUREMENT_ERROR;

From b57009e56454ae8d74e2a6893f10eaefebc0ca7e Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 6 Jun 2016 23:11:34 +0300
Subject: [PATCH 356/393] TSCH: fix signedness in adaptive timesync

---
 core/net/mac/tsch/tsch-adaptive-timesync.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/net/mac/tsch/tsch-adaptive-timesync.c b/core/net/mac/tsch/tsch-adaptive-timesync.c
index 6677c690d..08d4df2ee 100644
--- a/core/net/mac/tsch/tsch-adaptive-timesync.c
+++ b/core/net/mac/tsch/tsch-adaptive-timesync.c
@@ -86,8 +86,8 @@ timesync_entry_add(int32_t val, uint32_t time_delta)
 static void
 timesync_learn_drift_ticks(uint32_t time_delta_asn, int32_t drift_ticks)
 {
-  /* should fit in 32-bit unsigned integer */
-  uint32_t time_delta_ticks = time_delta_asn * tsch_timing[tsch_ts_timeslot_length];
+  /* should fit in a 32-bit integer */
+  int32_t time_delta_ticks = time_delta_asn * tsch_timing[tsch_ts_timeslot_length];
   int32_t real_drift_ticks = drift_ticks + compensated_ticks;
   int32_t last_drift_ppm = (int32_t)((int64_t)real_drift_ticks * TSCH_DRIFT_UNIT / time_delta_ticks);
 

From fbb66f9cd5fe15637d11f16c0eb4f6dbcb5b5213 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 6 Jun 2016 23:12:09 +0300
Subject: [PATCH 357/393] TSCH: allow to configure channel scanning duration
 during the join phase

---
 core/net/mac/tsch/tsch-conf.h |  7 +++++++
 core/net/mac/tsch/tsch.c      | 13 +++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/core/net/mac/tsch/tsch-conf.h b/core/net/mac/tsch/tsch-conf.h
index 631f47d03..d8d58f0ff 100644
--- a/core/net/mac/tsch/tsch-conf.h
+++ b/core/net/mac/tsch/tsch-conf.h
@@ -191,4 +191,11 @@
 #define TSCH_RADIO_ON_DURING_TIMESLOT 0
 #endif
 
+/* How long to scan each channel in the scanning phase */
+#ifdef TSCH_CONF_CHANNEL_SCAN_DURATION
+#define TSCH_CHANNEL_SCAN_DURATION TSCH_CONF_CHANNEL_SCAN_DURATION
+#else
+#define TSCH_CHANNEL_SCAN_DURATION CLOCK_SECOND
+#endif
+
 #endif /* __TSCH_CONF_H__ */
diff --git a/core/net/mac/tsch/tsch.c b/core/net/mac/tsch/tsch.c
index de6619dc5..292744ecc 100644
--- a/core/net/mac/tsch/tsch.c
+++ b/core/net/mac/tsch/tsch.c
@@ -609,24 +609,25 @@ PT_THREAD(tsch_scan(struct pt *pt))
 
   static struct input_packet input_eb;
   static struct etimer scan_timer;
+  /* Time when we started scanning on current_channel */
+  static clock_time_t current_channel_since;
 
   ASN_INIT(current_asn, 0, 0);
 
   etimer_set(&scan_timer, CLOCK_SECOND / TSCH_ASSOCIATION_POLL_FREQUENCY);
+  current_channel_since = clock_time();
 
   while(!tsch_is_associated && !tsch_is_coordinator) {
     /* Hop to any channel offset */
-    static int current_channel = 0;
-    /* Time when we started scanning on current_channel */
-    static clock_time_t current_channel_since = 0;
+    static uint8_t current_channel = 0;
 
     /* We are not coordinator, try to associate */
     rtimer_clock_t t0;
     int is_packet_pending = 0;
-    clock_time_t now_seconds = clock_seconds();
+    clock_time_t now_time = clock_time();
 
     /* Switch to a (new) channel for scanning */
-    if(current_channel == 0 || now_seconds != current_channel_since) {
+    if(current_channel == 0 || now_time - current_channel_since > TSCH_CHANNEL_SCAN_DURATION) {
       /* Pick a channel at random in TSCH_JOIN_HOPPING_SEQUENCE */
       uint8_t scan_channel = TSCH_JOIN_HOPPING_SEQUENCE[
           random_rand() % sizeof(TSCH_JOIN_HOPPING_SEQUENCE)];
@@ -635,7 +636,7 @@ PT_THREAD(tsch_scan(struct pt *pt))
         current_channel = scan_channel;
         PRINTF("TSCH: scanning on channel %u\n", scan_channel);
       }
-      current_channel_since = now_seconds;
+      current_channel_since = now_time;
     }
 
     /* Turn radio on and wait for EB */

From 5b728691adc7779d2746d40c219eb1962878fbb1 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Tue, 26 Apr 2016 16:40:56 +0300
Subject: [PATCH 358/393] TSCH: add missing include

---
 core/net/mac/tsch/tsch-queue.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/net/mac/tsch/tsch-queue.h b/core/net/mac/tsch/tsch-queue.h
index c350ab063..676619a3a 100644
--- a/core/net/mac/tsch/tsch-queue.h
+++ b/core/net/mac/tsch/tsch-queue.h
@@ -39,6 +39,7 @@
 #include "lib/ringbufindex.h"
 #include "net/linkaddr.h"
 #include "net/mac/tsch/tsch-schedule.h"
+#include "net/mac/mac.h"
 
 /******** Configuration *******/
 

From f0fcff2d1a6dbe96011035e00cc6803c6fd9a036 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Fri, 10 Jun 2016 15:03:25 +0300
Subject: [PATCH 359/393] TSCH: declare `radio_rx_mode` only when HW timestamps
 are enabled to avoid warnings

---
 core/net/mac/tsch/tsch-slot-operation.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/mac/tsch/tsch-slot-operation.c b/core/net/mac/tsch/tsch-slot-operation.c
index 36c841ea4..be83da4ab 100644
--- a/core/net/mac/tsch/tsch-slot-operation.c
+++ b/core/net/mac/tsch/tsch-slot-operation.c
@@ -563,12 +563,12 @@ PT_THREAD(tsch_tx_slot(struct pt *pt, struct rtimer *t))
               int ack_len;
               rtimer_clock_t ack_start_time;
               int is_time_source;
-              radio_value_t radio_rx_mode;
               struct ieee802154_ies ack_ies;
               uint8_t ack_hdrlen;
               frame802154_t frame;
 
 #if TSCH_HW_FRAME_FILTERING
+              radio_value_t radio_rx_mode;
               /* Entering promiscuous mode so that the radio accepts the enhanced ACK */
               NETSTACK_RADIO.get_value(RADIO_PARAM_RX_MODE, &radio_rx_mode);
               NETSTACK_RADIO.set_value(RADIO_PARAM_RX_MODE, radio_rx_mode & (~RADIO_RX_MODE_ADDRESS_FILTER));

From b3ea790449c7709b2334fee5ff9c976b9c101ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Sat, 11 Jun 2016 22:56:58 +0200
Subject: [PATCH 360/393] cc2538: sys-ctrl: Provide last reset cause
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add functions providing the last reset cause, one as an integer (ID),
and one as a string.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 cpu/cc2538/dev/sys-ctrl.c | 20 ++++++++++++++++++++
 cpu/cc2538/dev/sys-ctrl.h | 16 ++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/cpu/cc2538/dev/sys-ctrl.c b/cpu/cc2538/dev/sys-ctrl.c
index c2e8777ad..92592b942 100644
--- a/cpu/cc2538/dev/sys-ctrl.c
+++ b/cpu/cc2538/dev/sys-ctrl.c
@@ -50,6 +50,26 @@
 #define SYS_CTRL_OSCS   SYS_CTRL_CLOCK_CTRL_OSC32K
 #endif
 /*---------------------------------------------------------------------------*/
+int
+sys_ctrl_get_reset_cause(void)
+{
+  return (REG(SYS_CTRL_CLOCK_STA) & SYS_CTRL_CLOCK_STA_RST) >>
+         SYS_CTRL_CLOCK_STA_RST_S;
+}
+/*---------------------------------------------------------------------------*/
+const char *
+sys_ctrl_get_reset_cause_str(void)
+{
+  static const char *reset_cause[] = {
+    "POR",
+    "External reset",
+    "WDT",
+    "CLD or software reset"
+  };
+
+  return reset_cause[sys_ctrl_get_reset_cause()];
+}
+/*---------------------------------------------------------------------------*/
 void
 sys_ctrl_init()
 {
diff --git a/cpu/cc2538/dev/sys-ctrl.h b/cpu/cc2538/dev/sys-ctrl.h
index 3fda071fe..22dece434 100644
--- a/cpu/cc2538/dev/sys-ctrl.h
+++ b/cpu/cc2538/dev/sys-ctrl.h
@@ -115,6 +115,11 @@
 #define SYS_CTRL_CLOCK_STA_OSC32K_CALDIS    0x02000000
 #define SYS_CTRL_CLOCK_STA_OSC32K           0x01000000
 #define SYS_CTRL_CLOCK_STA_RST              0x00C00000
+#define SYS_CTRL_CLOCK_STA_RST_S            22
+#define SYS_CTRL_CLOCK_STA_RST_POR          0
+#define SYS_CTRL_CLOCK_STA_RST_EXT          1
+#define SYS_CTRL_CLOCK_STA_RST_WDT          2
+#define SYS_CTRL_CLOCK_STA_RST_CLD_SW       3
 #define SYS_CTRL_CLOCK_STA_SOURCE_CHANGE    0x00100000
 #define SYS_CTRL_CLOCK_STA_XOSC_STB         0x00080000
 #define SYS_CTRL_CLOCK_STA_HSOSC_STB        0x00040000
@@ -302,6 +307,17 @@
 /** \name SysCtrl functions
  * @{
  */
+
+/** \brief Gets the cause of the last reset
+ * \return A \c SYS_CTRL_CLOCK_STA_RST_x reset cause
+ */
+int sys_ctrl_get_reset_cause(void);
+
+/** \brief Gets a string describing the cause of the last reset
+ * \return Last reset cause as a string
+ */
+const char *sys_ctrl_get_reset_cause_str(void);
+
 /** \brief Initialises the System Control Driver. The main purpose of this
  * function is to power up and select clocks and oscillators
  * \note This function depends on ioc_init() having been called beforehand. */

From b655d92aa4368ed4088d7a651acac54c842e453b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Sat, 11 Jun 2016 23:15:22 +0200
Subject: [PATCH 361/393] cc2538: Provide SoC information
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add functions providing the SoC revision, SRAM size, and enabled
hardware features, as well as a function printing SoC information.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 cpu/cc2538/Makefile.cc2538 |   2 +-
 cpu/cc2538/soc.c           | 108 +++++++++++++++++++++++++++++++++++++
 cpu/cc2538/soc.h           |  87 ++++++++++++++++++++++++++++++
 3 files changed, 196 insertions(+), 1 deletion(-)
 create mode 100644 cpu/cc2538/soc.c
 create mode 100644 cpu/cc2538/soc.h

diff --git a/cpu/cc2538/Makefile.cc2538 b/cpu/cc2538/Makefile.cc2538
index f28a77d11..218f05200 100644
--- a/cpu/cc2538/Makefile.cc2538
+++ b/cpu/cc2538/Makefile.cc2538
@@ -51,7 +51,7 @@ CONTIKI_CPU_DIRS += ../arm/common/dbg-io
 CONTIKI_CPU_DIRS += ../cc253x/usb/common ../cc253x/usb/common/cdc-acm
 
 ### CPU-dependent source files
-CONTIKI_CPU_SOURCEFILES += clock.c rtimer-arch.c uart.c watchdog.c
+CONTIKI_CPU_SOURCEFILES += soc.c clock.c rtimer-arch.c uart.c watchdog.c
 CONTIKI_CPU_SOURCEFILES += nvic.c cpu.c sys-ctrl.c gpio.c ioc.c spi.c adc.c
 CONTIKI_CPU_SOURCEFILES += crypto.c aes.c ecb.c cbc.c ctr.c cbc-mac.c gcm.c
 CONTIKI_CPU_SOURCEFILES += ccm.c sha256.c
diff --git a/cpu/cc2538/soc.c b/cpu/cc2538/soc.c
new file mode 100644
index 000000000..58ebb3692
--- /dev/null
+++ b/cpu/cc2538/soc.c
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2016, Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/**
+ * \addtogroup cc2538-soc
+ * @{
+ *
+ * \file
+ * Implementation of the cc2538 SoC driver
+ */
+#include "contiki-conf.h"
+#include "dev/rom-util.h"
+#include "dev/sys-ctrl.h"
+#include "reg.h"
+#include "soc.h"
+
+#include <stdint.h>
+#include <stdio.h>
+/*----------------------------------------------------------------------------*/
+#define DIECFG0         0x400d3014
+#define DIECFG0_SRAM_SIZE_OFS   7
+#define DIECFG0_SRAM_SIZE_SZ    3
+#define DIECFG0_SRAM_SIZE_MSK   (((1 << DIECFG0_SRAM_SIZE_SZ) - 1) << \
+                                 DIECFG0_SRAM_SIZE_OFS)
+#define DIECFG2         0x400d301c
+#define DIECFG2_DIE_REV_OFS     8
+#define DIECFG2_DIE_REV_SZ      8
+#define DIECFG2_DIE_REV_MSK     (((1 << DIECFG2_DIE_REV_SZ) - 1) << \
+                                 DIECFG2_DIE_REV_OFS)
+#define DIECFG2_AES_EN          0x00000002
+#define DIECFG2_PKA_EN          0x00000001
+/*----------------------------------------------------------------------------*/
+uint8_t
+soc_get_rev(void)
+{
+  uint8_t rev = (REG(DIECFG2) & DIECFG2_DIE_REV_MSK) >> DIECFG2_DIE_REV_OFS;
+
+  /* PG1.0 is encoded as 0x00. */
+  if(!(rev >> 4))
+    rev += 0x10;
+  return rev;
+}
+/*----------------------------------------------------------------------------*/
+uint32_t
+soc_get_sram_size(void)
+{
+  uint32_t size_code = (REG(DIECFG0) & DIECFG0_SRAM_SIZE_MSK) >>
+                       DIECFG0_SRAM_SIZE_OFS;
+
+  return size_code <= 1 ? (2 - size_code) << 13 : 32 << 10;
+}
+/*----------------------------------------------------------------------------*/
+uint32_t
+soc_get_features(void)
+{
+  return REG(DIECFG2) & (DIECFG2_AES_EN | DIECFG2_PKA_EN);
+}
+/*----------------------------------------------------------------------------*/
+void
+soc_print_info(void)
+{
+  uint8_t rev = soc_get_rev();
+  uint32_t features = soc_get_features();
+
+  printf("CC2538: ID: 0x%04lx, rev.: PG%d.%d, Flash: %lu KiB, SRAM: %lu KiB, "
+           "AES/SHA: %u, ECC/RSA: %u\n"
+         "System clock: %lu Hz\n"
+         "I/O clock: %lu Hz\n"
+         "Reset cause: %s\n",
+         rom_util_get_chip_id(),
+         rev >> 4, rev & 0x0f,
+         rom_util_get_flash_size() >> 10,
+         soc_get_sram_size() >> 10,
+         !!(features & SOC_FEATURE_AES_SHA),
+         !!(features & SOC_FEATURE_ECC_RSA),
+         sys_ctrl_get_sys_clock(),
+         sys_ctrl_get_io_clock(),
+         sys_ctrl_get_reset_cause_str());
+}
+
+/** @} */
diff --git a/cpu/cc2538/soc.h b/cpu/cc2538/soc.h
new file mode 100644
index 000000000..d8bf939de
--- /dev/null
+++ b/cpu/cc2538/soc.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2016, Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
+ * 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 copyright holder 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 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 HOLDER 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.
+ */
+/**
+ * \addtogroup cc2538
+ * @{
+ *
+ * \defgroup cc2538-soc cc2538 SoC
+ *
+ * Driver for the cc2538 SoC
+ * @{
+ *
+ * \file
+ * Header file with macro and function declarations for the cc2538 SoC
+ */
+#ifndef SOC_H_
+#define SOC_H_
+
+#include "contiki-conf.h"
+
+#include <stdint.h>
+/*----------------------------------------------------------------------------*/
+/** \name SoC features
+ * @{
+ */
+#define SOC_FEATURE_AES_SHA     0x00000002 /**< Security HW AES/SHA */
+#define SOC_FEATURE_ECC_RSA     0x00000001 /**< Security HW ECC/RSA */
+/** @} */
+/*----------------------------------------------------------------------------*/
+/** \name SoC functions
+ * @{
+ */
+
+/** \brief Gets the SoC revision
+ * \return The SoC revision as a byte with nibbles representing the major and
+ * minor revisions
+ */
+uint8_t soc_get_rev(void);
+
+/** \brief Gets the SRAM size of the SoC
+ * \return The SRAM size in bytes
+ */
+uint32_t soc_get_sram_size(void);
+
+/** \brief Gets the hardware features of the SoC that are enabled
+ * \return The enabled hardware features as a bitmask of \c SOC_FEATURE_x values
+ */
+uint32_t soc_get_features(void);
+
+/** \brief Prints SoC information */
+void soc_print_info(void);
+
+/** @} */
+
+#endif /* SOC_H_ */
+
+/**
+ * @}
+ * @}
+ */

From 9845973971d13fd0ed9960614c5cf13500a2f4d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Sat, 11 Jun 2016 23:19:21 +0200
Subject: [PATCH 362/393] cc2538: Print SoC information upon startup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If STARTUP_CONF_VERBOSE is enabled, print SoC information upon startup.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 platform/cc2538dk/contiki-main.c        | 4 ++++
 platform/openmote-cc2538/contiki-main.c | 4 ++++
 platform/zoul/contiki-main.c            | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/platform/cc2538dk/contiki-main.c b/platform/cc2538dk/contiki-main.c
index 8d55dc1d0..6534b103c 100644
--- a/platform/cc2538dk/contiki-main.c
+++ b/platform/cc2538dk/contiki-main.c
@@ -64,6 +64,7 @@
 #include "net/ip/tcpip.h"
 #include "net/ip/uip.h"
 #include "net/mac/frame802154.h"
+#include "soc.h"
 #include "cpu.h"
 #include "reg.h"
 #include "ieee-addr.h"
@@ -185,6 +186,9 @@ main(void)
 
   PUTS(CONTIKI_VERSION_STRING);
   PUTS(BOARD_STRING);
+#if STARTUP_CONF_VERBOSE
+  soc_print_info();
+#endif
 
   PRINTF(" Net: ");
   PRINTF("%s\n", NETSTACK_NETWORK.name);
diff --git a/platform/openmote-cc2538/contiki-main.c b/platform/openmote-cc2538/contiki-main.c
index 39736463e..580f84f56 100644
--- a/platform/openmote-cc2538/contiki-main.c
+++ b/platform/openmote-cc2538/contiki-main.c
@@ -67,6 +67,7 @@
 #include "net/ip/tcpip.h"
 #include "net/ip/uip.h"
 #include "net/mac/frame802154.h"
+#include "soc.h"
 #include "cpu.h"
 #include "reg.h"
 #include "ieee-addr.h"
@@ -181,6 +182,9 @@ main(void)
 
   PUTS(CONTIKI_VERSION_STRING);
   PUTS(BOARD_STRING);
+#if STARTUP_CONF_VERBOSE
+  soc_print_info();
+#endif
 
   random_init(0);
 
diff --git a/platform/zoul/contiki-main.c b/platform/zoul/contiki-main.c
index fc9ed91e9..0779681d0 100644
--- a/platform/zoul/contiki-main.c
+++ b/platform/zoul/contiki-main.c
@@ -65,6 +65,7 @@
 #include "net/ip/tcpip.h"
 #include "net/ip/uip.h"
 #include "net/mac/frame802154.h"
+#include "soc.h"
 #include "cpu.h"
 #include "reg.h"
 #include "ieee-addr.h"
@@ -185,6 +186,9 @@ main(void)
 
   PUTS(CONTIKI_VERSION_STRING);
   PUTS(BOARD_STRING);
+#if STARTUP_CONF_VERBOSE
+  soc_print_info();
+#endif
 
   /* Initialise the H/W RNG engine. */
   random_init(0);

From 373fda46f7b7a20462005299ea565cafffdcdce9 Mon Sep 17 00:00:00 2001
From: Sumankumar Panchal <suman@ece.iisc.ernet.in>
Date: Thu, 9 Jun 2016 20:17:00 +0530
Subject: [PATCH 363/393] TSCH port for Zolertia ReMote/Zoul.

---
 core/net/mac/tsch/README.md   |  5 ++--
 examples/ipv6/rpl-tsch/node.c | 46 ++++++++++++++++++++---------------
 platform/zoul/contiki-conf.h  |  8 ++++++
 3 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/core/net/mac/tsch/README.md b/core/net/mac/tsch/README.md
index 021bdf346..ae8f7dcba 100644
--- a/core/net/mac/tsch/README.md
+++ b/core/net/mac/tsch/README.md
@@ -37,6 +37,7 @@ It has been tested on the following platforms:
   * Tmote Sky (`sky`, tested on hardware and in cooja)
   * Zolertia Z1 (`z1`, tested in cooja only)
   * CC2538DK (`cc2538dk`, tested on hardware)
+  * Zolertia Zoul (`zoul`, tested on hardware)
 
 This implementation was present at the ETSI Plugtest
 event in Prague in July 2015, and did successfully inter-operate with all
@@ -77,7 +78,7 @@ Orchestra is implemented in:
 
 A simple TSCH+RPL example is included under `examples/ipv6/rpl-tsch`.
 To use TSCH, first make sure your platform supports it.
-Currently, `jn516x`, `sky`, `z1` and `cc2538dk` are the supported platforms.
+Currently, `jn516x`, `sky`, `z1`, `cc2538dk` and `zoul` are the supported platforms.
 To add your own, we refer the reader to the next section.
 
 To add TSCH to your application, first include the TSCH module from your makefile with:
@@ -163,7 +164,7 @@ Finally, one can also implement his own scheduler, centralized or distributed, b
 ## Porting TSCH to a new platform
 
 Porting TSCH to a new platform requires a few new features in the radio driver, a number of timing-related configuration paramters.
-The easiest is probably to start from one of the existing port: `jn516x`, `sky`, `z1`, `cc2538dk`.
+The easiest is probably to start from one of the existing port: `jn516x`, `sky`, `z1`, `cc2538dk`, `zoul`.
 
 ### Radio features required for TSCH
 
diff --git a/examples/ipv6/rpl-tsch/node.c b/examples/ipv6/rpl-tsch/node.c
index af0db8845..35852b608 100644
--- a/examples/ipv6/rpl-tsch/node.c
+++ b/examples/ipv6/rpl-tsch/node.c
@@ -71,7 +71,7 @@ print_network_status(void)
   uip_ds6_route_t *route;
 
   PRINTA("--- Network status ---\n");
-  
+
   /* Our IPv6 addresses */
   PRINTA("- Server IPv6 addresses:\n");
   for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
@@ -83,13 +83,13 @@ print_network_status(void)
       PRINTA("\n");
     }
   }
-  
+
   /* Our default route */
   PRINTA("- Default route:\n");
   default_route = uip_ds6_defrt_lookup(uip_ds6_defrt_choose());
   if(default_route != NULL) {
     PRINTA("-- ");
-    uip_debug_ipaddr_print(&default_route->ipaddr);;
+    uip_debug_ipaddr_print(&default_route->ipaddr);
     PRINTA(" (lifetime: %lu seconds)\n", (unsigned long)default_route->lifetime.interval);
   } else {
     PRINTA("-- None\n");
@@ -104,9 +104,9 @@ print_network_status(void)
     PRINTA(" via ");
     uip_debug_ipaddr_print(uip_ds6_route_nexthop(route));
     PRINTA(" (lifetime: %lu seconds)\n", (unsigned long)route->state.lifetime);
-    route = uip_ds6_route_next(route); 
+    route = uip_ds6_route_next(route);
   }
-  
+
   PRINTA("----------------------\n");
 }
 /*---------------------------------------------------------------------------*/
@@ -134,16 +134,23 @@ PROCESS_THREAD(node_process, ev, data)
   PROCESS_BEGIN();
 
   /* 3 possible roles:
-     * - role_6ln: simple node, will join any network, secured or not
-     * - role_6dr: DAG root, will advertise (unsecured) beacons
-     * - role_6dr_sec: DAG root, will advertise secured beacons
-     * */
+   * - role_6ln: simple node, will join any network, secured or not
+   * - role_6dr: DAG root, will advertise (unsecured) beacons
+   * - role_6dr_sec: DAG root, will advertise secured beacons
+   * */
   static int is_coordinator = 0;
   static enum { role_6ln, role_6dr, role_6dr_sec } node_role;
   node_role = role_6ln;
-  
-  /* Set node with ID == 1 as coordinator, convenient in Cooja. */
-  if(node_id == 1) {
+
+  /* Set node with MAC address c1:0c:00:00:00:00:01 as coordinator,
+   * convenient in cooja for regression tests using z1 nodes
+   * */
+
+#ifdef CONTIKI_TARGET_Z1
+  extern unsigned char node_mac[8];
+  unsigned char coordinator_mac[8] = { 0xc1, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 };
+
+  if(memcmp(node_mac, coordinator_mac, 8) == 0) {
     if(LLSEC802154_ENABLED) {
       node_role = role_6dr_sec;
     } else {
@@ -152,6 +159,7 @@ PROCESS_THREAD(node_process, ev, data)
   } else {
     node_role = role_6ln;
   }
+#endif
 
 #if CONFIG_VIA_BUTTON
   {
@@ -162,8 +170,8 @@ PROCESS_THREAD(node_process, ev, data)
 
     while(!etimer_expired(&et)) {
       printf("Init: current role: %s. Will start in %u seconds. Press user button to toggle mode.\n",
-                node_role == role_6ln ? "6ln" : (node_role == role_6dr) ? "6dr" : "6dr-sec",
-                CONFIG_WAIT_TIME);
+             node_role == role_6ln ? "6ln" : (node_role == role_6dr) ? "6dr" : "6dr-sec",
+             CONFIG_WAIT_TIME);
       PROCESS_WAIT_EVENT_UNTIL(((ev == sensors_event) &&
                                 (data == &button_sensor) && button_sensor.value(0) > 0)
                                || etimer_expired(&et));
@@ -180,7 +188,7 @@ PROCESS_THREAD(node_process, ev, data)
 #endif /* CONFIG_VIA_BUTTON */
 
   printf("Init: node starting with role %s\n",
-      node_role == role_6ln ? "6ln" : (node_role == role_6dr) ? "6dr" : "6dr-sec");
+         node_role == role_6ln ? "6ln" : (node_role == role_6dr) ? "6dr" : "6dr-sec");
 
   tsch_set_pan_secured(LLSEC802154_ENABLED && (node_role == role_6dr_sec));
   is_coordinator = node_role > role_6ln;
@@ -192,19 +200,19 @@ PROCESS_THREAD(node_process, ev, data)
   } else {
     net_init(NULL);
   }
-  
+
 #if WITH_ORCHESTRA
   orchestra_init();
 #endif /* WITH_ORCHESTRA */
-  
+
   /* Print out routing tables every minute */
   etimer_set(&et, CLOCK_SECOND * 60);
-  while(1) {      
+  while(1) {
     print_network_status();
     PROCESS_YIELD_UNTIL(etimer_expired(&et));
     etimer_reset(&et);
   }
-  
+
   PROCESS_END();
 }
 /*---------------------------------------------------------------------------*/
diff --git a/platform/zoul/contiki-conf.h b/platform/zoul/contiki-conf.h
index c28d789d3..59463f691 100644
--- a/platform/zoul/contiki-conf.h
+++ b/platform/zoul/contiki-conf.h
@@ -77,6 +77,14 @@ typedef uint32_t rtimer_clock_t;
 #define RTIMER_CLOCK_DIFF(a, b)     ((int32_t)((a) - (b)))
 /** @} */
 /*---------------------------------------------------------------------------*/
+#define TSCH_CONF_HW_FRAME_FILTERING    0
+
+/* 352us from calling transmit() until the SFD byte has been sent */
+#define RADIO_DELAY_BEFORE_TX     ((unsigned)US_TO_RTIMERTICKS(352))
+/* 192us as in datasheet but ACKs are not always received, so adjusted to 250us */
+#define RADIO_DELAY_BEFORE_RX     ((unsigned)US_TO_RTIMERTICKS(250))
+#define RADIO_DELAY_BEFORE_DETECT 0
+/*---------------------------------------------------------------------------*/
 /**
  * \name Serial Boot Loader Backdoor configuration
  *

From 7853a7434bea7a12800e4e983e05f8bfc0146559 Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Sun, 12 Jun 2016 11:32:12 +0200
Subject: [PATCH 364/393] fix for compilation with clang - issue reported by
 Olaf Bergmann

---
 core/net/rpl/rpl-timers.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/net/rpl/rpl-timers.c b/core/net/rpl/rpl-timers.c
index 1a159e5bb..8149401b4 100644
--- a/core/net/rpl/rpl-timers.c
+++ b/core/net/rpl/rpl-timers.c
@@ -84,11 +84,13 @@ handle_periodic_timer(void *ptr)
   rpl_dag_t *dag = rpl_get_any_dag();
 
   rpl_purge_dags();
-  if(dag != NULL && RPL_IS_STORING(dag->instance)) {
-    rpl_purge_routes();
-  }
-  if(dag != NULL && RPL_IS_NON_STORING(dag->instance)) {
-    rpl_ns_periodic();
+  if(dag != NULL) {
+    if(RPL_IS_STORING(dag->instance)) {
+      rpl_purge_routes();
+    }
+    if(RPL_IS_NON_STORING(dag->instance)) {
+      rpl_ns_periodic();
+    }
   }
   rpl_recalculate_ranks();
 

From f99511f49427f0163131c7d576a558ac98a70363 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Tue, 7 Jun 2016 00:09:02 +0300
Subject: [PATCH 365/393] srf06-cc26xx: add default TSCH configuration for the
 platform

---
 platform/srf06-cc26xx/contiki-conf.h | 49 ++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/platform/srf06-cc26xx/contiki-conf.h b/platform/srf06-cc26xx/contiki-conf.h
index 6e52b5c0c..62e807524 100644
--- a/platform/srf06-cc26xx/contiki-conf.h
+++ b/platform/srf06-cc26xx/contiki-conf.h
@@ -329,6 +329,55 @@ typedef uint32_t uip_stats_t;
  */
 typedef uint32_t rtimer_clock_t;
 #define RTIMER_CLOCK_DIFF(a, b)     ((int32_t)((a) - (b)))
+
+/* --------------------------------------------------------------------- */
+/* TSCH related defines */
+
+/* Delay between GO signal and SFD */
+#define RADIO_DELAY_BEFORE_TX ((unsigned)US_TO_RTIMERTICKS(81))
+/* Delay between GO signal and start listening.
+ * This value is so small because the radio is constantly on within each timeslot. */
+#define RADIO_DELAY_BEFORE_RX ((unsigned)US_TO_RTIMERTICKS(15))
+/* Delay between the SFD finishes arriving and it is detected in software.
+ * Not important on this platform as it uses hardware timestamps for SFD */
+#define RADIO_DELAY_BEFORE_DETECT ((unsigned)US_TO_RTIMERTICKS(0))
+
+/* Timer conversion; radio is running at 4 MHz */
+#define RADIO_TIMER_SECOND   4000000u
+#if (RTIMER_SECOND % 256) || (RADIO_TIMER_SECOND % 256)
+#error RADIO_TO_RTIMER macro must be fixed!
+#endif
+#define RADIO_TO_RTIMER(X)   ((uint32_t)(((uint64_t)(X) * (RTIMER_SECOND / 256)) / (RADIO_TIMER_SECOND / 256)))
+#define USEC_TO_RADIO(X)     ((X) * 4)
+
+/* The PHY header (preamble + SFD, 4+1 bytes) duration is equivalent to 10 symbols */
+#define RADIO_IEEE_802154_PHY_HEADER_DURATION_USEC 160
+
+/* Do not turn off TSCH within a timeslot: not enough time */
+#define TSCH_CONF_RADIO_ON_DURING_TIMESLOT 1
+
+/* Disable TSCH frame filtering */
+#define TSCH_CONF_HW_FRAME_FILTERING	0
+
+/* Disable turning off HF oscillator when radio is off;
+   enable this for TSCH, disable to save more energy. */
+#ifndef CC2650_FAST_RADIO_STARTUP
+#define CC2650_FAST_RADIO_STARTUP     1
+#endif
+
+/* Use hardware timestamps */
+#ifndef TSCH_CONF_RESYNC_WITH_SFD_TIMESTAMPS
+#define TSCH_CONF_RESYNC_WITH_SFD_TIMESTAMPS 1
+#define TSCH_CONF_TIMESYNC_REMOVE_JITTER 0
+#endif
+
+/* The drift compared to "true" 10ms slots.
+   Enable adaptive sync to enable compensation for this. */
+#define TSCH_CONF_BASE_DRIFT_PPM -977
+
+/* 10 times per second */
+#define TSCH_CONF_ASSOCIATION_CHANNEL_SWITCH_FREQUENCY 10
+
 /** @} */
 /*---------------------------------------------------------------------------*/
 /* board.h assumes that basic configuration is done */

From 3ff8aa8ad84d3a25f97ed5b73dbdfccf2842126b Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 18:00:19 +0300
Subject: [PATCH 366/393] srf06-cc26xx: add node_id variable

---
 platform/srf06-cc26xx/contiki-main.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/platform/srf06-cc26xx/contiki-main.c b/platform/srf06-cc26xx/contiki-main.c
index 9e91cec5d..b3d64f24a 100644
--- a/platform/srf06-cc26xx/contiki-main.c
+++ b/platform/srf06-cc26xx/contiki-main.c
@@ -59,6 +59,7 @@
 #include "uart.h"
 #include "sys/clock.h"
 #include "sys/rtimer.h"
+#include "sys/node-id.h"
 #include "lib/sensors.h"
 #include "button-sensor.h"
 #include "dev/serial-line.h"
@@ -68,6 +69,8 @@
 
 #include <stdio.h>
 /*---------------------------------------------------------------------------*/
+unsigned short node_id = 0;
+/*---------------------------------------------------------------------------*/
 /** \brief Board specific iniatialisation */
 void board_init(void);
 /*---------------------------------------------------------------------------*/
@@ -123,6 +126,10 @@ set_rf_params(void)
     printf("%02x\n", linkaddr_node_addr.u8[i]);
   }
 #endif
+
+  /* also set the global node id */
+  node_id = short_addr;
+  printf(" Node ID: %d\n", node_id);
 }
 /*---------------------------------------------------------------------------*/
 /**

From ac6f8008fd8e4cf9c3802353de1c1ddebd6b7d63 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 17:58:24 +0300
Subject: [PATCH 367/393] cc26xx: implement poll mode, hardware timestamps, and
 other minor changes in the IEEE radio driver

---
 cpu/cc26xx-cc13xx/rf-core/ieee-mode.c | 245 +++++++++++++++++++++-----
 cpu/cc26xx-cc13xx/rf-core/prop-mode.c |   6 +-
 cpu/cc26xx-cc13xx/rf-core/rf-core.c   | 121 ++++++++++---
 cpu/cc26xx-cc13xx/rf-core/rf-core.h   |  28 ++-
 4 files changed, 328 insertions(+), 72 deletions(-)

diff --git a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
index f26d57939..9cc614433 100644
--- a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
+++ b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
@@ -51,6 +51,7 @@
 #include "sys/energest.h"
 #include "sys/clock.h"
 #include "sys/rtimer.h"
+#include "sys/ctimer.h"
 #include "sys/cc.h"
 #include "lpm.h"
 #include "ti-lib.h"
@@ -102,6 +103,9 @@
 #define IEEE_MODE_RSSI_THRESHOLD 0xA6
 #endif /* IEEE_MODE_CONF_RSSI_THRESHOLD */
 /*---------------------------------------------------------------------------*/
+#define STATUS_CRC_OK      0x80
+#define STATUS_CORRELATION 0x7f
+/*---------------------------------------------------------------------------*/
 /* Data entry status field constants */
 #define DATA_ENTRY_STATUS_PENDING    0x00 /* Not in use by the Radio CPU */
 #define DATA_ENTRY_STATUS_ACTIVE     0x01 /* Open for r/w by the radio CPU */
@@ -186,6 +190,35 @@ static const output_config_t output_power[] = {
 /* Default TX Power - position in output_power[] */
 const output_config_t *tx_power_current = &output_power[0];
 /*---------------------------------------------------------------------------*/
+static volatile int8_t last_rssi = 0;
+static volatile uint8_t last_corr_lqi = 0;
+
+extern int32_t rat_offset;
+
+/*---------------------------------------------------------------------------*/
+/* SFD timestamp in RTIMER ticks */
+static volatile uint32_t last_packet_timestamp = 0;
+/* SFD timestamp in RAT ticks (but 64 bits) */
+static uint64_t last_rat_timestamp64 = 0;
+
+/* For RAT overflow handling */
+static struct ctimer rat_overflow_timer;
+static uint32_t rat_overflow_counter = 0;
+static rtimer_clock_t last_rat_overflow = 0;
+
+/* RAT has 32-bit register, overflows once 18 minutes */
+#define RAT_RANGE  4294967296ull
+/* approximate value */
+#define RAT_OVERFLOW_PERIOD_SECONDS (60 * 18)
+
+/* XXX: don't know what exactly is this, looks like the time to Tx 3 octets */
+#define TIMESTAMP_OFFSET  -(USEC_TO_RADIO(32 * 3) - 1) /* -95.75 usec */
+/*---------------------------------------------------------------------------*/
+/* Are we currently in poll mode? */
+static uint8_t poll_mode = 0;
+
+static rfc_CMD_IEEE_MOD_FILT_t filter_cmd;
+/*---------------------------------------------------------------------------*/
 /*
  * Buffers used to send commands to the RF core (generic and IEEE commands).
  * Some of those buffers are re-usable, some are not.
@@ -202,7 +235,7 @@ static uint8_t cmd_ieee_rx_buf[RF_CMD_BUFFER_SIZE] CC_ALIGN(4);
 #define DATA_ENTRY_LENSZ_BYTE 1
 #define DATA_ENTRY_LENSZ_WORD 2 /* 2 bytes */
 
-#define RX_BUF_SIZE 140
+#define RX_BUF_SIZE 144
 /* Four receive buffers entries with room for 1 IEEE802.15.4 frame in each */
 static uint8_t rx_buf_0[RX_BUF_SIZE] CC_ALIGN(4);
 static uint8_t rx_buf_1[RX_BUF_SIZE] CC_ALIGN(4);
@@ -544,7 +577,7 @@ init_rf_params(void)
   cmd->rxConfig.bAppendRssi = 1;
   cmd->rxConfig.bAppendCorrCrc = 1;
   cmd->rxConfig.bAppendSrcInd = 0;
-  cmd->rxConfig.bAppendTimestamp = 0;
+  cmd->rxConfig.bAppendTimestamp = 1;
 
   cmd->pRxQ = &rx_data_queue;
   cmd->pOutput = (rfc_ieeeRxOutput_t *)rf_stats;
@@ -647,13 +680,14 @@ rx_off(void)
   if(RF_RADIO_OP_GET_STATUS(cmd_ieee_rx_buf) == IEEE_DONE_STOPPED ||
      RF_RADIO_OP_GET_STATUS(cmd_ieee_rx_buf) == IEEE_DONE_ABORT) {
     /* Stopped gracefully */
-    ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
     ret = RF_CORE_CMD_OK;
   } else {
     PRINTF("RX off: BG status=0x%04x\n", RF_RADIO_OP_GET_STATUS(cmd_ieee_rx_buf));
     ret = RF_CORE_CMD_ERROR;
   }
 
+  ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
+
   return ret;
 }
 /*---------------------------------------------------------------------------*/
@@ -712,6 +746,55 @@ static const rf_core_primary_mode_t mode_ieee = {
   soft_on,
 };
 /*---------------------------------------------------------------------------*/
+static void
+check_rat_overflow(bool first_time)
+{
+  static uint32_t last_value;
+  uint32_t current_value;
+  uint8_t interrupts_enabled;
+
+  interrupts_enabled = ti_lib_int_master_disable();
+  if(first_time) {
+    last_value = HWREG(RFC_RAT_BASE + RATCNT);
+  } else {
+    current_value = HWREG(RFC_RAT_BASE + RATCNT);
+    if(current_value + RAT_RANGE / 4 < last_value) {
+      /* overflow detected */
+      last_rat_overflow = RTIMER_NOW();
+      rat_overflow_counter++;
+    }
+    last_value = current_value;
+  }
+  if(interrupts_enabled) {
+    ti_lib_int_master_enable();
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+handle_rat_overflow(void *unused)
+{
+  uint8_t was_off = 0;
+
+  if(!rf_is_on()) {
+    was_off = 1;
+    if(on() != RF_CORE_CMD_OK) {
+      PRINTF("overflow: on() failed\n");
+      ctimer_set(&rat_overflow_timer, RAT_OVERFLOW_PERIOD_SECONDS * CLOCK_SECOND / 2,
+                 handle_rat_overflow, NULL);
+      return;
+    }
+  }
+
+  check_rat_overflow(false);
+
+  if(was_off) {
+    off();
+  }
+
+  ctimer_set(&rat_overflow_timer, RAT_OVERFLOW_PERIOD_SECONDS * CLOCK_SECOND / 2,
+             handle_rat_overflow, NULL);
+}
+/*---------------------------------------------------------------------------*/
 static int
 init(void)
 {
@@ -745,6 +828,10 @@ init(void)
 
   rf_core_primary_mode_register(&mode_ieee);
 
+  check_rat_overflow(true);
+  ctimer_set(&rat_overflow_timer, RAT_OVERFLOW_PERIOD_SECONDS * CLOCK_SECOND / 2,
+             handle_rat_overflow, NULL);
+
   process_start(&rf_core_process, NULL);
   return 1;
 }
@@ -768,6 +855,7 @@ transmit(unsigned short transmit_len)
   uint8_t tx_active = 0;
   rtimer_clock_t t0;
   volatile rfc_CMD_IEEE_TX_t cmd;
+  uint8_t interrupts_enabled;
 
   if(!rf_is_on()) {
     was_off = 1;
@@ -805,8 +893,19 @@ transmit(unsigned short transmit_len)
   cmd.payloadLen = transmit_len;
   cmd.pPayload = &tx_buf[TX_BUF_HDR_LEN];
 
+  cmd.startTime = 0;
+  cmd.startTrigger.triggerType = TRIG_NOW;
+
+  /* XXX: there seems to be no function that gets interrupt state w/o changing it */
+  interrupts_enabled = ti_lib_int_master_disable();
+  if(interrupts_enabled) {
+    ti_lib_int_master_enable();
+  }
+
   /* Enable the LAST_FG_COMMAND_DONE interrupt, which will wake us up */
-  rf_core_cmd_done_en(true);
+  if(interrupts_enabled) {
+    rf_core_cmd_done_en(true, poll_mode);
+  }
 
   ret = rf_core_send_cmd((uint32_t)&cmd, &cmd_status);
 
@@ -818,7 +917,14 @@ transmit(unsigned short transmit_len)
     /* Idle away while the command is running */
     while((cmd.status & RF_CORE_RADIO_OP_MASKED_STATUS)
           == RF_CORE_RADIO_OP_MASKED_STATUS_RUNNING) {
-      lpm_sleep();
+      /* Note: for now sleeping while Tx'ing in polling mode is disabled.
+       * To enable it:
+       *  1) make the `lpm_sleep()` call here unconditional;
+       *  2) change the radio ISR priority to allow radio ISR to interrupt rtimer ISR.
+       */
+      if(interrupts_enabled) {
+        lpm_sleep();
+      }
     }
 
     stat = cmd.status;
@@ -848,12 +954,13 @@ transmit(unsigned short transmit_len)
   ENERGEST_OFF(ENERGEST_TYPE_TRANSMIT);
   ENERGEST_ON(ENERGEST_TYPE_LISTEN);
 
-  /*
-   * Disable LAST_FG_COMMAND_DONE interrupt. We don't really care about it
-   * except when we are transmitting
-   */
-  rf_core_cmd_done_dis();
-
+  if(interrupts_enabled) {
+    /*
+     * Disable LAST_FG_COMMAND_DONE interrupt. We don't really care about it
+     * except when we are transmitting
+     */
+    rf_core_cmd_done_dis(poll_mode);
+  }
 
   if(was_off) {
     off();
@@ -880,13 +987,48 @@ release_data_entry(void)
   /* Set status to 0 "Pending" in element */
   entry->status = DATA_ENTRY_STATUS_PENDING;
   rx_read_entry = entry->pNextEntry;
-}/*---------------------------------------------------------------------------*/
+}
+/*---------------------------------------------------------------------------*/
+static uint32_t
+calc_last_packet_timestamp(uint32_t rat_timestamp)
+{
+  uint64_t rat_timestamp64;
+  uint32_t adjusted_overflow_counter = rat_overflow_counter;
+
+  /* if the timestamp is large and the last oveflow was recently,
+     assume that the timestamp refers to the time before the overflow */
+  if(rat_timestamp > (uint32_t)(RAT_RANGE * 3 / 4)) {
+    if(RTIMER_CLOCK_LT(RTIMER_NOW(),
+                       last_rat_overflow + RAT_OVERFLOW_PERIOD_SECONDS * RTIMER_SECOND / 4)) {
+      adjusted_overflow_counter--;
+    }
+  }
+
+  /* add the overflowed time to the timestamp */
+  rat_timestamp64 = rat_timestamp + RAT_RANGE * adjusted_overflow_counter;
+  /* correct timestamp so that it refers to the end of the SFD */
+  rat_timestamp64 += TIMESTAMP_OFFSET;
+
+  last_rat_timestamp64 = rat_timestamp64 - rat_offset;
+
+  return RADIO_TO_RTIMER(rat_timestamp64 - rat_offset);
+}
+/*---------------------------------------------------------------------------*/
 static int
 read_frame(void *buf, unsigned short buf_len)
 {
-  int8_t rssi;
   int len = 0;
   rfc_dataEntryGeneral_t *entry = (rfc_dataEntryGeneral_t *)rx_read_entry;
+  uint32_t rat_timestamp;
+
+  if(rf_is_on()) {
+    check_rat_overflow(false);
+  }
+
+  /* wait for entry to become finished */
+  rtimer_clock_t t0 = RTIMER_NOW();
+  while(entry->status == DATA_ENTRY_STATUS_BUSY
+      && RTIMER_CLOCK_LT(RTIMER_NOW(), t0 + (RTIMER_SECOND / 250)));
 
   if(entry->status != DATA_ENTRY_STATUS_FINISHED) {
     /* No available data */
@@ -901,7 +1043,7 @@ read_frame(void *buf, unsigned short buf_len)
     return 0;
   }
 
-  len = rx_read_entry[8] - 4;
+  len = rx_read_entry[8] - 8;
 
   if(len > buf_len) {
     PRINTF("RF: too long\n");
@@ -913,9 +1055,21 @@ read_frame(void *buf, unsigned short buf_len)
 
   memcpy(buf, (char *)&rx_read_entry[9], len);
 
-  rssi = (int8_t)rx_read_entry[9 + len + 2];
+  last_rssi = (int8_t)rx_read_entry[9 + len + 2];
+  last_corr_lqi = (uint8_t)rx_read_entry[9 + len + 2] & STATUS_CORRELATION;
 
-  packetbuf_set_attr(PACKETBUF_ATTR_RSSI, rssi);
+  /* get the timestamp */
+  memcpy(&rat_timestamp, (char *)rx_read_entry + 9 + len + 4, 4);
+
+  last_packet_timestamp = calc_last_packet_timestamp(rat_timestamp);
+
+  if(!poll_mode) {
+    /* Not in poll mode: packetbuf should not be accessed in interrupt context.
+     * In poll mode, the last packet RSSI and link quality can be obtained through
+     * RADIO_PARAM_LAST_RSSI and RADIO_PARAM_LAST_LINK_QUALITY */
+    packetbuf_set_attr(PACKETBUF_ATTR_RSSI, last_rssi);
+    packetbuf_set_attr(PACKETBUF_ATTR_LINK_QUALITY, last_corr_lqi);
+  }
   RIMESTATS_ADD(llrx);
 
   release_data_entry();
@@ -983,9 +1137,7 @@ channel_clear(void)
 static int
 receiving_packet(void)
 {
-  int ret = 0;
   uint8_t cca_info;
-  uint8_t was_off = 0;
 
   /*
    * If we are in the middle of a BLE operation, we got called by ContikiMAC
@@ -1035,7 +1187,9 @@ pending_packet(void)
   do {
     if(entry->status == DATA_ENTRY_STATUS_FINISHED) {
       rv = 1;
-      process_poll(&rf_core_process);
+      if(!poll_mode) {
+        process_poll(&rf_core_process);
+      }
     }
 
     entry = (rfc_dataEntry_t *)entry->pNextEntry;
@@ -1076,7 +1230,7 @@ on(void)
 
   init_rx_buffers();
 
-  rf_core_setup_interrupts();
+  rf_core_setup_interrupts(poll_mode);
 
   /*
    * Trigger a switch to the XOSC, so that we can subsequently use the RF FS
@@ -1162,6 +1316,9 @@ get_value(radio_param_t param, radio_value_t *value)
     if(cmd->frameFiltOpt.autoAckEn) {
       *value |= RADIO_RX_MODE_AUTOACK;
     }
+    if(poll_mode) {
+      *value |= RADIO_RX_MODE_POLL_MODE;
+    }
 
     return RADIO_RESULT_OK;
   case RADIO_PARAM_TXPOWER:
@@ -1222,6 +1379,7 @@ set_value(radio_param_t param, radio_value_t value)
       return RADIO_RESULT_INVALID_VALUE;
     }
 
+    /* Note: this return may lead to long periods when RAT and RTC are not resynchronized */
     if(cmd->channel == (uint8_t)value) {
       /* We already have that very same channel configured.
        * Nothing to do here. */
@@ -1239,7 +1397,7 @@ set_value(radio_param_t param, radio_value_t value)
   case RADIO_PARAM_RX_MODE:
   {
     if(value & ~(RADIO_RX_MODE_ADDRESS_FILTER |
-                 RADIO_RX_MODE_AUTOACK)) {
+                 RADIO_RX_MODE_AUTOACK | RADIO_RX_MODE_POLL_MODE)) {
       return RADIO_RESULT_INVALID_VALUE;
     }
 
@@ -1252,6 +1410,8 @@ set_value(radio_param_t param, radio_value_t value)
     cmd->frameFiltOpt.bPendDataReqOnly = 0;
     cmd->frameFiltOpt.bPanCoord = 0;
     cmd->frameFiltOpt.bStrictLenFilter = 0;
+
+    poll_mode = (value & RADIO_RX_MODE_POLL_MODE) != 0;
     break;
   }
   case RADIO_PARAM_TXPOWER:
@@ -1269,30 +1429,28 @@ set_value(radio_param_t param, radio_value_t value)
     return RADIO_RESULT_NOT_SUPPORTED;
   }
 
-  /* If we reach here we had no errors. Apply new settings */
+  /* If off, the new configuration will be applied the next time radio is started */
   if(!rf_is_on()) {
-    was_off = 1;
-    if(on() != RF_CORE_CMD_OK) {
-      PRINTF("set_value: on() failed (2)\n");
-      return RADIO_RESULT_ERROR;
-    }
+    return RADIO_RESULT_OK;
   }
 
+  /* If we reach here we had no errors. Apply new settings */
   if(rx_off() != RF_CORE_CMD_OK) {
     PRINTF("set_value: rx_off() failed\n");
     rv = RADIO_RESULT_ERROR;
   }
 
+  /* Restart the radio timer (RAT).
+     This causes resynchronization between RAT and RTC: useful for TSCH. */
+  rf_core_restart_rat();
+
+  check_rat_overflow(false);
+
   if(rx_on() != RF_CORE_CMD_OK) {
     PRINTF("set_value: rx_on() failed\n");
     rv = RADIO_RESULT_ERROR;
   }
 
-  /* If we were off, turn back off */
-  if(was_off) {
-    off();
-  }
-
   return rv;
 }
 /*---------------------------------------------------------------------------*/
@@ -1318,13 +1476,22 @@ get_object(radio_param_t param, void *dest, size_t size)
 
     return RADIO_RESULT_OK;
   }
+
+  if(param == RADIO_PARAM_LAST_PACKET_TIMESTAMP) {
+    if(size != sizeof(rtimer_clock_t) || !dest) {
+      return RADIO_RESULT_INVALID_VALUE;
+    }
+    *(rtimer_clock_t *)dest = last_packet_timestamp;
+
+    return RADIO_RESULT_OK;
+  }
+
   return RADIO_RESULT_NOT_SUPPORTED;
 }
 /*---------------------------------------------------------------------------*/
 static radio_result_t
 set_object(radio_param_t param, const void *src, size_t size)
 {
-  uint8_t was_off = 0;
   radio_result_t rv;
   int i;
   uint8_t *dst;
@@ -1341,12 +1508,9 @@ set_object(radio_param_t param, const void *src, size_t size)
       dst[i] = ((uint8_t *)src)[7 - i];
     }
 
+    /* If off, the new configuration will be applied the next time radio is started */
     if(!rf_is_on()) {
-      was_off = 1;
-      if(on() != RF_CORE_CMD_OK) {
-        PRINTF("set_object: on() failed\n");
-        return RADIO_RESULT_ERROR;
-      }
+      return RADIO_RESULT_OK;
     }
 
     if(rx_off() != RF_CORE_CMD_OK) {
@@ -1359,11 +1523,6 @@ set_object(radio_param_t param, const void *src, size_t size)
       rv = RADIO_RESULT_ERROR;
     }
 
-    /* If we were off, turn back off */
-    if(was_off) {
-      off();
-    }
-
     return rv;
   }
   return RADIO_RESULT_NOT_SUPPORTED;
diff --git a/cpu/cc26xx-cc13xx/rf-core/prop-mode.c b/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
index 419a7b9d2..54102f164 100644
--- a/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
+++ b/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
@@ -683,7 +683,7 @@ transmit(unsigned short transmit_len)
   rx_off_prop();
 
   /* Enable the LAST_COMMAND_DONE interrupt to wake us up */
-  rf_core_cmd_done_en(false);
+  rf_core_cmd_done_en(false, false);
 
   ret = rf_core_send_cmd((uint32_t)cmd_tx_adv, &cmd_status);
 
@@ -728,7 +728,7 @@ transmit(unsigned short transmit_len)
    * Disable LAST_FG_COMMAND_DONE interrupt. We don't really care about it
    * except when we are transmitting
    */
-  rf_core_cmd_done_dis();
+  rf_core_cmd_done_dis(false);
 
   /* Workaround. Set status to IDLE */
   cmd_tx_adv->status = RF_CORE_RADIO_OP_STATUS_IDLE;
@@ -933,7 +933,7 @@ on(void)
     }
   }
 
-  rf_core_setup_interrupts();
+  rf_core_setup_interrupts(false);
 
   /*
    * Trigger a switch to the XOSC, so that we can subsequently use the RF FS
diff --git a/cpu/cc26xx-cc13xx/rf-core/rf-core.c b/cpu/cc26xx-cc13xx/rf-core/rf-core.c
index 8efe41dac..15fc8e3bc 100644
--- a/cpu/cc26xx-cc13xx/rf-core/rf-core.c
+++ b/cpu/cc26xx-cc13xx/rf-core/rf-core.c
@@ -92,6 +92,8 @@
 #define ENABLED_IRQS (RX_FRAME_IRQ | ERROR_IRQ)
 #endif
 
+#define ENABLED_IRQS_POLL_MODE (ENABLED_IRQS & ~(RX_FRAME_IRQ | ERROR_IRQ))
+
 #define cc26xx_rf_cpe0_isr RFCCPE0IntHandler
 #define cc26xx_rf_cpe1_isr RFCCPE1IntHandler
 /*---------------------------------------------------------------------------*/
@@ -101,6 +103,10 @@ static rfc_radioOp_t *last_radio_op = NULL;
 /* A struct holding pointers to the primary mode's abort() and restore() */
 static const rf_core_primary_mode_t *primary_mode = NULL;
 /*---------------------------------------------------------------------------*/
+/* Radio timer (RAT) offset as compared to the rtimer counter (RTC) */
+int32_t rat_offset = 0;
+static bool rat_offset_known = false;
+/*---------------------------------------------------------------------------*/
 PROCESS(rf_core_process, "CC13xx / CC26xx RF driver");
 /*---------------------------------------------------------------------------*/
 #define RF_CORE_CLOCKS_MASK (RFC_PWR_PWMCLKEN_RFC_M | RFC_PWR_PWMCLKEN_CPE_M \
@@ -265,6 +271,66 @@ rf_core_power_up()
   return RF_CORE_CMD_OK;
 }
 /*---------------------------------------------------------------------------*/
+uint8_t
+rf_core_start_rat(void)
+{
+  uint32_t cmd_status;
+  rfc_CMD_SYNC_START_RAT_t cmd_start;
+
+  /* Start radio timer (RAT) */
+  rf_core_init_radio_op((rfc_radioOp_t *)&cmd_start, sizeof(cmd_start), CMD_SYNC_START_RAT);
+
+  /* copy the value and send back */
+  cmd_start.rat0 = rat_offset;
+
+  if(rf_core_send_cmd((uint32_t)&cmd_start, &cmd_status) != RF_CORE_CMD_OK) {
+    PRINTF("rf_core_get_rat_rtc_offset: SYNC_START_RAT fail, CMDSTA=0x%08lx\n",
+           cmd_status);
+    return RF_CORE_CMD_ERROR;
+  }
+
+  /* Wait until done (?) */
+  if(rf_core_wait_cmd_done(&cmd_start) != RF_CORE_CMD_OK) {
+    PRINTF("rf_core_cmd_ok: SYNC_START_RAT wait, CMDSTA=0x%08lx, status=0x%04x\n",
+           cmd_status, cmd_start.status);
+    return RF_CORE_CMD_ERROR;
+  }
+
+  return RF_CORE_CMD_OK;
+}
+/*---------------------------------------------------------------------------*/
+uint8_t
+rf_core_stop_rat(void)
+{
+  rfc_CMD_SYNC_STOP_RAT_t cmd_stop;
+  uint32_t cmd_status;
+
+  rf_core_init_radio_op((rfc_radioOp_t *)&cmd_stop, sizeof(cmd_stop), CMD_SYNC_STOP_RAT);
+
+  int ret = rf_core_send_cmd((uint32_t)&cmd_stop, &cmd_status);
+  if(ret != RF_CORE_CMD_OK) {
+    PRINTF("rf_core_get_rat_rtc_offset: SYNC_STOP_RAT fail, ret %d CMDSTA=0x%08lx\n",
+           ret, cmd_status);
+    return ret;
+  }
+
+  /* Wait until done */
+  ret = rf_core_wait_cmd_done(&cmd_stop);
+  if(ret != RF_CORE_CMD_OK) {
+    PRINTF("rf_core_cmd_ok: SYNC_STOP_RAT wait, CMDSTA=0x%08lx, status=0x%04x\n",
+        cmd_status, cmd_stop.status);
+    return ret;
+  }
+
+  if(!rat_offset_known) {
+    /* save the offset, but only if this is the first time */
+    rat_offset_known = true;
+    rat_offset = cmd_stop.rat0;
+  }
+
+  return RF_CORE_CMD_OK;
+}
+/*---------------------------------------------------------------------------*/
 void
 rf_core_power_down()
 {
@@ -280,6 +346,8 @@ rf_core_power_down()
     fs_powerdown();
   }
 
+  rf_core_stop_rat();
+
   /* Shut down the RFCORE clock domain in the MCU VD */
   ti_lib_prcm_domain_disable(PRCM_DOMAIN_RFCORE);
   ti_lib_prcm_load_set();
@@ -329,22 +397,6 @@ rf_core_set_modesel()
 }
 /*---------------------------------------------------------------------------*/
 uint8_t
-rf_core_start_rat()
-{
-  uint32_t cmd_status;
-
-  /* Start radio timer (RAT) */
-  if(rf_core_send_cmd(CMDR_DIR_CMD(CMD_START_RAT), &cmd_status)
-     != RF_CORE_CMD_OK) {
-    PRINTF("rf_core_apply_patches: START_RAT fail, CMDSTA=0x%08lx\n",
-           cmd_status);
-    return RF_CORE_CMD_ERROR;
-  }
-
-  return RF_CORE_CMD_OK;
-}
-/*---------------------------------------------------------------------------*/
-uint8_t
 rf_core_boot()
 {
   if(rf_core_power_up() != RF_CORE_CMD_OK) {
@@ -366,10 +418,31 @@ rf_core_boot()
   return RF_CORE_CMD_OK;
 }
 /*---------------------------------------------------------------------------*/
+uint8_t
+rf_core_restart_rat(void)
+{
+  if(rf_core_stop_rat() != RF_CORE_CMD_OK) {
+    PRINTF("rf_core_restart_rat: rf_core_stop_rat() failed\n");
+
+    return RF_CORE_CMD_ERROR;
+  }
+
+  if(rf_core_start_rat() != RF_CORE_CMD_OK) {
+    PRINTF("rf_core_restart_rat: rf_core_start_rat() failed\n");
+
+    rf_core_power_down();
+
+    return RF_CORE_CMD_ERROR;
+  }
+
+  return RF_CORE_CMD_OK;
+}
+/*---------------------------------------------------------------------------*/
 void
-rf_core_setup_interrupts()
+rf_core_setup_interrupts(bool poll_mode)
 {
   bool interrupts_disabled;
+  const uint32_t enabled_irqs = poll_mode ? ENABLED_IRQS_POLL_MODE : ENABLED_IRQS;
 
   /* We are already turned on by the caller, so this should not happen */
   if(!rf_core_is_accessible()) {
@@ -384,7 +457,7 @@ rf_core_setup_interrupts()
   HWREG(RFC_DBELL_NONBUF_BASE + RFC_DBELL_O_RFCPEISL) = ERROR_IRQ;
 
   /* Acknowledge configured interrupts */
-  HWREG(RFC_DBELL_NONBUF_BASE + RFC_DBELL_O_RFCPEIEN) = ENABLED_IRQS;
+  HWREG(RFC_DBELL_NONBUF_BASE + RFC_DBELL_O_RFCPEIEN) = enabled_irqs;
 
   /* Clear interrupt flags, active low clear(?) */
   HWREG(RFC_DBELL_NONBUF_BASE + RFC_DBELL_O_RFCPEIFG) = 0x0;
@@ -400,18 +473,20 @@ rf_core_setup_interrupts()
 }
 /*---------------------------------------------------------------------------*/
 void
-rf_core_cmd_done_en(bool fg)
+rf_core_cmd_done_en(bool fg, bool poll_mode)
 {
   uint32_t irq = fg ? IRQ_LAST_FG_COMMAND_DONE : IRQ_LAST_COMMAND_DONE;
+  const uint32_t enabled_irqs = poll_mode ? ENABLED_IRQS_POLL_MODE : ENABLED_IRQS;
 
-  HWREG(RFC_DBELL_NONBUF_BASE + RFC_DBELL_O_RFCPEIFG) = ENABLED_IRQS;
-  HWREG(RFC_DBELL_NONBUF_BASE + RFC_DBELL_O_RFCPEIEN) = ENABLED_IRQS | irq;
+  HWREG(RFC_DBELL_NONBUF_BASE + RFC_DBELL_O_RFCPEIFG) = enabled_irqs;
+  HWREG(RFC_DBELL_NONBUF_BASE + RFC_DBELL_O_RFCPEIEN) = enabled_irqs | irq;
 }
 /*---------------------------------------------------------------------------*/
 void
-rf_core_cmd_done_dis()
+rf_core_cmd_done_dis(bool poll_mode)
 {
-  HWREG(RFC_DBELL_NONBUF_BASE + RFC_DBELL_O_RFCPEIEN) = ENABLED_IRQS;
+  const uint32_t enabled_irqs = poll_mode ? ENABLED_IRQS_POLL_MODE : ENABLED_IRQS;
+  HWREG(RFC_DBELL_NONBUF_BASE + RFC_DBELL_O_RFCPEIEN) = enabled_irqs;
 }
 /*---------------------------------------------------------------------------*/
 rfc_radioOp_t *
diff --git a/cpu/cc26xx-cc13xx/rf-core/rf-core.h b/cpu/cc26xx-cc13xx/rf-core/rf-core.h
index 42c6edb90..474de4a87 100644
--- a/cpu/cc26xx-cc13xx/rf-core/rf-core.h
+++ b/cpu/cc26xx-cc13xx/rf-core/rf-core.h
@@ -228,6 +228,9 @@ typedef struct rf_core_primary_mode_s {
 #define RF_CORE_COMMAND_PROTOCOL_IEEE                    0x2000
 #define RF_CORE_COMMAND_PROTOCOL_PROP                    0x3000
 /*---------------------------------------------------------------------------*/
+/* Radio timer register */
+#define RATCNT  0x00000004
+/*---------------------------------------------------------------------------*/
 /* Make the main driver process visible to mode drivers */
 PROCESS_NAME(rf_core_process);
 /*---------------------------------------------------------------------------*/
@@ -310,6 +313,24 @@ uint8_t rf_core_set_modesel(void);
  */
 uint8_t rf_core_start_rat(void);
 
+/**
+ * \brief Stop the CM0 RAT synchronously
+ * \return RF_CORE_CMD_OK or RF_CORE_CMD_ERROR
+ *
+ * This function is not strictly necessary, but through calling it it's possibly
+ * to learn the RAT / RTC offset, which useful to get accurate radio timestamps.
+ */
+uint8_t rf_core_stop_rat(void);
+
+/**
+ * \brief Restart the CM0 RAT
+ * \return RF_CORE_CMD_OK or RF_CORE_CMD_ERROR
+ *
+ * This function restarts the CM0 RAT and therefore resynchornizes it with RTC.
+ * To achieve good timing accuracy, it should be called periodically.
+ */
+uint8_t rf_core_restart_rat(void);
+
 /**
  * \brief Boot the RF Core
  * \return RF_CORE_CMD_OK or RF_CORE_CMD_ERROR
@@ -327,19 +348,20 @@ uint8_t rf_core_boot(void);
 /**
  * \brief Setup RF core interrupts
  */
-void rf_core_setup_interrupts(void);
+void rf_core_setup_interrupts(bool poll_mode);
 
 /**
  * \brief Enable interrupt on command done.
  * \param fg set true to enable irq on foreground command done and false for
  * background commands or if not in ieee mode.
+ * \param poll_mode true if the driver is in poll mode
  *
  * This is used within TX routines in order to be able to sleep the CM3 and
  * wake up after TX has finished
  *
  * \sa rf_core_cmd_done_dis()
  */
-void rf_core_cmd_done_en(bool fg);
+void rf_core_cmd_done_en(bool fg, bool poll_mode);
 
 /**
  * \brief Disable the LAST_CMD_DONE and LAST_FG_CMD_DONE interrupts.
@@ -348,7 +370,7 @@ void rf_core_cmd_done_en(bool fg);
  *
  * \sa rf_core_cmd_done_en()
  */
-void rf_core_cmd_done_dis(void);
+void rf_core_cmd_done_dis(bool poll_mode);
 
 /**
  * \brief Returns a pointer to the most recent proto-dependent Radio Op

From 95b66657aab656e3ca9b2a44d3c2e8cf093ff4d2 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 17:57:46 +0300
Subject: [PATCH 368/393] cc26xx: add TSCH-related rtimer defines

---
 cpu/cc26xx-cc13xx/rtimer-arch.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/cpu/cc26xx-cc13xx/rtimer-arch.h b/cpu/cc26xx-cc13xx/rtimer-arch.h
index 0d54d227c..128461c8d 100644
--- a/cpu/cc26xx-cc13xx/rtimer-arch.h
+++ b/cpu/cc26xx-cc13xx/rtimer-arch.h
@@ -50,6 +50,21 @@
 #define RTIMER_ARCH_SECOND 65536
 /*---------------------------------------------------------------------------*/
 rtimer_clock_t rtimer_arch_now(void);
+
+/* HW oscillator frequency is 32 kHz, not 64 kHz and RTIMER_NOW() never returns
+ * an odd value; so US_TO_RTIMERTICKS always rounds to the nearest even number.
+ */
+#define US_TO_RTIMERTICKS(US)  (2 * ((US) >= 0 ?                        \
+                               (((int32_t)(US) * (RTIMER_ARCH_SECOND / 2) + 500000) / 1000000L) :      \
+                                ((int32_t)(US) * (RTIMER_ARCH_SECOND / 2) - 500000) / 1000000L))
+
+#define RTIMERTICKS_TO_US(T)   ((T) >= 0 ?                     \
+                               (((int32_t)(T) * 1000000L + ((RTIMER_ARCH_SECOND) / 2)) / (RTIMER_ARCH_SECOND)) : \
+                               ((int32_t)(T) * 1000000L - ((RTIMER_ARCH_SECOND) / 2)) / (RTIMER_ARCH_SECOND))
+
+/* A 64-bit version because the 32-bit one cannot handle T >= 4295 ticks.
+   Intended only for positive values of T. */
+#define RTIMERTICKS_TO_US_64(T)  ((uint32_t)(((uint64_t)(T) * 1000000 + ((RTIMER_ARCH_SECOND) / 2)) / (RTIMER_ARCH_SECOND)))
 /*---------------------------------------------------------------------------*/
 #endif /* RTIMER_ARCH_H_ */
 /*---------------------------------------------------------------------------*/

From a47fb723e468368808f44e48712552c52519a31a Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 18:02:26 +0300
Subject: [PATCH 369/393] cc26xx: enable sync between radio timer and RTC,
 useful for TSCH

---
 cpu/cc26xx-cc13xx/clock.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cpu/cc26xx-cc13xx/clock.c b/cpu/cc26xx-cc13xx/clock.c
index 4f6df056f..85ea6e444 100644
--- a/cpu/cc26xx-cc13xx/clock.c
+++ b/cpu/cc26xx-cc13xx/clock.c
@@ -118,6 +118,9 @@ clock_init(void)
   /* GPT0 / Timer B: One shot, PWM interrupt enable */
   HWREG(GPT0_BASE + GPT_O_TBMR) =
         ((TIMER_CFG_B_ONE_SHOT >> 8) & 0xFF) | GPT_TBMR_TBPWMIE;
+
+  /* enable sync with radio timer */
+  HWREGBITW(AON_RTC_BASE + AON_RTC_O_CTL, AON_RTC_CTL_RTC_UPD_EN_BITN) = 1;
 }
 /*---------------------------------------------------------------------------*/
 static void

From 3a99639294bef07938ed9ccb54603060ef9226c1 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 18:08:34 +0300
Subject: [PATCH 370/393] cc26xx: implement CC2650_FAST_RADIO_STARTUP option,
 required for TSCH

---
 cpu/cc26xx-cc13xx/dev/soc-rtc.c      |  12 +-
 cpu/cc26xx-cc13xx/lpm.c              | 235 ++++++++++++++-------------
 platform/srf06-cc26xx/contiki-main.c |   5 +
 3 files changed, 139 insertions(+), 113 deletions(-)

diff --git a/cpu/cc26xx-cc13xx/dev/soc-rtc.c b/cpu/cc26xx-cc13xx/dev/soc-rtc.c
index 08d9a7cce..398f14d6a 100644
--- a/cpu/cc26xx-cc13xx/dev/soc-rtc.c
+++ b/cpu/cc26xx-cc13xx/dev/soc-rtc.c
@@ -81,11 +81,13 @@ soc_rtc_init(void)
 
   ti_lib_aon_rtc_event_clear(AON_RTC_CH0);
   ti_lib_aon_rtc_event_clear(AON_RTC_CH1);
+  ti_lib_aon_rtc_event_clear(AON_RTC_CH2);
 
   /* Setup the wakeup event */
   ti_lib_aon_event_mcu_wake_up_set(AON_EVENT_MCU_WU0, AON_EVENT_RTC_CH0);
   ti_lib_aon_event_mcu_wake_up_set(AON_EVENT_MCU_WU1, AON_EVENT_RTC_CH1);
-  ti_lib_aon_rtc_combined_event_config(AON_RTC_CH0 | AON_RTC_CH1);
+  ti_lib_aon_event_mcu_wake_up_set(AON_EVENT_MCU_WU2, AON_EVENT_RTC_CH2);
+  ti_lib_aon_rtc_combined_event_config(AON_RTC_CH0 | AON_RTC_CH1 | AON_RTC_CH2);
 
   HWREG(AON_RTC_BASE + AON_RTC_O_SEC) = SOC_RTC_START_TICK_COUNT;
 
@@ -123,7 +125,7 @@ soc_rtc_get_next_trigger()
 void
 soc_rtc_schedule_one_shot(uint32_t channel, uint32_t ticks)
 {
-  if((channel != AON_RTC_CH0) && (channel != AON_RTC_CH1)) {
+  if((channel != AON_RTC_CH0) && (channel != AON_RTC_CH1) && (channel != AON_RTC_CH2)) {
     return;
   }
 
@@ -170,6 +172,12 @@ soc_rtc_isr(void)
     rtimer_run_next();
   }
 
+  if(ti_lib_aon_rtc_event_get(AON_RTC_CH2)) {
+    /* after sleep; since a rtimer is already scheduled, do nothing */
+    ti_lib_aon_rtc_channel_disable(AON_RTC_CH2);
+    HWREG(AON_RTC_BASE + AON_RTC_O_EVFLAGS) = AON_RTC_EVFLAGS_CH2;
+  }
+
   ENERGEST_OFF(ENERGEST_TYPE_IRQ);
 }
 /*---------------------------------------------------------------------------*/
diff --git a/cpu/cc26xx-cc13xx/lpm.c b/cpu/cc26xx-cc13xx/lpm.c
index 686065c73..3253202c2 100644
--- a/cpu/cc26xx-cc13xx/lpm.c
+++ b/cpu/cc26xx-cc13xx/lpm.c
@@ -77,12 +77,13 @@ LIST(modules_list);
  * Don't consider standby mode if the next AON RTC event is scheduled to fire
  * in less than STANDBY_MIN_DURATION rtimer ticks
  */
-#define STANDBY_MIN_DURATION  (RTIMER_SECOND >> 11)
-#define MINIMAL_SAFE_SCHEDUAL 8u
+#define STANDBY_MIN_DURATION (RTIMER_SECOND / 100) /* 10.0 ms */
+
+/* Wake up this much time earlier before the next rtimer */
+#define SLEEP_GUARD_TIME (RTIMER_SECOND / 1000) /* 1.0 ms */
+
 #define MAX_SLEEP_TIME        RTIMER_SECOND
-#define DEFAULT_SLEEP_TIME    RTIMER_SECOND
-/*---------------------------------------------------------------------------*/
-#define CLK_TO_RT(c) ((c) * (RTIMER_SECOND / CLOCK_SECOND))
+#define MINIMAL_SAFE_SCHEDULE 8u
 /*---------------------------------------------------------------------------*/
 /* Prototype of a function in clock.c. Called every time we come out of DS */
 void clock_update(void);
@@ -241,14 +242,124 @@ wake_up(void)
       module->wakeup();
     }
   }
+
+#if CC2650_FAST_RADIO_STARTUP
+  /*
+   * Trigger a switch to the XOSC, so that we can subsequently use the RF FS
+   */
+  oscillators_request_hf_xosc();
+#endif
+}
+/*---------------------------------------------------------------------------*/
+static int
+setup_sleep_mode(rtimer_clock_t *next_timer)
+{
+  lpm_registered_module_t *module;
+  uint8_t max_pm = LPM_MODE_MAX_SUPPORTED;
+
+  rtimer_clock_t now = RTIMER_NOW();
+  const rtimer_clock_t max_sleep = now + MAX_SLEEP_TIME;
+
+  /* next_timer will hold the time of the next system wakeup due to a timer*/
+  *next_timer = max_sleep;
+
+  /* Check if any events fired before we turned interrupts off. If so, abort */
+  if(LPM_MODE_MAX_SUPPORTED == LPM_MODE_AWAKE || process_nevents()) {
+    return LPM_MODE_AWAKE;
+  }
+
+  if(ti_lib_aon_rtc_channel_active(AON_RTC_CH0)) {
+    rtimer_clock_t next_rtimer;
+    /* find out the timer of the next rtimer interrupt */
+    next_rtimer = ti_lib_aon_rtc_compare_value_get(AON_RTC_CH0);
+    if(RTIMER_CLOCK_LT(next_rtimer, now + 2)) {
+      return LPM_MODE_AWAKE;
+    }
+    if(RTIMER_CLOCK_LT(next_rtimer, now + STANDBY_MIN_DURATION)) {
+      return LPM_MODE_SLEEP;
+    }
+    *next_timer = next_rtimer;
+  }
+
+  /* also find out the timer of the next etimer */
+  if(etimer_pending()) {
+    int32_t until_next_etimer;
+    rtimer_clock_t next_etimer;
+
+    until_next_etimer = (int32_t)etimer_next_expiration_time() - (int32_t)clock_time();
+    if(until_next_etimer < 1) {
+      return LPM_MODE_AWAKE;
+    }
+
+    next_etimer = soc_rtc_last_isr_time() + (until_next_etimer * (RTIMER_SECOND / CLOCK_SECOND));
+    if(RTIMER_CLOCK_LT(next_etimer, now + STANDBY_MIN_DURATION)) {
+      /* ensure that we schedule sleep a minimal number of ticks into the
+         future */
+      soc_rtc_schedule_one_shot(AON_RTC_CH1, now + MINIMAL_SAFE_SCHEDULE);
+      return LPM_MODE_SLEEP;
+    }
+
+    if(RTIMER_CLOCK_LT(max_sleep, next_etimer)) {
+      /* if max_pm is LPM_MODE_SLEEP, we could trigger the watchdog if we slept
+         for too long. */
+      if(RTIMER_CLOCK_LT(max_sleep, *next_timer)) {
+        soc_rtc_schedule_one_shot(AON_RTC_CH1, max_sleep);
+      }
+    } else {
+      /* Reschedule AON RTC CH1 to fire just in time for the next etimer event */
+      soc_rtc_schedule_one_shot(AON_RTC_CH1, next_etimer);
+    }
+
+    if(RTIMER_CLOCK_LT(next_etimer, *next_timer)) {
+      /* set `next_timer` to the time the first etimer fires */
+      *next_timer = next_etimer;
+    }
+  }
+
+  /* Collect max allowed PM permission from interested modules */
+  for(module = list_head(modules_list); module != NULL;
+      module = module->next) {
+    if(module->request_max_pm) {
+      uint8_t module_pm = module->request_max_pm();
+      if(module_pm < max_pm) {
+        max_pm = module_pm;
+      }
+    }
+  }
+
+  return max_pm;
+}
+/*---------------------------------------------------------------------------*/
+void
+lpm_sleep(void)
+{
+  ENERGEST_SWITCH(ENERGEST_TYPE_CPU, ENERGEST_TYPE_LPM);
+
+  /* We are only interested in IRQ energest while idle or in LPM */
+  ENERGEST_IRQ_RESTORE(irq_energest);
+
+  /* Just to be on the safe side, explicitly disable Deep Sleep */
+  HWREG(NVIC_SYS_CTRL) &= ~(NVIC_SYS_CTRL_SLEEPDEEP);
+
+  ti_lib_prcm_sleep();
+
+  /* Remember IRQ energest for next pass */
+  ENERGEST_IRQ_SAVE(irq_energest);
+
+  ENERGEST_SWITCH(ENERGEST_TYPE_LPM, ENERGEST_TYPE_CPU);
 }
 /*---------------------------------------------------------------------------*/
 static void
-deep_sleep(void)
+deep_sleep(rtimer_clock_t next_timer)
 {
   uint32_t domains = LOCKABLE_DOMAINS;
   lpm_registered_module_t *module;
 
+#if CC2650_FAST_RADIO_STARTUP
+  /* schedule a wakeup briefly before the next etimer/rtimer to wake up the system */
+  soc_rtc_schedule_one_shot(AON_RTC_CH2, next_timer - SLEEP_GUARD_TIME);
+#endif
+
   /*
    * Notify all registered modules that we are dropping to mode X. We do not
    * need to do this for simple sleep.
@@ -304,7 +415,8 @@ deep_sleep(void)
    * turn back off.
    *
    * If the radio is on, we won't even reach here, and if it's off the HF
-   * clock source should already be the HF RC.
+   * clock source should already be the HF RC, unless CC2650_FAST_RADIO_STARTUP
+   * is defined.
    *
    * Nevertheless, request the switch to the HF RC explicitly here.
    */
@@ -370,131 +482,32 @@ deep_sleep(void)
    * unpending events so the handlers can fire
    */
   wake_up();
-}
-/*---------------------------------------------------------------------------*/
-static void
-safe_schedule_rtimer(rtimer_clock_t time, rtimer_clock_t now, int pm)
-{
-  rtimer_clock_t min_sleep;
-  rtimer_clock_t max_sleep;
 
-  min_sleep = now + MINIMAL_SAFE_SCHEDUAL;
-  max_sleep = now + MAX_SLEEP_TIME;
-
-  if(RTIMER_CLOCK_LT(time, min_sleep)) {
-    /* ensure that we schedule sleep a minimal number of ticks into the
-       future */
-    soc_rtc_schedule_one_shot(AON_RTC_CH1, min_sleep);
-  } else if((pm == LPM_MODE_SLEEP) && RTIMER_CLOCK_LT(max_sleep, time)) {
-    /* if max_pm is LPM_MODE_SLEEP, we could trigger the watchdog if we slept
-       for too long. */
-    soc_rtc_schedule_one_shot(AON_RTC_CH1, max_sleep);
-  } else {
-    soc_rtc_schedule_one_shot(AON_RTC_CH1, time);
-  }
-}
-/*---------------------------------------------------------------------------*/
-static int
-setup_sleep_mode(void)
-{
-  rtimer_clock_t et_distance = 0;
-
-  lpm_registered_module_t *module;
-  int max_pm;
-  int module_pm;
-  int etimer_is_pending;
-  rtimer_clock_t now;
-  rtimer_clock_t et_time;
-  rtimer_clock_t next_trig;
-
-  max_pm = LPM_MODE_MAX_SUPPORTED;
-  now = RTIMER_NOW();
-
-  if((LPM_MODE_MAX_SUPPORTED == LPM_MODE_AWAKE) || process_nevents()) {
-    return LPM_MODE_AWAKE;
-  }
-
-  etimer_is_pending = etimer_pending();
-
-  if(etimer_is_pending) {
-    et_distance = CLK_TO_RT(etimer_next_expiration_time() - clock_time());
-
-    if(RTIMER_CLOCK_LT(et_distance, 1)) {
-      /* there is an etimer which is already expired; we shouldn't go to
-         sleep at all */
-      return LPM_MODE_AWAKE;
-    }
-  }
-
-  next_trig = soc_rtc_get_next_trigger();
-  if(RTIMER_CLOCK_LT(next_trig, now + STANDBY_MIN_DURATION)) {
-    return LPM_MODE_SLEEP;
-  }
-
-  /* Collect max allowed PM permission from interested modules */
-  for(module = list_head(modules_list); module != NULL;
-      module = module->next) {
-    if(module->request_max_pm) {
-      module_pm = module->request_max_pm();
-      if(module_pm < max_pm) {
-        max_pm = module_pm;
-      }
-    }
-  }
-
-  /* Reschedule AON RTC CH1 to fire just in time for the next etimer event */
-  if(etimer_is_pending) {
-    et_time = soc_rtc_last_isr_time() + et_distance;
-
-    safe_schedule_rtimer(et_time, now, max_pm);
-  } else {
-    /* set a maximal sleep period if no etimers are queued */
-    soc_rtc_schedule_one_shot(AON_RTC_CH1, now + DEFAULT_SLEEP_TIME);
-  }
-
-  return max_pm;
+  ti_lib_int_master_enable();
 }
 /*---------------------------------------------------------------------------*/
 void
 lpm_drop()
 {
   uint8_t max_pm;
+  rtimer_clock_t next_timer;
 
   /* Critical. Don't get interrupted! */
   ti_lib_int_master_disable();
 
-  max_pm = setup_sleep_mode();
+  max_pm = setup_sleep_mode(&next_timer);
 
   /* Drop */
   if(max_pm == LPM_MODE_SLEEP) {
     lpm_sleep();
   } else if(max_pm == LPM_MODE_DEEP_SLEEP) {
-    deep_sleep();
+    deep_sleep(next_timer);
   }
 
   ti_lib_int_master_enable();
 }
 /*---------------------------------------------------------------------------*/
 void
-lpm_sleep(void)
-{
-  ENERGEST_SWITCH(ENERGEST_TYPE_CPU, ENERGEST_TYPE_LPM);
-
-  /* We are only interested in IRQ energest while idle or in LPM */
-  ENERGEST_IRQ_RESTORE(irq_energest);
-
-  /* Just to be on the safe side, explicitly disable Deep Sleep */
-  HWREG(NVIC_SYS_CTRL) &= ~(NVIC_SYS_CTRL_SLEEPDEEP);
-
-  ti_lib_prcm_sleep();
-
-  /* Remember IRQ energest for next pass */
-  ENERGEST_IRQ_SAVE(irq_energest);
-
-  ENERGEST_SWITCH(ENERGEST_TYPE_LPM, ENERGEST_TYPE_CPU);
-}
-/*---------------------------------------------------------------------------*/
-void
 lpm_register_module(lpm_registered_module_t *module)
 {
   list_add(modules_list, module);
@@ -512,7 +525,7 @@ lpm_init()
   list_init(modules_list);
 
   /* Always wake up on any DIO edge detection */
-  ti_lib_aon_event_mcu_wake_up_set(AON_EVENT_MCU_WU2, AON_EVENT_IO);
+  ti_lib_aon_event_mcu_wake_up_set(AON_EVENT_MCU_WU3, AON_EVENT_IO);
 }
 /*---------------------------------------------------------------------------*/
 void
diff --git a/platform/srf06-cc26xx/contiki-main.c b/platform/srf06-cc26xx/contiki-main.c
index b3d64f24a..b3f5c37f7 100644
--- a/platform/srf06-cc26xx/contiki-main.c
+++ b/platform/srf06-cc26xx/contiki-main.c
@@ -149,6 +149,11 @@ main(void)
   /* Set the LF XOSC as the LF system clock source */
   oscillators_select_lf_xosc();
 
+#if CC2650_FAST_RADIO_STARTUP
+  /* Also request HF XOSC to start up */
+  oscillators_request_hf_xosc();
+#endif
+
   lpm_init();
 
   board_init();

From e19fbc996e240c0222409ac2b51a44645f7caf89 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 19:10:38 +0300
Subject: [PATCH 371/393] cc26xx: use CMD_IEEE_MOD_FILT to change address
 filtering instead of fully restarting the radio

---
 cpu/cc26xx-cc13xx/rf-core/ieee-mode.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
index 9cc614433..03c4ab2fc 100644
--- a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
+++ b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
@@ -631,6 +631,11 @@ init_rf_params(void)
 
   cmd->endTrigger.triggerType = TRIG_NEVER;
   cmd->endTime = 0x00000000;
+
+  /* set address filter command */
+  filter_cmd.commandNo = CMD_IEEE_MOD_FILT;
+  memcpy(&filter_cmd.newFrameFiltOpt, &cmd->frameFiltOpt, sizeof(cmd->frameFiltOpt));
+  memcpy(&filter_cmd.newFrameTypes, &cmd->frameTypes, sizeof(cmd->frameTypes));
 }
 /*---------------------------------------------------------------------------*/
 static int
@@ -1355,9 +1360,9 @@ get_value(radio_param_t param, radio_value_t *value)
 static radio_result_t
 set_value(radio_param_t param, radio_value_t value)
 {
-  uint8_t was_off = 0;
   radio_result_t rv = RADIO_RESULT_OK;
   rfc_CMD_IEEE_RX_t *cmd = (rfc_CMD_IEEE_RX_t *)cmd_ieee_rx_buf;
+  uint8_t old_poll_mode;
 
   switch(param) {
   case RADIO_PARAM_POWER_MODE:
@@ -1411,7 +1416,20 @@ set_value(radio_param_t param, radio_value_t value)
     cmd->frameFiltOpt.bPanCoord = 0;
     cmd->frameFiltOpt.bStrictLenFilter = 0;
 
+    old_poll_mode = poll_mode;
     poll_mode = (value & RADIO_RX_MODE_POLL_MODE) != 0;
+    if(poll_mode == old_poll_mode) {
+      uint32_t cmd_status;
+
+      /* do not turn the radio on and off, just send an update command */
+      memcpy(&filter_cmd.newFrameFiltOpt, &cmd->frameFiltOpt, sizeof(cmd->frameFiltOpt));
+
+      if(rf_core_send_cmd((uint32_t)&filter_cmd, &cmd_status) == RF_CORE_CMD_ERROR) {
+        PRINTF("setting address filter failed: CMDSTA=0x%08lx\n", cmd_status);
+        return RADIO_RESULT_ERROR;
+      }
+      return RADIO_RESULT_OK;
+    }
     break;
   }
   case RADIO_PARAM_TXPOWER:

From 97c1cfc3b4fe4ea430f5ed6413a5d9867ed6728d Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 19:22:20 +0300
Subject: [PATCH 372/393] cc26xx: return the expected value 0 from prepare() in
 ieee and prop mode radio

---
 cpu/cc26xx-cc13xx/rf-core/ieee-mode.c | 2 +-
 cpu/cc26xx-cc13xx/rf-core/prop-mode.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
index 03c4ab2fc..f81faf1c3 100644
--- a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
+++ b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
@@ -847,7 +847,7 @@ prepare(const void *payload, unsigned short payload_len)
   int len = MIN(payload_len, TX_BUF_PAYLOAD_LEN);
 
   memcpy(&tx_buf[TX_BUF_HDR_LEN], payload, len);
-  return RF_CORE_CMD_OK;
+  return 0;
 }
 /*---------------------------------------------------------------------------*/
 static int
diff --git a/cpu/cc26xx-cc13xx/rf-core/prop-mode.c b/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
index 54102f164..94aef33b9 100644
--- a/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
+++ b/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
@@ -634,7 +634,7 @@ prepare(const void *payload, unsigned short payload_len)
   int len = MIN(payload_len, TX_BUF_PAYLOAD_LEN);
 
   memcpy(&tx_buf[TX_BUF_HDR_LEN], payload, len);
-  return RF_CORE_CMD_OK;
+  return 0;
 }
 /*---------------------------------------------------------------------------*/
 static int

From 25c5f0b744970343841edd3d7d26215d60fceefc Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 19:23:59 +0300
Subject: [PATCH 373/393] cc26xx: implement support for
 CC2650_FAST_RADIO_STARTUP

---
 cpu/cc26xx-cc13xx/rf-core/ieee-mode.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
index f81faf1c3..b67bddac0 100644
--- a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
+++ b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
@@ -1216,11 +1216,13 @@ on(void)
     return RF_CORE_CMD_OK;
   }
 
+#if !CC2650_FAST_RADIO_STARTUP
   /*
    * Request the HF XOSC as the source for the HF clock. Needed before we can
    * use the FS. This will only request, it will _not_ perform the switch.
    */
   oscillators_request_hf_xosc();
+#endif
 
   if(rf_is_on()) {
     PRINTF("on: We were on. PD=%u, RX=0x%04x \n", rf_core_is_accessible(),
@@ -1228,22 +1230,23 @@ on(void)
     return RF_CORE_CMD_OK;
   }
 
+  init_rx_buffers();
+
+  /*
+   * Trigger a switch to the XOSC, so that we can subsequently use the RF FS
+   * This will block until the XOSC is actually ready, but give how we
+   * requested it early on, this won't be too long a wait.
+   * This should be done before starting the RAT.
+   */
+  oscillators_switch_to_hf_xosc();
+
   if(rf_core_boot() != RF_CORE_CMD_OK) {
     PRINTF("on: rf_core_boot() failed\n");
     return RF_CORE_CMD_ERROR;
   }
 
-  init_rx_buffers();
-
   rf_core_setup_interrupts(poll_mode);
 
-  /*
-   * Trigger a switch to the XOSC, so that we can subsequently use the RF FS
-   * This will block until the XOSC is actually ready, but give how we
-   * requested it early on, this won't be too long a wait/
-   */
-  oscillators_switch_to_hf_xosc();
-
   if(rf_radio_setup() != RF_CORE_CMD_OK) {
     PRINTF("on: radio_setup() failed\n");
     return RF_CORE_CMD_ERROR;
@@ -1272,8 +1275,12 @@ off(void)
 
   ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
 
-  /* Switch HF clock source to the RCOSC to preserve power */
+#if !CC2650_FAST_RADIO_STARTUP
+  /* Switch HF clock source to the RCOSC to preserve power.
+   * This must be done after stopping RAT.
+   */
   oscillators_switch_to_hf_rc();
+#endif
 
   /* We pulled the plug, so we need to restore the status manually */
   ((rfc_CMD_IEEE_RX_t *)cmd_ieee_rx_buf)->status = RF_CORE_RADIO_OP_STATUS_IDLE;

From 80aa30c5da2aeaf2f6688930c54d6a39cb47944b Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 19:25:38 +0300
Subject: [PATCH 374/393] cc26xx: add support for RADIO_PARAM_TX_MODE getting
 and setting and for LAST_RSSI and LAST_LQI reading

---
 cpu/cc26xx-cc13xx/rf-core/ieee-mode.c | 29 +++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
index b67bddac0..3eb46ae78 100644
--- a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
+++ b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
@@ -1297,6 +1297,17 @@ off(void)
   return RF_CORE_CMD_OK;
 }
 /*---------------------------------------------------------------------------*/
+/* Enable or disable CCA before sending */
+static radio_result_t
+set_send_on_cca(uint8_t enable)
+{
+  if(enable) {
+    /* this driver does not have support for CCA on Tx */
+    return RADIO_RESULT_NOT_SUPPORTED;
+  }
+  return RADIO_RESULT_OK;
+}
+/*---------------------------------------------------------------------------*/
 static radio_result_t
 get_value(radio_param_t param, radio_value_t *value)
 {
@@ -1332,6 +1343,9 @@ get_value(radio_param_t param, radio_value_t *value)
       *value |= RADIO_RX_MODE_POLL_MODE;
     }
 
+    return RADIO_RESULT_OK;
+  case RADIO_PARAM_TX_MODE:
+    *value = 0;
     return RADIO_RESULT_OK;
   case RADIO_PARAM_TXPOWER:
     *value = get_tx_power();
@@ -1359,6 +1373,12 @@ get_value(radio_param_t param, radio_value_t *value)
   case RADIO_CONST_TXPOWER_MAX:
     *value = OUTPUT_POWER_MAX;
     return RADIO_RESULT_OK;
+  case RADIO_PARAM_LAST_RSSI:
+    *value = last_rssi;
+    return RADIO_RESULT_OK;
+  case RADIO_PARAM_LAST_LINK_QUALITY:
+    *value = last_corr_lqi;
+    return RADIO_RESULT_OK;
   default:
     return RADIO_RESULT_NOT_SUPPORTED;
   }
@@ -1439,6 +1459,13 @@ set_value(radio_param_t param, radio_value_t value)
     }
     break;
   }
+
+  case RADIO_PARAM_TX_MODE:
+    if(value & ~(RADIO_TX_MODE_SEND_ON_CCA)) {
+      return RADIO_RESULT_INVALID_VALUE;
+    }
+    return set_send_on_cca((value & RADIO_TX_MODE_SEND_ON_CCA) != 0);
+
   case RADIO_PARAM_TXPOWER:
     if(value < OUTPUT_POWER_MIN || value > OUTPUT_POWER_MAX) {
       return RADIO_RESULT_INVALID_VALUE;
@@ -1447,9 +1474,11 @@ set_value(radio_param_t param, radio_value_t value)
     set_tx_power(value);
 
     return RADIO_RESULT_OK;
+
   case RADIO_PARAM_CCA_THRESHOLD:
     cmd->ccaRssiThr = (int8_t)value;
     break;
+
   default:
     return RADIO_RESULT_NOT_SUPPORTED;
   }

From 54e4b5f3510ecb9f249eaf8e465aef3344c65b99 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 19:27:16 +0300
Subject: [PATCH 375/393] cc26xx: allow IEEE 802.15.4 frames with version 2,
 required for TSCH

---
 cpu/cc26xx-cc13xx/rf-core/ieee-mode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
index 3eb46ae78..7d4de12be 100644
--- a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
+++ b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
@@ -601,7 +601,7 @@ init_rf_params(void)
   cmd->frameFiltOpt.defaultPend = 0;
   cmd->frameFiltOpt.bPendDataReqOnly = 0;
   cmd->frameFiltOpt.bPanCoord = 0;
-  cmd->frameFiltOpt.maxFrameVersion = 1;
+  cmd->frameFiltOpt.maxFrameVersion = 2;
   cmd->frameFiltOpt.bStrictLenFilter = 0;
 
   /* Receive all frame types */

From d85667d5356b3a08773adadce69eab552b43d805 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 19:29:35 +0300
Subject: [PATCH 376/393] cc26xx: packet queue changes: allow to read packets
 after radio has been turned off; make pending_packet() return true when there
 is a packets being received

---
 cpu/cc26xx-cc13xx/rf-core/ieee-mode.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
index 7d4de12be..af48a73bd 100644
--- a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
+++ b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
@@ -1190,7 +1190,8 @@ pending_packet(void)
 
   /* Go through all RX buffers and check their status */
   do {
-    if(entry->status == DATA_ENTRY_STATUS_FINISHED) {
+    if(entry->status == DATA_ENTRY_STATUS_FINISHED
+        || entry->status == DATA_ENTRY_STATUS_BUSY) {
       rv = 1;
       if(!poll_mode) {
         process_poll(&rf_core_process);
@@ -1289,10 +1290,18 @@ off(void)
    * Just in case there was an ongoing RX (which started after we begun the
    * shutdown sequence), we don't want to leave the buffer in state == ongoing
    */
-  ((rfc_dataEntry_t *)rx_buf_0)->status = DATA_ENTRY_STATUS_PENDING;
-  ((rfc_dataEntry_t *)rx_buf_1)->status = DATA_ENTRY_STATUS_PENDING;
-  ((rfc_dataEntry_t *)rx_buf_2)->status = DATA_ENTRY_STATUS_PENDING;
-  ((rfc_dataEntry_t *)rx_buf_3)->status = DATA_ENTRY_STATUS_PENDING;
+  if(((rfc_dataEntry_t *)rx_buf_0)->status == DATA_ENTRY_STATUS_BUSY) {
+    ((rfc_dataEntry_t *)rx_buf_0)->status = DATA_ENTRY_STATUS_PENDING;
+  }
+  if(((rfc_dataEntry_t *)rx_buf_1)->status == DATA_ENTRY_STATUS_BUSY) {
+    ((rfc_dataEntry_t *)rx_buf_1)->status = DATA_ENTRY_STATUS_PENDING;
+  }
+  if(((rfc_dataEntry_t *)rx_buf_2)->status == DATA_ENTRY_STATUS_BUSY) {
+    ((rfc_dataEntry_t *)rx_buf_2)->status = DATA_ENTRY_STATUS_PENDING;
+  }
+  if(((rfc_dataEntry_t *)rx_buf_3)->status == DATA_ENTRY_STATUS_BUSY) {
+    ((rfc_dataEntry_t *)rx_buf_3)->status = DATA_ENTRY_STATUS_PENDING;
+  }
 
   return RF_CORE_CMD_OK;
 }

From e233c3f27f9adc475e9d6d6d0b4cac560644eb0c Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Mon, 25 Apr 2016 19:31:04 +0300
Subject: [PATCH 377/393] cc26xx: change CCA logic to be standard-compatible;
 change receiving_packet to return true iff sync (SFD) has been seen

---
 cpu/cc26xx-cc13xx/rf-core/ieee-mode.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
index af48a73bd..08843d699 100644
--- a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
+++ b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
@@ -146,6 +146,13 @@ static uint8_t rf_stats[16] = { 0 };
 #define RF_CMD_CCA_REQ_CCA_STATE_IDLE      0 /* 00 */
 #define RF_CMD_CCA_REQ_CCA_STATE_BUSY      1 /* 01 */
 #define RF_CMD_CCA_REQ_CCA_STATE_INVALID   2 /* 10 */
+
+#define RF_CMD_CCA_REQ_CCA_CORR_IDLE       (0 << 4)
+#define RF_CMD_CCA_REQ_CCA_CORR_BUSY       (1 << 4)
+#define RF_CMD_CCA_REQ_CCA_CORR_INVALID    (3 << 4)
+#define RF_CMD_CCA_REQ_CCA_CORR_MASK       (3 << 4)
+
+#define RF_CMD_CCA_REQ_CCA_SYNC_BUSY       (1 << 6)
 /*---------------------------------------------------------------------------*/
 #define IEEE_MODE_CHANNEL_MIN            11
 #define IEEE_MODE_CHANNEL_MAX            26
@@ -617,9 +624,9 @@ init_rf_params(void)
   /* Configure CCA settings */
   cmd->ccaOpt.ccaEnEnergy = 1;
   cmd->ccaOpt.ccaEnCorr = 1;
-  cmd->ccaOpt.ccaEnSync = 0;
+  cmd->ccaOpt.ccaEnSync = 1;
   cmd->ccaOpt.ccaCorrOp = 1;
-  cmd->ccaOpt.ccaSyncOp = 1;
+  cmd->ccaOpt.ccaSyncOp = 0;
   cmd->ccaOpt.ccaCorrThr = 3;
 
   cmd->ccaRssiThr = IEEE_MODE_RSSI_THRESHOLD;
@@ -1167,19 +1174,17 @@ receiving_packet(void)
 
   cca_info = get_cca_info();
 
+  /* If we can't read CCA info, return "not receiving" */
   if(cca_info == RF_GET_CCA_INFO_ERROR) {
-    /* If we can't read CCA info, return "not receiving" */
-    ret = 0;
-  } else {
-    /* Return 1 (receiving) if ccaState is busy */
-    ret = (cca_info & 0x03) == RF_CMD_CCA_REQ_CCA_STATE_BUSY;
+    return 0;
   }
 
-  if(was_off) {
-    off();
+  /* If sync has been seen, return 1 (receiving) */
+  if(cca_info & RF_CMD_CCA_REQ_CCA_SYNC_BUSY) {
+    return 1;
   }
 
-  return ret;
+  return 0;
 }
 /*---------------------------------------------------------------------------*/
 static int

From 6800f9502e4e64d07cd0a43afc2d6df58aab63b7 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis.elsts@gmail.com>
Date: Tue, 7 Jun 2016 01:06:15 +0300
Subject: [PATCH 378/393] Update the list of supported platforms in TSCH README
 file

---
 core/net/mac/tsch/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/net/mac/tsch/README.md b/core/net/mac/tsch/README.md
index ae8f7dcba..0b7c54ef3 100644
--- a/core/net/mac/tsch/README.md
+++ b/core/net/mac/tsch/README.md
@@ -38,6 +38,7 @@ It has been tested on the following platforms:
   * Zolertia Z1 (`z1`, tested in cooja only)
   * CC2538DK (`cc2538dk`, tested on hardware)
   * Zolertia Zoul (`zoul`, tested on hardware)
+  * CC2650 (`srf06-cc26xx`, tested on hardware)
 
 This implementation was present at the ETSI Plugtest
 event in Prague in July 2015, and did successfully inter-operate with all
@@ -78,7 +79,7 @@ Orchestra is implemented in:
 
 A simple TSCH+RPL example is included under `examples/ipv6/rpl-tsch`.
 To use TSCH, first make sure your platform supports it.
-Currently, `jn516x`, `sky`, `z1`, `cc2538dk` and `zoul` are the supported platforms.
+Currently, `jn516x`, `sky`, `z1`, `cc2538dk`, `zoul` and `srf06-cc26xx` are the supported platforms.
 To add your own, we refer the reader to the next section.
 
 To add TSCH to your application, first include the TSCH module from your makefile with:
@@ -164,7 +165,7 @@ Finally, one can also implement his own scheduler, centralized or distributed, b
 ## Porting TSCH to a new platform
 
 Porting TSCH to a new platform requires a few new features in the radio driver, a number of timing-related configuration paramters.
-The easiest is probably to start from one of the existing port: `jn516x`, `sky`, `z1`, `cc2538dk`, `zoul`.
+The easiest is probably to start from one of the existing port: `jn516x`, `sky`, `z1`, `cc2538dk`, `zoul`, `srf06-cc26xx`.
 
 ### Radio features required for TSCH
 

From 5010309005388d327e7a0087ed8d30d3e8180111 Mon Sep 17 00:00:00 2001
From: Nicolas Tsiftes <nvt@sics.se>
Date: Mon, 13 Jun 2016 15:55:58 +0200
Subject: [PATCH 379/393] Make the I/O semantics functionality in Coffee
 unconditional so that the API becomes consistent across platforms.

Change certain CPP conditionals into C conditionals, which should be possible for the compiler to optimize at runtime. This makes the source code easier to read.
---
 core/cfs/cfs-coffee.c             | 87 ++++++++++++-------------------
 platform/native/cfs-coffee-arch.h |  1 -
 platform/sky/cfs-coffee-arch.h    |  1 -
 3 files changed, 32 insertions(+), 57 deletions(-)

diff --git a/core/cfs/cfs-coffee.c b/core/cfs/cfs-coffee.c
index 374b3419f..3acd0480b 100644
--- a/core/cfs/cfs-coffee.c
+++ b/core/cfs/cfs-coffee.c
@@ -75,12 +75,6 @@
 #error "Cannot have COFFEE_APPEND_ONLY set when COFFEE_MICRO_LOGS is set."
 #endif
 
-/* I/O semantics can be set on file descriptors in order to optimize
-   file access on certain storage types. */
-#ifndef COFFEE_IO_SEMANTICS
-#define COFFEE_IO_SEMANTICS 0
-#endif
-
 /*
  * Prevent sectors from being erased directly after file removal.
  * This will level the wear across sectors better, but may lead
@@ -94,24 +88,29 @@
 #error COFFEE_START must point to the first byte in a sector.
 #endif
 
+/* File descriptor flags. */
 #define COFFEE_FD_FREE    0x0
 #define COFFEE_FD_READ    0x1
 #define COFFEE_FD_WRITE   0x2
 #define COFFEE_FD_APPEND  0x4
 
+/* File object flags. */
 #define COFFEE_FILE_MODIFIED  0x1
 
-#define INVALID_PAGE    ((coffee_page_t)-1)
+/* Internal Coffee markers. */
+#define INVALID_PAGE      ((coffee_page_t)-1)
 #define UNKNOWN_OFFSET    ((cfs_offset_t)-1)
 
-#define REMOVE_LOG    1
-#define CLOSE_FDS   1
-#define ALLOW_GC    1
+/* File removal actions. They can have the same values because
+   they are passed as separate parameters. */
+#define REMOVE_LOG        1
+#define CLOSE_FDS         1
+#define ALLOW_GC          1
 
 /* "Greedy" garbage collection erases as many sectors as possible. */
-#define GC_GREEDY   0
+#define GC_GREEDY         0
 /* "Reluctant" garbage collection stops after erasing one sector. */
-#define GC_RELUCTANT    1
+#define GC_RELUCTANT      1
 
 /* File descriptor macros. */
 #define FD_VALID(fd)      ((fd) >= 0 && (fd) < COFFEE_FD_SET_SIZE && \
@@ -176,9 +175,7 @@ struct file_desc {
   cfs_offset_t offset;
   struct file *file;
   uint8_t flags;
-#if COFFEE_IO_SEMANTICS
   uint8_t io_flags;
-#endif
 };
 
 /* The file header structure mimics the representation of file headers
@@ -221,11 +218,9 @@ static void
 read_header(struct file_header *hdr, coffee_page_t page)
 {
   COFFEE_READ(hdr, sizeof(*hdr), page * COFFEE_PAGE_SIZE);
-#if DEBUG
-  if(HDR_ACTIVE(*hdr) && !HDR_VALID(*hdr)) {
-    PRINTF("Invalid header at page %u!\n", (unsigned)page);
+  if(DEBUG && HDR_ACTIVE(*hdr) && !HDR_VALID(*hdr)) {
+    PRINTF("Coffee: Invalid header at page %u!\n", (unsigned)page);
   }
-#endif
 }
 /*---------------------------------------------------------------------------*/
 static cfs_offset_t
@@ -561,8 +556,8 @@ find_contiguous_pages(coffee_page_t amount)
 }
 /*---------------------------------------------------------------------------*/
 static int
-remove_by_page(coffee_page_t page, int remove_log, int close_fds,
-               int gc_allowed)
+remove_by_page(coffee_page_t page, int remove_log,
+	       int close_fds, int gc_allowed)
 {
   struct file_header hdr;
   int i;
@@ -600,11 +595,9 @@ remove_by_page(coffee_page_t page, int remove_log, int close_fds,
     }
   }
 
-#if !COFFEE_EXTENDED_WEAR_LEVELLING
-  if(gc_allowed) {
+  if(!COFFEE_EXTENDED_WEAR_LEVELLING && gc_allowed) {
     collect_garbage(GC_RELUCTANT);
   }
-#endif
 
   return 0;
 }
@@ -1104,19 +1097,13 @@ cfs_read(int fd, void *buf, unsigned size)
   fdp = &coffee_fd_set[fd];
   file = fdp->file;
   
-#if COFFEE_IO_SEMANTICS
   if(fdp->io_flags & CFS_COFFEE_IO_ENSURE_READ_LENGTH) {
     while(fdp->offset + size > file->end) {
-      ((char*)buf)[--size] = 0;
+      ((char *)buf)[--size] = '\0';
     }
-  } else {
-#endif
-    if(fdp->offset + size > file->end) {
-      size = file->end - fdp->offset;
-    }
-#if COFFEE_IO_SEMANTICS
+  } else if(fdp->offset + size > file->end) {
+    size = file->end - fdp->offset;
   }
-#endif
 
   /* If the file is not modified, read directly from the file extent. */
   if(!FILE_MODIFIED(file)) {
@@ -1173,28 +1160,20 @@ cfs_write(int fd, const void *buf, unsigned size)
   file = fdp->file;
 
   /* Attempt to extend the file if we try to write past the end. */
-#if COFFEE_IO_SEMANTICS
   if(!(fdp->io_flags & CFS_COFFEE_IO_FIRM_SIZE)) {
-#endif
-  while(size + fdp->offset + sizeof(struct file_header) >
-        (file->max_pages * COFFEE_PAGE_SIZE)) {
-    if(merge_log(file->page, 1) < 0) {
-      return -1;
+    while(size + fdp->offset + sizeof(struct file_header) >
+	  (file->max_pages * COFFEE_PAGE_SIZE)) {
+      if(merge_log(file->page, 1) < 0) {
+	return -1;
+      }
+      file = fdp->file;
+      PRINTF("Extended the file at page %u\n", (unsigned)file->page);
     }
-    file = fdp->file;
-    PRINTF("Extended the file at page %u\n", (unsigned)file->page);
   }
-#if COFFEE_IO_SEMANTICS
-}
-#endif
 
 #if COFFEE_MICRO_LOGS
-#if COFFEE_IO_SEMANTICS
   if(!(fdp->io_flags & CFS_COFFEE_IO_FLASH_AWARE) &&
      (FILE_MODIFIED(file) || fdp->offset < file->end)) {
-#else
-  if(FILE_MODIFIED(file) || fdp->offset < file->end) {
-#endif
     need_dummy_write = 0;
     for(bytes_left = size; bytes_left > 0;) {
       lp.offset = fdp->offset;
@@ -1236,16 +1215,14 @@ cfs_write(int fd, const void *buf, unsigned size)
     }
   } else {
 #endif /* COFFEE_MICRO_LOGS */
-#if COFFEE_APPEND_ONLY
-  if(fdp->offset < file->end) {
-    return -1;
-  }
-#endif /* COFFEE_APPEND_ONLY */
+    if(COFFEE_APPEND_ONLY && fdp->offset < file->end) {
+      return -1;
+    }
 
-  COFFEE_WRITE(buf, size, absolute_offset(file->page, fdp->offset));
-  fdp->offset += size;
+    COFFEE_WRITE(buf, size, absolute_offset(file->page, fdp->offset));
+    fdp->offset += size;
 #if COFFEE_MICRO_LOGS
-}
+  }
 #endif /* COFFEE_MICRO_LOGS */
 
   if(fdp->offset > file->end) {
diff --git a/platform/native/cfs-coffee-arch.h b/platform/native/cfs-coffee-arch.h
index d7622cd46..763e1ebae 100644
--- a/platform/native/cfs-coffee-arch.h
+++ b/platform/native/cfs-coffee-arch.h
@@ -55,7 +55,6 @@
 #define COFFEE_LOG_SIZE			8192
 #define COFFEE_LOG_TABLE_LIMIT		256
 #define COFFEE_MICRO_LOGS		0
-#define COFFEE_IO_SEMANTICS		1
 
 #define COFFEE_WRITE(buf, size, offset)				\
 		xmem_pwrite((char *)(buf), (size), COFFEE_START + (offset))
diff --git a/platform/sky/cfs-coffee-arch.h b/platform/sky/cfs-coffee-arch.h
index 08373c5e9..5eb183a42 100644
--- a/platform/sky/cfs-coffee-arch.h
+++ b/platform/sky/cfs-coffee-arch.h
@@ -59,7 +59,6 @@
 #endif
 #define COFFEE_LOG_SIZE			1024
 
-#define COFFEE_IO_SEMANTICS		1
 #define COFFEE_APPEND_ONLY		0
 #define COFFEE_MICRO_LOGS		1
 

From a06110e5edc3e847430a01ecba41c40508fbfeb0 Mon Sep 17 00:00:00 2001
From: Nicolas Tsiftes <nvt@sics.se>
Date: Mon, 13 Jun 2016 17:00:20 +0200
Subject: [PATCH 380/393] Renamed the internal dummy_space variable, since it
 contains useful information.

---
 core/cfs/cfs-coffee.c | 12 +++++-------
 core/cfs/cfs.h        |  4 +++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/cfs/cfs-coffee.c b/core/cfs/cfs-coffee.c
index 3acd0480b..9aa5726b7 100644
--- a/core/cfs/cfs-coffee.c
+++ b/core/cfs/cfs-coffee.c
@@ -445,10 +445,7 @@ load_file(coffee_page_t start, struct file_header *hdr)
   file->page = start;
   file->end = UNKNOWN_OFFSET;
   file->max_pages = hdr->max_pages;
-  file->flags = 0;
-  if(HDR_MODIFIED(*hdr)) {
-    file->flags |= COFFEE_FILE_MODIFIED;
-  }
+  file->flags = HDR_MODIFIED(*hdr) ? COFFEE_FILE_MODIFIED : 0;
   /* We don't know the amount of records yet. */
   file->record_count = -1;
 
@@ -990,6 +987,7 @@ cfs_open(const char *name, int flags)
 
   fdp = &coffee_fd_set[fd];
   fdp->flags = 0;
+  fdp->io_flags = 0;
 
   fdp->file = find_file(name);
   if(fdp->file == NULL) {
@@ -1239,7 +1237,7 @@ cfs_opendir(struct cfs_dir *dir, const char *name)
    * Coffee is only guaranteed to support the directory names "/" and ".",
    * but it does not enforce this currently.
    */
-  memset(dir->dummy_space, 0, sizeof(coffee_page_t));
+  memset(dir->state, 0, sizeof(coffee_page_t));
   return 0;
 }
 /*---------------------------------------------------------------------------*/
@@ -1250,7 +1248,7 @@ cfs_readdir(struct cfs_dir *dir, struct cfs_dirent *record)
   coffee_page_t page;
   coffee_page_t next_page;
 
-  memcpy(&page, dir->dummy_space, sizeof(coffee_page_t));
+  memcpy(&page, dir->state, sizeof(coffee_page_t));
 
   while(page < COFFEE_PAGE_COUNT) {
     read_header(&hdr, page);
@@ -1260,7 +1258,7 @@ cfs_readdir(struct cfs_dir *dir, struct cfs_dirent *record)
       record->size = file_end(page);
 
       next_page = next_file(page, &hdr);
-      memcpy(dir->dummy_space, &next_page, sizeof(coffee_page_t));
+      memcpy(dir->state, &next_page, sizeof(coffee_page_t));
       return 0;
     }
     page = next_file(page, &hdr);
diff --git a/core/cfs/cfs.h b/core/cfs/cfs.h
index a0426b9ff..3e2452c61 100644
--- a/core/cfs/cfs.h
+++ b/core/cfs/cfs.h
@@ -68,7 +68,9 @@ typedef CFS_CONF_OFFSET_TYPE cfs_offset_t;
 #endif
 
 struct cfs_dir {
-  char dummy_space[32];
+  /* Iteration state, which is implementation-defined and should not be
+     accessed externally. */
+  char state[32];
 };
 
 struct cfs_dirent {

From 67e0575bd38b3d332797d75d7ce3d3ae5e81fb27 Mon Sep 17 00:00:00 2001
From: cedric-d <cedric-d@users.noreply.github.com>
Date: Sun, 24 Apr 2016 12:06:09 +0200
Subject: [PATCH 381/393] Prevent uIP buffer over-read with big UDP packets

When an UDP packet too big to fit in the uIP packet buffer is to be sent, the part fitting in the uIP buffer is copied to it (so no buffer overflow occurs) but uIP actually sends a packet of the original size therefore a buffer over-read occurs.

This modification makes uIP discard the UDP packets that do not fit in the uIP packet buffer.
---
 core/net/ip/uip-udp-packet.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/net/ip/uip-udp-packet.c b/core/net/ip/uip-udp-packet.c
index 923661709..b40d7cc9f 100644
--- a/core/net/ip/uip-udp-packet.c
+++ b/core/net/ip/uip-udp-packet.c
@@ -51,12 +51,10 @@ void
 uip_udp_packet_send(struct uip_udp_conn *c, const void *data, int len)
 {
 #if UIP_UDP
-  if(data != NULL) {
+  if(data != NULL && len <= (UIP_BUFSIZE - (UIP_LLH_LEN + UIP_IPUDPH_LEN))) {
     uip_udp_conn = c;
     uip_slen = len;
-    memmove(&uip_buf[UIP_LLH_LEN + UIP_IPUDPH_LEN], data,
-            len > UIP_BUFSIZE - UIP_LLH_LEN - UIP_IPUDPH_LEN?
-            UIP_BUFSIZE - UIP_LLH_LEN - UIP_IPUDPH_LEN: len);
+    memmove(&uip_buf[UIP_LLH_LEN + UIP_IPUDPH_LEN], data, len);
     uip_process(UIP_UDP_SEND_CONN);
 
 #if UIP_CONF_IPV6_MULTICAST

From 8a273a248e33cb57a16650aeb8ea4b911a3e5809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Sun, 19 Jun 2016 22:57:36 +0200
Subject: [PATCH 382/393] cc2538: Add configuration for firmware location
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Introduce FLASH_CONF_FW_ADDR and FLASH_CONF_FW_SIZE in order to make it
possible to place the firmware anywhere, regardless of Coffee, and
without having to write a custom linker script. Also, handle the default
values properly in order to fix the link breakage reported by
Arthur Fabre <arthur@arthurfabre.com> with COFFEE_CONF_CUSTOM_PORT.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 cpu/cc2538/cc2538.lds  |  3 +--
 cpu/cc2538/dev/flash.h | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/cpu/cc2538/cc2538.lds b/cpu/cc2538/cc2538.lds
index 189968717..ef465409e 100644
--- a/cpu/cc2538/cc2538.lds
+++ b/cpu/cc2538/cc2538.lds
@@ -35,8 +35,7 @@
  */
 MEMORY
 {
-    FLASH_FW (rx) : ORIGIN = COFFEE_START + COFFEE_SIZE,
-                    LENGTH = FLASH_CCA_ADDR - (COFFEE_START + COFFEE_SIZE)
+    FLASH_FW (rx) : ORIGIN = FLASH_FW_ADDR, LENGTH = FLASH_FW_SIZE
     FLASH_CCA (RX) : ORIGIN = FLASH_CCA_ADDR, LENGTH = FLASH_CCA_SIZE
 
     /*
diff --git a/cpu/cc2538/dev/flash.h b/cpu/cc2538/dev/flash.h
index 6af19723e..49db85b20 100644
--- a/cpu/cc2538/dev/flash.h
+++ b/cpu/cc2538/dev/flash.h
@@ -48,6 +48,7 @@
 #define FLASH_H_
 
 #include "dev/cc2538-dev.h"
+#include "cfs-coffee-arch.h"
 
 #include <stdint.h>
 /*---------------------------------------------------------------------------*/
@@ -90,6 +91,23 @@
 #define FLASH_CCA_LOCK_DEBUG_BIT                7  /**< Debug lock bit position in the corresponding lock byte */
 /** @} */
 /*---------------------------------------------------------------------------*/
+/** \name Firmware location in flash memory
+ * @{
+ */
+#ifdef FLASH_CONF_FW_ADDR
+#define FLASH_FW_ADDR   FLASH_CONF_FW_ADDR
+#elif !defined(COFFEE_CONF_CUSTOM_PORT)
+#define FLASH_FW_ADDR   (COFFEE_START + COFFEE_SIZE)
+#else
+#define FLASH_FW_ADDR   CC2538_DEV_FLASH_ADDR
+#endif
+#ifdef FLASH_CONF_FW_SIZE
+#define FLASH_FW_SIZE   FLASH_CONF_FW_SIZE
+#else
+#define FLASH_FW_SIZE   (FLASH_CCA_ADDR - FLASH_FW_ADDR)
+#endif
+/** @} */
+/*---------------------------------------------------------------------------*/
 /** \name Flash lock bit page and CCA layout
  * @{
  */

From b074e5c3e05654aadf53ae2c8531be8fa737744a Mon Sep 17 00:00:00 2001
From: Yasuyuki Tanaka <yasuyuki.tanaka@inf.ethz.ch>
Date: Mon, 20 Jun 2016 16:35:09 +0200
Subject: [PATCH 383/393] Replece UIP_IPV6_MULTICAST_RPL in a comment with
 RPL_CONF_MULTICAST

---
 core/net/rpl/rpl-private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h
index 34d2e4445..044fbadd7 100644
--- a/core/net/rpl/rpl-private.h
+++ b/core/net/rpl/rpl-private.h
@@ -207,7 +207,7 @@
 #define RPL_MOP_DEFAULT                 RPL_MOP_STORING_MULTICAST
 #else
 #define RPL_MOP_DEFAULT                 RPL_MOP_STORING_NO_MULTICAST
-#endif /* UIP_IPV6_MULTICAST_RPL */
+#endif /* RPL_CONF_MULTICAST */
 #endif /* RPL_CONF_MOP */
 
 /*

From 704847db04036956a4b80afa98a7da8298c0dbe4 Mon Sep 17 00:00:00 2001
From: Yasuyuki Tanaka <yasuyuki.tanaka@inf.ethz.ch>
Date: Mon, 20 Jun 2016 16:35:09 +0200
Subject: [PATCH 384/393] Fix a typo, UIP_IPV6_CONF_MULTICAST, in a comment
 with UIP_CONF_IPV6_MULTICAST

---
 core/net/ipv6/uip6.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/ipv6/uip6.c b/core/net/ipv6/uip6.c
index a54754371..541323ffa 100644
--- a/core/net/ipv6/uip6.c
+++ b/core/net/ipv6/uip6.c
@@ -1202,7 +1202,7 @@ uip_process(uint8_t flag)
       goto drop;
     }
   }
-#endif /* UIP_IPV6_CONF_MULTICAST */
+#endif /* UIP_CONF_IPV6_MULTICAST */
 
   /* TBD Some Parameter problem messages */
   if(!uip_ds6_is_my_addr(&UIP_IP_BUF->destipaddr) &&

From ca3a4726d11d3aef2cb41a5a9f121e76923119b0 Mon Sep 17 00:00:00 2001
From: Yasuyuki Tanaka <yasuyuki.tanaka@inf.ethz.ch>
Date: Mon, 20 Jun 2016 16:35:09 +0200
Subject: [PATCH 385/393] Rename two macros related to multicast, which are not
 user configuration

- UIP_CONF_IPV6_MULTICAST -> UIP_IPV6_MULTICAST
- RPL_CONF_MULTICAST      -> RPL_WITH_MULTICAST
---
 core/net/ip/uip-udp-packet.c           | 2 +-
 core/net/ipv6/multicast/README.md      | 2 +-
 core/net/ipv6/multicast/uip-mcast6.h   | 8 ++++----
 core/net/ipv6/uip6.c                   | 8 ++++----
 core/net/rpl/rpl-dag.c                 | 2 +-
 core/net/rpl/rpl-icmp6.c               | 6 +++---
 core/net/rpl/rpl-private.h             | 6 +++---
 core/net/rpl/rpl-timers.c              | 4 ++--
 core/net/rpl/rpl.c                     | 8 ++++----
 examples/ipv6/multicast/intermediate.c | 2 +-
 examples/ipv6/multicast/root.c         | 2 +-
 examples/ipv6/multicast/sink.c         | 2 +-
 12 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/core/net/ip/uip-udp-packet.c b/core/net/ip/uip-udp-packet.c
index b40d7cc9f..aa86435f9 100644
--- a/core/net/ip/uip-udp-packet.c
+++ b/core/net/ip/uip-udp-packet.c
@@ -57,7 +57,7 @@ uip_udp_packet_send(struct uip_udp_conn *c, const void *data, int len)
     memmove(&uip_buf[UIP_LLH_LEN + UIP_IPUDPH_LEN], data, len);
     uip_process(UIP_UDP_SEND_CONN);
 
-#if UIP_CONF_IPV6_MULTICAST
+#if UIP_IPV6_MULTICAST
   /* Let the multicast engine process the datagram before we send it */
   if(uip_is_addr_mcast_routable(&uip_udp_conn->ripaddr)) {
     UIP_MCAST6.out();
diff --git a/core/net/ipv6/multicast/README.md b/core/net/ipv6/multicast/README.md
index 2108b92f2..7a33fca0f 100644
--- a/core/net/ipv6/multicast/README.md
+++ b/core/net/ipv6/multicast/README.md
@@ -98,7 +98,7 @@ In order to extend multicast with a new engine, perform the following steps:
 - Open `uip-mcast6.h` and add a section in the `#if` spree. This aims to
   configure the uIPv6 core. More specifically, you need to:
   * Specify if you want to put RPL in MOP3 by defining
-      `RPL_CONF_MULTICAST`: 1: MOP 3, 0: non-multicast MOP
+      `RPL_WITH_MULTICAST`: 1: MOP 3, 0: non-multicast MOP
   * Define your engine details
 
             #define UIP_MCAST6             foo_driver
diff --git a/core/net/ipv6/multicast/uip-mcast6.h b/core/net/ipv6/multicast/uip-mcast6.h
index de2003839..cbec93c41 100644
--- a/core/net/ipv6/multicast/uip-mcast6.h
+++ b/core/net/ipv6/multicast/uip-mcast6.h
@@ -147,15 +147,15 @@ struct uip_mcast6_driver {
 #if UIP_MCAST6_ENGINE
 
 /* Enable Multicast hooks in the uip6 core */
-#define UIP_CONF_IPV6_MULTICAST 1
+#define UIP_IPV6_MULTICAST 1
 
 #if UIP_MCAST6_ENGINE == UIP_MCAST6_ENGINE_ROLL_TM
-#define RPL_CONF_MULTICAST     0        /* Not used by trickle */
+#define RPL_WITH_MULTICAST     0        /* Not used by trickle */
 #define UIP_CONF_IPV6_ROLL_TM  1        /* ROLL Trickle ICMP type support */
 
 #define UIP_MCAST6             roll_tm_driver
 #elif UIP_MCAST6_ENGINE == UIP_MCAST6_ENGINE_SMRF
-#define RPL_CONF_MULTICAST     1
+#define RPL_WITH_MULTICAST     1
 
 #define UIP_MCAST6             smrf_driver
 #else
@@ -168,7 +168,7 @@ extern const struct uip_mcast6_driver UIP_MCAST6;
 /*---------------------------------------------------------------------------*/
 /* Configuration Checks */
 /*---------------------------------------------------------------------------*/
-#if RPL_CONF_MULTICAST && (!UIP_CONF_IPV6_RPL)
+#if RPL_WITH_MULTICAST && (!UIP_CONF_IPV6_RPL)
 #error "The selected Multicast mode requires UIP_CONF_IPV6_RPL != 0"
 #error "Check the value of UIP_CONF_IPV6_RPL in conf files."
 #endif
diff --git a/core/net/ipv6/uip6.c b/core/net/ipv6/uip6.c
index 541323ffa..94f4dfcf9 100644
--- a/core/net/ipv6/uip6.c
+++ b/core/net/ipv6/uip6.c
@@ -451,7 +451,7 @@ uip_init(void)
   }
 #endif /* UIP_UDP */
 
-#if UIP_CONF_IPV6_MULTICAST
+#if UIP_IPV6_MULTICAST
   UIP_MCAST6.init();
 #endif
 }
@@ -1192,7 +1192,7 @@ uip_process(uint8_t flag)
    * All multicast engines must hook in here. After this function returns, we
    * expect UIP_BUF to be unmodified
    */
-#if UIP_CONF_IPV6_MULTICAST
+#if UIP_IPV6_MULTICAST
   if(uip_is_addr_mcast_routable(&UIP_IP_BUF->destipaddr)) {
     if(UIP_MCAST6.in() == UIP_MCAST6_ACCEPT) {
       /* Deliver up the stack */
@@ -1202,7 +1202,7 @@ uip_process(uint8_t flag)
       goto drop;
     }
   }
-#endif /* UIP_CONF_IPV6_MULTICAST */
+#endif /* UIP_IPV6_MULTICAST */
 
   /* TBD Some Parameter problem messages */
   if(!uip_ds6_is_my_addr(&UIP_IP_BUF->destipaddr) &&
@@ -1276,7 +1276,7 @@ uip_process(uint8_t flag)
   uip_ext_bitmap = 0;
 #endif /* UIP_CONF_ROUTER */
 
-#if UIP_CONF_IPV6_MULTICAST
+#if UIP_IPV6_MULTICAST
   process:
 #endif
 
diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index 2077c4eb4..4e9af23f7 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -1435,7 +1435,7 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
   rpl_dag_t *dag, *previous_dag;
   rpl_parent_t *p;
 
-#if RPL_CONF_MULTICAST
+#if RPL_WITH_MULTICAST
   /* If the root is advertising MOP 2 but we support MOP 3 we can still join
    * In that scenario, we suppress DAOs for multicast targets */
   if(dio->mop < RPL_MOP_STORING_NO_MULTICAST) {
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 9ffc61dea..5fac66d7c 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -92,7 +92,7 @@ void RPL_DEBUG_DAO_OUTPUT(rpl_parent_t *);
 
 static uint8_t dao_sequence = RPL_LOLLIPOP_INIT;
 
-#if RPL_CONF_MULTICAST
+#if RPL_WITH_MULTICAST
 static uip_mcast6_route_t *mcast_group;
 #endif
 /*---------------------------------------------------------------------------*/
@@ -755,7 +755,7 @@ dao_input_storing(void)
   PRINT6ADDR(&prefix);
   PRINTF("\n");
 
-#if RPL_CONF_MULTICAST
+#if RPL_WITH_MULTICAST
   if(uip_is_addr_mcast_global(&prefix)) {
     mcast_group = uip_mcast6_route_add(&prefix);
     if(mcast_group) {
@@ -845,7 +845,7 @@ dao_input_storing(void)
   rep->state.lifetime = RPL_LIFETIME(instance, lifetime);
   RPL_ROUTE_CLEAR_NOPATH_RECEIVED(rep);
 
-#if RPL_CONF_MULTICAST
+#if RPL_WITH_MULTICAST
 fwd_dao:
 #endif
 
diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h
index 044fbadd7..bb7af2a04 100644
--- a/core/net/rpl/rpl-private.h
+++ b/core/net/rpl/rpl-private.h
@@ -203,11 +203,11 @@
 #ifdef  RPL_CONF_MOP
 #define RPL_MOP_DEFAULT                 RPL_CONF_MOP
 #else /* RPL_CONF_MOP */
-#if RPL_CONF_MULTICAST
+#if RPL_WITH_MULTICAST
 #define RPL_MOP_DEFAULT                 RPL_MOP_STORING_MULTICAST
 #else
 #define RPL_MOP_DEFAULT                 RPL_MOP_STORING_NO_MULTICAST
-#endif /* RPL_CONF_MULTICAST */
+#endif /* RPL_WITH_MULTICAST */
 #endif /* RPL_CONF_MOP */
 
 /*
@@ -248,7 +248,7 @@
 #define RPL_IS_NON_STORING(instance) (RPL_WITH_NON_STORING && ((instance) != NULL) && ((instance)->mop == RPL_MOP_NON_STORING))
 
 /* Emit a pre-processor error if the user configured multicast with bad MOP */
-#if RPL_CONF_MULTICAST && (RPL_MOP_DEFAULT != RPL_MOP_STORING_MULTICAST)
+#if RPL_WITH_MULTICAST && (RPL_MOP_DEFAULT != RPL_MOP_STORING_MULTICAST)
 #error "RPL Multicast requires RPL_MOP_DEFAULT==3. Check contiki-conf.h"
 #endif
 
diff --git a/core/net/rpl/rpl-timers.c b/core/net/rpl/rpl-timers.c
index 8149401b4..05384fc14 100644
--- a/core/net/rpl/rpl-timers.c
+++ b/core/net/rpl/rpl-timers.c
@@ -256,7 +256,7 @@ static void
 handle_dao_timer(void *ptr)
 {
   rpl_instance_t *instance;
-#if RPL_CONF_MULTICAST
+#if RPL_WITH_MULTICAST
   uip_mcast6_route_t *mcast_route;
   uint8_t i;
 #endif
@@ -275,7 +275,7 @@ handle_dao_timer(void *ptr)
     /* Set the route lifetime to the default value. */
     dao_output(instance->current_dag->preferred_parent, instance->default_lifetime);
 
-#if RPL_CONF_MULTICAST
+#if RPL_WITH_MULTICAST
     /* Send DAOs for multicast prefixes only if the instance is in MOP 3 */
     if(instance->mop == RPL_MOP_STORING_MULTICAST) {
       /* Send a DAO for own multicast addresses */
diff --git a/core/net/rpl/rpl.c b/core/net/rpl/rpl.c
index fd03e3cb6..92ea2b309 100644
--- a/core/net/rpl/rpl.c
+++ b/core/net/rpl/rpl.c
@@ -114,7 +114,7 @@ rpl_purge_routes(void)
   uip_ds6_route_t *r;
   uip_ipaddr_t prefix;
   rpl_dag_t *dag;
-#if RPL_CONF_MULTICAST
+#if RPL_WITH_MULTICAST
   uip_mcast6_route_t *mcast_route;
 #endif
 
@@ -159,7 +159,7 @@ rpl_purge_routes(void)
     }
   }
 
-#if RPL_CONF_MULTICAST
+#if RPL_WITH_MULTICAST
   mcast_route = uip_mcast6_route_list_head();
 
   while(mcast_route != NULL) {
@@ -178,7 +178,7 @@ void
 rpl_remove_routes(rpl_dag_t *dag)
 {
   uip_ds6_route_t *r;
-#if RPL_CONF_MULTICAST
+#if RPL_WITH_MULTICAST
   uip_mcast6_route_t *mcast_route;
 #endif
 
@@ -193,7 +193,7 @@ rpl_remove_routes(rpl_dag_t *dag)
     }
   }
 
-#if RPL_CONF_MULTICAST
+#if RPL_WITH_MULTICAST
   mcast_route = uip_mcast6_route_list_head();
 
   while(mcast_route != NULL) {
diff --git a/examples/ipv6/multicast/intermediate.c b/examples/ipv6/multicast/intermediate.c
index 5c45aa75d..a17b7393c 100644
--- a/examples/ipv6/multicast/intermediate.c
+++ b/examples/ipv6/multicast/intermediate.c
@@ -47,7 +47,7 @@
 #include "contiki-net.h"
 #include "net/ipv6/multicast/uip-mcast6.h"
 
-#if !NETSTACK_CONF_WITH_IPV6 || !UIP_CONF_ROUTER || !UIP_CONF_IPV6_MULTICAST || !UIP_CONF_IPV6_RPL
+#if !NETSTACK_CONF_WITH_IPV6 || !UIP_CONF_ROUTER || !UIP_IPV6_MULTICAST || !UIP_CONF_IPV6_RPL
 #error "This example can not work with the current contiki configuration"
 #error "Check the values of: NETSTACK_CONF_WITH_IPV6, UIP_CONF_ROUTER, UIP_CONF_IPV6_RPL"
 #endif
diff --git a/examples/ipv6/multicast/root.c b/examples/ipv6/multicast/root.c
index cb7d2b4a6..f10e140d2 100644
--- a/examples/ipv6/multicast/root.c
+++ b/examples/ipv6/multicast/root.c
@@ -63,7 +63,7 @@ static struct uip_udp_conn * mcast_conn;
 static char buf[MAX_PAYLOAD_LEN];
 static uint32_t seq_id;
 
-#if !NETSTACK_CONF_WITH_IPV6 || !UIP_CONF_ROUTER || !UIP_CONF_IPV6_MULTICAST || !UIP_CONF_IPV6_RPL
+#if !NETSTACK_CONF_WITH_IPV6 || !UIP_CONF_ROUTER || !UIP_IPV6_MULTICAST || !UIP_CONF_IPV6_RPL
 #error "This example can not work with the current contiki configuration"
 #error "Check the values of: NETSTACK_CONF_WITH_IPV6, UIP_CONF_ROUTER, UIP_CONF_IPV6_RPL"
 #endif
diff --git a/examples/ipv6/multicast/sink.c b/examples/ipv6/multicast/sink.c
index ea2ef1085..4e795e9de 100644
--- a/examples/ipv6/multicast/sink.c
+++ b/examples/ipv6/multicast/sink.c
@@ -57,7 +57,7 @@ static uint16_t count;
 
 #define UIP_IP_BUF   ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
 
-#if !NETSTACK_CONF_WITH_IPV6 || !UIP_CONF_ROUTER || !UIP_CONF_IPV6_MULTICAST || !UIP_CONF_IPV6_RPL
+#if !NETSTACK_CONF_WITH_IPV6 || !UIP_CONF_ROUTER || !UIP_IPV6_MULTICAST || !UIP_CONF_IPV6_RPL
 #error "This example can not work with the current contiki configuration"
 #error "Check the values of: NETSTACK_CONF_WITH_IPV6, UIP_CONF_ROUTER, UIP_CONF_IPV6_RPL"
 #endif

From e5ac3df7e1392777d3c4ff43598bf86d905d2452 Mon Sep 17 00:00:00 2001
From: Yasuyuki Tanaka <yasuyuki.tanaka@inf.ethz.ch>
Date: Mon, 20 Jun 2016 16:35:09 +0200
Subject: [PATCH 386/393] Include uip-mcast6.h to refer to UIP_IPV6_MULTICAST

---
 core/net/ipv6/uip-ds6.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/net/ipv6/uip-ds6.c b/core/net/ipv6/uip-ds6.c
index ef30334d4..9b690ab8c 100644
--- a/core/net/ipv6/uip-ds6.c
+++ b/core/net/ipv6/uip-ds6.c
@@ -48,6 +48,7 @@
 #include "lib/random.h"
 #include "net/ipv6/uip-nd6.h"
 #include "net/ipv6/uip-ds6.h"
+#include "net/ipv6/multicast/uip-mcast6.h"
 #include "net/ip/uip-packetqueue.h"
 
 #define DEBUG DEBUG_NONE

From 8fd7719c073b8c6ec4c7fdd178b266bb8e327064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Thu, 23 Jun 2016 22:10:43 +0200
Subject: [PATCH 387/393] noncoresec: Fix build errors with DEBUG set to 1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix these build errors, which are generated if DEBUG is set to 1:

../../core/net/llsec/noncoresec/noncoresec.c: In function 'parse':
../../core/net/llsec/noncoresec/noncoresec.c:198:54: error: expected ')' before 'PRIu32'
     PRINTF("noncoresec: received unauthentic frame %"PRIu32"\n",
                                                      ^
../../core/net/llsec/noncoresec/noncoresec.c:88:28: note: in definition of macro 'PRINTF'
 #define PRINTF(...) printf(__VA_ARGS__)
                            ^
../../core/net/llsec/noncoresec/noncoresec.c:198:12: warning: spurious trailing '%' in format [-Wformat=]
     PRINTF("noncoresec: received unauthentic frame %"PRIu32"\n",
            ^
../../core/net/llsec/noncoresec/noncoresec.c:88:28: note: in definition of macro 'PRINTF'
 #define PRINTF(...) printf(__VA_ARGS__)
                            ^
../../core/net/llsec/noncoresec/noncoresec.c:198:12: warning: spurious trailing '%' in format [-Wformat=]
     PRINTF("noncoresec: received unauthentic frame %"PRIu32"\n",
            ^
../../core/net/llsec/noncoresec/noncoresec.c:88:28: note: in definition of macro 'PRINTF'
 #define PRINTF(...) printf(__VA_ARGS__)
                            ^
../../core/net/llsec/noncoresec/noncoresec.c:231:54: error: expected ')' before 'PRIu32'
        PRINTF("noncoresec: received replayed frame %"PRIu32"\n",
                                                      ^
../../core/net/llsec/noncoresec/noncoresec.c:88:28: note: in definition of macro 'PRINTF'
 #define PRINTF(...) printf(__VA_ARGS__)
                            ^
../../core/net/llsec/noncoresec/noncoresec.c:231:15: warning: spurious trailing '%' in format [-Wformat=]
        PRINTF("noncoresec: received replayed frame %"PRIu32"\n",
               ^
../../core/net/llsec/noncoresec/noncoresec.c:88:28: note: in definition of macro 'PRINTF'
 #define PRINTF(...) printf(__VA_ARGS__)
                            ^
../../core/net/llsec/noncoresec/noncoresec.c:231:15: warning: spurious trailing '%' in format [-Wformat=]
        PRINTF("noncoresec: received replayed frame %"PRIu32"\n",
               ^
../../core/net/llsec/noncoresec/noncoresec.c:88:28: note: in definition of macro 'PRINTF'
 #define PRINTF(...) printf(__VA_ARGS__)
                            ^

PRIu32 is not defined, so replace it with a standard format directive.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 core/net/llsec/noncoresec/noncoresec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/net/llsec/noncoresec/noncoresec.c b/core/net/llsec/noncoresec/noncoresec.c
index 71a1cb82a..f9d442651 100644
--- a/core/net/llsec/noncoresec/noncoresec.c
+++ b/core/net/llsec/noncoresec/noncoresec.c
@@ -195,7 +195,7 @@ parse(void)
   packetbuf_set_datalen(packetbuf_datalen() - MIC_LEN);
   
   if(!aead(result, 0)) {
-    PRINTF("noncoresec: received unauthentic frame %"PRIu32"\n",
+    PRINTF("noncoresec: received unauthentic frame %lu\n",
         anti_replay_get_counter());
     return FRAMER_FAILED;
   }
@@ -228,7 +228,7 @@ parse(void)
     anti_replay_init_info(info);
   } else {
     if(anti_replay_was_replayed(info)) {
-       PRINTF("noncoresec: received replayed frame %"PRIu32"\n",
+       PRINTF("noncoresec: received replayed frame %lu\n",
            anti_replay_get_counter());
        return FRAMER_FAILED;
     }

From 1da00a482fe91e4e4af2324202439a799cc02f89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau.dev@gmail.com>
Date: Thu, 23 Jun 2016 22:25:27 +0200
Subject: [PATCH 388/393] cc2538: aes: Fix possibly missing result available
 status
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Depending on the use case and on the timings,
aes_auth_crypt_check_status() sometimes never reported an available
result, leading to a deadlock of any protothread waiting for this event,
and to a WDT reset if a protothread was polling it.

This was caused by aes_auth_crypt_start() clearing the result available
interrupt after operations that may rightfully trigger it, leading to a
missed interrupt.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
---
 cpu/cc2538/dev/aes.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/cpu/cc2538/dev/aes.c b/cpu/cc2538/dev/aes.c
index 429def67b..2b9e11a17 100644
--- a/cpu/cc2538/dev/aes.c
+++ b/cpu/cc2538/dev/aes.c
@@ -226,12 +226,14 @@ aes_auth_crypt_start(uint32_t ctrl, uint8_t key_area, const void *iv,
         REG(AES_CTRL_ALG_SEL) = 0x00000000;
         return CRYPTO_DMA_BUS_ERROR;
       }
+
+      /* Clear interrupt status */
+      REG(AES_CTRL_INT_CLR) = AES_CTRL_INT_CLR_DMA_IN_DONE;
     }
   }
 
-  /* Clear interrupt status */
-  REG(AES_CTRL_INT_CLR) = AES_CTRL_INT_CLR_DMA_IN_DONE |
-                          AES_CTRL_INT_CLR_RESULT_AV;
+  /* Enable result available bit in interrupt enable */
+  REG(AES_CTRL_INT_EN) = AES_CTRL_INT_EN_RESULT_AV;
 
   if(process != NULL) {
     crypto_register_process_notification(process);
@@ -239,9 +241,6 @@ aes_auth_crypt_start(uint32_t ctrl, uint8_t key_area, const void *iv,
     nvic_interrupt_enable(NVIC_INT_AES);
   }
 
-  /* Enable result available bit in interrupt enable */
-  REG(AES_CTRL_INT_EN) = AES_CTRL_INT_EN_RESULT_AV;
-
   if(data_len != 0) {
     /* Configure DMAC
      * Enable DMA channel 0 */

From c28b6fb7ba8973749b548ccb6720395d49bfd6f6 Mon Sep 17 00:00:00 2001
From: kkrentz <konrad.krentz@gmail.com>
Date: Sun, 29 May 2016 04:29:43 -0700
Subject: [PATCH 389/393] CC2538: Reboot if the crypto engine fails (error
 handling is too hard)

---
 cpu/cc2538/dev/cc2538-aes-128.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cpu/cc2538/dev/cc2538-aes-128.c b/cpu/cc2538/dev/cc2538-aes-128.c
index a1031c2c8..aa5b5e8e6 100644
--- a/cpu/cc2538/dev/cc2538-aes-128.c
+++ b/cpu/cc2538/dev/cc2538-aes-128.c
@@ -40,6 +40,7 @@
 #include "contiki.h"
 #include "dev/ecb.h"
 #include "dev/cc2538-aes-128.h"
+#include "dev/sys-ctrl.h"
 
 #include <stdint.h>
 #include <stdio.h>
@@ -82,6 +83,7 @@ set_key(const uint8_t *key)
                       CC2538_AES_128_KEY_AREA);
   if(ret != CRYPTO_SUCCESS) {
     PRINTF("%s: aes_load_keys() error %u\n", MODULE_NAME, ret);
+    sys_ctrl_reset();
   }
 
   restore_crypto(crypto_enabled);
@@ -99,13 +101,13 @@ encrypt(uint8_t *plaintext_and_result)
                         plaintext_and_result, AES_128_BLOCK_SIZE, NULL);
   if(ret != CRYPTO_SUCCESS) {
     PRINTF("%s: ecb_crypt_start() error %u\n", MODULE_NAME, ret);
-    restore_crypto(crypto_enabled);
-    return;
+    sys_ctrl_reset();
   }
 
   while((res = ecb_crypt_check_status()) == CRYPTO_PENDING);
   if(res != CRYPTO_SUCCESS) {
     PRINTF("%s: ecb_crypt_check_status() error %d\n", MODULE_NAME, res);
+    sys_ctrl_reset();
   }
 
   restore_crypto(crypto_enabled);

From bc8b6cd8ed2ee431c9b80ab93548b15fa265fd22 Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Fri, 24 Jun 2016 22:10:39 +0200
Subject: [PATCH 390/393] Updated cc2538-bsl to version 2.1 (c6100a7)

---
 tools/cc2538-bsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cc2538-bsl b/tools/cc2538-bsl
index 434054237..c6100a779 160000
--- a/tools/cc2538-bsl
+++ b/tools/cc2538-bsl
@@ -1 +1 @@
-Subproject commit 4340542370d3e319d692f9f969c5683231fce438
+Subproject commit c6100a7794c7b530923145c03e37412013a4551e

From 3a105f214124cb0dd4ded81d7d2565b45feb53e5 Mon Sep 17 00:00:00 2001
From: George Oikonomou <g.oikonomou@bristol.ac.uk>
Date: Sun, 26 Jun 2016 13:48:27 +0100
Subject: [PATCH 391/393] Disable CC2650_FAST_RADIO_STARTUP by default

`CC2650_FAST_RADIO_STARTUP` is required for TSCH, but it currently breaks ContikiMAC. We set the default value to the one that will work with the default choice of RDC.

Fixes #1744
---
 platform/srf06-cc26xx/contiki-conf.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/platform/srf06-cc26xx/contiki-conf.h b/platform/srf06-cc26xx/contiki-conf.h
index 62e807524..c1546f6a8 100644
--- a/platform/srf06-cc26xx/contiki-conf.h
+++ b/platform/srf06-cc26xx/contiki-conf.h
@@ -65,6 +65,14 @@
 #define NETSTACK_CONF_RDC     contikimac_driver
 #endif
 
+/*
+ * Disable turning off HF oscillator when the radio is off:
+ * You need to set this in order to use TSCH, disable to save more energy.
+ */
+#ifndef CC2650_FAST_RADIO_STARTUP
+#define CC2650_FAST_RADIO_STARTUP               0
+#endif
+
 /* Configure NullRDC for when it's selected */
 #define NULLRDC_CONF_802154_AUTOACK             1
 
@@ -359,12 +367,6 @@ typedef uint32_t rtimer_clock_t;
 /* Disable TSCH frame filtering */
 #define TSCH_CONF_HW_FRAME_FILTERING	0
 
-/* Disable turning off HF oscillator when radio is off;
-   enable this for TSCH, disable to save more energy. */
-#ifndef CC2650_FAST_RADIO_STARTUP
-#define CC2650_FAST_RADIO_STARTUP     1
-#endif
-
 /* Use hardware timestamps */
 #ifndef TSCH_CONF_RESYNC_WITH_SFD_TIMESTAMPS
 #define TSCH_CONF_RESYNC_WITH_SFD_TIMESTAMPS 1

From 978ef63002b2c194cbdc4b664f05bd373aa98282 Mon Sep 17 00:00:00 2001
From: Harald Pichler <harald@the-develop.net>
Date: Tue, 28 Jun 2016 14:08:38 +0200
Subject: [PATCH 392/393] cleanup debugpronts

---
 examples/osd/arduino-weather/sketch.pde | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/osd/arduino-weather/sketch.pde b/examples/osd/arduino-weather/sketch.pde
index 513557347..e83fd2b8c 100644
--- a/examples/osd/arduino-weather/sketch.pde
+++ b/examples/osd/arduino-weather/sketch.pde
@@ -115,14 +115,14 @@ void loop (void)
     lux = lightMeter.getLightLevel();     
     
 // Debug Print
-	printf("BMP085");
-    printf("\t\tPress: %s\n",bmp085press_s);
-    printf("\t\tAltitude: %s\n",bmp085alt_s);
-    printf("\t\tatm: %s\n",bmp085atm_s);
-    printf("\t\tHTU21d");
-    printf("\t\tTemp: %s",htu21d_temp_s);
-    printf("\t\tHum: %s\n",htu21d_hum_s);
-    printf("\t\tBH1750");    
+	printf("BMP085\n");
+    printf("Press: %s\n",bmp085press_s);
+    printf("Altitude: %s\n",bmp085alt_s);
+    printf("atm: %s\n",bmp085atm_s);
+    printf("HTU21d\n");
+    printf("Temp: %s\n",htu21d_temp_s);
+    printf("Hum: %s\n",htu21d_hum_s);
+    printf("BH1750\n");    
     printf("Lux: %d\n",lux);
   	mcu_sleep_on();    
 }

From d408da5be5431bae9b6097fb8fe3fb8ee2c65227 Mon Sep 17 00:00:00 2001
From: Harald Pichler <harald@the-develop.net>
Date: Wed, 29 Jun 2016 07:50:41 +0200
Subject: [PATCH 393/393] bugfix merge

---
 core/net/rpl/rpl-conf.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h
index 52ddde748..97ab8f49d 100644
--- a/core/net/rpl/rpl-conf.h
+++ b/core/net/rpl/rpl-conf.h
@@ -287,6 +287,8 @@
 #else
 #define RPL_PROBING_INTERVAL (120 * CLOCK_SECOND)
 #endif
+
+/*
  * Function used to select the next parent to be probed.
  */
 #ifdef RPL_CONF_PROBING_SELECT_FUNC