From bb5092a5ee2bf293e6357df5a92974c1bf44c846 Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Thu, 26 Jan 2012 23:39:27 +0100
Subject: [PATCH 1/4] smartflash: get rid of unneccessary error message if
 files/ exists

---
 tools/smartflash/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/smartflash/Makefile b/tools/smartflash/Makefile
index 89e9976..acd9615 100644
--- a/tools/smartflash/Makefile
+++ b/tools/smartflash/Makefile
@@ -14,7 +14,7 @@ rebuild:
 
 setup:
 	cp ../../firmware/firmware.bin .
-	-mkdir files
+	mkdir -p files
 	cp ../../firmware/l0dable/*c0d files
 	cp ../../firmware/l0dable/*nik files
 	cp ../../firmware/l0dable/*int files

From 53bc25c0fa48e70be6752fc1654cf5d5dfc93d99 Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Thu, 26 Jan 2012 23:40:39 +0100
Subject: [PATCH 2/4] dbgmesh: Don't exit while no key is pressed.

---
 firmware/l0dable/dbgmesh.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/firmware/l0dable/dbgmesh.c b/firmware/l0dable/dbgmesh.c
index 83a6c2f..7da067c 100644
--- a/firmware/l0dable/dbgmesh.c
+++ b/firmware/l0dable/dbgmesh.c
@@ -169,6 +169,8 @@ void m_time(void){
 		case BTN_UP:
 		    active=1;
 		    break;
+		case BTN_NONE:
+		    break;
 		default:
 		    return;
 	    };

From 376db6a6071c9d0679089f6b226d57cd884c827a Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Thu, 26 Jan 2012 23:48:23 +0100
Subject: [PATCH 3/4] dbgmesg: show stackpointer

---
 firmware/l0dable/dbgmesh.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/firmware/l0dable/dbgmesh.c b/firmware/l0dable/dbgmesh.c
index 7da067c..0506cb7 100644
--- a/firmware/l0dable/dbgmesh.c
+++ b/firmware/l0dable/dbgmesh.c
@@ -83,6 +83,7 @@ void m_time(void){
     struct tm* tm;
     int select=0;
     char c[2]={0,0};
+    int sp;
     getInputWaitRelease();
     delayms(100);
     while(1) {
@@ -133,6 +134,11 @@ void m_time(void){
         lcdNl();
         lcdPrint("Inc:");
         lcdPrintInt(meshincctr);
+
+        lcdPrint(" SP:");
+        __asm(  "mov %0, sp\n" : "=r" (sp) :);
+        lcdPrint(IntToStrX(sp,4));
+
         lcdNl();
         lcdPrint("Nice:");
         lcdPrintInt(meshnice);

From b53f11bf7e1c21ee49d4f58bb55d98c95c2a8285 Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Thu, 26 Jan 2012 23:49:37 +0100
Subject: [PATCH 4/4] revert part of eee6ae55 (mistakenly committed)

---
 firmware/funk/openbeacon.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/firmware/funk/openbeacon.c b/firmware/funk/openbeacon.c
index ec048dd..23e8a82 100644
--- a/firmware/funk/openbeacon.c
+++ b/firmware/funk/openbeacon.c
@@ -72,17 +72,6 @@ static void openbeaconRead()
 
 void openbeaconSetup(void)
 {
-    uint8_t c = 0;
-    uint8_t channels[] = {12,17,22,27,32,37,42,47,52,57,62,67,72};
-    //nrf_startCW();
-    while(0){
-        delayms(20);
-        nrf_set_channel(channels[c++]);
-        if( c == sizeof(channels) ){
-            c = 0;
-        }
-    }
-
     oid = GetUUID32();
     strength = 0;
 #if SAVE_OPENBEACON