From c439b097d85e01e07650e752f46dee035612dc70 Mon Sep 17 00:00:00 2001
From: jgromes <jgromes@users.noreply.github.com>
Date: Sat, 4 Jul 2020 16:05:56 +0200
Subject: [PATCH] Switched to initializer lists

---
 src/Module.cpp | 89 +++++++++++++++++++++++++++-----------------------
 src/Module.h   |  7 ++--
 2 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/src/Module.cpp b/src/Module.cpp
index 218be4fa..ee9d00e3 100644
--- a/src/Module.cpp
+++ b/src/Module.cpp
@@ -1,35 +1,39 @@
 #include "Module.h"
 
-Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst) {
-  _cs = cs;
-  _rx = RADIOLIB_NC;
-  _tx = RADIOLIB_NC;
-  _irq = irq;
-  _rst = rst;
+Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst):
+  _cs(cs),
+  _irq(irq),
+  _rst(rst),
+  _rx(RADIOLIB_NC),
+  _tx(RADIOLIB_NC),
+  _spiSettings(SPISettings(2000000, MSBFIRST, SPI_MODE0))
+{
   _spi = &RADIOLIB_DEFAULT_SPI;
-  _spiSettings = SPISettings(2000000, MSBFIRST, SPI_MODE0);
   _initInterface = true;
   ModuleSerial = NULL;
 }
 
-Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE gpio) {
-  _cs = cs;
-  _rx = gpio;
-  _tx = RADIOLIB_NC;
-  _irq = irq;
-  _rst = rst;
+Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE gpio):
+  _cs(cs),
+  _irq(irq),
+  _rst(rst),
+  _rx(gpio),
+  _tx(RADIOLIB_NC),
+  _spiSettings(SPISettings(2000000, MSBFIRST, SPI_MODE0))
+{
   _spi = &RADIOLIB_DEFAULT_SPI;
-  _spiSettings = SPISettings(2000000, MSBFIRST, SPI_MODE0);
   _initInterface = true;
   ModuleSerial = NULL;
 }
 
-Module::Module(RADIOLIB_PIN_TYPE rx, RADIOLIB_PIN_TYPE tx, HardwareSerial* serial, RADIOLIB_PIN_TYPE rst) {
-  _cs = RADIOLIB_NC;
-  _rx = rx;
-  _tx = tx;
-  _irq = RADIOLIB_NC;
-  _rst = rst;
+Module::Module(RADIOLIB_PIN_TYPE rx, RADIOLIB_PIN_TYPE tx, HardwareSerial* serial, RADIOLIB_PIN_TYPE rst):
+  _cs(RADIOLIB_NC),
+  _irq(RADIOLIB_NC),
+  _rst(rst),
+  _rx(rx),
+  _tx(tx),
+  _spiSettings(SPISettings(2000000, MSBFIRST, SPI_MODE0))
+{
   _initInterface = true;
 
 #ifdef RADIOLIB_SOFTWARE_SERIAL_UNSUPPORTED
@@ -40,38 +44,41 @@ Module::Module(RADIOLIB_PIN_TYPE rx, RADIOLIB_PIN_TYPE tx, HardwareSerial* seria
 #endif
 }
 
-Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, SPIClass& spi, SPISettings spiSettings) {
-  _cs = cs;
-  _rx = RADIOLIB_NC;
-  _tx = RADIOLIB_NC;
-  _irq = irq;
-  _rst = rst;
+Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, SPIClass& spi, SPISettings spiSettings):
+  _cs(cs),
+  _irq(irq),
+  _rst(rst),
+  _rx(RADIOLIB_NC),
+  _tx(RADIOLIB_NC),
+  _spiSettings(spiSettings)
+{
   _spi = &spi;
-  _spiSettings = spiSettings;
   _initInterface = false;
   ModuleSerial = NULL;
 }
 
-Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE gpio, SPIClass& spi, SPISettings spiSettings) {
-  _cs = cs;
-  _rx = gpio;
-  _tx = RADIOLIB_NC;
-  _irq = irq;
-  _rst = rst;
+Module::Module(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE gpio, SPIClass& spi, SPISettings spiSettings):
+  _cs(cs),
+  _irq(irq),
+  _rst(rst),
+  _rx(gpio),
+  _tx(RADIOLIB_NC),
+  _spiSettings(spiSettings)
+{
   _spi = &spi;
-  _spiSettings = spiSettings;
   _initInterface = false;
   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) {
-  _cs = cs;
-  _rx = rx;
-  _tx = tx;
-  _irq = irq;
-  _rst = rst;
+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),
+  _irq(irq),
+  _rst(rst),
+  _rx(rx),
+  _tx(tx),
+  _spiSettings(spiSettings)
+{
   _spi = &spi;
-  _spiSettings = spiSettings;
   _initInterface = false;
 
 #ifdef RADIOLIB_SOFTWARE_SERIAL_UNSUPPORTED
diff --git a/src/Module.h b/src/Module.h
index ccc571c0..71b372eb 100644
--- a/src/Module.h
+++ b/src/Module.h
@@ -409,14 +409,15 @@ class Module {
   private:
 #endif
     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 _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;
     SPIClass* _spi = NULL;
-    SPISettings _spiSettings;
 
     bool _useRfSwitch = false;
     RADIOLIB_PIN_TYPE _rxEn = RADIOLIB_NC, _txEn = RADIOLIB_NC;