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

openbeacon: fixed nick broadcast

This commit is contained in:
schneider 2011-12-22 15:05:22 +01:00
parent cf639ee620
commit 8e26d2b81c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/funk/openbeacon.c
View File

@ -88,7 +88,7 @@ static void openbeaconSendPacket(uint32_t id, uint32_t seq,
i = (getRandom()&0xfff)+1; i = (getRandom()&0xfff)+1;
while(i--); while(i--);
static uint32_t n = 0; static uint32_t n = 123;
if( --n == 0 ){ if( --n == 0 ){
n = 123; n = 123;
proto = 0x23; //Nick name proto = 0x23; //Nick name
@ -111,6 +111,9 @@ static void openbeaconSendPacket(uint32_t id, uint32_t seq,
nrf_snd_pkt_crc_encr(16,buf,NULL); nrf_snd_pkt_crc_encr(16,buf,NULL);
#endif #endif
}else{ }else{
if( strlen(GLOBAL(nickname)) > 8 )
buf[1] = 0x24;
nrf_set_strength(3);
uint32touint8p(id, buf+2); uint32touint8p(id, buf+2);
memcpy(buf+6, GLOBAL(nickname), 8); memcpy(buf+6, GLOBAL(nickname), 8);
#if ENCRYPT_OPENBEACON #if ENCRYPT_OPENBEACON
@ -120,7 +123,7 @@ static void openbeaconSendPacket(uint32_t id, uint32_t seq,
#endif #endif
if( strlen(GLOBAL(nickname)) < 9 ) if( strlen(GLOBAL(nickname)) < 9 )
return; return;
buf[1]=0x24; buf[1]=0x25;
memcpy(buf+6, GLOBAL(nickname)+8, 8); memcpy(buf+6, GLOBAL(nickname)+8, 8);
#if ENCRYPT_OPENBEACON #if ENCRYPT_OPENBEACON
nrf_snd_pkt_crc_encr(16,buf,openbeaconkey); nrf_snd_pkt_crc_encr(16,buf,openbeaconkey);