Commit 2db0f2e6 authored by TMRh20's avatar TMRh20

Merge branch 'master' into Updates

parents cd52d61b ded7e1bc
...@@ -448,6 +448,11 @@ void RF24::setChannel(uint8_t channel) ...@@ -448,6 +448,11 @@ void RF24::setChannel(uint8_t channel)
write_register(RF_CH,rf24_min(channel,max_channel)); write_register(RF_CH,rf24_min(channel,max_channel));
} }
uint8_t RF24::getChannel()
{
return read_register(RF_CH);
}
/****************************************************************************/ /****************************************************************************/
void RF24::setPayloadSize(uint8_t size) void RF24::setPayloadSize(uint8_t size)
......
...@@ -711,6 +711,13 @@ s * ...@@ -711,6 +711,13 @@ s *
* @param channel Which RF channel to communicate on, 0-127 * @param channel Which RF channel to communicate on, 0-127
*/ */
void setChannel(uint8_t channel); void setChannel(uint8_t channel);
/**
* Get RF communication channel
*
* @return The currently configured RF Channel
*/
uint8_t getChannel(void);
/** /**
* Set Static Payload Size * Set Static Payload Size
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
// Arduino DUE is arm and does not include avr/pgmspace // Arduino DUE is arm and does not include avr/pgmspace
#if defined (ARDUINO_ARCH_ESP8266) #if defined (ARDUINO_ARCH_ESP8266)
#include <pgmspace.h> #include <pgmspace.h>
#define PRIPSTR "%S" #define PRIPSTR "%s"
#define printf_P printf #define printf_P printf
#elif defined(ARDUINO) && ! defined(__arm__) && !defined (__ARDUINO_X86__) #elif defined(ARDUINO) && ! defined(__arm__) && !defined (__ARDUINO_X86__)
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
......
{
"name": "RF24",
"keywords": "rf, radio, wireless, spi",
"description": "Optimized High Speed Driver for nRF24L01(+) 2.4GHz Wireless Transceiver",
"repository":
{
"type": "git",
"url": "https://github.com/TMRh20/RF24.git"
},
"include": [
"*.h",
"*.c",
"*.cpp",
"arch/ATTiny/*",
"arch/Due/*",
"arch/Teensy/*",
"examples/*/*.ino"
],
"frameworks": "arduino",
"platforms": [
"atmelavr",
"atmelsam",
"teensy"
]
}
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