Skip to content

GitLab

R
RF24
Commit 8a8803be authored by TMRh20's avatar TMRh20
Browse files
Options

Merge remote-tracking branch 'origin/Updates'

parents d5773797 e3f4a6ba
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
RF24.cpp
View file @ 8a8803be
...@@ -428,7 +428,7 @@ void RF24::print_byte_register(const char* name, uint8_t reg, uint8_t qty) ...@@ -428,7 +428,7 @@ void RF24::print_byte_register(const char* name, uint8_t reg, uint8_t qty)
char extra_tab = strlen_P(name) < 8 ? '\t' : 0; char extra_tab = strlen_P(name) < 8 ? '\t' : 0;
printf("%s\t%c =", name, extra_tab); printf("%s\t%c =", name, extra_tab);
#else #else
char extra_tab = strlen_P(name) < 8 ? '\t' : '\a'; char extra_tab = strlen_P(name) < 8 ? '\t' : 0;
printf_P(PSTR(PRIPSTR"\t%c ="),name,extra_tab); printf_P(PSTR(PRIPSTR"\t%c ="),name,extra_tab);
#endif #endif
while (qty--) while (qty--)
...@@ -445,7 +445,7 @@ void RF24::print_address_register(const char* name, uint8_t reg, uint8_t qty) ...@@ -445,7 +445,7 @@ void RF24::print_address_register(const char* name, uint8_t reg, uint8_t qty)
char extra_tab = strlen_P(name) < 8 ? '\t' : 0; char extra_tab = strlen_P(name) < 8 ? '\t' : 0;
printf("%s\t%c =",name,extra_tab); printf("%s\t%c =",name,extra_tab);
#else #else
char extra_tab = strlen_P(name) < 8 ? '\t' : '\a'; char extra_tab = strlen_P(name) < 8 ? '\t' : 0;
printf_P(PSTR(PRIPSTR"\t%c ="),name,extra_tab); printf_P(PSTR(PRIPSTR"\t%c ="),name,extra_tab);
#endif #endif
while (qty--) while (qty--)
......
RF24.h
View file @ 8a8803be
...@@ -115,7 +115,7 @@ public: ...@@ -115,7 +115,7 @@ public:
RF24(uint8_t _cepin, uint8_t _cspin, uint32_t spispeed ); RF24(uint8_t _cepin, uint8_t _cspin, uint32_t spispeed );
//#endif //#endif
#if !defined (RF24_TINY) #if defined (RF24_LINUX)
virtual ~RF24() {}; virtual ~RF24() {};
#endif #endif
...@@ -1309,7 +1309,7 @@ private: ...@@ -1309,7 +1309,7 @@ private:
* @section News News * @section News News
* *
* **March 2015**<br> * **March 2015**<br>
* - New layout for easier portability: Break out defines & includes for individual platforms to RF24/arch * - New layout for <a href="Portability.html">easier portability:</a> Break out defines & includes for individual platforms to RF24/arch
* - <a href="MRAA.html">MRAA</a> support added ( Galileo, Edison, etc) * - <a href="MRAA.html">MRAA</a> support added ( Galileo, Edison, etc)
* - <a href="BBB.html">BBB/Generic Linux </a> support via spidev & MRAA * - <a href="BBB.html">BBB/Generic Linux </a> support via spidev & MRAA
* - Support for RPi 2 added * - Support for RPi 2 added
...@@ -1369,16 +1369,16 @@ private: ...@@ -1369,16 +1369,16 @@ private:
* The table below shows how to connect the the pins of the NRF24L01(+) to different boards. * The table below shows how to connect the the pins of the NRF24L01(+) to different boards.
* CE and CSN are configurable. * CE and CSN are configurable.
* *
* | PIN | NRF24L01 | Arduino UNO | ATtiny25/45/85 [0] | ATtiny44/84 [1] | LittleWire [2] * | PIN | NRF24L01 | Arduino UNO | ATtiny25/45/85 [0] | ATtiny44/84 [1] | LittleWire [2] | RPI | RPi -P1 Connector |
* |-----|----------|-------------|--------------------|-----------------|-------------- * |-----|----------|-------------|--------------------|-----------------|-------------------------|------------|-------------------|
* | 1 | GND | GND | pin 4 | pin 14 | GND * | 1 | GND | GND | pin 4 | pin 14 | GND | rpi-gnd | (25) |
* | 2 | VCC | 3.3V | pin 8 | pin 1 | regulator 3.3V required * | 2 | VCC | 3.3V | pin 8 | pin 1 | regulator 3.3V required | rpi-3v3 | (17) |
* | 3 | CE | digIO 7 | pin 2 | pin 12 | pin to 3.3V * | 3 | CE | digIO 7 | pin 2 | pin 12 | pin to 3.3V | rpi-gpio22 | (15) |
* | 4 | CSN | digIO 8 | pin 3 | pin 11 | RESET * | 4 | CSN | digIO 8 | pin 3 | pin 11 | RESET | rpi-gpio8 | (24) |
* | 5 | SCK | digIO 13 | pin 7 | pin 9 | SCK * | 5 | SCK | digIO 13 | pin 7 | pin 9 | SCK | rpi-sckl | (23) |
* | 6 | MOSI | digIO 11 | pin 6 | pin 7 | MOSI * | 6 | MOSI | digIO 11 | pin 6 | pin 7 | MOSI | rpi-mosi | (19) |
* | 7 | MISO | digIO 12 | pin 5 | pin 8 | MISO * | 7 | MISO | digIO 12 | pin 5 | pin 8 | MISO | rpi-miso | (21) |
* | 8 | IRQ | - | - | - | - * | 8 | IRQ | - | - | - | - | - | - |
* *
* @li [0] https://learn.sparkfun.com/tutorials/tiny-avr-programmer-hookup-guide/attiny85-use-hints * @li [0] https://learn.sparkfun.com/tutorials/tiny-avr-programmer-hookup-guide/attiny85-use-hints
* @li [1] http://highlowtech.org/?p=1695 * @li [1] http://highlowtech.org/?p=1695
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment