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

Merge branch 'master' into meshdebug

This commit is contained in:
Stefan `Sec` Zehl 2012-01-03 22:34:05 +01:00
parent 845883fa13 1a61837fa8
commit da38c7a0c4
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/funk/nrf24l01p.c
View File

@ -153,7 +153,6 @@ int nrf_rcv_pkt_poll_dec(int maxsize, uint8_t * pkt, uint32_t const key[4]){
// if(key==NULL) return len; // if(key==NULL) return len;
cmpcrc=crc16(pkt,len-2);
if(key!=NULL) if(key!=NULL)
xxtea_decode_words((uint32_t*)pkt,len/4,key); xxtea_decode_words((uint32_t*)pkt,len/4,key);

2
firmware/l0dable/dbgmesh.c
View File

@ -135,6 +135,8 @@ void m_time(void){
lcdNl(); lcdNl();
lcdPrint("Nice:"); lcdPrint("Nice:");
lcdPrintInt(meshnice); lcdPrintInt(meshnice);
lcdPrint(" R:");
lcdPrint(IntToStrX(getrelease()%0xfff,3));
lcdNl(); lcdNl();
lcdRefresh(); lcdRefresh();

2
firmware/main.c
View File

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