ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change room names. Remove schnitzeljagd protocode

This commit is contained in:
Stefan `Sec` Zehl 2011-12-22 19:45:52 +01:00
parent acd07331a4
commit fb010d0250
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
firmware/applications/final/mesh.c
View File

@ -120,6 +120,7 @@ char *meshmsgs(void){
return msgtypes; return msgtypes;
}; };
#if 0
static inline uint32_t popcount(uint32_t *buf, uint8_t n){ static inline uint32_t popcount(uint32_t *buf, uint8_t n){
int cnt=0; int cnt=0;
do { do {
@ -133,6 +134,7 @@ static inline uint32_t popcount(uint32_t *buf, uint8_t n){
} while(--n); } while(--n);
return cnt; return cnt;
} }
#endif
extern MPKT meshbuffer[MESHBUFSIZE]; extern MPKT meshbuffer[MESHBUFSIZE];
//# MENU messages //# MENU messages
@ -156,10 +158,13 @@ void m_choose(){
strcpy(p,"Message"); strcpy(p,"Message");
break; break;
case('E'): case('E'):
strcpy(p,"Kourou"); strcpy(p,"Saal 1");
break; break;
case('F'): case('F'):
strcpy(p,"Baikonur"); strcpy(p,"Saal 2");
break;
case('G'):
strcpy(p,"Saal 3");
break; break;
case('T'): case('T'):
strcpy(p,"Time"); strcpy(p,"Time");
@ -167,12 +172,14 @@ void m_choose(){
case('i'): case('i'):
strcpy(p,"Invaders"); strcpy(p,"Invaders");
break; break;
#if 0
case('j'): case('j'):
strcpy(p,"Jump"); strcpy(p,"Jump");
break; break;
case('r'): case('r'):
strcpy(p,"r0type"); strcpy(p,"r0type");
break; break;
#endif
default: default:
p[0]=*mm; p[0]=*mm;
p[1]=0; p[1]=0;
@ -198,10 +205,13 @@ void m_choose(){
lcdPrintln("Message"); lcdPrintln("Message");
break; break;
case('E'): case('E'):
lcdPrintln("Kourou"); lcdPrintln("Saal 1");
break; break;
case('F'): case('F'):
lcdPrintln("Baikonur"); lcdPrintln("Saal 2");
break;
case('G'):
lcdPrintln("Saal 3");
break; break;
case('T'): case('T'):
lcdPrintln("Time"); lcdPrintln("Time");
@ -209,12 +219,14 @@ void m_choose(){
case('i'): case('i'):
lcdPrintln("Invaders"); lcdPrintln("Invaders");
break; break;
#if 0
case('j'): case('j'):
strcpy(p,"Jump"); strcpy(p,"Jump");
break; break;
case('r'): case('r'):
strcpy(p,"r0type"); strcpy(p,"r0type");
break; break;
#endif
}; };
if(tmm[i]>='a' && tmm[i]<='z'){ if(tmm[i]>='a' && tmm[i]<='z'){
lcdPrintln(IntToStr(MO_TIME(meshbuffer[j].pkt),10,0)); lcdPrintln(IntToStr(MO_TIME(meshbuffer[j].pkt),10,0));
@ -227,6 +239,7 @@ void m_choose(){
lcdPrint(IntToStr(tm->tm_sec,2,F_LONG|F_ZEROS)); lcdPrint(IntToStr(tm->tm_sec,2,F_LONG|F_ZEROS));
lcdNl(); lcdNl();
#if 0
if(tmm[i]=='Z'){ if(tmm[i]=='Z'){
lcdPrintln(IntToStrX(uint8ptouint32(meshbuffer[j].pkt+ 6),8)); lcdPrintln(IntToStrX(uint8ptouint32(meshbuffer[j].pkt+ 6),8));
lcdPrintln(IntToStrX(uint8ptouint32(meshbuffer[j].pkt+10),8)); lcdPrintln(IntToStrX(uint8ptouint32(meshbuffer[j].pkt+10),8));
@ -239,7 +252,9 @@ void m_choose(){
lcdRefresh(); lcdRefresh();
getInputWaitRelease(); getInputWaitRelease();
continue; continue;
}else if(tmm[i]=='T'){ }else
#endif
if(tmm[i]=='T'){
lcdPrint(IntToStr(tm->tm_mday,2,F_LONG)); lcdPrint(IntToStr(tm->tm_mday,2,F_LONG));
lcdPrint("."); lcdPrint(".");
lcdPrint(IntToStr(tm->tm_mon+1,2,0)); lcdPrint(IntToStr(tm->tm_mon+1,2,0));