From 1575e3735549a8d7f82f66c340e00d84e1a1cb19 Mon Sep 17 00:00:00 2001
From: jgromes <jan.gromes@gmail.com>
Date: Fri, 12 Jan 2024 20:29:09 +0100
Subject: [PATCH] [nRF24] Cleanup private/protected members
---
src/modules/nRF24/nRF24.cpp | 8 ++++----
src/modules/nRF24/nRF24.h | 7 +++----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/modules/nRF24/nRF24.cpp b/src/modules/nRF24/nRF24.cpp
index e4923bcd..3f64f27f 100644
--- a/src/modules/nRF24/nRF24.cpp
+++ b/src/modules/nRF24/nRF24.cpp
@@ -6,10 +6,6 @@ nRF24::nRF24(Module* mod) : PhysicalLayer(RADIOLIB_NRF24_FREQUENCY_STEP_SIZE, RA
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) {
// set module properties
this->mod->SPIreadCommand = RADIOLIB_NRF24_CMD_READ;
@@ -606,6 +602,10 @@ int16_t nRF24::config() {
return(state);
}
+Module* nRF24::getMod() {
+ return(this->mod);
+}
+
void nRF24::SPIreadRxPayload(uint8_t* data, uint8_t numBytes) {
SPItransfer(RADIOLIB_NRF24_CMD_READ_RX_PAYLOAD, false, NULL, data, numBytes);
}
diff --git a/src/modules/nRF24/nRF24.h b/src/modules/nRF24/nRF24.h
index d6f9346a..54ed9c25 100644
--- a/src/modules/nRF24/nRF24.h
+++ b/src/modules/nRF24/nRF24.h
@@ -195,8 +195,6 @@ class nRF24: public PhysicalLayer {
*/
nRF24(Module* mod);
- Module* getMod();
-
// basic methods
/*!
@@ -470,15 +468,16 @@ class nRF24: public PhysicalLayer {
#if !RADIOLIB_GODMODE && !RADIOLIB_LOW_LEVEL
protected:
#endif
- Module* mod;
+ Module* getMod();
void SPIreadRxPayload(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);
#if !RADIOLIB_GODMODE
- protected:
+ private:
#endif
+ Module* mod;
int16_t frequency = RADIOLIB_NRF24_DEFAULT_FREQ;
int16_t dataRate = RADIOLIB_NRF24_DEFAULT_DR;