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

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

This commit is contained in:
schneider 2011-08-13 01:10:59 +02:00
parent d8bca43628 df82442138
commit 0eaf74fa87
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,15 +164,15 @@ void m_choose(){
case('T'): case('T'):
strcpy(p,"Time"); strcpy(p,"Time");
break; break;
case('Z'):
strcpy(p,"Schnitzel");
break;
case('z'):
strcpy(p,"S-Score");
break;
case('i'): case('i'):
strcpy(p,"Invaders"); strcpy(p,"Invaders");
break; break;
case('j'):
strcpy(p,"Jump");
break;
case('r'):
strcpy(p,"r0type");
break;
default: default:
p[0]=*mm; p[0]=*mm;
p[1]=0; p[1]=0;
@ -206,15 +206,15 @@ void m_choose(){
case('T'): case('T'):
lcdPrintln("Time"); lcdPrintln("Time");
break; break;
case('Z'):
strcpy(p,"Schnitzel");
break;
case('z'):
strcpy(p,"S-Score");
break;
case('i'): case('i'):
lcdPrintln("Invaders"); lcdPrintln("Invaders");
break; break;
case('j'):
strcpy(p,"Jump");
break;
case('r'):
strcpy(p,"r0type");
break;
}; };
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));

3
firmware/funk/mesh.c
View File

@ -41,6 +41,9 @@ int mesh_sanity(uint8_t * pkt){
if(MO_TIME(pkt)<0) if(MO_TIME(pkt)<0)
return 1; return 1;
}; };
if(MO_TYPE(pkt)=='t'){
return 1;
};
if(MO_TYPE(pkt)>0x7f || MO_TYPE(pkt)<0x20) if(MO_TYPE(pkt)>0x7f || MO_TYPE(pkt)<0x20)
return 1; return 1;
return 0; return 0;

1
firmware/l0dable/EXPORTS
View File

@ -91,7 +91,6 @@ GetVoltage
isNight isNight
_timectr _timectr
crc16 crc16
randomInit
getRandom getRandom
getSeconds getSeconds
iapReadSerialNumber iapReadSerialNumber