From 71fcdba017db8bb36271c2268426f4d7d81afa15 Mon Sep 17 00:00:00 2001 From: geeksville Date: Fri, 1 May 2020 09:04:00 -0700 Subject: [PATCH] cleanup directory structure --- platformio.ini | 2 +- src/{rf95 => mesh}/FloodingRouter.cpp | 0 src/{rf95 => mesh}/FloodingRouter.h | 0 src/{rf95 => mesh}/MemoryPool.h | 0 src/{rf95 => mesh}/PointerQueue.h | 0 src/{rf95 => mesh}/RF95Interface.cpp | 0 src/{rf95 => mesh}/RF95Interface.h | 0 src/{rf95 => mesh}/RadioInterface.cpp | 0 src/{rf95 => mesh}/RadioInterface.h | 0 src/{rf95 => mesh}/RadioLibInterface.cpp | 0 src/{rf95 => mesh}/RadioLibInterface.h | 0 src/{rf95 => mesh}/RadioLibRF95.cpp | 0 src/{rf95 => mesh}/RadioLibRF95.h | 0 src/{rf95 => mesh}/Router.cpp | 0 src/{rf95 => mesh}/Router.h | 0 src/{rf95 => mesh}/SX1262Interface.cpp | 0 src/{rf95 => mesh}/SX1262Interface.h | 0 src/{rf95 => mesh}/TypedQueue.h | 0 src/rf95/LICENSE | 17 ----------------- src/rf95/README.md | 4 ---- src/rf95/kh-todo.txt | 22 ---------------------- 21 files changed, 1 insertion(+), 44 deletions(-) rename src/{rf95 => mesh}/FloodingRouter.cpp (100%) rename src/{rf95 => mesh}/FloodingRouter.h (100%) rename src/{rf95 => mesh}/MemoryPool.h (100%) rename src/{rf95 => mesh}/PointerQueue.h (100%) rename src/{rf95 => mesh}/RF95Interface.cpp (100%) rename src/{rf95 => mesh}/RF95Interface.h (100%) rename src/{rf95 => mesh}/RadioInterface.cpp (100%) rename src/{rf95 => mesh}/RadioInterface.h (100%) rename src/{rf95 => mesh}/RadioLibInterface.cpp (100%) rename src/{rf95 => mesh}/RadioLibInterface.h (100%) rename src/{rf95 => mesh}/RadioLibRF95.cpp (100%) rename src/{rf95 => mesh}/RadioLibRF95.h (100%) rename src/{rf95 => mesh}/Router.cpp (100%) rename src/{rf95 => mesh}/Router.h (100%) rename src/{rf95 => mesh}/SX1262Interface.cpp (100%) rename src/{rf95 => mesh}/SX1262Interface.h (100%) rename src/{rf95 => mesh}/TypedQueue.h (100%) delete mode 100644 src/rf95/LICENSE delete mode 100644 src/rf95/README.md delete mode 100644 src/rf95/kh-todo.txt diff --git a/platformio.ini b/platformio.ini index e543b06d..936a8e6c 100644 --- a/platformio.ini +++ b/platformio.ini @@ -31,7 +31,7 @@ board_build.partitions = partition-table.csv ; note: we add src to our include search path so that lmic_project_config can override ; FIXME: fix lib/BluetoothOTA dependency back on src/ so we can remove -Isrc -build_flags = -Wno-missing-field-initializers -Isrc -Isrc/rf95 -Isrc/mesh -Ilib/nanopb/include -Os -Wl,-Map,.pio/build/output.map +build_flags = -Wno-missing-field-initializers -Isrc -Isrc/mesh -Ilib/nanopb/include -Os -Wl,-Map,.pio/build/output.map -DAXP_DEBUG_PORT=Serial -DHW_VERSION_${sysenv.COUNTRY} -DAPP_VERSION=${sysenv.APP_VERSION} diff --git a/src/rf95/FloodingRouter.cpp b/src/mesh/FloodingRouter.cpp similarity index 100% rename from src/rf95/FloodingRouter.cpp rename to src/mesh/FloodingRouter.cpp diff --git a/src/rf95/FloodingRouter.h b/src/mesh/FloodingRouter.h similarity index 100% rename from src/rf95/FloodingRouter.h rename to src/mesh/FloodingRouter.h diff --git a/src/rf95/MemoryPool.h b/src/mesh/MemoryPool.h similarity index 100% rename from src/rf95/MemoryPool.h rename to src/mesh/MemoryPool.h diff --git a/src/rf95/PointerQueue.h b/src/mesh/PointerQueue.h similarity index 100% rename from src/rf95/PointerQueue.h rename to src/mesh/PointerQueue.h diff --git a/src/rf95/RF95Interface.cpp b/src/mesh/RF95Interface.cpp similarity index 100% rename from src/rf95/RF95Interface.cpp rename to src/mesh/RF95Interface.cpp diff --git a/src/rf95/RF95Interface.h b/src/mesh/RF95Interface.h similarity index 100% rename from src/rf95/RF95Interface.h rename to src/mesh/RF95Interface.h diff --git a/src/rf95/RadioInterface.cpp b/src/mesh/RadioInterface.cpp similarity index 100% rename from src/rf95/RadioInterface.cpp rename to src/mesh/RadioInterface.cpp diff --git a/src/rf95/RadioInterface.h b/src/mesh/RadioInterface.h similarity index 100% rename from src/rf95/RadioInterface.h rename to src/mesh/RadioInterface.h diff --git a/src/rf95/RadioLibInterface.cpp b/src/mesh/RadioLibInterface.cpp similarity index 100% rename from src/rf95/RadioLibInterface.cpp rename to src/mesh/RadioLibInterface.cpp diff --git a/src/rf95/RadioLibInterface.h b/src/mesh/RadioLibInterface.h similarity index 100% rename from src/rf95/RadioLibInterface.h rename to src/mesh/RadioLibInterface.h diff --git a/src/rf95/RadioLibRF95.cpp b/src/mesh/RadioLibRF95.cpp similarity index 100% rename from src/rf95/RadioLibRF95.cpp rename to src/mesh/RadioLibRF95.cpp diff --git a/src/rf95/RadioLibRF95.h b/src/mesh/RadioLibRF95.h similarity index 100% rename from src/rf95/RadioLibRF95.h rename to src/mesh/RadioLibRF95.h diff --git a/src/rf95/Router.cpp b/src/mesh/Router.cpp similarity index 100% rename from src/rf95/Router.cpp rename to src/mesh/Router.cpp diff --git a/src/rf95/Router.h b/src/mesh/Router.h similarity index 100% rename from src/rf95/Router.h rename to src/mesh/Router.h diff --git a/src/rf95/SX1262Interface.cpp b/src/mesh/SX1262Interface.cpp similarity index 100% rename from src/rf95/SX1262Interface.cpp rename to src/mesh/SX1262Interface.cpp diff --git a/src/rf95/SX1262Interface.h b/src/mesh/SX1262Interface.h similarity index 100% rename from src/rf95/SX1262Interface.h rename to src/mesh/SX1262Interface.h diff --git a/src/rf95/TypedQueue.h b/src/mesh/TypedQueue.h similarity index 100% rename from src/rf95/TypedQueue.h rename to src/mesh/TypedQueue.h diff --git a/src/rf95/LICENSE b/src/rf95/LICENSE deleted file mode 100644 index da124e12..00000000 --- a/src/rf95/LICENSE +++ /dev/null @@ -1,17 +0,0 @@ -This software is Copyright (C) 2008 Mike McCauley. Use is subject to license -conditions. The main licensing options available are GPL V2 or Commercial: - -Open Source Licensing GPL V2 - -This is the appropriate option if you want to share the source code of your -application with everyone you distribute it to, and you also want to give them -the right to share who uses it. If you wish to use this software under Open -Source Licensing, you must contribute all your source code to the open source -community in accordance with the GPL Version 2 when your application is -distributed. See http://www.gnu.org/copyleft/gpl.html - -Commercial Licensing - -This is the appropriate option if you are creating proprietary applications -and you are not prepared to distribute and share the source code of your -application. Contact info@open.com.au for details. diff --git a/src/rf95/README.md b/src/rf95/README.md deleted file mode 100644 index f6346e4a..00000000 --- a/src/rf95/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# RF95 - -This is a heavily modified version of the Mike McCauley's RadioHead RF95 driver. We are using it under the GPL V3 License. See the -file LICENSE for Mike's license terms (which listed GPL as acceptible). diff --git a/src/rf95/kh-todo.txt b/src/rf95/kh-todo.txt deleted file mode 100644 index 96664a2c..00000000 --- a/src/rf95/kh-todo.txt +++ /dev/null @@ -1,22 +0,0 @@ -In old lib code: -* pass header all the way down to device -* have device send header using the same code it uses to send payload -* have device treat received header as identical to payload -* use new MessageHeader in existing app (make sure it is packed properly) - -In the sudomesh code: -* move this rf95 lib into the layer2 project -* make RadioInterface the new layer one API (move over set radio options) -* change meshtastic app to use new layer one API - -Now meshtastic is sharing layer one with disaster radio. -* change mesthastic app to use new layer two API (make sure broadcast still works for max TTL of 1) - -Now meshtastic is sharing layer two with disaster radio. - -* make simulation code work with new API -* make disaster radio app work with new API - -later: -* implement naive flooding in the layer2 lib, use TTL limit max depth of broadcast -* allow packets to be filtered at the device level RX time based on dest addr (to avoid waking main CPU unnecessarily)