From da9fd2a11b505c011d5f7a9a9711e5abb63fba5e Mon Sep 17 00:00:00 2001 From: Ashok Rao Date: Mon, 10 Aug 2020 10:17:42 +0100 Subject: [PATCH 1/7] Mbed OS will soon be changing directory structure to the below: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` connectivity ├── netsocket ├── lorawan │ ├── mbed_lib.json // nanostack-interface's mbed_lib.json │ ├── lorastack │ ├── tests ├── nanostack ├── cellular ├── ... ``` This PR is a part of a wider \connectivity refactoring and implements the above new directory structure for \lorawan. --- LICENSE.md | 2 +- UNITTESTS/CMakeLists.txt | 10 +++++----- {features => connectivity}/lorawan/FSB_Usage.txt | 0 {features => connectivity}/lorawan/LICENSE | 0 {features => connectivity}/lorawan/LoRaRadio.h | 0 {features => connectivity}/lorawan/LoRaWANBase.h | 0 .../lorawan/LoRaWANInterface.cpp | 0 {features => connectivity}/lorawan/LoRaWANInterface.h | 0 {features => connectivity}/lorawan/LoRaWANStack.cpp | 0 {features => connectivity}/lorawan/LoRaWANStack.h | 0 .../lorawan/lorastack/mac/LoRaMac.cpp | 0 .../lorawan/lorastack/mac/LoRaMac.h | 0 .../lorawan/lorastack/mac/LoRaMacChannelPlan.cpp | 0 .../lorawan/lorastack/mac/LoRaMacChannelPlan.h | 0 .../lorawan/lorastack/mac/LoRaMacCommand.cpp | 0 .../lorawan/lorastack/mac/LoRaMacCommand.h | 0 .../lorawan/lorastack/mac/LoRaMacCrypto.cpp | 0 .../lorawan/lorastack/mac/LoRaMacCrypto.h | 0 .../lorawan/lorastack/phy/LoRaPHY.cpp | 0 .../lorawan/lorastack/phy/LoRaPHY.h | 0 .../lorawan/lorastack/phy/LoRaPHYAS923.cpp | 0 .../lorawan/lorastack/phy/LoRaPHYAS923.h | 0 .../lorawan/lorastack/phy/LoRaPHYAU915.cpp | 0 .../lorawan/lorastack/phy/LoRaPHYAU915.h | 0 .../lorawan/lorastack/phy/LoRaPHYCN470.cpp | 0 .../lorawan/lorastack/phy/LoRaPHYCN470.h | 0 .../lorawan/lorastack/phy/LoRaPHYCN779.cpp | 0 .../lorawan/lorastack/phy/LoRaPHYCN779.h | 0 .../lorawan/lorastack/phy/LoRaPHYEU433.cpp | 0 .../lorawan/lorastack/phy/LoRaPHYEU433.h | 0 .../lorawan/lorastack/phy/LoRaPHYEU868.cpp | 0 .../lorawan/lorastack/phy/LoRaPHYEU868.h | 0 .../lorawan/lorastack/phy/LoRaPHYIN865.cpp | 0 .../lorawan/lorastack/phy/LoRaPHYIN865.h | 0 .../lorawan/lorastack/phy/LoRaPHYKR920.cpp | 0 .../lorawan/lorastack/phy/LoRaPHYKR920.h | 0 .../lorawan/lorastack/phy/LoRaPHYUS915.cpp | 0 .../lorawan/lorastack/phy/LoRaPHYUS915.h | 0 .../lorawan/lorastack/phy/lora_phy_ds.h | 0 .../lorawan/lorastack/phy/loraphy_target.h | 0 {features => connectivity}/lorawan/lorawan_types.h | 0 {features => connectivity}/lorawan/mbed_lib.json | 0 .../lorawan/system/LoRaWANTimer.cpp | 0 .../lorawan/system/LoRaWANTimer.h | 0 .../lorawan/system/lorawan_data_structures.h | 0 .../lorawan/tests/TESTS}/lorawan/loraradio/README.md | 0 .../lorawan/tests/TESTS}/lorawan/loraradio/main.cpp | 0 .../TESTS}/lorawan/loraradio/template_mbed_app.txt | 0 .../features/lorawan/loramac/Test_LoRaMac.cpp | 0 .../UNITTESTS}/features/lorawan/loramac/unittest.cmake | 0 .../loramacchannelplan/Test_LoRaMacChannelPlan.cpp | 0 .../features/lorawan/loramacchannelplan/unittest.cmake | 0 .../lorawan/loramaccommand/Test_LoRaMacCommand.cpp | 0 .../features/lorawan/loramaccommand/unittest.cmake | 0 .../lorawan/loramaccrypto/Test_LoRaMacCrypto.cpp | 0 .../features/lorawan/loramaccrypto/unittest.cmake | 0 .../features/lorawan/loraphy/Test_LoRaPHY.cpp | 0 .../UNITTESTS}/features/lorawan/loraphy/unittest.cmake | 0 .../lorawan/loraphyas923/Test_LoRaPHYAS923.cpp | 0 .../features/lorawan/loraphyas923/unittest.cmake | 0 .../lorawan/loraphyau915/Test_LoRaPHYAU915.cpp | 0 .../features/lorawan/loraphyau915/unittest.cmake | 0 .../lorawan/loraphycn470/Test_LoRaPHYCN470.cpp | 0 .../features/lorawan/loraphycn470/unittest.cmake | 0 .../lorawan/loraphycn779/Test_LoRaPHYCN779.cpp | 0 .../features/lorawan/loraphycn779/unittest.cmake | 0 .../lorawan/loraphyeu433/Test_LoRaPHYEU433.cpp | 0 .../features/lorawan/loraphyeu433/unittest.cmake | 0 .../lorawan/loraphyeu868/Test_LoRaPHYEU868.cpp | 0 .../features/lorawan/loraphyeu868/unittest.cmake | 0 .../lorawan/loraphyin865/Test_LoRaPHYIN865.cpp | 0 .../features/lorawan/loraphyin865/unittest.cmake | 0 .../lorawan/loraphykr920/Test_LoRaPHYKR920.cpp | 0 .../features/lorawan/loraphykr920/unittest.cmake | 0 .../lorawan/loraphyus915/Test_LoRaPHYUS915.cpp | 0 .../features/lorawan/loraphyus915/unittest.cmake | 0 .../lorawan/lorawaninterface/Test_LoRaWANInterface.cpp | 0 .../features/lorawan/lorawaninterface/unittest.cmake | 0 .../lorawan/lorawanstack/Test_LoRaWANStack.cpp | 0 .../features/lorawan/lorawanstack/unittest.cmake | 0 .../lorawan/lorawantimer/Test_LoRaWANTimer.cpp | 0 .../features/lorawan/lorawantimer/unittest.cmake | 0 82 files changed, 6 insertions(+), 6 deletions(-) rename {features => connectivity}/lorawan/FSB_Usage.txt (100%) rename {features => connectivity}/lorawan/LICENSE (100%) rename {features => connectivity}/lorawan/LoRaRadio.h (100%) rename {features => connectivity}/lorawan/LoRaWANBase.h (100%) rename {features => connectivity}/lorawan/LoRaWANInterface.cpp (100%) rename {features => connectivity}/lorawan/LoRaWANInterface.h (100%) rename {features => connectivity}/lorawan/LoRaWANStack.cpp (100%) rename {features => connectivity}/lorawan/LoRaWANStack.h (100%) rename {features => connectivity}/lorawan/lorastack/mac/LoRaMac.cpp (100%) rename {features => connectivity}/lorawan/lorastack/mac/LoRaMac.h (100%) rename {features => connectivity}/lorawan/lorastack/mac/LoRaMacChannelPlan.cpp (100%) rename {features => connectivity}/lorawan/lorastack/mac/LoRaMacChannelPlan.h (100%) rename {features => connectivity}/lorawan/lorastack/mac/LoRaMacCommand.cpp (100%) rename {features => connectivity}/lorawan/lorastack/mac/LoRaMacCommand.h (100%) rename {features => connectivity}/lorawan/lorastack/mac/LoRaMacCrypto.cpp (100%) rename {features => connectivity}/lorawan/lorastack/mac/LoRaMacCrypto.h (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHY.cpp (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHY.h (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYAS923.cpp (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYAS923.h (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYAU915.cpp (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYAU915.h (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYCN470.cpp (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYCN470.h (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYCN779.cpp (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYCN779.h (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYEU433.cpp (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYEU433.h (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYEU868.cpp (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYEU868.h (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYIN865.cpp (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYIN865.h (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYKR920.cpp (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYKR920.h (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYUS915.cpp (100%) rename {features => connectivity}/lorawan/lorastack/phy/LoRaPHYUS915.h (100%) rename {features => connectivity}/lorawan/lorastack/phy/lora_phy_ds.h (100%) rename {features => connectivity}/lorawan/lorastack/phy/loraphy_target.h (100%) rename {features => connectivity}/lorawan/lorawan_types.h (100%) rename {features => connectivity}/lorawan/mbed_lib.json (100%) rename {features => connectivity}/lorawan/system/LoRaWANTimer.cpp (100%) rename {features => connectivity}/lorawan/system/LoRaWANTimer.h (100%) rename {features => connectivity}/lorawan/system/lorawan_data_structures.h (100%) rename {TESTS => connectivity/lorawan/tests/TESTS}/lorawan/loraradio/README.md (100%) rename {TESTS => connectivity/lorawan/tests/TESTS}/lorawan/loraradio/main.cpp (100%) rename {TESTS => connectivity/lorawan/tests/TESTS}/lorawan/loraradio/template_mbed_app.txt (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loramac/Test_LoRaMac.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loramac/unittest.cmake (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loramacchannelplan/Test_LoRaMacChannelPlan.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loramacchannelplan/unittest.cmake (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loramaccommand/Test_LoRaMacCommand.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loramaccommand/unittest.cmake (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loramaccrypto/Test_LoRaMacCrypto.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loramaccrypto/unittest.cmake (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphy/Test_LoRaPHY.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphy/unittest.cmake (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphyas923/Test_LoRaPHYAS923.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphyas923/unittest.cmake (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphyau915/Test_LoRaPHYAU915.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphyau915/unittest.cmake (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphycn470/Test_LoRaPHYCN470.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphycn470/unittest.cmake (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphycn779/Test_LoRaPHYCN779.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphycn779/unittest.cmake (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphyeu433/Test_LoRaPHYEU433.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphyeu433/unittest.cmake (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphyeu868/Test_LoRaPHYEU868.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphyeu868/unittest.cmake (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphyin865/Test_LoRaPHYIN865.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphyin865/unittest.cmake (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphykr920/Test_LoRaPHYKR920.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphykr920/unittest.cmake (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphyus915/Test_LoRaPHYUS915.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/loraphyus915/unittest.cmake (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/lorawaninterface/Test_LoRaWANInterface.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/lorawaninterface/unittest.cmake (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/lorawanstack/Test_LoRaWANStack.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/lorawanstack/unittest.cmake (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/lorawantimer/Test_LoRaWANTimer.cpp (100%) rename {UNITTESTS => connectivity/lorawan/tests/UNITTESTS}/features/lorawan/lorawantimer/unittest.cmake (100%) diff --git a/LICENSE.md b/LICENSE.md index 6a5d58ce557..26f2e47a9af 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -12,7 +12,7 @@ Folders containing files under different permissive license than Apache 2.0 are - [features/FEATURE_PSA/FEATURE_TFM](./features/FEATURE_PSA/FEATURE_TFM) - BSD-3-Clause - [features/FEATURE_PSA/FEATURE_MBED_PSA_SRV/services/attestation](./features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation) - BSD-3-Clause - [features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/qcbor](./features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/qcbor) - BSD-3-Clause -- [features/lorawan](./features/lorawan) - Revised BSD +- [connectivity/lorawan](./features/lorawan) - Revised BSD - [connectivity/lwipstack](./connectivity/lwipstack) - BSD-style, MIT-style - [connectivity/nanostack/sal-stack-nanostack](./connectivity/nanostack/sal-stack-nanostack) - BSD-3-Clause - [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt index 77e7f8f4597..e54d21a190d 100644 --- a/UNITTESTS/CMakeLists.txt +++ b/UNITTESTS/CMakeLists.txt @@ -146,11 +146,11 @@ set(unittest-includes-base "${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/device" "${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework" "${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/common" - "${PROJECT_SOURCE_DIR}/../features/lorawan" - "${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack" - "${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack/mac" - "${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack/phy" - "${PROJECT_SOURCE_DIR}/../features/lorawan/system" + "${PROJECT_SOURCE_DIR}/../connectivity/lorawan" + "${PROJECT_SOURCE_DIR}/../connectivity/lorawan/lorastack" + "${PROJECT_SOURCE_DIR}/../connectivity/lorawan/lorastack/mac" + "${PROJECT_SOURCE_DIR}/../connectivity/lorawan/lorastack/phy" + "${PROJECT_SOURCE_DIR}/../connectivity/lorawan/system" "${PROJECT_SOURCE_DIR}/../connectivity/mbedtls" "${PROJECT_SOURCE_DIR}/../connectivity/mbedtls/include" ) diff --git a/features/lorawan/FSB_Usage.txt b/connectivity/lorawan/FSB_Usage.txt similarity index 100% rename from features/lorawan/FSB_Usage.txt rename to connectivity/lorawan/FSB_Usage.txt diff --git a/features/lorawan/LICENSE b/connectivity/lorawan/LICENSE similarity index 100% rename from features/lorawan/LICENSE rename to connectivity/lorawan/LICENSE diff --git a/features/lorawan/LoRaRadio.h b/connectivity/lorawan/LoRaRadio.h similarity index 100% rename from features/lorawan/LoRaRadio.h rename to connectivity/lorawan/LoRaRadio.h diff --git a/features/lorawan/LoRaWANBase.h b/connectivity/lorawan/LoRaWANBase.h similarity index 100% rename from features/lorawan/LoRaWANBase.h rename to connectivity/lorawan/LoRaWANBase.h diff --git a/features/lorawan/LoRaWANInterface.cpp b/connectivity/lorawan/LoRaWANInterface.cpp similarity index 100% rename from features/lorawan/LoRaWANInterface.cpp rename to connectivity/lorawan/LoRaWANInterface.cpp diff --git a/features/lorawan/LoRaWANInterface.h b/connectivity/lorawan/LoRaWANInterface.h similarity index 100% rename from features/lorawan/LoRaWANInterface.h rename to connectivity/lorawan/LoRaWANInterface.h diff --git a/features/lorawan/LoRaWANStack.cpp b/connectivity/lorawan/LoRaWANStack.cpp similarity index 100% rename from features/lorawan/LoRaWANStack.cpp rename to connectivity/lorawan/LoRaWANStack.cpp diff --git a/features/lorawan/LoRaWANStack.h b/connectivity/lorawan/LoRaWANStack.h similarity index 100% rename from features/lorawan/LoRaWANStack.h rename to connectivity/lorawan/LoRaWANStack.h diff --git a/features/lorawan/lorastack/mac/LoRaMac.cpp b/connectivity/lorawan/lorastack/mac/LoRaMac.cpp similarity index 100% rename from features/lorawan/lorastack/mac/LoRaMac.cpp rename to connectivity/lorawan/lorastack/mac/LoRaMac.cpp diff --git a/features/lorawan/lorastack/mac/LoRaMac.h b/connectivity/lorawan/lorastack/mac/LoRaMac.h similarity index 100% rename from features/lorawan/lorastack/mac/LoRaMac.h rename to connectivity/lorawan/lorastack/mac/LoRaMac.h diff --git a/features/lorawan/lorastack/mac/LoRaMacChannelPlan.cpp b/connectivity/lorawan/lorastack/mac/LoRaMacChannelPlan.cpp similarity index 100% rename from features/lorawan/lorastack/mac/LoRaMacChannelPlan.cpp rename to connectivity/lorawan/lorastack/mac/LoRaMacChannelPlan.cpp diff --git a/features/lorawan/lorastack/mac/LoRaMacChannelPlan.h b/connectivity/lorawan/lorastack/mac/LoRaMacChannelPlan.h similarity index 100% rename from features/lorawan/lorastack/mac/LoRaMacChannelPlan.h rename to connectivity/lorawan/lorastack/mac/LoRaMacChannelPlan.h diff --git a/features/lorawan/lorastack/mac/LoRaMacCommand.cpp b/connectivity/lorawan/lorastack/mac/LoRaMacCommand.cpp similarity index 100% rename from features/lorawan/lorastack/mac/LoRaMacCommand.cpp rename to connectivity/lorawan/lorastack/mac/LoRaMacCommand.cpp diff --git a/features/lorawan/lorastack/mac/LoRaMacCommand.h b/connectivity/lorawan/lorastack/mac/LoRaMacCommand.h similarity index 100% rename from features/lorawan/lorastack/mac/LoRaMacCommand.h rename to connectivity/lorawan/lorastack/mac/LoRaMacCommand.h diff --git a/features/lorawan/lorastack/mac/LoRaMacCrypto.cpp b/connectivity/lorawan/lorastack/mac/LoRaMacCrypto.cpp similarity index 100% rename from features/lorawan/lorastack/mac/LoRaMacCrypto.cpp rename to connectivity/lorawan/lorastack/mac/LoRaMacCrypto.cpp diff --git a/features/lorawan/lorastack/mac/LoRaMacCrypto.h b/connectivity/lorawan/lorastack/mac/LoRaMacCrypto.h similarity index 100% rename from features/lorawan/lorastack/mac/LoRaMacCrypto.h rename to connectivity/lorawan/lorastack/mac/LoRaMacCrypto.h diff --git a/features/lorawan/lorastack/phy/LoRaPHY.cpp b/connectivity/lorawan/lorastack/phy/LoRaPHY.cpp similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHY.cpp rename to connectivity/lorawan/lorastack/phy/LoRaPHY.cpp diff --git a/features/lorawan/lorastack/phy/LoRaPHY.h b/connectivity/lorawan/lorastack/phy/LoRaPHY.h similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHY.h rename to connectivity/lorawan/lorastack/phy/LoRaPHY.h diff --git a/features/lorawan/lorastack/phy/LoRaPHYAS923.cpp b/connectivity/lorawan/lorastack/phy/LoRaPHYAS923.cpp similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYAS923.cpp rename to connectivity/lorawan/lorastack/phy/LoRaPHYAS923.cpp diff --git a/features/lorawan/lorastack/phy/LoRaPHYAS923.h b/connectivity/lorawan/lorastack/phy/LoRaPHYAS923.h similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYAS923.h rename to connectivity/lorawan/lorastack/phy/LoRaPHYAS923.h diff --git a/features/lorawan/lorastack/phy/LoRaPHYAU915.cpp b/connectivity/lorawan/lorastack/phy/LoRaPHYAU915.cpp similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYAU915.cpp rename to connectivity/lorawan/lorastack/phy/LoRaPHYAU915.cpp diff --git a/features/lorawan/lorastack/phy/LoRaPHYAU915.h b/connectivity/lorawan/lorastack/phy/LoRaPHYAU915.h similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYAU915.h rename to connectivity/lorawan/lorastack/phy/LoRaPHYAU915.h diff --git a/features/lorawan/lorastack/phy/LoRaPHYCN470.cpp b/connectivity/lorawan/lorastack/phy/LoRaPHYCN470.cpp similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYCN470.cpp rename to connectivity/lorawan/lorastack/phy/LoRaPHYCN470.cpp diff --git a/features/lorawan/lorastack/phy/LoRaPHYCN470.h b/connectivity/lorawan/lorastack/phy/LoRaPHYCN470.h similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYCN470.h rename to connectivity/lorawan/lorastack/phy/LoRaPHYCN470.h diff --git a/features/lorawan/lorastack/phy/LoRaPHYCN779.cpp b/connectivity/lorawan/lorastack/phy/LoRaPHYCN779.cpp similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYCN779.cpp rename to connectivity/lorawan/lorastack/phy/LoRaPHYCN779.cpp diff --git a/features/lorawan/lorastack/phy/LoRaPHYCN779.h b/connectivity/lorawan/lorastack/phy/LoRaPHYCN779.h similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYCN779.h rename to connectivity/lorawan/lorastack/phy/LoRaPHYCN779.h diff --git a/features/lorawan/lorastack/phy/LoRaPHYEU433.cpp b/connectivity/lorawan/lorastack/phy/LoRaPHYEU433.cpp similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYEU433.cpp rename to connectivity/lorawan/lorastack/phy/LoRaPHYEU433.cpp diff --git a/features/lorawan/lorastack/phy/LoRaPHYEU433.h b/connectivity/lorawan/lorastack/phy/LoRaPHYEU433.h similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYEU433.h rename to connectivity/lorawan/lorastack/phy/LoRaPHYEU433.h diff --git a/features/lorawan/lorastack/phy/LoRaPHYEU868.cpp b/connectivity/lorawan/lorastack/phy/LoRaPHYEU868.cpp similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYEU868.cpp rename to connectivity/lorawan/lorastack/phy/LoRaPHYEU868.cpp diff --git a/features/lorawan/lorastack/phy/LoRaPHYEU868.h b/connectivity/lorawan/lorastack/phy/LoRaPHYEU868.h similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYEU868.h rename to connectivity/lorawan/lorastack/phy/LoRaPHYEU868.h diff --git a/features/lorawan/lorastack/phy/LoRaPHYIN865.cpp b/connectivity/lorawan/lorastack/phy/LoRaPHYIN865.cpp similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYIN865.cpp rename to connectivity/lorawan/lorastack/phy/LoRaPHYIN865.cpp diff --git a/features/lorawan/lorastack/phy/LoRaPHYIN865.h b/connectivity/lorawan/lorastack/phy/LoRaPHYIN865.h similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYIN865.h rename to connectivity/lorawan/lorastack/phy/LoRaPHYIN865.h diff --git a/features/lorawan/lorastack/phy/LoRaPHYKR920.cpp b/connectivity/lorawan/lorastack/phy/LoRaPHYKR920.cpp similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYKR920.cpp rename to connectivity/lorawan/lorastack/phy/LoRaPHYKR920.cpp diff --git a/features/lorawan/lorastack/phy/LoRaPHYKR920.h b/connectivity/lorawan/lorastack/phy/LoRaPHYKR920.h similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYKR920.h rename to connectivity/lorawan/lorastack/phy/LoRaPHYKR920.h diff --git a/features/lorawan/lorastack/phy/LoRaPHYUS915.cpp b/connectivity/lorawan/lorastack/phy/LoRaPHYUS915.cpp similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYUS915.cpp rename to connectivity/lorawan/lorastack/phy/LoRaPHYUS915.cpp diff --git a/features/lorawan/lorastack/phy/LoRaPHYUS915.h b/connectivity/lorawan/lorastack/phy/LoRaPHYUS915.h similarity index 100% rename from features/lorawan/lorastack/phy/LoRaPHYUS915.h rename to connectivity/lorawan/lorastack/phy/LoRaPHYUS915.h diff --git a/features/lorawan/lorastack/phy/lora_phy_ds.h b/connectivity/lorawan/lorastack/phy/lora_phy_ds.h similarity index 100% rename from features/lorawan/lorastack/phy/lora_phy_ds.h rename to connectivity/lorawan/lorastack/phy/lora_phy_ds.h diff --git a/features/lorawan/lorastack/phy/loraphy_target.h b/connectivity/lorawan/lorastack/phy/loraphy_target.h similarity index 100% rename from features/lorawan/lorastack/phy/loraphy_target.h rename to connectivity/lorawan/lorastack/phy/loraphy_target.h diff --git a/features/lorawan/lorawan_types.h b/connectivity/lorawan/lorawan_types.h similarity index 100% rename from features/lorawan/lorawan_types.h rename to connectivity/lorawan/lorawan_types.h diff --git a/features/lorawan/mbed_lib.json b/connectivity/lorawan/mbed_lib.json similarity index 100% rename from features/lorawan/mbed_lib.json rename to connectivity/lorawan/mbed_lib.json diff --git a/features/lorawan/system/LoRaWANTimer.cpp b/connectivity/lorawan/system/LoRaWANTimer.cpp similarity index 100% rename from features/lorawan/system/LoRaWANTimer.cpp rename to connectivity/lorawan/system/LoRaWANTimer.cpp diff --git a/features/lorawan/system/LoRaWANTimer.h b/connectivity/lorawan/system/LoRaWANTimer.h similarity index 100% rename from features/lorawan/system/LoRaWANTimer.h rename to connectivity/lorawan/system/LoRaWANTimer.h diff --git a/features/lorawan/system/lorawan_data_structures.h b/connectivity/lorawan/system/lorawan_data_structures.h similarity index 100% rename from features/lorawan/system/lorawan_data_structures.h rename to connectivity/lorawan/system/lorawan_data_structures.h diff --git a/TESTS/lorawan/loraradio/README.md b/connectivity/lorawan/tests/TESTS/lorawan/loraradio/README.md similarity index 100% rename from TESTS/lorawan/loraradio/README.md rename to connectivity/lorawan/tests/TESTS/lorawan/loraradio/README.md diff --git a/TESTS/lorawan/loraradio/main.cpp b/connectivity/lorawan/tests/TESTS/lorawan/loraradio/main.cpp similarity index 100% rename from TESTS/lorawan/loraradio/main.cpp rename to connectivity/lorawan/tests/TESTS/lorawan/loraradio/main.cpp diff --git a/TESTS/lorawan/loraradio/template_mbed_app.txt b/connectivity/lorawan/tests/TESTS/lorawan/loraradio/template_mbed_app.txt similarity index 100% rename from TESTS/lorawan/loraradio/template_mbed_app.txt rename to connectivity/lorawan/tests/TESTS/lorawan/loraradio/template_mbed_app.txt diff --git a/UNITTESTS/features/lorawan/loramac/Test_LoRaMac.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/Test_LoRaMac.cpp similarity index 100% rename from UNITTESTS/features/lorawan/loramac/Test_LoRaMac.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/Test_LoRaMac.cpp diff --git a/UNITTESTS/features/lorawan/loramac/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/loramac/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/unittest.cmake diff --git a/UNITTESTS/features/lorawan/loramacchannelplan/Test_LoRaMacChannelPlan.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/Test_LoRaMacChannelPlan.cpp similarity index 100% rename from UNITTESTS/features/lorawan/loramacchannelplan/Test_LoRaMacChannelPlan.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/Test_LoRaMacChannelPlan.cpp diff --git a/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake diff --git a/UNITTESTS/features/lorawan/loramaccommand/Test_LoRaMacCommand.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/Test_LoRaMacCommand.cpp similarity index 100% rename from UNITTESTS/features/lorawan/loramaccommand/Test_LoRaMacCommand.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/Test_LoRaMacCommand.cpp diff --git a/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/loramaccommand/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake diff --git a/UNITTESTS/features/lorawan/loramaccrypto/Test_LoRaMacCrypto.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/Test_LoRaMacCrypto.cpp similarity index 100% rename from UNITTESTS/features/lorawan/loramaccrypto/Test_LoRaMacCrypto.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/Test_LoRaMacCrypto.cpp diff --git a/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake diff --git a/UNITTESTS/features/lorawan/loraphy/Test_LoRaPHY.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/Test_LoRaPHY.cpp similarity index 100% rename from UNITTESTS/features/lorawan/loraphy/Test_LoRaPHY.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/Test_LoRaPHY.cpp diff --git a/UNITTESTS/features/lorawan/loraphy/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/loraphy/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/unittest.cmake diff --git a/UNITTESTS/features/lorawan/loraphyas923/Test_LoRaPHYAS923.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/Test_LoRaPHYAS923.cpp similarity index 100% rename from UNITTESTS/features/lorawan/loraphyas923/Test_LoRaPHYAS923.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/Test_LoRaPHYAS923.cpp diff --git a/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/loraphyas923/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake diff --git a/UNITTESTS/features/lorawan/loraphyau915/Test_LoRaPHYAU915.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/Test_LoRaPHYAU915.cpp similarity index 100% rename from UNITTESTS/features/lorawan/loraphyau915/Test_LoRaPHYAU915.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/Test_LoRaPHYAU915.cpp diff --git a/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/loraphyau915/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake diff --git a/UNITTESTS/features/lorawan/loraphycn470/Test_LoRaPHYCN470.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/Test_LoRaPHYCN470.cpp similarity index 100% rename from UNITTESTS/features/lorawan/loraphycn470/Test_LoRaPHYCN470.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/Test_LoRaPHYCN470.cpp diff --git a/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/loraphycn470/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake diff --git a/UNITTESTS/features/lorawan/loraphycn779/Test_LoRaPHYCN779.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/Test_LoRaPHYCN779.cpp similarity index 100% rename from UNITTESTS/features/lorawan/loraphycn779/Test_LoRaPHYCN779.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/Test_LoRaPHYCN779.cpp diff --git a/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/loraphycn779/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake diff --git a/UNITTESTS/features/lorawan/loraphyeu433/Test_LoRaPHYEU433.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/Test_LoRaPHYEU433.cpp similarity index 100% rename from UNITTESTS/features/lorawan/loraphyeu433/Test_LoRaPHYEU433.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/Test_LoRaPHYEU433.cpp diff --git a/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake diff --git a/UNITTESTS/features/lorawan/loraphyeu868/Test_LoRaPHYEU868.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/Test_LoRaPHYEU868.cpp similarity index 100% rename from UNITTESTS/features/lorawan/loraphyeu868/Test_LoRaPHYEU868.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/Test_LoRaPHYEU868.cpp diff --git a/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake diff --git a/UNITTESTS/features/lorawan/loraphyin865/Test_LoRaPHYIN865.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/Test_LoRaPHYIN865.cpp similarity index 100% rename from UNITTESTS/features/lorawan/loraphyin865/Test_LoRaPHYIN865.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/Test_LoRaPHYIN865.cpp diff --git a/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/loraphyin865/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake diff --git a/UNITTESTS/features/lorawan/loraphykr920/Test_LoRaPHYKR920.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/Test_LoRaPHYKR920.cpp similarity index 100% rename from UNITTESTS/features/lorawan/loraphykr920/Test_LoRaPHYKR920.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/Test_LoRaPHYKR920.cpp diff --git a/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/loraphykr920/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake diff --git a/UNITTESTS/features/lorawan/loraphyus915/Test_LoRaPHYUS915.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/Test_LoRaPHYUS915.cpp similarity index 100% rename from UNITTESTS/features/lorawan/loraphyus915/Test_LoRaPHYUS915.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/Test_LoRaPHYUS915.cpp diff --git a/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/loraphyus915/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake diff --git a/UNITTESTS/features/lorawan/lorawaninterface/Test_LoRaWANInterface.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/Test_LoRaWANInterface.cpp similarity index 100% rename from UNITTESTS/features/lorawan/lorawaninterface/Test_LoRaWANInterface.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/Test_LoRaWANInterface.cpp diff --git a/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake diff --git a/UNITTESTS/features/lorawan/lorawanstack/Test_LoRaWANStack.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/Test_LoRaWANStack.cpp similarity index 100% rename from UNITTESTS/features/lorawan/lorawanstack/Test_LoRaWANStack.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/Test_LoRaWANStack.cpp diff --git a/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/lorawanstack/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake diff --git a/UNITTESTS/features/lorawan/lorawantimer/Test_LoRaWANTimer.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/Test_LoRaWANTimer.cpp similarity index 100% rename from UNITTESTS/features/lorawan/lorawantimer/Test_LoRaWANTimer.cpp rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/Test_LoRaWANTimer.cpp diff --git a/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake similarity index 100% rename from UNITTESTS/features/lorawan/lorawantimer/unittest.cmake rename to connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake From cc1dd29259a65649f5e4d3e04da854a7d0450fdc Mon Sep 17 00:00:00 2001 From: Ashok Rao Date: Mon, 10 Aug 2020 13:30:56 +0100 Subject: [PATCH 2/7] Adding .mbedignore for tests and modifying greentea test for deprecated API and missing header --- connectivity/lorawan/tests/.mbedignore | 1 + .../lorawan/tests/TESTS/lorawan/loraradio/main.cpp | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 connectivity/lorawan/tests/.mbedignore diff --git a/connectivity/lorawan/tests/.mbedignore b/connectivity/lorawan/tests/.mbedignore new file mode 100644 index 00000000000..979080d2da3 --- /dev/null +++ b/connectivity/lorawan/tests/.mbedignore @@ -0,0 +1 @@ +UNITTESTS/* \ No newline at end of file diff --git a/connectivity/lorawan/tests/TESTS/lorawan/loraradio/main.cpp b/connectivity/lorawan/tests/TESTS/lorawan/loraradio/main.cpp index fa9706e6006..470c7f70290 100644 --- a/connectivity/lorawan/tests/TESTS/lorawan/loraradio/main.cpp +++ b/connectivity/lorawan/tests/TESTS/lorawan/loraradio/main.cpp @@ -23,6 +23,7 @@ #include "greentea-client/test_env.h" #include "Semaphore.h" +#include "ThisThread.h" #include "mbed_trace.h" #define TRACE_GROUP "RTST" @@ -61,7 +62,7 @@ static volatile event_t received_event; static void tx_done() { - ThisThread::sleep_for(2); + rtos::ThisThread::sleep_for(2); TEST_ASSERT_EQUAL(EV_NONE, received_event); received_event = EV_TX_DONE; TEST_ASSERT_EQUAL(osOK, event_sem.release()); @@ -69,7 +70,7 @@ static void tx_done() static void tx_timeout() { - ThisThread::sleep_for(2); + rtos::ThisThread::sleep_for(2); TEST_ASSERT_EQUAL(EV_NONE, received_event); received_event = EV_TX_TIMEOUT; TEST_ASSERT_EQUAL(osOK, event_sem.release()); @@ -77,7 +78,7 @@ static void tx_timeout() static void rx_done(const uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr) { - ThisThread::sleep_for(2); + rtos::ThisThread::sleep_for(2); TEST_ASSERT_EQUAL(EV_NONE, received_event); received_event = EV_RX_DONE; TEST_ASSERT_EQUAL(osOK, event_sem.release()); @@ -85,7 +86,7 @@ static void rx_done(const uint8_t *payload, uint16_t size, int16_t rssi, int8_t static void rx_timeout() { - ThisThread::sleep_for(2); + rtos::ThisThread::sleep_for(2); TEST_ASSERT_EQUAL(EV_NONE, received_event); received_event = EV_RX_TIMEOUT; TEST_ASSERT_EQUAL(osOK, event_sem.release()); @@ -93,7 +94,7 @@ static void rx_timeout() static void rx_error() { - ThisThread::sleep_for(2); + rtos::ThisThread::sleep_for(2); TEST_ASSERT_EQUAL(EV_NONE, received_event); received_event = EV_RX_ERROR; TEST_ASSERT_EQUAL(osOK, event_sem.release()); @@ -146,7 +147,7 @@ void test_set_rx_config() 0, // payload_len, false, false, 0, // crc_on, freq_hop_on, hop_period, true, false); // iq_inverted, rx_continuous - radio->receive(100); + radio->receive(); TEST_ASSERT_EQUAL(RF_RX_RUNNING, radio->get_status()); From c5ffa220e11d0a88d1ddc4da5375fef8182d41b7 Mon Sep 17 00:00:00 2001 From: Ashok Rao Date: Mon, 10 Aug 2020 14:21:39 +0100 Subject: [PATCH 3/7] Moving headers and sources to their respective separate directories based on new component structure --- connectivity/lorawan/{ => include/lorawan}/LoRaRadio.h | 0 connectivity/lorawan/{ => include/lorawan}/LoRaWANBase.h | 0 connectivity/lorawan/{ => include/lorawan}/LoRaWANInterface.h | 0 connectivity/lorawan/{ => include/lorawan}/LoRaWANStack.h | 0 connectivity/lorawan/{ => include}/lorawan_types.h | 0 connectivity/lorawan/{ => source}/LoRaWANInterface.cpp | 0 connectivity/lorawan/{ => source}/LoRaWANStack.cpp | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename connectivity/lorawan/{ => include/lorawan}/LoRaRadio.h (100%) rename connectivity/lorawan/{ => include/lorawan}/LoRaWANBase.h (100%) rename connectivity/lorawan/{ => include/lorawan}/LoRaWANInterface.h (100%) rename connectivity/lorawan/{ => include/lorawan}/LoRaWANStack.h (100%) rename connectivity/lorawan/{ => include}/lorawan_types.h (100%) rename connectivity/lorawan/{ => source}/LoRaWANInterface.cpp (100%) rename connectivity/lorawan/{ => source}/LoRaWANStack.cpp (100%) diff --git a/connectivity/lorawan/LoRaRadio.h b/connectivity/lorawan/include/lorawan/LoRaRadio.h similarity index 100% rename from connectivity/lorawan/LoRaRadio.h rename to connectivity/lorawan/include/lorawan/LoRaRadio.h diff --git a/connectivity/lorawan/LoRaWANBase.h b/connectivity/lorawan/include/lorawan/LoRaWANBase.h similarity index 100% rename from connectivity/lorawan/LoRaWANBase.h rename to connectivity/lorawan/include/lorawan/LoRaWANBase.h diff --git a/connectivity/lorawan/LoRaWANInterface.h b/connectivity/lorawan/include/lorawan/LoRaWANInterface.h similarity index 100% rename from connectivity/lorawan/LoRaWANInterface.h rename to connectivity/lorawan/include/lorawan/LoRaWANInterface.h diff --git a/connectivity/lorawan/LoRaWANStack.h b/connectivity/lorawan/include/lorawan/LoRaWANStack.h similarity index 100% rename from connectivity/lorawan/LoRaWANStack.h rename to connectivity/lorawan/include/lorawan/LoRaWANStack.h diff --git a/connectivity/lorawan/lorawan_types.h b/connectivity/lorawan/include/lorawan_types.h similarity index 100% rename from connectivity/lorawan/lorawan_types.h rename to connectivity/lorawan/include/lorawan_types.h diff --git a/connectivity/lorawan/LoRaWANInterface.cpp b/connectivity/lorawan/source/LoRaWANInterface.cpp similarity index 100% rename from connectivity/lorawan/LoRaWANInterface.cpp rename to connectivity/lorawan/source/LoRaWANInterface.cpp diff --git a/connectivity/lorawan/LoRaWANStack.cpp b/connectivity/lorawan/source/LoRaWANStack.cpp similarity index 100% rename from connectivity/lorawan/LoRaWANStack.cpp rename to connectivity/lorawan/source/LoRaWANStack.cpp From 326f1435f457e128b947e42e33309d6544dc87a8 Mon Sep 17 00:00:00 2001 From: Ashok Rao Date: Mon, 10 Aug 2020 16:22:00 +0100 Subject: [PATCH 4/7] Modifying paths in each unit test according to new directory structure --- LICENSE.md | 2 +- .../tests/UNITTESTS/features/lorawan/loramac/unittest.cmake | 4 ++-- .../features/lorawan/loramacchannelplan/unittest.cmake | 4 ++-- .../UNITTESTS/features/lorawan/loramaccommand/unittest.cmake | 4 ++-- .../UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake | 4 ++-- .../tests/UNITTESTS/features/lorawan/loraphy/unittest.cmake | 4 ++-- .../UNITTESTS/features/lorawan/loraphyas923/unittest.cmake | 4 ++-- .../UNITTESTS/features/lorawan/loraphyau915/unittest.cmake | 4 ++-- .../UNITTESTS/features/lorawan/loraphycn470/unittest.cmake | 4 ++-- .../UNITTESTS/features/lorawan/loraphycn779/unittest.cmake | 4 ++-- .../UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake | 4 ++-- .../UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake | 4 ++-- .../UNITTESTS/features/lorawan/loraphyin865/unittest.cmake | 4 ++-- .../UNITTESTS/features/lorawan/loraphykr920/unittest.cmake | 4 ++-- .../UNITTESTS/features/lorawan/loraphyus915/unittest.cmake | 4 ++-- .../features/lorawan/lorawaninterface/unittest.cmake | 4 ++-- .../UNITTESTS/features/lorawan/lorawanstack/unittest.cmake | 4 ++-- .../UNITTESTS/features/lorawan/lorawantimer/unittest.cmake | 4 ++-- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 26f2e47a9af..cf159fecf22 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -12,7 +12,7 @@ Folders containing files under different permissive license than Apache 2.0 are - [features/FEATURE_PSA/FEATURE_TFM](./features/FEATURE_PSA/FEATURE_TFM) - BSD-3-Clause - [features/FEATURE_PSA/FEATURE_MBED_PSA_SRV/services/attestation](./features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation) - BSD-3-Clause - [features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/qcbor](./features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/qcbor) - BSD-3-Clause -- [connectivity/lorawan](./features/lorawan) - Revised BSD +- [connectivity/lorawan](./connectivity/lorawan) - Revised BSD - [connectivity/lwipstack](./connectivity/lwipstack) - BSD-style, MIT-style - [connectivity/nanostack/sal-stack-nanostack](./connectivity/nanostack/sal-stack-nanostack) - BSD-3-Clause - [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/unittest.cmake index f68bee28b82..07ed7f3fc44 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaMac") # Source files set(unittest-sources - ../features/lorawan/lorastack/mac/LoRaMac.cpp + ../connectivity/lorawan/lorastack/mac/LoRaMac.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan/lorastack/mac + ../connectivity/lorawan/lorastack/mac ) # Test & stub files diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake index 4bc3c0ac89d..94c923d2ca0 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaMacChannelPlan") # Source files set(unittest-sources - ../features/lorawan/lorastack/mac/LoRaMacChannelPlan.cpp + ../connectivity/lorawan/lorastack/mac/LoRaMacChannelPlan.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan/lorastack/mac + ../connectivity/lorawan/lorastack/mac ) # Test & stub files diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake index a1929ec218c..50e9c8ee5ea 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaMacCommand") # Source files set(unittest-sources - ../features/lorawan/lorastack/mac/LoRaMacCommand.cpp + ../connectivity/lorawan/lorastack/mac/LoRaMacCommand.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan/lorastack/mac + ../connectivity/lorawan/lorastack/mac ) # Test & stub files diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake index 61aaae9357c..7aba046bc9b 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaMacCrypto") # Source files set(unittest-sources - ../features/lorawan/lorastack/mac/LoRaMacCrypto.cpp + ../connectivity/lorawan/lorastack/mac/LoRaMacCrypto.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan/lorastack/mac + ../connectivity/lorawan/lorastack/mac ) # Test & stub files diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/unittest.cmake index 75665763d0b..bf59481db56 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaPHY") # Source files set(unittest-sources - ../features/lorawan/lorastack/phy/LoRaPHY.cpp + ../connectivity/lorawan/lorastack/phy/LoRaPHY.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan/lorastack/phy + ../connectivity/lorawan/lorastack/phy ) # Test & stub files diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake index 723ade142be..b7307a39259 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaPHYAS923") # Source files set(unittest-sources - ../features/lorawan/lorastack/phy/LoRaPHYAS923.cpp + ../connectivity/lorawan/lorastack/phy/LoRaPHYAS923.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan/lorastack/phy + ../connectivity/lorawan/lorastack/phy ) # Test & stub files diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake index 93c12ac9348..048eeaa96b1 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaPHYAU915") # Source files set(unittest-sources - ../features/lorawan/lorastack/phy/LoRaPHYAU915.cpp + ../connectivity/lorawan/lorastack/phy/LoRaPHYAU915.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan/lorastack/phy + ../connectivity/lorawan/lorastack/phy ) # Test & stub files diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake index 910ba9a183e..a3368898a66 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaPHYCN470") # Source files set(unittest-sources - ../features/lorawan/lorastack/phy/LoRaPHYCN470.cpp + ../connectivity/lorawan/lorastack/phy/LoRaPHYCN470.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan/lorastack/phy + ../connectivity/lorawan/lorastack/phy ) # Test & stub files diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake index 66c11e27a4e..dbc5d0cfa93 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaPHYCN779") # Source files set(unittest-sources - ../features/lorawan/lorastack/phy/LoRaPHYCN779.cpp + ../connectivity/lorawan/lorastack/phy/LoRaPHYCN779.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan/lorastack/phy + ../connectivity/lorawan/lorastack/phy ) # Test & stub files diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake index ffafac6247a..2dedae7f535 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaPHYEU433") # Source files set(unittest-sources - ../features/lorawan/lorastack/phy/LoRaPHYEU433.cpp + ../connectivity/lorawan/lorastack/phy/LoRaPHYEU433.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan/lorastack/phy + ../connectivity/lorawan/lorastack/phy ) # Test & stub files diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake index 009eb043b25..a48febd0332 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaPHYEU868") # Source files set(unittest-sources - ../features/lorawan/lorastack/phy/LoRaPHYEU868.cpp + ../connectivity/lorawan/lorastack/phy/LoRaPHYEU868.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan/lorastack/phy + ../connectivity/lorawan/lorastack/phy ) # Test & stub files diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake index 1ba6039ac55..d6d014a3b9d 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaPHYIN865") # Source files set(unittest-sources - ../features/lorawan/lorastack/phy/LoRaPHYIN865.cpp + ../connectivity/lorawan/lorastack/phy/LoRaPHYIN865.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan/lorastack/phy + ../connectivity/lorawan/lorastack/phy ) # Test & stub files diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake index a34e3aad8d7..f9818446a43 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaPHYKR920") # Source files set(unittest-sources - ../features/lorawan/lorastack/phy/LoRaPHYKR920.cpp + ../connectivity/lorawan/lorastack/phy/LoRaPHYKR920.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan/lorastack/phy + ../connectivity/lorawan/lorastack/phy ) # Test & stub files diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake index d68bca9de26..cbd179b9f8c 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaPHYUS915") # Source files set(unittest-sources - ../features/lorawan/lorastack/phy/LoRaPHYUS915.cpp + ../connectivity/lorawan/lorastack/phy/LoRaPHYUS915.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan/lorastack/phy + ../connectivity/lorawan/lorastack/phy ) # Test & stub files diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake index 0db5b7ad296..fdc82dad6f3 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaWANInterface") # Source files set(unittest-sources - ../features/lorawan/LoRaWANInterface.cpp + ../connectivity/lorawan/LoRaWANInterface.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan + ../connectivity/lorawan ) # Test & stub files diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake index cbedd9cdf4d..1a9e47c09fe 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaWANStack") # Source files set(unittest-sources - ../features/lorawan/LoRaWANStack.cpp + ../connectivity/lorawan/LoRaWANStack.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan + ../connectivity/lorawan ) # Test & stub files diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake index b4ee1c9e3dd..3ee9ddf54a4 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake @@ -20,13 +20,13 @@ set(TEST_SUITE_NAME "lorawan_LoRaWANTimer") # Source files set(unittest-sources - ../features/lorawan/system/LoRaWANTimer.cpp + ../connectivity/lorawan/system/LoRaWANTimer.cpp ) # Add test specific include paths set(unittest-includes ${unittest-includes} target_h - ../features/lorawan/system + ../connectivity/lorawan/system ) # Test & stub files From 0c584dfd58d776d6f409a13096d96488d00f0186 Mon Sep 17 00:00:00 2001 From: Ashok Rao Date: Tue, 11 Aug 2020 12:44:09 +0100 Subject: [PATCH 5/7] Following 2 changes as part of this commit: 1. Moving lora drivers from \components\lora to \connectivity\drivers\lora 2. Incorporating review comments. --- .../drivers}/lora/COMPONENT_SX126X/SX126X_LoRaRadio.cpp | 0 .../drivers}/lora/COMPONENT_SX126X/SX126X_LoRaRadio.h | 0 .../drivers}/lora/COMPONENT_SX126X/SleepMode.txt | 0 .../drivers}/lora/COMPONENT_SX126X/mbed_lib.json | 0 .../drivers}/lora/COMPONENT_SX126X/sx126x_ds.h | 0 .../drivers}/lora/COMPONENT_SX1272/README.md | 0 .../drivers}/lora/COMPONENT_SX1272/SX1272_LoRaRadio.cpp | 0 .../drivers}/lora/COMPONENT_SX1272/SX1272_LoRaRadio.h | 0 .../drivers}/lora/COMPONENT_SX1272/mbed_lib.json | 0 .../drivers}/lora/COMPONENT_SX1272/registers/sx1272Regs-Fsk.h | 0 .../drivers}/lora/COMPONENT_SX1272/registers/sx1272Regs-LoRa.h | 0 .../drivers}/lora/COMPONENT_SX1276/README.md | 0 .../drivers}/lora/COMPONENT_SX1276/SX1276_LoRaRadio.cpp | 0 .../drivers}/lora/COMPONENT_SX1276/SX1276_LoRaRadio.h | 0 .../drivers}/lora/COMPONENT_SX1276/mbed_lib.json | 0 .../drivers}/lora/COMPONENT_SX1276/registers/sx1276Regs-Fsk.h | 0 .../drivers}/lora/COMPONENT_SX1276/registers/sx1276Regs-LoRa.h | 0 {components => connectivity/drivers}/lora/LICENCE-BSD-3-Clause | 0 {components => connectivity/drivers}/lora/LICENSE | 0 {components => connectivity/drivers}/lora/README.md | 0 .../tests/UNITTESTS/features/lorawan/loramac/unittest.cmake | 2 +- .../features/lorawan/loramacchannelplan/unittest.cmake | 2 +- .../UNITTESTS/features/lorawan/loramaccommand/unittest.cmake | 2 +- .../UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake | 2 +- .../tests/UNITTESTS/features/lorawan/loraphy/unittest.cmake | 2 +- .../UNITTESTS/features/lorawan/loraphyas923/unittest.cmake | 2 +- .../UNITTESTS/features/lorawan/loraphyau915/unittest.cmake | 2 +- .../UNITTESTS/features/lorawan/loraphycn470/unittest.cmake | 2 +- .../UNITTESTS/features/lorawan/loraphycn779/unittest.cmake | 2 +- .../UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake | 2 +- .../UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake | 2 +- .../UNITTESTS/features/lorawan/loraphyin865/unittest.cmake | 2 +- .../UNITTESTS/features/lorawan/loraphykr920/unittest.cmake | 2 +- .../UNITTESTS/features/lorawan/loraphyus915/unittest.cmake | 2 +- .../UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake | 2 +- .../UNITTESTS/features/lorawan/lorawanstack/unittest.cmake | 2 +- .../UNITTESTS/features/lorawan/lorawantimer/unittest.cmake | 2 +- 37 files changed, 17 insertions(+), 17 deletions(-) rename {components => connectivity/drivers}/lora/COMPONENT_SX126X/SX126X_LoRaRadio.cpp (100%) rename {components => connectivity/drivers}/lora/COMPONENT_SX126X/SX126X_LoRaRadio.h (100%) rename {components => connectivity/drivers}/lora/COMPONENT_SX126X/SleepMode.txt (100%) rename {components => connectivity/drivers}/lora/COMPONENT_SX126X/mbed_lib.json (100%) rename {components => connectivity/drivers}/lora/COMPONENT_SX126X/sx126x_ds.h (100%) rename {components => connectivity/drivers}/lora/COMPONENT_SX1272/README.md (100%) rename {components => connectivity/drivers}/lora/COMPONENT_SX1272/SX1272_LoRaRadio.cpp (100%) rename {components => connectivity/drivers}/lora/COMPONENT_SX1272/SX1272_LoRaRadio.h (100%) rename {components => connectivity/drivers}/lora/COMPONENT_SX1272/mbed_lib.json (100%) rename {components => connectivity/drivers}/lora/COMPONENT_SX1272/registers/sx1272Regs-Fsk.h (100%) rename {components => connectivity/drivers}/lora/COMPONENT_SX1272/registers/sx1272Regs-LoRa.h (100%) rename {components => connectivity/drivers}/lora/COMPONENT_SX1276/README.md (100%) rename {components => connectivity/drivers}/lora/COMPONENT_SX1276/SX1276_LoRaRadio.cpp (100%) rename {components => connectivity/drivers}/lora/COMPONENT_SX1276/SX1276_LoRaRadio.h (100%) rename {components => connectivity/drivers}/lora/COMPONENT_SX1276/mbed_lib.json (100%) rename {components => connectivity/drivers}/lora/COMPONENT_SX1276/registers/sx1276Regs-Fsk.h (100%) rename {components => connectivity/drivers}/lora/COMPONENT_SX1276/registers/sx1276Regs-LoRa.h (100%) rename {components => connectivity/drivers}/lora/LICENCE-BSD-3-Clause (100%) rename {components => connectivity/drivers}/lora/LICENSE (100%) rename {components => connectivity/drivers}/lora/README.md (100%) diff --git a/components/lora/COMPONENT_SX126X/SX126X_LoRaRadio.cpp b/connectivity/drivers/lora/COMPONENT_SX126X/SX126X_LoRaRadio.cpp similarity index 100% rename from components/lora/COMPONENT_SX126X/SX126X_LoRaRadio.cpp rename to connectivity/drivers/lora/COMPONENT_SX126X/SX126X_LoRaRadio.cpp diff --git a/components/lora/COMPONENT_SX126X/SX126X_LoRaRadio.h b/connectivity/drivers/lora/COMPONENT_SX126X/SX126X_LoRaRadio.h similarity index 100% rename from components/lora/COMPONENT_SX126X/SX126X_LoRaRadio.h rename to connectivity/drivers/lora/COMPONENT_SX126X/SX126X_LoRaRadio.h diff --git a/components/lora/COMPONENT_SX126X/SleepMode.txt b/connectivity/drivers/lora/COMPONENT_SX126X/SleepMode.txt similarity index 100% rename from components/lora/COMPONENT_SX126X/SleepMode.txt rename to connectivity/drivers/lora/COMPONENT_SX126X/SleepMode.txt diff --git a/components/lora/COMPONENT_SX126X/mbed_lib.json b/connectivity/drivers/lora/COMPONENT_SX126X/mbed_lib.json similarity index 100% rename from components/lora/COMPONENT_SX126X/mbed_lib.json rename to connectivity/drivers/lora/COMPONENT_SX126X/mbed_lib.json diff --git a/components/lora/COMPONENT_SX126X/sx126x_ds.h b/connectivity/drivers/lora/COMPONENT_SX126X/sx126x_ds.h similarity index 100% rename from components/lora/COMPONENT_SX126X/sx126x_ds.h rename to connectivity/drivers/lora/COMPONENT_SX126X/sx126x_ds.h diff --git a/components/lora/COMPONENT_SX1272/README.md b/connectivity/drivers/lora/COMPONENT_SX1272/README.md similarity index 100% rename from components/lora/COMPONENT_SX1272/README.md rename to connectivity/drivers/lora/COMPONENT_SX1272/README.md diff --git a/components/lora/COMPONENT_SX1272/SX1272_LoRaRadio.cpp b/connectivity/drivers/lora/COMPONENT_SX1272/SX1272_LoRaRadio.cpp similarity index 100% rename from components/lora/COMPONENT_SX1272/SX1272_LoRaRadio.cpp rename to connectivity/drivers/lora/COMPONENT_SX1272/SX1272_LoRaRadio.cpp diff --git a/components/lora/COMPONENT_SX1272/SX1272_LoRaRadio.h b/connectivity/drivers/lora/COMPONENT_SX1272/SX1272_LoRaRadio.h similarity index 100% rename from components/lora/COMPONENT_SX1272/SX1272_LoRaRadio.h rename to connectivity/drivers/lora/COMPONENT_SX1272/SX1272_LoRaRadio.h diff --git a/components/lora/COMPONENT_SX1272/mbed_lib.json b/connectivity/drivers/lora/COMPONENT_SX1272/mbed_lib.json similarity index 100% rename from components/lora/COMPONENT_SX1272/mbed_lib.json rename to connectivity/drivers/lora/COMPONENT_SX1272/mbed_lib.json diff --git a/components/lora/COMPONENT_SX1272/registers/sx1272Regs-Fsk.h b/connectivity/drivers/lora/COMPONENT_SX1272/registers/sx1272Regs-Fsk.h similarity index 100% rename from components/lora/COMPONENT_SX1272/registers/sx1272Regs-Fsk.h rename to connectivity/drivers/lora/COMPONENT_SX1272/registers/sx1272Regs-Fsk.h diff --git a/components/lora/COMPONENT_SX1272/registers/sx1272Regs-LoRa.h b/connectivity/drivers/lora/COMPONENT_SX1272/registers/sx1272Regs-LoRa.h similarity index 100% rename from components/lora/COMPONENT_SX1272/registers/sx1272Regs-LoRa.h rename to connectivity/drivers/lora/COMPONENT_SX1272/registers/sx1272Regs-LoRa.h diff --git a/components/lora/COMPONENT_SX1276/README.md b/connectivity/drivers/lora/COMPONENT_SX1276/README.md similarity index 100% rename from components/lora/COMPONENT_SX1276/README.md rename to connectivity/drivers/lora/COMPONENT_SX1276/README.md diff --git a/components/lora/COMPONENT_SX1276/SX1276_LoRaRadio.cpp b/connectivity/drivers/lora/COMPONENT_SX1276/SX1276_LoRaRadio.cpp similarity index 100% rename from components/lora/COMPONENT_SX1276/SX1276_LoRaRadio.cpp rename to connectivity/drivers/lora/COMPONENT_SX1276/SX1276_LoRaRadio.cpp diff --git a/components/lora/COMPONENT_SX1276/SX1276_LoRaRadio.h b/connectivity/drivers/lora/COMPONENT_SX1276/SX1276_LoRaRadio.h similarity index 100% rename from components/lora/COMPONENT_SX1276/SX1276_LoRaRadio.h rename to connectivity/drivers/lora/COMPONENT_SX1276/SX1276_LoRaRadio.h diff --git a/components/lora/COMPONENT_SX1276/mbed_lib.json b/connectivity/drivers/lora/COMPONENT_SX1276/mbed_lib.json similarity index 100% rename from components/lora/COMPONENT_SX1276/mbed_lib.json rename to connectivity/drivers/lora/COMPONENT_SX1276/mbed_lib.json diff --git a/components/lora/COMPONENT_SX1276/registers/sx1276Regs-Fsk.h b/connectivity/drivers/lora/COMPONENT_SX1276/registers/sx1276Regs-Fsk.h similarity index 100% rename from components/lora/COMPONENT_SX1276/registers/sx1276Regs-Fsk.h rename to connectivity/drivers/lora/COMPONENT_SX1276/registers/sx1276Regs-Fsk.h diff --git a/components/lora/COMPONENT_SX1276/registers/sx1276Regs-LoRa.h b/connectivity/drivers/lora/COMPONENT_SX1276/registers/sx1276Regs-LoRa.h similarity index 100% rename from components/lora/COMPONENT_SX1276/registers/sx1276Regs-LoRa.h rename to connectivity/drivers/lora/COMPONENT_SX1276/registers/sx1276Regs-LoRa.h diff --git a/components/lora/LICENCE-BSD-3-Clause b/connectivity/drivers/lora/LICENCE-BSD-3-Clause similarity index 100% rename from components/lora/LICENCE-BSD-3-Clause rename to connectivity/drivers/lora/LICENCE-BSD-3-Clause diff --git a/components/lora/LICENSE b/connectivity/drivers/lora/LICENSE similarity index 100% rename from components/lora/LICENSE rename to connectivity/drivers/lora/LICENSE diff --git a/components/lora/README.md b/connectivity/drivers/lora/README.md similarity index 100% rename from components/lora/README.md rename to connectivity/drivers/lora/README.md diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/unittest.cmake index 07ed7f3fc44..f1044ede03e 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/loramac/Test_LoRaMac.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaMac.cpp stubs/LoRaPHY_stub.cpp stubs/LoRaWANStack_stub.cpp stubs/mbed_assert_stub.cpp diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake index 94c923d2ca0..702e41ea734 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/loramacchannelplan/Test_LoRaMacChannelPlan.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaMacChannelPlan.cpp stubs/LoRaPHY_stub.cpp ) diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake index 50e9c8ee5ea..c6497c781ef 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/loramaccommand/Test_LoRaMacCommand.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaMacCommand.cpp stubs/mbed_assert_stub.cpp stubs/LoRaPHY_stub.cpp ) diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake index 7aba046bc9b..19a752fe670 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/loramaccrypto/Test_LoRaMacCrypto.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaMacCrypto.cpp stubs/cipher_stub.c stubs/aes_stub.c stubs/cmac_stub.c diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/unittest.cmake index bf59481db56..55d4df04f2f 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/loraphy/Test_LoRaPHY.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaPHY.cpp stubs/LoRaWANTimer_stub.cpp stubs/mbed_assert_stub.cpp ) diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake index b7307a39259..27fe3072443 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/loraphyas923/Test_LoRaPHYAS923.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaPHYAS923.cpp stubs/LoRaPHY_stub.cpp stubs/LoRaWANTimer_stub.cpp stubs/mbed_assert_stub.cpp diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake index 048eeaa96b1..713840c88ed 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/loraphyau915/Test_LoRaPHYAU915.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaPHYAU915.cpp stubs/LoRaPHY_stub.cpp stubs/LoRaWANTimer_stub.cpp stubs/mbed_assert_stub.cpp diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake index a3368898a66..a67f0dff5cb 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/loraphycn470/Test_LoRaPHYCN470.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaPHYCN470.cpp stubs/LoRaPHY_stub.cpp stubs/LoRaWANTimer_stub.cpp stubs/mbed_assert_stub.cpp diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake index dbc5d0cfa93..7d2fb8fab68 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/loraphycn779/Test_LoRaPHYCN779.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaPHYCN779.cpp stubs/LoRaPHY_stub.cpp stubs/mbed_assert_stub.cpp diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake index 2dedae7f535..d4722e7a03e 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/loraphyeu433/Test_LoRaPHYEU433.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaPHYEU433.cpp stubs/LoRaPHY_stub.cpp stubs/mbed_assert_stub.cpp diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake index a48febd0332..cc43f25687d 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/loraphyeu868/Test_LoRaPHYEU868.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaPHYEU868.cpp stubs/LoRaPHY_stub.cpp stubs/mbed_assert_stub.cpp diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake index d6d014a3b9d..be47422a46f 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/loraphyin865/Test_LoRaPHYIN865.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaPHYIN865.cpp stubs/LoRaPHY_stub.cpp stubs/mbed_assert_stub.cpp diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake index f9818446a43..e7ac20cfa62 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/loraphykr920/Test_LoRaPHYKR920.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaPHYKR920.cpp stubs/LoRaPHY_stub.cpp stubs/LoRaWANTimer_stub.cpp stubs/mbed_assert_stub.cpp diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake index cbd179b9f8c..722f4fcc583 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/loraphyus915/Test_LoRaPHYUS915.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaPHYUS915.cpp stubs/LoRaPHY_stub.cpp stubs/LoRaWANTimer_stub.cpp stubs/mbed_assert_stub.cpp diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake index fdc82dad6f3..4b4dd4bde2b 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/lorawaninterface/Test_LoRaWANInterface.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaWANInterface.cpp stubs/LoRaPHY_stub.cpp stubs/LoRaWANStack_stub.cpp stubs/LoRaMac_stub.cpp diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake index 1a9e47c09fe..fabbf53d73e 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/lorawanstack/Test_LoRaWANStack.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaWANStack.cpp stubs/LoRaPHY_stub.cpp stubs/LoRaMac_stub.cpp stubs/mbed_assert_stub.cpp diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake index 3ee9ddf54a4..a95ab5dc295 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake @@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes} # Test & stub files set(unittest-test-sources - features/lorawan/lorawantimer/Test_LoRaWANTimer.cpp + ${CMAKE_CURRENT_LIST_DIR}/Test_LoRaWANTimer.cpp stubs/EventQueue_stub.cpp stubs/mbed_assert_stub.cpp stubs/equeue_stub.c From 9977da64afe3c91de3076006585ea0af9a58f652 Mon Sep 17 00:00:00 2001 From: Ashok Rao Date: Tue, 11 Aug 2020 15:53:26 +0100 Subject: [PATCH 6/7] Incorporating review comments --- UNITTESTS/CMakeLists.txt | 3 ++- connectivity/lorawan/include/{ => lorawan}/lorawan_types.h | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename connectivity/lorawan/include/{ => lorawan}/lorawan_types.h (100%) diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt index e54d21a190d..8fbf61be226 100644 --- a/UNITTESTS/CMakeLists.txt +++ b/UNITTESTS/CMakeLists.txt @@ -146,7 +146,8 @@ set(unittest-includes-base "${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/device" "${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework" "${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/common" - "${PROJECT_SOURCE_DIR}/../connectivity/lorawan" + "${PROJECT_SOURCE_DIR}/../connectivity" + "${PROJECT_SOURCE_DIR}/../connectivity/lorawan/include/lorawan" "${PROJECT_SOURCE_DIR}/../connectivity/lorawan/lorastack" "${PROJECT_SOURCE_DIR}/../connectivity/lorawan/lorastack/mac" "${PROJECT_SOURCE_DIR}/../connectivity/lorawan/lorastack/phy" diff --git a/connectivity/lorawan/include/lorawan_types.h b/connectivity/lorawan/include/lorawan/lorawan_types.h similarity index 100% rename from connectivity/lorawan/include/lorawan_types.h rename to connectivity/lorawan/include/lorawan/lorawan_types.h From 07511d39b1de3ca420d4d620a769e636d7907dba Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Fri, 14 Aug 2020 12:32:50 +0100 Subject: [PATCH 7/7] Fix UNITTESTS build failure --- UNITTESTS/CMakeLists.txt | 2 +- UNITTESTS/stubs/LoRaMac_stub.h | 2 +- UNITTESTS/stubs/LoRaWANTimer_stub.cpp | 2 +- UNITTESTS/stubs/LoRaWANTimer_stub.h | 2 +- .../UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake | 2 +- .../features/lorawan/lorawanstack/Test_LoRaWANStack.cpp | 2 +- .../UNITTESTS/features/lorawan/lorawanstack/unittest.cmake | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt index 8fbf61be226..598c76ecdd5 100644 --- a/UNITTESTS/CMakeLists.txt +++ b/UNITTESTS/CMakeLists.txt @@ -151,7 +151,7 @@ set(unittest-includes-base "${PROJECT_SOURCE_DIR}/../connectivity/lorawan/lorastack" "${PROJECT_SOURCE_DIR}/../connectivity/lorawan/lorastack/mac" "${PROJECT_SOURCE_DIR}/../connectivity/lorawan/lorastack/phy" - "${PROJECT_SOURCE_DIR}/../connectivity/lorawan/system" + "${PROJECT_SOURCE_DIR}/../connectivity/lorawan" "${PROJECT_SOURCE_DIR}/../connectivity/mbedtls" "${PROJECT_SOURCE_DIR}/../connectivity/mbedtls/include" ) diff --git a/UNITTESTS/stubs/LoRaMac_stub.h b/UNITTESTS/stubs/LoRaMac_stub.h index dedb261745e..e8a0e574af7 100644 --- a/UNITTESTS/stubs/LoRaMac_stub.h +++ b/UNITTESTS/stubs/LoRaMac_stub.h @@ -20,7 +20,7 @@ #include #include "lorawan_types.h" -#include "lorawan_data_structures.h" +#include "system/lorawan_data_structures.h" namespace LoRaMac_stub { extern bool bool_value; diff --git a/UNITTESTS/stubs/LoRaWANTimer_stub.cpp b/UNITTESTS/stubs/LoRaWANTimer_stub.cpp index 4cbf21cdd81..5ca68b29e76 100644 --- a/UNITTESTS/stubs/LoRaWANTimer_stub.cpp +++ b/UNITTESTS/stubs/LoRaWANTimer_stub.cpp @@ -16,7 +16,7 @@ */ #include "mbed_assert.h" -#include "LoRaWANTimer.h" +#include "system/LoRaWANTimer.h" #include "LoRaWANTimer_stub.h" diff --git a/UNITTESTS/stubs/LoRaWANTimer_stub.h b/UNITTESTS/stubs/LoRaWANTimer_stub.h index 0bc3db7396b..31eeb00e2d6 100644 --- a/UNITTESTS/stubs/LoRaWANTimer_stub.h +++ b/UNITTESTS/stubs/LoRaWANTimer_stub.h @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "LoRaWANTimer.h" +#include "system/LoRaWANTimer.h" namespace LoRaWANTimer_stub { extern lorawan_time_t time_value; diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake index 4b4dd4bde2b..e6c04662939 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake @@ -20,7 +20,7 @@ set(TEST_SUITE_NAME "lorawan_LoRaWANInterface") # Source files set(unittest-sources - ../connectivity/lorawan/LoRaWANInterface.cpp + ../connectivity/lorawan/source/LoRaWANInterface.cpp ) # Add test specific include paths diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/Test_LoRaWANStack.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/Test_LoRaWANStack.cpp index 9fc72b1077d..589e95b51f0 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/Test_LoRaWANStack.cpp +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/Test_LoRaWANStack.cpp @@ -22,7 +22,7 @@ #include "LoRaPHY_stub.h" #include "LoRaMac_stub.h" #include "equeue_stub.h" -#include "lorawan_data_structures.h" +#include "system/lorawan_data_structures.h" static uint8_t batt_level = 0; diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake index fabbf53d73e..9607ac1f281 100644 --- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake +++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake @@ -20,7 +20,7 @@ set(TEST_SUITE_NAME "lorawan_LoRaWANStack") # Source files set(unittest-sources - ../connectivity/lorawan/LoRaWANStack.cpp + ../connectivity/lorawan/source/LoRaWANStack.cpp ) # Add test specific include paths