Merge branch 'master' of github.com:r0ket/r0ket

This commit is contained in:
iggy 2011-08-04 21:39:28 +02:00
commit 50b89a076d
3 changed files with 4 additions and 1 deletions

View File

@ -210,6 +210,7 @@ void m_choose(){
lcdPrint("."); lcdPrint(".");
lcdPrint(IntToStr(tm->tm_year+YEAR0,4,F_LONG|F_ZEROS)); lcdPrint(IntToStr(tm->tm_year+YEAR0,4,F_LONG|F_ZEROS));
lcdNl(); lcdNl();
MO_BODY(meshbuffer[j].pkt)[0]=0;
}; };
}; };
char *foo=(char *)MO_BODY(meshbuffer[j].pkt); char *foo=(char *)MO_BODY(meshbuffer[j].pkt);

View File

@ -80,3 +80,5 @@ getFontHeight
menuflags menuflags
delayms_queue_plus delayms_queue_plus
getInputWaitTimeout getInputWaitTimeout
readFile
writeFile

View File

@ -67,7 +67,7 @@ void ram(void) {
lcdShift(1,-2,1); lcdShift(1,-2,1);
if(getInputRaw()) if(getInputRaw())
return; return;
delayms_queue(10); delayms_queue_plus(10,0);
calc_area(); calc_area();
} }
return; return;