From f143fcd7a2d2e6f093cb11908ef72fc439a05987 Mon Sep 17 00:00:00 2001 From: Henrik Ekblad Date: Mon, 3 Nov 2014 20:08:56 +0100 Subject: [PATCH] Moved RFM69 library to utility --- libraries/MySensors/MyDriverRF69.cpp | 1 - libraries/MySensors/MyDriverRF69.h | 4 ++-- libraries/MySensors/{ => utility}/RFM69.cpp | 6 +++--- libraries/MySensors/{ => utility}/RFM69.h | 0 libraries/MySensors/{ => utility}/RFM69registers.h | 0 5 files changed, 5 insertions(+), 6 deletions(-) rename libraries/MySensors/{ => utility}/RFM69.cpp (99%) rename libraries/MySensors/{ => utility}/RFM69.h (100%) rename libraries/MySensors/{ => utility}/RFM69registers.h (100%) diff --git a/libraries/MySensors/MyDriverRF69.cpp b/libraries/MySensors/MyDriverRF69.cpp index 126e364..2363da7 100644 --- a/libraries/MySensors/MyDriverRF69.cpp +++ b/libraries/MySensors/MyDriverRF69.cpp @@ -1,4 +1,3 @@ -#include #include "MyDriver.h" #include "MyDriverRF69.h" diff --git a/libraries/MySensors/MyDriverRF69.h b/libraries/MySensors/MyDriverRF69.h index 4c53786..6b14772 100644 --- a/libraries/MySensors/MyDriverRF69.h +++ b/libraries/MySensors/MyDriverRF69.h @@ -4,7 +4,7 @@ #include "MyConfig.h" #include "MyDriver.h" #include -#include "RFM69.h" +#include "utility/RFM69.h" #include #define NODEID 2 //unique for each node on same network @@ -41,4 +41,4 @@ private: uint8_t _address; }; -#endif \ No newline at end of file +#endif diff --git a/libraries/MySensors/RFM69.cpp b/libraries/MySensors/utility/RFM69.cpp similarity index 99% rename from libraries/MySensors/RFM69.cpp rename to libraries/MySensors/utility/RFM69.cpp index 8b0305f..24bb2d3 100644 --- a/libraries/MySensors/RFM69.cpp +++ b/libraries/MySensors/utility/RFM69.cpp @@ -29,8 +29,8 @@ // Please maintain this license information along with authorship // and copyright notices in any redistribution of this code // ********************************************************************************** -#include -#include +#include "RFM69.h" +#include "RFM69registers.h" #include volatile byte RFM69::DATA[RF69_MAX_DATA_LEN]; @@ -461,4 +461,4 @@ void RFM69::rcCalibration() { writeReg(REG_OSC1, RF_OSC1_RCCAL_START); while ((readReg(REG_OSC1) & RF_OSC1_RCCAL_DONE) == 0x00); -} \ No newline at end of file +} diff --git a/libraries/MySensors/RFM69.h b/libraries/MySensors/utility/RFM69.h similarity index 100% rename from libraries/MySensors/RFM69.h rename to libraries/MySensors/utility/RFM69.h diff --git a/libraries/MySensors/RFM69registers.h b/libraries/MySensors/utility/RFM69registers.h similarity index 100% rename from libraries/MySensors/RFM69registers.h rename to libraries/MySensors/utility/RFM69registers.h