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

Reverted constructor changes. Changed SPI bus speed. Fixed setAutoAck 

for specific pipelines per suggestion.
This commit is contained in:
Greg Copeland 2011-07-16 10:36:36 -05:00
parent 059efa5ffa
commit b491480dde
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
RF24.cpp
View File

@ -35,9 +35,9 @@ void RF24::csn(const int mode) const
/******************************************************************/ /******************************************************************/
void RF24::ce(const int mode) const void RF24::ce(const int level) const
{ {
digitalWrite(ce_pin,mode); digitalWrite(ce_pin,level);
} }
/******************************************************************/ /******************************************************************/
@ -208,14 +208,11 @@ void RF24::print_observe_tx(uint8_t value) const
/******************************************************************/ /******************************************************************/
RF24::RF24(const uint8_t _cepin, const uint8_t _cspin, RF24::RF24(const uint8_t _cepin, const uint8_t _cspin):
const rf24_datarate_e speed, const uint8_t channel):
ce_pin(_cepin), csn_pin(_cspin), wide_band(true), p_variant(false), ce_pin(_cepin), csn_pin(_cspin), wide_band(true), p_variant(false),
payload_size(32), ack_payload_available(false) payload_size(32), ack_payload_available(false)
{ {
begin() ; begin() ;
setDataRate( speed ) ;
setChannel( channel ) ;
} }
/******************************************************************/ /******************************************************************/
@ -305,13 +302,12 @@ void RF24::begin(void)
pinMode(ce_pin,OUTPUT); pinMode(ce_pin,OUTPUT);
pinMode(csn_pin,OUTPUT); pinMode(csn_pin,OUTPUT);
SPI.begin();
ce(LOW); ce(LOW);
csn(HIGH); csn(HIGH);
SPI.begin();
SPI.setBitOrder(MSBFIRST); SPI.setBitOrder(MSBFIRST);
SPI.setDataMode(SPI_MODE0); SPI.setDataMode(SPI_MODE0);
SPI.setClockDivider(SPI_CLOCK_DIV8); SPI.setClockDivider(SPI_CLOCK_DIV2);
// Set 1500uS (minimum for 32B payload in ESB@250KBPS) timeouts, to make testing a little easier // Set 1500uS (minimum for 32B payload in ESB@250KBPS) timeouts, to make testing a little easier
// WARNING: If this is ever lowered, either 250KBS mode with AA is broken or maximum packet // WARNING: If this is ever lowered, either 250KBS mode with AA is broken or maximum packet
@ -331,7 +327,7 @@ void RF24::begin(void)
// Determine if this is a p or non-p RF24 module and then // Determine if this is a p or non-p RF24 module and then
// reset our data rate back to default value. This works // reset our data rate back to default value. This works
// because a non-P variant won't allow the data rate to // because a non-P variant won't allow the data rate to
// be set to 250KBS. // be set to 250Kbps.
if( setDataRate( RF24_250KBPS ) ) { if( setDataRate( RF24_250KBPS ) ) {
p_variant = true ; p_variant = true ;
} }
@ -636,7 +632,11 @@ void RF24::setAutoAck(const bool enable) const
void RF24::setAutoAck( const uint8_t pipe, const bool enable ) const void RF24::setAutoAck( const uint8_t pipe, const bool enable ) const
{ {
uint8_t en_aa = read_register( EN_AA ) ; uint8_t en_aa = read_register( EN_AA ) ;
en_aa &= ~((enable?0:1)<<pipe) ;// inverted logic here (1=off, 0=on) if( enable ) {
en_aa |= _BV(pipe) ;
} else {
en_aa &= ~_BV(pipe) ;
}
write_register( EN_AA, en_aa ) ; write_register( EN_AA, en_aa ) ;
} }

16
RF24.h
View File

@ -43,7 +43,7 @@ protected:
/** /**
* Set chip select pin * Set chip select pin
* Running SPI bus at PI_CLOCK_DIV2 so we don't waist time transferring data * Running SPI bus at PI_CLOCK_DIV2 so we don't waste time transferring data
* and best of all, we make use of the radio's FIFO buffers. A lower speed * and best of all, we make use of the radio's FIFO buffers. A lower speed
* means we're less likely to effectively leverage our FIFOs and pay a higher * means we're less likely to effectively leverage our FIFOs and pay a higher
* AVR runtime cost as toll. * AVR runtime cost as toll.
@ -55,10 +55,10 @@ protected:
/** /**
* Set chip enable * Set chip enable
* *
* @param mode HIGH to actively begin transmission or LOW to put in standby. Please see data sheet * @param level HIGH to actively begin transmission or LOW to put in standby. Please see data sheet
* for a much more detailed description of this pin. * for a much more detailed description of this pin.
*/ */
void ce(const int mode) const ; void ce(const int level) const ;
/** /**
* Read a chunk of data in from a register * Read a chunk of data in from a register
@ -193,17 +193,9 @@ 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(const uint8_t _cepin, const 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