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

[nRF24] Cleanup private/protected members

Browse source
This commit is contained in:
jgromes 2024-01-12 20:29:09 +01:00
parent 3a5d9b5c32
commit 1575e37355
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,10 +6,6 @@ nRF24::nRF24(Module* mod) : PhysicalLayer(RADIOLIB_NRF24_FREQUENCY_STEP_SIZE, RA
this->mod = mod; this->mod = mod;
} }
Module* nRF24::getMod() {
return(this->mod);
}
int16_t nRF24::begin(int16_t freq, int16_t dr, int8_t pwr, uint8_t addrWidth) { int16_t nRF24::begin(int16_t freq, int16_t dr, int8_t pwr, uint8_t addrWidth) {
// set module properties // set module properties
this->mod->SPIreadCommand = RADIOLIB_NRF24_CMD_READ; this->mod->SPIreadCommand = RADIOLIB_NRF24_CMD_READ;
@ -606,6 +602,10 @@ int16_t nRF24::config() {
return(state); return(state);
} }
Module* nRF24::getMod() {
return(this->mod);
}
void nRF24::SPIreadRxPayload(uint8_t* data, uint8_t numBytes) { void nRF24::SPIreadRxPayload(uint8_t* data, uint8_t numBytes) {
SPItransfer(RADIOLIB_NRF24_CMD_READ_RX_PAYLOAD, false, NULL, data, numBytes); SPItransfer(RADIOLIB_NRF24_CMD_READ_RX_PAYLOAD, false, NULL, data, numBytes);
} }

7
src/modules/nRF24/nRF24.h
View file

@ -195,8 +195,6 @@ class nRF24: public PhysicalLayer {
*/ */
nRF24(Module* mod); nRF24(Module* mod);
Module* getMod();
// basic methods // basic methods
/*! /*!
@ -470,15 +468,16 @@ class nRF24: public PhysicalLayer {
#if !RADIOLIB_GODMODE && !RADIOLIB_LOW_LEVEL #if !RADIOLIB_GODMODE && !RADIOLIB_LOW_LEVEL
protected: protected:
#endif #endif
Module* mod; Module* getMod();
void SPIreadRxPayload(uint8_t* data, uint8_t numBytes); void SPIreadRxPayload(uint8_t* data, uint8_t numBytes);
void SPIwriteTxPayload(uint8_t* data, uint8_t numBytes); void SPIwriteTxPayload(uint8_t* data, uint8_t numBytes);
void SPItransfer(uint8_t cmd, bool write = false, uint8_t* dataOut = NULL, uint8_t* dataIn = NULL, uint8_t numBytes = 0); void SPItransfer(uint8_t cmd, bool write = false, uint8_t* dataOut = NULL, uint8_t* dataIn = NULL, uint8_t numBytes = 0);
#if !RADIOLIB_GODMODE #if !RADIOLIB_GODMODE
protected: private:
#endif #endif
Module* mod;
int16_t frequency = RADIOLIB_NRF24_DEFAULT_FREQ; int16_t frequency = RADIOLIB_NRF24_DEFAULT_FREQ;
int16_t dataRate = RADIOLIB_NRF24_DEFAULT_DR; int16_t dataRate = RADIOLIB_NRF24_DEFAULT_DR;