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

Merge cleanups

This commit is contained in:
maniacbug 2011-07-31 10:00:21 -07:00
parent 956b63a4dc
commit cd3b0b3ccb
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
RF24.cpp
View File

@ -616,9 +616,9 @@ void RF24::openReadingPipe(uint8_t child, uint64_t address)
{ {
// For pipes 2-5, only write the LSB // For pipes 2-5, only write the LSB
if ( child < 2 ) if ( child < 2 )
write_register(child_pipe[child], reinterpret_cast<const uint8_t*>(&value), 5); write_register(child_pipe[child], reinterpret_cast<const uint8_t*>(&address), 5);
else else
write_register(child_pipe[child], reinterpret_cast<const uint8_t*>(&value), 1); write_register(child_pipe[child], reinterpret_cast<const uint8_t*>(&address), 1);
write_register(child_payload_size[child],payload_size); write_register(child_payload_size[child],payload_size);
@ -861,14 +861,16 @@ bool RF24::setDataRate(rf24_datarate_e speed)
write_register(RF_SETUP,setup); write_register(RF_SETUP,setup);
// Verify our result // Verify our result
setup = read_register(RF_SETUP) ; if ( read_register(RF_SETUP) == setup )
if( setup == setup )
{ {
return true ; result = true;
}
else
{
wide_band = false;
} }
wide_band = false ; return result;
return false ;
} }
/******************************************************************/ /******************************************************************/

14
RF24.h
View File

@ -569,9 +569,21 @@ public:
/** /**
* Set the transmission data rate * Set the transmission data rate
* *
* @warning setting RF24_250KBPS will fail for non-P units
*
* @param speed RF24_250KBPS for 250kbs, RF24_1MBPS for 1Mbps, or RF24_2MBPS for 2Mbps * @param speed RF24_250KBPS for 250kbs, RF24_1MBPS for 1Mbps, or RF24_2MBPS for 2Mbps
* @return true if the change was successful
*/ */
void setDataRate(rf24_datarate_e speed); bool setDataRate(rf24_datarate_e speed);
/**
* Fetches the transmission data rate
*
* @return Returns the hardware's currently configured datarate. The value
* is one of 250kbs, RF24_1MBPS for 1Mbps, or RF24_2MBPS, as defined in the
* rf24_datarate_e enum.
*/
rf24_datarate_e getDataRate( void ) ;
/** /**
* Set the CRC length * Set the CRC length