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

Switched to initializer lists

Browse source
This commit is contained in:
jgromes 2020-07-04 16:05:56 +02:00
parent 91de2e1eeb
commit c439b097d8
2 changed files with 52 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
src/Module.cpp
View file

@ -1,35 +1,39 @@
#include "Module.h" #include "Module.h"
Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst) { Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst):
_cs = cs; _cs(cs),
_rx = RADIOLIB_NC; _irq(irq),
_tx = RADIOLIB_NC; _rst(rst),
_irq = irq; _rx(RADIOLIB_NC),
_rst = rst; _tx(RADIOLIB_NC),
_spiSettings(SPISettings(2000000, MSBFIRST, SPI_MODE0))
{
_spi = &RADIOLIB_DEFAULT_SPI; _spi = &RADIOLIB_DEFAULT_SPI;
_spiSettings = SPISettings(2000000, MSBFIRST, SPI_MODE0);
_initInterface = true; _initInterface = true;
ModuleSerial = NULL; ModuleSerial = NULL;
} }
Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE gpio) { Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE gpio):
_cs = cs; _cs(cs),
_rx = gpio; _irq(irq),
_tx = RADIOLIB_NC; _rst(rst),
_irq = irq; _rx(gpio),
_rst = rst; _tx(RADIOLIB_NC),
_spiSettings(SPISettings(2000000, MSBFIRST, SPI_MODE0))
{
_spi = &RADIOLIB_DEFAULT_SPI; _spi = &RADIOLIB_DEFAULT_SPI;
_spiSettings = SPISettings(2000000, MSBFIRST, SPI_MODE0);
_initInterface = true; _initInterface = true;
ModuleSerial = NULL; ModuleSerial = NULL;
} }
Module::Module(RADIOLIB_PIN_TYPE rx, RADIOLIB_PIN_TYPE tx, HardwareSerial* serial, RADIOLIB_PIN_TYPE rst) { Module::Module(RADIOLIB_PIN_TYPE rx, RADIOLIB_PIN_TYPE tx, HardwareSerial* serial, RADIOLIB_PIN_TYPE rst):
_cs = RADIOLIB_NC; _cs(RADIOLIB_NC),
_rx = rx; _irq(RADIOLIB_NC),
_tx = tx; _rst(rst),
_irq = RADIOLIB_NC; _rx(rx),
_rst = rst; _tx(tx),
_spiSettings(SPISettings(2000000, MSBFIRST, SPI_MODE0))
{
_initInterface = true; _initInterface = true;
#ifdef RADIOLIB_SOFTWARE_SERIAL_UNSUPPORTED #ifdef RADIOLIB_SOFTWARE_SERIAL_UNSUPPORTED
@ -40,38 +44,41 @@ Module::Module(RADIOLIB_PIN_TYPE rx, RADIOLIB_PIN_TYPE tx, HardwareSerial* seria
#endif #endif
} }
Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, SPIClass& spi, SPISettings spiSettings) { Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, SPIClass& spi, SPISettings spiSettings):
_cs = cs; _cs(cs),
_rx = RADIOLIB_NC; _irq(irq),
_tx = RADIOLIB_NC; _rst(rst),
_irq = irq; _rx(RADIOLIB_NC),
_rst = rst; _tx(RADIOLIB_NC),
_spiSettings(spiSettings)
{
_spi = &spi; _spi = &spi;
_spiSettings = spiSettings;
_initInterface = false; _initInterface = false;
ModuleSerial = NULL; ModuleSerial = NULL;
} }
Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE gpio, SPIClass& spi, SPISettings spiSettings) { Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE gpio, SPIClass& spi, SPISettings spiSettings):
_cs = cs; _cs(cs),
_rx = gpio; _irq(irq),
_tx = RADIOLIB_NC; _rst(rst),
_irq = irq; _rx(gpio),
_rst = rst; _tx(RADIOLIB_NC),
_spiSettings(spiSettings)
{
_spi = &spi; _spi = &spi;
_spiSettings = spiSettings;
_initInterface = false; _initInterface = false;
ModuleSerial = NULL; ModuleSerial = NULL;
} }
Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE rx, RADIOLIB_PIN_TYPE tx, SPIClass& spi, SPISettings spiSettings, HardwareSerial* serial) { Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE rx, RADIOLIB_PIN_TYPE tx, SPIClass& spi, SPISettings spiSettings, HardwareSerial* serial):
_cs = cs; _cs(cs),
_rx = rx; _irq(irq),
_tx = tx; _rst(rst),
_irq = irq; _rx(rx),
_rst = rst; _tx(tx),
_spiSettings(spiSettings)
{
_spi = &spi; _spi = &spi;
_spiSettings = spiSettings;
_initInterface = false; _initInterface = false;
#ifdef RADIOLIB_SOFTWARE_SERIAL_UNSUPPORTED #ifdef RADIOLIB_SOFTWARE_SERIAL_UNSUPPORTED

7
src/Module.h
View file

@ -409,14 +409,15 @@ class Module {
private: private:
#endif #endif
RADIOLIB_PIN_TYPE _cs = RADIOLIB_NC; RADIOLIB_PIN_TYPE _cs = RADIOLIB_NC;
RADIOLIB_PIN_TYPE _tx = RADIOLIB_NC;
RADIOLIB_PIN_TYPE _rx = RADIOLIB_NC;
RADIOLIB_PIN_TYPE _irq = RADIOLIB_NC; RADIOLIB_PIN_TYPE _irq = RADIOLIB_NC;
RADIOLIB_PIN_TYPE _rst = RADIOLIB_NC; RADIOLIB_PIN_TYPE _rst = RADIOLIB_NC;
RADIOLIB_PIN_TYPE _rx = RADIOLIB_NC;
RADIOLIB_PIN_TYPE _tx = RADIOLIB_NC;
SPISettings _spiSettings = SPISettings(2000000, MSBFIRST, SPI_MODE0);
bool _initInterface = false; bool _initInterface = false;
SPIClass* _spi = NULL; SPIClass* _spi = NULL;
SPISettings _spiSettings;
bool _useRfSwitch = false; bool _useRfSwitch = false;
RADIOLIB_PIN_TYPE _rxEn = RADIOLIB_NC, _txEn = RADIOLIB_NC; RADIOLIB_PIN_TYPE _rxEn = RADIOLIB_NC, _txEn = RADIOLIB_NC;