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

Removed the line that set the payload size to 8 in begin(). Reduced some ints to uint8_t. Added some more debugging info.

This commit is contained in:
maniacbug 2011-04-25 20:29:57 -07:00
parent e005ec75f1
commit dfb2faa841
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
RF24.cpp
View File

@ -71,6 +71,8 @@ uint8_t RF24::write_register(uint8_t reg, uint8_t value)
{ {
uint8_t status; uint8_t status;
IF_SERIAL_DEBUG(printf_P(PSTR("write_register(%02x,%02x)\n\r"),reg,value));
csn(LOW); csn(LOW);
status = SPI.transfer( W_REGISTER | ( REGISTER_MASK & reg ) ); status = SPI.transfer( W_REGISTER | ( REGISTER_MASK & reg ) );
SPI.transfer(value); SPI.transfer(value);
@ -187,14 +189,14 @@ void RF24::print_observe_tx(uint8_t value)
/******************************************************************/ /******************************************************************/
RF24::RF24(int _cepin, int _cspin): RF24::RF24(uint8_t _cepin, uint8_t _cspin):
ce_pin(_cepin), csn_pin(_cspin), payload_size(32) ce_pin(_cepin), csn_pin(_cspin), payload_size(32)
{ {
} }
/******************************************************************/ /******************************************************************/
void RF24::setChannel(int channel) void RF24::setChannel(uint8_t channel)
{ {
write_register(RF_CH,min(channel,127)); write_register(RF_CH,min(channel,127));
} }
@ -247,6 +249,12 @@ void RF24::printDetails(void)
while( bufptr-- > buffer ) while( bufptr-- > buffer )
printf("%02x",*bufptr); printf("%02x",*bufptr);
printf("\n\r"); printf("\n\r");
status = read_register(RX_PW_P0,buffer,1);
printf("RX_PW_P0 = 0x%02x\n\r",*buffer);
status = read_register(RX_PW_P1,buffer,1);
printf("RX_PW_P1 = 0x%02x\n\r",*buffer);
read_register(EN_AA,buffer,1); read_register(EN_AA,buffer,1);
printf("EN_AA = %02x\n\r",*buffer); printf("EN_AA = %02x\n\r",*buffer);
@ -285,7 +293,6 @@ void RF24::begin(void)
// Set up default configuration. Callers can always change it later. // Set up default configuration. Callers can always change it later.
setChannel(1); setChannel(1);
setPayloadSize(8);
} }
/******************************************************************/ /******************************************************************/

10
RF24.h
View File

@ -18,9 +18,9 @@
class RF24 class RF24
{ {
private: private:
int ce_pin; /**< "Chip Enable" pin, activates the RX or TX role */ uint8_t ce_pin; /**< "Chip Enable" pin, activates the RX or TX role */
int csn_pin; /**< SPI Chip select */ uint8_t csn_pin; /**< SPI Chip select */
int payload_size; /**< Fixed size of payloads */ uint8_t payload_size; /**< Fixed size of payloads */
protected: protected:
/** /**
@ -147,7 +147,7 @@ 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
*/ */
RF24(int _cepin, int _cspin); RF24(uint8_t _cepin, uint8_t _cspin);
/** /**
* Begin operation of the chip * Begin operation of the chip
@ -161,7 +161,7 @@ public:
* *
* @param channel Which RF channel to communicate on, 0-127 * @param channel Which RF channel to communicate on, 0-127
*/ */
void setChannel(int channel); void setChannel(uint8_t channel);
/** /**
* Set Payload Size * Set Payload Size