interfisch
/
rf24-pio
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:maniacbug/RF24

This commit is contained in:
maniacbug 2011-10-19 15:18:11 -07:00
parent 066d79f21e ef02ce6e60
commit 726027837e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
RF24.cpp
View File

@ -266,14 +266,16 @@ void RF24::setChannel(uint8_t channel)
// TODO: This method could take advantage of the 'wide_band' calculation // TODO: This method could take advantage of the 'wide_band' calculation
// done in setChannel() to require certain channel spacing. // done in setChannel() to require certain channel spacing.
write_register(RF_CH,min(channel,127)); const uint8_t max_channel = 127;
write_register(RF_CH,min(channel,max_channel));
} }
/****************************************************************************/ /****************************************************************************/
void RF24::setPayloadSize(uint8_t size) void RF24::setPayloadSize(uint8_t size)
{ {
payload_size = min(size,32); const uint8_t max_payload_size = 32;
payload_size = min(size,max_payload_size);
} }
/****************************************************************************/ /****************************************************************************/
@ -593,7 +595,9 @@ void RF24::openWritingPipe(uint64_t value)
write_register(RX_ADDR_P0, reinterpret_cast<uint8_t*>(&value), 5); write_register(RX_ADDR_P0, reinterpret_cast<uint8_t*>(&value), 5);
write_register(TX_ADDR, reinterpret_cast<uint8_t*>(&value), 5); write_register(TX_ADDR, reinterpret_cast<uint8_t*>(&value), 5);
write_register(RX_PW_P0,min(payload_size,32));
const uint8_t max_payload_size = 32;
write_register(RX_PW_P0,min(payload_size,max_payload_size));
} }
/****************************************************************************/ /****************************************************************************/
@ -707,7 +711,8 @@ void RF24::writeAckPayload(uint8_t pipe, const void* buf, uint8_t len)
csn(LOW); csn(LOW);
SPI.transfer( W_ACK_PAYLOAD | ( pipe & B111 ) ); SPI.transfer( W_ACK_PAYLOAD | ( pipe & B111 ) );
uint8_t data_len = min(len,32); const uint8_t max_payload_size = 32;
uint8_t data_len = min(len,max_payload_size);
while ( data_len-- ) while ( data_len-- )
SPI.transfer(*current++); SPI.transfer(*current++);