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

Skip crc on receive

This commit is contained in:
Stefan `Sec` Zehl 2011-07-16 19:43:23 +02:00
parent 4d89ccf805
commit 64ee2abbd7
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
firmware/funk/nrf24l01p.c
View File

@ -68,6 +68,14 @@ void nrf_read_long(const uint8_t cmd, int len, uint8_t* data){
CS_HIGH(); CS_HIGH();
}; };
void nrf_read_pkt_crc(int len, uint8_t* data, uint8_t* crc){
CS_LOW();
xmit_spi(C_R_RX_PAYLOAD);
sspReceive(0,data,len);
sspReceive(0,crc,2);
CS_HIGH();
};
void nrf_write_long(const uint8_t cmd, int len, uint8_t* data){ void nrf_write_long(const uint8_t cmd, int len, uint8_t* data){
CS_LOW(); CS_LOW();
xmit_spi(cmd); xmit_spi(cmd);
@ -102,6 +110,8 @@ int nrf_rcv_pkt_time(int maxtime, int maxsize, uint8_t * pkt){
uint8_t buf; uint8_t buf;
int len; int len;
uint8_t status=0; uint8_t status=0;
uint8_t crc[2];
uint16_t cmp_crc;
nrf_write_reg(R_CONFIG, nrf_write_reg(R_CONFIG,
R_CONFIG_PRIM_RX| // Receive mode R_CONFIG_PRIM_RX| // Receive mode
@ -114,6 +124,8 @@ int nrf_rcv_pkt_time(int maxtime, int maxsize, uint8_t * pkt){
CE_HIGH(); CE_HIGH();
for(int i=0;i<maxsize;i++) pkt[i] = 0x00; // Sanity: clear packet buffer
#define LOOPY 10 #define LOOPY 10
for (;maxtime >= LOOPY;maxtime-=LOOPY){ for (;maxtime >= LOOPY;maxtime-=LOOPY){
delayms(LOOPY); delayms(LOOPY);
@ -140,12 +152,16 @@ int nrf_rcv_pkt_time(int maxtime, int maxsize, uint8_t * pkt){
if(len>32 || len==0){ if(len>32 || len==0){
return -2; // no packet error return -2; // no packet error
}; };
if(len>maxsize){ if(len>maxsize+2){
return -1; // packet too large return -1; // packet too large
}; };
nrf_read_long(C_R_RX_PAYLOAD,len,pkt);
nrf_read_pkt_crc(len-2,pkt,crc);
cmpcrc=crc16(buf,14);
CS_HIGH(); CS_HIGH();
return len; return len-2;
}; };
char nrf_snd_pkt_crc(int size, uint8_t * pkt){ char nrf_snd_pkt_crc(int size, uint8_t * pkt){
@ -167,7 +183,6 @@ char nrf_snd_pkt_crc(int size, uint8_t * pkt){
xmit_spi(crc & 0xff); xmit_spi(crc & 0xff);
CS_HIGH(); CS_HIGH();
CE_HIGH(); CE_HIGH();
delayms(1); // Send it. (only needs >10ys, i think) delayms(1); // Send it. (only needs >10ys, i think)
CE_LOW(); CE_LOW();