Reworked directory structure

zhgzhg · Nov 20, 2019 · a6c8135 · a6c8135
1 parent f0ee58f
commit a6c8135
Show file tree

Hide file tree

Showing 23 changed files with 38 additions and 39 deletions.
diff --git a/src/LoRaLib.h b/src/LoRaLib.h
@@ -23,17 +23,16 @@
  #warning "God mode active, I hope it was intentional. Buckle up, lads."
 #endif
 
-#include "modules/SX1272.h"
-#include "modules/SX1273.h"
-
-#include "modules/SX1278.h"
-#include "modules/SX1276.h"
-#include "modules/SX1277.h"
-#include "modules/SX1279.h"
-
-#include "modules/RFM95.h"
-#include "modules/RFM96.h"
-#include "modules/RFM97.h"
+#include "modules/SX127x/SX1272.h"
+#include "modules/SX127x/SX1273.h"
+#include "modules/SX127x/SX1278.h"
+#include "modules/SX127x/SX1276.h"
+#include "modules/SX127x/SX1277.h"
+#include "modules/SX127x/SX1279.h"
+
+#include "modules/RFM9x/RFM95.h"
+#include "modules/RFM9x/RFM96.h"
+#include "modules/RFM9x/RFM97.h"
 
 /*!
  \class LoRa

diff --git a/src/modules/RFM95.cpp → src/modules/RFM9x/RFM95.cpp b/src/modules/RFM95.cpp → src/modules/RFM9x/RFM95.cpp
diff --git a/src/modules/RFM95.h → src/modules/RFM9x/RFM95.h b/src/modules/RFM95.h → src/modules/RFM9x/RFM95.h
@@ -1,10 +1,10 @@
 #ifndef _RADIOLIB_RFM95_H
 #define _RADIOLIB_RFM95_H
 
-#include "TypeDef.h"
-#include "Module.h"
-#include "SX127x.h"
-#include "SX1278.h"
+#include "../../TypeDef.h"
+#include "../../Module.h"
+#include "../SX127x/SX127x.h"
+#include "../SX127x/SX1278.h"
 
 // SX127X_REG_VERSION
 #define RFM95_CHIP_VERSION 0x11
@@ -66,7 +66,7 @@ class RFM95: public SX1278 {
  \returns \ref status_codes
  */
  int16_t setFrequency(float freq);
- 
+
 #ifndef RADIOLIB_GODMODE
  private:
 #endif

diff --git a/src/modules/RFM96.cpp → src/modules/RFM9x/RFM96.cpp b/src/modules/RFM96.cpp → src/modules/RFM9x/RFM96.cpp
diff --git a/src/modules/RFM96.h → src/modules/RFM9x/RFM96.h b/src/modules/RFM96.h → src/modules/RFM9x/RFM96.h
@@ -1,10 +1,10 @@
 #ifndef _RADIOLIB_RFM96_H
 #define _RADIOLIB_RFM96_H
 
-#include "TypeDef.h"
-#include "Module.h"
-#include "SX127x.h"
-#include "SX1278.h"
+#include "../../TypeDef.h"
+#include "../../Module.h"
+#include "../SX127x/SX127x.h"
+#include "../SX127x/SX1278.h"
 
 // SX127X_REG_VERSION
 #define RFM9X_CHIP_VERSION 0x12 // according to datasheet, this should be 0x11, but all modules seem to have 0x12

diff --git a/src/modules/RFM97.cpp → src/modules/RFM9x/RFM97.cpp b/src/modules/RFM97.cpp → src/modules/RFM9x/RFM97.cpp
diff --git a/src/modules/RFM97.h → src/modules/RFM9x/RFM97.h b/src/modules/RFM97.h → src/modules/RFM9x/RFM97.h
@@ -1,10 +1,10 @@
 #ifndef _RADIOLIB_RFM97_H
 #define _RADIOLIB_RFM97_H
 
-#include "TypeDef.h"
-#include "Module.h"
-#include "SX127x.h"
-#include "SX1278.h"
+#include "../../TypeDef.h"
+#include "../../Module.h"
+#include "../SX127x/SX127x.h"
+#include "../SX127x/SX1278.h"
 #include "RFM95.h"
 
 /*!

diff --git a/src/modules/SX1272.cpp → src/modules/SX127x/SX1272.cpp b/src/modules/SX1272.cpp → src/modules/SX127x/SX1272.cpp
diff --git a/src/modules/SX1272.h → src/modules/SX127x/SX1272.h b/src/modules/SX1272.h → src/modules/SX127x/SX1272.h
@@ -1,8 +1,8 @@
 #ifndef _RADIOLIB_SX1272_H
 #define _RADIOLIB_SX1272_H
 
-#include "TypeDef.h"
-#include "Module.h"
+#include "../../TypeDef.h"
+#include "../../Module.h"
 #include "SX127x.h"
 
 // SX1272 specific register map
@@ -262,7 +262,7 @@ class SX1272: public SX127x {
 #ifndef RADIOLIB_GODMODE
  private:
 #endif
- 
+
 };
 
 #endif
diff --git a/src/modules/SX1273.cpp → src/modules/SX127x/SX1273.cpp b/src/modules/SX1273.cpp → src/modules/SX127x/SX1273.cpp
diff --git a/src/modules/SX1273.h → src/modules/SX127x/SX1273.h b/src/modules/SX1273.h → src/modules/SX127x/SX1273.h
@@ -1,7 +1,7 @@
 #ifndef _RADIOLIB_SX1273_H
 #define _RADIOLIB_SX1273_H
 
-#include "TypeDef.h"
+#include "../../TypeDef.h"
 #include "SX1272.h"
 
 /*!

diff --git a/src/modules/SX1276.cpp → src/modules/SX127x/SX1276.cpp b/src/modules/SX1276.cpp → src/modules/SX127x/SX1276.cpp
diff --git a/src/modules/SX1276.h → src/modules/SX127x/SX1276.h b/src/modules/SX1276.h → src/modules/SX127x/SX1276.h
@@ -1,7 +1,7 @@
 #ifndef _RADIOLIB_SX1276_H
 #define _RADIOLIB_SX1276_H
 
-#include "TypeDef.h"
+#include "../../TypeDef.h"
 #include "SX1278.h"
 
 /*!

diff --git a/src/modules/SX1277.cpp → src/modules/SX127x/SX1277.cpp b/src/modules/SX1277.cpp → src/modules/SX127x/SX1277.cpp
diff --git a/src/modules/SX1277.h → src/modules/SX127x/SX1277.h b/src/modules/SX1277.h → src/modules/SX127x/SX1277.h
@@ -1,7 +1,7 @@
 #ifndef _RADIOLIB_SX1277_H
 #define _RADIOLIB_SX1277_H
 
-#include "TypeDef.h"
+#include "../../TypeDef.h"
 #include "SX1278.h"
 
 /*!

diff --git a/src/modules/SX1278.cpp → src/modules/SX127x/SX1278.cpp b/src/modules/SX1278.cpp → src/modules/SX127x/SX1278.cpp
diff --git a/src/modules/SX1278.h → src/modules/SX127x/SX1278.h b/src/modules/SX1278.h → src/modules/SX127x/SX1278.h
@@ -1,8 +1,8 @@
 #ifndef _RADIOLIB_SX1278_H
 #define _RADIOLIB_SX1278_H
 
-#include "TypeDef.h"
-#include "Module.h"
+#include "../../TypeDef.h"
+#include "../../Module.h"
 #include "SX127x.h"
 
 // SX1278 specific register map
@@ -271,7 +271,7 @@ class SX1278: public SX127x {
 #ifndef RADIOLIB_GODMODE
  private:
 #endif
- 
+
 };
 
 #endif
diff --git a/src/modules/SX1279.cpp → src/modules/SX127x/SX1279.cpp b/src/modules/SX1279.cpp → src/modules/SX127x/SX1279.cpp
diff --git a/src/modules/SX1279.h → src/modules/SX127x/SX1279.h b/src/modules/SX1279.h → src/modules/SX127x/SX1279.h
@@ -1,7 +1,7 @@
 #ifndef _RADIOLIB_SX1279_H
 #define _RADIOLIB_SX1279_H
 
-#include "TypeDef.h"
+#include "../../TypeDef.h"
 #include "SX1278.h"
 
 /*!
@@ -65,7 +65,7 @@ class SX1279: public SX1278 {
 #ifndef RADIOLIB_GODMODE
  private:
 #endif
- 
+
 };
 
 #endif
diff --git a/src/modules/SX127x.cpp → src/modules/SX127x/SX127x.cpp b/src/modules/SX127x.cpp → src/modules/SX127x/SX127x.cpp
diff --git a/src/modules/SX127x.h → src/modules/SX127x/SX127x.h b/src/modules/SX127x.h → src/modules/SX127x/SX127x.h
@@ -1,10 +1,10 @@
 #ifndef _RADIOLIB_SX127X_H
 #define _RADIOLIB_SX127X_H
 
-#include "TypeDef.h"
-#include "Module.h"
+#include "../../TypeDef.h"
+#include "../../Module.h"
 
-#include "../protocols/PhysicalLayer.h"
+#include "../../protocols/PhysicalLayer/PhysicalLayer.h"
 
 // SX127x physical layer properties
 #define SX127X_CRYSTAL_FREQ 32.0

diff --git a/src/protocols/PhysicalLayer.cpp → ...protocols/PhysicalLayer/PhysicalLayer.cpp b/src/protocols/PhysicalLayer.cpp → ...protocols/PhysicalLayer/PhysicalLayer.cpp
diff --git a/src/protocols/PhysicalLayer.h → src/protocols/PhysicalLayer/PhysicalLayer.h b/src/protocols/PhysicalLayer.h → src/protocols/PhysicalLayer/PhysicalLayer.h
@@ -1,7 +1,7 @@
 #ifndef _RADIOLIB_PHYSICAL_LAYER_H
 #define _RADIOLIB_PHYSICAL_LAYER_H
 
-#include "TypeDef.h"
+#include "../../TypeDef.h"
 
 /*!
  \class PhysicalLayer