From 0c2d4c54208e177b1e7b4a361d5fde837f790cac Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Sat, 13 Aug 2011 00:42:58 +0200 Subject: [PATCH 1/2] Whoops. This shouldn't be here. And even if, not in the middle. --- firmware/l0dable/EXPORTS | 1 - 1 file changed, 1 deletion(-) diff --git a/firmware/l0dable/EXPORTS b/firmware/l0dable/EXPORTS index 66917af..d4936d2 100644 --- a/firmware/l0dable/EXPORTS +++ b/firmware/l0dable/EXPORTS @@ -91,7 +91,6 @@ GetVoltage isNight _timectr crc16 -randomInit getRandom getSeconds iapReadSerialNumber From df82442138748034d7ba527731201b0e0e9f5c6d Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Sat, 13 Aug 2011 00:52:41 +0200 Subject: [PATCH 2/2] Some mesh beauty :-) --- firmware/applications/final/mesh.c | 24 ++++++++++++------------ firmware/funk/mesh.c | 3 +++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/firmware/applications/final/mesh.c b/firmware/applications/final/mesh.c index 83c3669..f7ade86 100644 --- a/firmware/applications/final/mesh.c +++ b/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)); diff --git a/firmware/funk/mesh.c b/firmware/funk/mesh.c index a951149..2028ede 100644 --- a/firmware/funk/mesh.c +++ b/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;