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-05 18:39:05 +02:00
parent a61c1d162a 72e04c1d38
commit 06db5d81c2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,7 +234,7 @@ void m_choose(){
lcdPrintln(IntToStrX(uint8ptouint32(meshbuffer[j].pkt+18),8)); lcdPrintln(IntToStrX(uint8ptouint32(meshbuffer[j].pkt+18),8));
lcdPrintln(IntToStrX(uint8ptouint32(meshbuffer[j].pkt+22),8)); lcdPrintln(IntToStrX(uint8ptouint32(meshbuffer[j].pkt+22),8));
lcdPrintln(IntToStrX(uint8ptouint32(meshbuffer[j].pkt+26),8)); lcdPrintln(IntToStrX(uint8ptouint32(meshbuffer[j].pkt+26),8));
lcdPrint(IntToStr(popcount(meshbuffer[j].pkt+6,6),3,0)); lcdPrint(IntToStr(popcount((uint32_t*)(meshbuffer[j].pkt+6),6),3,0));
lcdPrintln(" pts."); lcdPrintln(" pts.");
lcdRefresh(); lcdRefresh();
getInputWaitRelease(); getInputWaitRelease();

2
firmware/funk/mesh.c
View File

@ -188,7 +188,7 @@ uint8_t mesh_recvqloop_work(void){
for(int i=6;i<MESHPKTSIZE;i++) for(int i=6;i<MESHPKTSIZE;i++)
mpkt->pkt[i]|=buf[i]; mpkt->pkt[i]|=buf[i];
int score=popcount(MO_BODY(mpkt->pkt),6); int score=popcount((uint32_t*)MO_BODY(mpkt->pkt),6);
MPKT* reply=meshGetMessage('z'); MPKT* reply=meshGetMessage('z');