From b63d324c5017dbb9b87b32288671d8dbd1043f55 Mon Sep 17 00:00:00 2001 From: jgromes Date: Wed, 1 May 2019 14:23:36 +0200 Subject: [PATCH] Changed pin order in Module constructor --- src/Module.h | 5 ++++- src/RadioLib.cpp | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Module.h b/src/Module.h index 7ee55b0c..3bd2d49c 100644 --- a/src/Module.h +++ b/src/Module.h @@ -11,7 +11,7 @@ class Module { public: Module(int tx, int rx); Module(int cs, int int0, int int1, SPIClass& spi = SPI); - Module(int cs, int rx, int tx, int int0, int int1, SPIClass& spi = SPI); + Module(int cs, int int0, int int1, int rx, int tx, SPIClass& spi = SPI); SoftwareSerial* ModuleSerial; @@ -43,6 +43,9 @@ class Module { int getCs() const { return(_cs); } int getInt0() const { return(_int0); } int getInt1() const { return(_int1); } + int getRx() const { return(_rx); } + int getTx() const { return(_tx); } + SPIClass* getSpi() const { return(_spi); } private: int _cs; diff --git a/src/RadioLib.cpp b/src/RadioLib.cpp index dcbdb1f3..aa189c34 100644 --- a/src/RadioLib.cpp +++ b/src/RadioLib.cpp @@ -1,8 +1,8 @@ #include "RadioLib.h" Radio::Radio() { - ModuleA = new Module(RADIOSHIELD_CS_A, RADIOSHIELD_RX_A, RADIOSHIELD_TX_A, RADIOSHIELD_INT_0, RADIOSHIELD_INT_1); - ModuleB = new Module(RADIOSHIELD_CS_B, RADIOSHIELD_RX_B, RADIOSHIELD_TX_B, RADIOSHIELD_INT_0, RADIOSHIELD_INT_1); + ModuleA = new Module(RADIOSHIELD_CS_A, RADIOSHIELD_INT_0, RADIOSHIELD_INT_1, RADIOSHIELD_RX_A, RADIOSHIELD_TX_A); + ModuleB = new Module(RADIOSHIELD_CS_B, RADIOSHIELD_INT_0, RADIOSHIELD_INT_1, RADIOSHIELD_RX_B, RADIOSHIELD_TX_B); } Radio RadioShield;