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

More mesh debugging

This commit is contained in:
Stefan `Sec` Zehl 2012-01-04 16:31:46 +01:00
parent da38c7a0c4
commit 1c3db0288b
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
firmware/funk/mesh.c
View File

@ -42,9 +42,9 @@ void initMesh(void){
#define MP_IGNORE 4 #define MP_IGNORE 4
int mesh_sanity(uint8_t * pkt){ int mesh_sanity(uint8_t * pkt){
if(MO_TYPE(pkt)>0x7f || MO_TYPE(pkt)<0x20) if(MO_TYPE(pkt)>0x7f || MO_TYPE(pkt)<0x20)
return MP_SEND; return MP_SEND|MP_RECV;
if(MO_TYPE(pkt)=='T' && MO_BODY(pkt)[5]) if(MO_TYPE(pkt)=='T' && MO_BODY(pkt)[5])
return MP_SEND; return MP_SEND|MP_RECV;
if(MO_TYPE(pkt)=='T' && MO_TIME(pkt)<86400) if(MO_TYPE(pkt)=='T' && MO_TIME(pkt)<86400)
return MP_OK; return MP_OK;
if(MO_TYPE(pkt)>='A' && MO_TYPE(pkt)<='Z'){ if(MO_TYPE(pkt)>='A' && MO_TYPE(pkt)<='Z'){
@ -66,7 +66,7 @@ int mesh_sanity(uint8_t * pkt){
MO_TYPE(pkt)!='G' && MO_TYPE(pkt)!='G' &&
MO_TYPE(pkt)!='T' MO_TYPE(pkt)!='T'
){ ){
return MP_IGNORE; return MP_IGNORE|MP_RECV;
}; };
return MP_OK; return MP_OK;
}; };
@ -105,11 +105,16 @@ void meshPanic(uint8_t * pkt,int bufno){
lcdPrint(IntToStrX(bufno,2)); lcdPrint(IntToStrX(bufno,2));
lcdPrint("]"); lcdPrint("]");
lcdNl(); lcdNl();
lcdPrint(" ");
for(int i=0;i<32;i++){ for(int i=0;i<32;i++){
lcdPrint(IntToStrX(pkt[i],2)); lcdPrint(IntToStrX(pkt[i],2));
if(i%6==5) if(i%6==5){
lcdNl(); lcdNl();
lcdPrint(" ");
};
} }
lcdPrint(" ");
lcdPrint(IntToStrX(crc16(pkt,30),4));
lcdRefresh(); lcdRefresh();
while ((getInputRaw())==BTN_NONE); while ((getInputRaw())==BTN_NONE);
}; };
@ -225,7 +230,7 @@ uint8_t mesh_recvqloop_work(void){
if(mesh_sanity(buf)){ if(mesh_sanity(buf)){
meshincctr++; meshincctr++;
if((mesh_sanity(buf)&MP_RECV)!=0){ if((mesh_sanity(buf)&MP_RECV)!=0){
meshPanic(buf,-1); meshPanic(buf,-len);
}; };
return 0; return 0;
}; };

2
firmware/main.c
View File

@ -77,5 +77,5 @@ int main(void) {
} }
int getrelease(void){ int getrelease(void){
return 0x00000108; return 0x00000109;
}; };