From ef4f5d13713344b0abce4848e94dd3af05bfc4cd Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Wed, 3 Aug 2011 19:19:49 +0200 Subject: [PATCH] Remove stuff that is now loadable --- firmware/applications/final/mesh.c | 53 ----------- firmware/applications/final/util.c | 141 ----------------------------- 2 files changed, 194 deletions(-) diff --git a/firmware/applications/final/mesh.c b/firmware/applications/final/mesh.c index 84b4784..82ffc73 100644 --- a/firmware/applications/final/mesh.c +++ b/firmware/applications/final/mesh.c @@ -22,59 +22,6 @@ void init_mesh(void){ initMesh(); }; -void m_tset(void){ - _timet=1311961112; -}; - -//# MENU debug MeshInfo -void m_time(void){ - struct tm* tm; - char c[2]={0,0}; - getInputWaitRelease(); - delayms(100); - do{ - lcdClear(); - tm= mygmtime(getSeconds()); - lcdPrint(IntToStr(tm->tm_hour,2,F_LONG)); - lcdPrint(":"); - lcdPrint(IntToStr(tm->tm_min,2,F_LONG|F_ZEROS)); - lcdPrint(":"); - lcdPrint(IntToStr(tm->tm_sec,2,F_LONG|F_ZEROS)); - lcdNl(); - lcdPrint(IntToStr(tm->tm_mday,2,F_LONG)); - lcdPrint("."); - lcdPrint(IntToStr(tm->tm_mon+1,2,0)); - lcdPrint("."); - lcdPrint(IntToStr(tm->tm_year+YEAR0,4,F_LONG|F_ZEROS)); - lcdNl(); - - lcdNl(); - lcdPrint("<"); - - for(int i=0;i"); - - lcdPrint("Gen:"); - lcdPrintInt(meshgen); - lcdNl(); - lcdRefresh(); - delayms_queue(50); - }while ((getInputRaw())==BTN_NONE); -}; - - -inline void blink(char a, char b){ - gpioSetValue (a,b, 1-gpioGetValue(a,b)); -}; - - int choose(char * texts, int8_t menuselection){ uint8_t numentries = 0; uint8_t visible_lines = 0; diff --git a/firmware/applications/final/util.c b/firmware/applications/final/util.c index fb4fbe7..aa99c61 100644 --- a/firmware/applications/final/util.c +++ b/firmware/applications/final/util.c @@ -13,147 +13,6 @@ /**************************************************************************/ -//# MENU debug ChkLight -void ChkLight(void) { - int dx=0; - int dy=8; - dx=DoString(0,dy,"Light:"); - DoString(0,dy+16,"Night:"); - while ((getInputRaw())==BTN_NONE){ - DoInt(dx,dy,GetLight()); - DoInt(dx,dy+16,isNight()); - DoInt(dx,dy+8,GLOBAL(daytrig)); - lcdDisplay(); - delayms_queue(100); - }; - dx=DoString(0,dy+24,"Done."); -} - -//# MENU debug ChkBattery -void ChkBattery(void) { - do{ - lcdClear(); - lcdPrintln("Voltage:"); - lcdPrintln(IntToStr(GetVoltage(),5,0)); - lcdNl(); - lcdPrintln("Chrg_stat:"); - if(gpioGetValue(RB_PWR_CHRG)){ - lcdPrintln("1"); - }else{ - lcdPrintln("0"); - }; - lcdRefresh(); - delayms_queue(100); - } while ((getInputRaw())==BTN_NONE); -} - -//# MENU debug Uptime -void uptime(void) { - int t; - int h; - char flag; - while ((getInputRaw())==BTN_NONE){ - lcdClear(); - lcdPrintln("Uptime:"); - t=getTimer()/(1000/SYSTICKSPEED); - h=t/60/60; - flag=F_ZEROS; - if(h>0){ - lcdPrint(IntToStr(h,2,flag)); - lcdPrint("h"); - flag|=F_LONG; - }; - h=t/60%60; - if(h>0){ - lcdPrint(IntToStr(h,2,flag)); - lcdPrint("m"); - flag|=F_LONG; - }; - h=t%60; - if(h>0){ - lcdPrint(IntToStr(h,2,flag)); - lcdPrint("s"); - }; - lcdNl(); - lcdNl(); - lcdPrintln("Ticks:"); - lcdPrint(IntToStr(_timectr,10,0)); - lcdRefresh(); - delayms_queue(200); - }; - lcdPrintln("done."); -} - -//# MENU debug Uuid -void uuid(void) { - IAP_return_t iap_return; - iap_return = iapReadSerialNumber(); - lcdClear(); - lcdPrintln("UUID:"); - lcdPrintIntHex(iap_return.Result[0]); lcdNl(); - lcdPrintIntHex(iap_return.Result[1]); lcdNl(); - lcdPrintIntHex(iap_return.Result[2]); lcdNl(); - lcdPrintIntHex(iap_return.Result[3]); lcdNl(); - lcdNl(); - lcdPrintln("Beacon ID:"); - lcdPrintln(IntToStrX(GetUUID32(),4)); - lcdRefresh(); -} - -//# MENU debug Qstatus -void Qstatus(void) { - int dx=0; - int dy=8; - lcdClear(); - dx=DoString(0,dy+16,"Qdepth:"); - while ((getInputRaw())!=BTN_ENTER){ - DoInt(dx,dy+16,(the_queue.qend-the_queue.qstart+MAXQENTRIES)%MAXQENTRIES); - lcdDisplay(); - if(getInputRaw()!=BTN_NONE) - work_queue(); - else - delayms(10); - }; - dy+=16; - dx=DoString(0,dy,"Done."); -}; - -void blink_led0(void){ - gpioSetValue (RB_LED0, 1-gpioGetValue(RB_LED0)); -}; - -void tick_alive(void){ - static int foo=0; - - if(GLOBAL(alivechk)==0) - return; - - if(foo++>500/SYSTICKSPEED){ - foo=0; - if(GLOBAL(alivechk)==2) - push_queue(blink_led0); - else - blink_led0(); - }; - return; -}; - -//# MENU debug ShowSP -void getsp(void) { - int dx=0; - int dy=8; - int x; - lcdClear(); - dx=DoString(0,dy,"SP:"); - while ((getInputRaw())==BTN_NONE){ - __asm( "mov %0, sp\n" : "=r" (x) :); - DoIntX(0,dy+8,x); - lcdDisplay(); - delayms_queue(50); - }; - dy+=16; - dx=DoString(0,dy,"Done."); -}; //# MENU msc void msc_menu(void){