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