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 1/3] 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 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 2/3] 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 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 3/3] 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=