Skip to content
Browse files

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

  • Loading branch information...
2 parents d8bca43 + df82442 commit 0eaf74fa871d1fc37b75144d126e1fdf700bdc48 @schneider42 schneider42 committed Aug 13, 2011
Showing with 15 additions and 13 deletions.
  1. +12 −12 firmware/applications/final/mesh.c
  2. +3 −0 firmware/funk/mesh.c
  3. +0 −1 firmware/l0dable/EXPORTS
View
24 firmware/applications/final/mesh.c
@@ -164,15 +164,15 @@ void m_choose(){
case('T'):
strcpy(p,"Time");
break;
- case('Z'):
- strcpy(p,"Schnitzel");
- break;
- case('z'):
- strcpy(p,"S-Score");
- break;
case('i'):
strcpy(p,"Invaders");
break;
+ case('j'):
+ strcpy(p,"Jump");
+ break;
+ case('r'):
+ strcpy(p,"r0type");
+ break;
default:
p[0]=*mm;
p[1]=0;
@@ -206,15 +206,15 @@ void m_choose(){
case('T'):
lcdPrintln("Time");
break;
- case('Z'):
- strcpy(p,"Schnitzel");
- break;
- case('z'):
- strcpy(p,"S-Score");
- break;
case('i'):
lcdPrintln("Invaders");
break;
+ case('j'):
+ strcpy(p,"Jump");
+ break;
+ case('r'):
+ strcpy(p,"r0type");
+ break;
};
if(tmm[i]>='a' && tmm[i]<='z'){
lcdPrintln(IntToStr(MO_TIME(meshbuffer[j].pkt),10,0));
View
3 firmware/funk/mesh.c
@@ -41,6 +41,9 @@ int mesh_sanity(uint8_t * pkt){
if(MO_TIME(pkt)<0)
return 1;
};
+ if(MO_TYPE(pkt)=='t'){
+ return 1;
+ };
if(MO_TYPE(pkt)>0x7f || MO_TYPE(pkt)<0x20)
return 1;
return 0;
View
1 firmware/l0dable/EXPORTS
@@ -91,7 +91,6 @@ GetVoltage
isNight
_timectr
crc16
-randomInit
getRandom
getSeconds
iapReadSerialNumber

0 comments on commit 0eaf74f

Please sign in to comment.
Something went wrong with that request. Please try again.