forks/RadioLibSmol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[nRF24] Changed pin mapping

Browse source
This commit is contained in:
jgromes 2019-12-27 13:17:34 +01:00
parent 9e2ed2ca6f
commit 05b300408b
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/nRF24/nRF24_Receive/nRF24_Receive.ino
View file

@ -17,9 +17,9 @@
#include <RadioLib.h> #include <RadioLib.h>
// nRF24 has the following connections: // nRF24 has the following connections:
// NSS pin: 10 // CS pin: 10
// CE pin: 2 // IRQ pin: 2
// IRQ pin: 3 // CE pin: 3
nRF24 nrf = new Module(10, 2, 3); nRF24 nrf = new Module(10, 2, 3);
// or using RadioShield // or using RadioShield

6
examples/nRF24/nRF24_Transmit/nRF24_Transmit.ino
View file

@ -17,9 +17,9 @@
#include <RadioLib.h> #include <RadioLib.h>
// nRF24 has the following connections: // nRF24 has the following connections:
// NSS pin: 10 // CS pin: 10
// CE pin: 2 // IRQ pin: 2
// IRQ pin: 3 // CE pin: 3
nRF24 nrf = new Module(10, 2, 3); nRF24 nrf = new Module(10, 2, 3);
// or using RadioShield // or using RadioShield

24
src/modules/nRF24/nRF24.cpp
View file

@ -8,11 +8,11 @@ int16_t nRF24::begin(int16_t freq, int16_t dataRate, int8_t power, uint8_t addrW
// set module properties // set module properties
_mod->SPIreadCommand = NRF24_CMD_READ; _mod->SPIreadCommand = NRF24_CMD_READ;
_mod->SPIwriteCommand = NRF24_CMD_WRITE; _mod->SPIwriteCommand = NRF24_CMD_WRITE;
_mod->init(RADIOLIB_USE_SPI, RADIOLIB_INT_BOTH); _mod->init(RADIOLIB_USE_SPI);
// override pin mode on INT0 (connected to nRF24 CE pin) // set pin mode on RST (connected to nRF24 CE pin)
pinMode(_mod->getInt0(), OUTPUT); Module::pinMode(_mod->getRst(), OUTPUT);
digitalWrite(_mod->getInt0(), LOW); Module::digitalWrite(_mod->getRst(), LOW);
// wait for minimum power-on reset duration // wait for minimum power-on reset duration
delay(100); delay(100);
@ -72,7 +72,7 @@ int16_t nRF24::standby() {
// make sure carrier output is disabled // make sure carrier output is disabled
_mod->SPIsetRegValue(NRF24_REG_RF_SETUP, NRF24_CONT_WAVE_OFF, 7, 7); _mod->SPIsetRegValue(NRF24_REG_RF_SETUP, NRF24_CONT_WAVE_OFF, 7, 7);
_mod->SPIsetRegValue(NRF24_REG_RF_SETUP, NRF24_PLL_LOCK_OFF, 4, 4); _mod->SPIsetRegValue(NRF24_REG_RF_SETUP, NRF24_PLL_LOCK_OFF, 4, 4);
digitalWrite(_mod->getInt0(), LOW); digitalWrite(_mod->getRst(), LOW);
// use standby-1 mode // use standby-1 mode
return(_mod->SPIsetRegValue(NRF24_REG_CONFIG, NRF24_POWER_UP, 1, 1)); return(_mod->SPIsetRegValue(NRF24_REG_CONFIG, NRF24_POWER_UP, 1, 1));
@ -87,7 +87,7 @@ int16_t nRF24::transmit(uint8_t* data, size_t len, uint8_t addr) {
// wait until transmission is finished // wait until transmission is finished
uint32_t start = micros(); uint32_t start = micros();
while(digitalRead(_mod->getInt1())) { while(digitalRead(_mod->getIrq())) {
// check maximum number of retransmits // check maximum number of retransmits
if(getStatus(NRF24_MAX_RT)) { if(getStatus(NRF24_MAX_RT)) {
standby(); standby();
@ -118,7 +118,7 @@ int16_t nRF24::receive(uint8_t* data, size_t len) {
// wait for Rx_DataReady or timeout // wait for Rx_DataReady or timeout
uint32_t start = micros(); uint32_t start = micros();
while(digitalRead(_mod->getInt1())) { while(digitalRead(_mod->getIrq())) {
// check timeout: 15 retries * 4ms (max Tx time as per datasheet) // check timeout: 15 retries * 4ms (max Tx time as per datasheet)
if(micros() - start >= 60000) { if(micros() - start >= 60000) {
standby(); standby();
@ -142,7 +142,7 @@ int16_t nRF24::transmitDirect(uint32_t frf) {
int16_t state = _mod->SPIsetRegValue(NRF24_REG_CONFIG, NRF24_PTX, 0, 0); int16_t state = _mod->SPIsetRegValue(NRF24_REG_CONFIG, NRF24_PTX, 0, 0);
state |= _mod->SPIsetRegValue(NRF24_REG_RF_SETUP, NRF24_CONT_WAVE_ON, 7, 7); state |= _mod->SPIsetRegValue(NRF24_REG_RF_SETUP, NRF24_CONT_WAVE_ON, 7, 7);
state |= _mod->SPIsetRegValue(NRF24_REG_RF_SETUP, NRF24_PLL_LOCK_ON, 4, 4); state |= _mod->SPIsetRegValue(NRF24_REG_RF_SETUP, NRF24_PLL_LOCK_ON, 4, 4);
digitalWrite(_mod->getInt0(), HIGH); digitalWrite(_mod->getRst(), HIGH);
return(state); return(state);
} }
@ -153,7 +153,7 @@ int16_t nRF24::receiveDirect() {
} }
void nRF24::setIrqAction(void (*func)(void)) { void nRF24::setIrqAction(void (*func)(void)) {
attachInterrupt(digitalPinToInterrupt(_mod->getInt1()), func, FALLING); attachInterrupt(digitalPinToInterrupt(_mod->getIrq()), func, FALLING);
} }
int16_t nRF24::startTransmit(uint8_t* data, size_t len, uint8_t addr) { int16_t nRF24::startTransmit(uint8_t* data, size_t len, uint8_t addr) {
@ -193,9 +193,9 @@ int16_t nRF24::startTransmit(uint8_t* data, size_t len, uint8_t addr) {
SPIwriteTxPayload(data, len); SPIwriteTxPayload(data, len);
// CE high to start transmitting // CE high to start transmitting
digitalWrite(_mod->getInt0(), HIGH); digitalWrite(_mod->getRst(), HIGH);
delayMicroseconds(10); delayMicroseconds(10);
digitalWrite(_mod->getInt0(), LOW); digitalWrite(_mod->getRst(), LOW);
return(state); return(state);
} }
@ -224,7 +224,7 @@ int16_t nRF24::startReceive() {
SPItransfer(NRF24_CMD_FLUSH_RX); SPItransfer(NRF24_CMD_FLUSH_RX);
// CE high to start receiving // CE high to start receiving
digitalWrite(_mod->getInt0(), HIGH); digitalWrite(_mod->getRst(), HIGH);
// wait to enter Rx state // wait to enter Rx state
delayMicroseconds(130); delayMicroseconds(130);