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

Added two default values to the RF24 constructor; speed and channel. 

Some additional constantness cleanup.
This commit is contained in:
Greg Copeland 2011-06-21 14:58:19 -05:00
parent b1a7dc7d54
commit aac2c3dba3
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
RF24.cpp
View File

@ -208,14 +208,17 @@ void RF24::print_observe_tx(uint8_t value) const
/******************************************************************/ /******************************************************************/
RF24::RF24(uint8_t _cepin, uint8_t _cspin): RF24::RF24(const uint8_t _cepin, const uint8_t _cspin,
const rf24_datarate_e speed, const uint8_t channel):
wide_band(true), ce_pin(_cepin), csn_pin(_cspin), payload_size(32), ack_payload_available(false) wide_band(true), ce_pin(_cepin), csn_pin(_cspin), payload_size(32), ack_payload_available(false)
{ {
setDataRate( speed ) ;
setChannel( channel ) ;
} }
/******************************************************************/ /******************************************************************/
void RF24::setChannel(uint8_t channel) void RF24::setChannel(const uint8_t channel)
{ {
if( wide_band ) { if( wide_band ) {
write_register(RF_CH,min(channel,127)); write_register(RF_CH,min(channel,127));
@ -316,10 +319,6 @@ void RF24::begin(void)
// Flush buffers // Flush buffers
flush_rx(); flush_rx();
flush_tx(); flush_tx();
// Set up default configuration. Callers can always change it later.
// Hardware default is channel 2 - even spacing implied.
setChannel(64);
} }
/******************************************************************/ /******************************************************************/

11
RF24.h
View File

@ -188,8 +188,17 @@ public:
* *
* @param _cepin The pin attached to Chip Enable on the RF module * @param _cepin The pin attached to Chip Enable on the RF module
* @param _cspin The pin attached to Chip Select * @param _cspin The pin attached to Chip Select
* @param speed The desired data rate of this network; default is 2Mbs
* @param channel The channel to use for this network; default is 64
*
* @warning Addition features enabled/set in the begin method should be
* migrated into our constructor. Basically features which are network
* specific should be variable and assignable here; including timeouts,
* retries, and CRC length.
*/ */
RF24(uint8_t _cepin, uint8_t _cspin); RF24(const uint8_t _cepin, const uint8_t _cspin,
const rf24_datarate_e speed=RF24_2MBPS,
const uint8_t channel=64 ) ;
/** /**
* Begin operation of the chip * Begin operation of the chip