Update paths to cellular framework

pull/13261/head
Lingkai Dong 2020-07-08 17:52:52 +01:00
parent b0131b22a9
commit 2b24a7a31e
18 changed files with 73 additions and 73 deletions

View File

@ -248,7 +248,7 @@ matrix:
# Check that example compiles without rtos
- sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' ${EVENTS}/README.md > main.cpp
- |
rm -r rtos/source/TARGET_CORTEX drivers/source/usb features/cellular features/netsocket features/nanostack \
rm -r rtos/source/TARGET_CORTEX drivers/source/usb connectivity/cellular features/netsocket features/nanostack \
connectivity/libraries/ppp features/lwipstack features/frameworks/greentea-client \
features/frameworks/utest features/frameworks/unity components BUILD
- python tools/make.py -t GCC_ARM -m NUCLEO_F103RB --source=. --build=BUILD/NUCLEO_F103RB/GCC_ARM -j0

View File

@ -134,11 +134,11 @@ set(unittest-includes-base
"${PROJECT_SOURCE_DIR}/../features/filesystem/"
"${PROJECT_SOURCE_DIR}/../features/filesystem/littlefs"
"${PROJECT_SOURCE_DIR}/../features/filesystem/littlefs/littlefs"
"${PROJECT_SOURCE_DIR}/../features/cellular/framework/API"
"${PROJECT_SOURCE_DIR}/../features/cellular/framework/AT"
"${PROJECT_SOURCE_DIR}/../features/cellular/framework/device"
"${PROJECT_SOURCE_DIR}/../features/cellular/framework"
"${PROJECT_SOURCE_DIR}/../features/cellular/framework/common"
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/framework/API"
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/framework/AT"
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/framework/device"
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/framework"
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/framework/common"
"${PROJECT_SOURCE_DIR}/../features/lorawan"
"${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack"
"${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack/mac"

View File

@ -5,21 +5,21 @@
# Add test specific include paths
set(unittest-includes ${unittest-includes}
features/cellular/framework/common/util
../features/cellular/framework/common
../features/cellular/framework/AT
../features/cellular/framework/device
connectivity/cellular/framework/common/util
../connectivity/cellular/framework/common
../connectivity/cellular/framework/AT
../connectivity/cellular/framework/device
../features/netsocket/cellular
)
# Source files
set(unittest-sources
../features/cellular/framework/AT/AT_CellularContext.cpp
../connectivity/cellular/framework/AT/AT_CellularContext.cpp
)
# Test files
set(unittest-test-sources
features/cellular/framework/AT/at_cellularcontext/at_cellularcontexttest.cpp
connectivity/cellular/framework/AT/at_cellularcontext/at_cellularcontexttest.cpp
stubs/ATHandler_stub.cpp
stubs/AT_CellularDevice_stub.cpp
stubs/AT_CellularStack_stub.cpp

View File

@ -5,10 +5,10 @@
# Add test specific include paths
set(unittest-includes ${unittest-includes}
../features/cellular/framework/common/util
../features/cellular/framework/common
../features/cellular/framework/AT
../features/cellular/framework/device
../connectivity/cellular/framework/common/util
../connectivity/cellular/framework/common
../connectivity/cellular/framework/AT
../connectivity/cellular/framework/device
../features/frameworks/mbed-client-randlib/mbed-client-randlib
../drivers
../hal
@ -18,12 +18,12 @@ set(unittest-includes ${unittest-includes}
# Source files
set(unittest-sources
stubs/randLIB_stub.c
../features/cellular/framework/AT/AT_CellularDevice.cpp
../connectivity/cellular/framework/AT/AT_CellularDevice.cpp
)
# Test files
set(unittest-test-sources
features/cellular/framework/AT/at_cellulardevice/at_cellulardevicetest.cpp
connectivity/cellular/framework/AT/at_cellulardevice/at_cellulardevicetest.cpp
stubs/AT_CellularNetwork_stub.cpp
stubs/ATHandler_stub.cpp
stubs/AT_CellularSMS_stub.cpp

View File

@ -5,9 +5,9 @@
# Add test specific include paths
set(unittest-includes ${unittest-includes}
features/cellular/framework/common/util
../features/cellular/framework/common
../features/cellular/framework/AT
connectivity/cellular/framework/common/util
../connectivity/cellular/framework/common
../connectivity/cellular/framework/AT
../features/frameworks/mbed-client-randlib/mbed-client-randlib
../features/netsocket/cellular
)
@ -15,12 +15,12 @@ set(unittest-includes ${unittest-includes}
# Source files
set(unittest-sources
stubs/randLIB_stub.c
../features/cellular/framework/AT/AT_CellularInformation.cpp
../connectivity/cellular/framework/AT/AT_CellularInformation.cpp
)
# Test files
set(unittest-test-sources
features/cellular/framework/AT//at_cellularinformation/at_cellularinformationtest.cpp
connectivity/cellular/framework/AT//at_cellularinformation/at_cellularinformationtest.cpp
stubs/ATHandler_stub.cpp
stubs/EventQueue_stub.cpp
stubs/FileHandle_stub.cpp

View File

@ -5,22 +5,22 @@
# Add test specific include paths
set(unittest-includes ${unittest-includes}
features/cellular/framework/common/util
../features/cellular/framework/common
../features/cellular/framework/AT
connectivity/cellular/framework/common/util
../connectivity/cellular/framework/common
../connectivity/cellular/framework/AT
../features/frameworks/mbed-client-randlib/mbed-client-randlib
../features/netsocket/cellular
)
# Source files
set(unittest-sources
../features/cellular/framework/AT/AT_CellularNetwork.cpp
../features/cellular/framework/common/CellularUtil.cpp
../connectivity/cellular/framework/AT/AT_CellularNetwork.cpp
../connectivity/cellular/framework/common/CellularUtil.cpp
)
# Test files
set(unittest-test-sources
features/cellular/framework/AT/at_cellularnetwork/at_cellularnetworktest.cpp
connectivity/cellular/framework/AT/at_cellularnetwork/at_cellularnetworktest.cpp
stubs/ATHandler_stub.cpp
stubs/EventQueue_stub.cpp
stubs/FileHandle_stub.cpp

View File

@ -5,21 +5,21 @@
# Add test specific include paths
set(unittest-includes ${unittest-includes}
features/cellular/framework/common/util
../features/cellular/framework/common
../features/cellular/framework/AT
connectivity/cellular/framework/common/util
../connectivity/cellular/framework/common
../connectivity/cellular/framework/AT
../features/frameworks/mbed-client-randlib/mbed-client-randlib
../features/netsocket/cellular
)
# Source files
set(unittest-sources
../features/cellular/framework/AT/AT_CellularSMS.cpp
../connectivity/cellular/framework/AT/AT_CellularSMS.cpp
)
# Test files
set(unittest-test-sources
features/cellular/framework/AT/at_cellularsms/at_cellularsmstest.cpp
connectivity/cellular/framework/AT/at_cellularsms/at_cellularsmstest.cpp
stubs/ATHandler_stub.cpp
stubs/EventQueue_stub.cpp
stubs/FileHandle_stub.cpp

View File

@ -5,16 +5,16 @@
# Add test specific include paths
set(unittest-includes ${unittest-includes}
features/cellular/framework/common/util
../features/cellular/framework/common
../features/cellular/framework/AT
connectivity/cellular/framework/common/util
../connectivity/cellular/framework/common
../connectivity/cellular/framework/AT
../features/frameworks/mbed-client-randlib/mbed-client-randlib
../features/netsocket/cellular
)
# Source files
set(unittest-sources
../features/cellular/framework/AT/AT_CellularStack.cpp
../connectivity/cellular/framework/AT/AT_CellularStack.cpp
../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
@ -25,7 +25,7 @@ set(unittest-sources
# Test files
set(unittest-test-sources
features/cellular/framework/AT/at_cellularstack/at_cellularstacktest.cpp
connectivity/cellular/framework/AT/at_cellularstack/at_cellularstacktest.cpp
stubs/ATHandler_stub.cpp
stubs/EventQueue_stub.cpp
stubs/FileHandle_stub.cpp

View File

@ -5,8 +5,8 @@
# Add test specific include paths
set(unittest-includes ${unittest-includes}
features/cellular/framework/common/util
../features/cellular/framework/common
connectivity/cellular/framework/common/util
../connectivity/cellular/framework/common
)
# Source files
@ -15,5 +15,5 @@ set(unittest-sources
# Test files
set(unittest-test-sources
features/cellular/framework/common/list/listtest.cpp
connectivity/cellular/framework/common/list/listtest.cpp
)

View File

@ -5,18 +5,18 @@
# Add test specific include paths
set(unittest-includes ${unittest-includes}
features/cellular/framework/common/util
../features/cellular/framework/common
connectivity/cellular/framework/common/util
../connectivity/cellular/framework/common
../features/frameworks/mbed-client-randlib/mbed-client-randlib
)
# Source files
set(unittest-sources
../features/cellular/framework/common/CellularUtil.cpp
../connectivity/cellular/framework/common/CellularUtil.cpp
)
# Test files
set(unittest-test-sources
features/cellular/framework/common/util/utiltest.cpp
connectivity/cellular/framework/common/util/utiltest.cpp
stubs/randLIB_stub.cpp
)

View File

@ -6,21 +6,21 @@
# Add test specific include paths
set(unittest-includes ${unittest-includes}
../platform
../features/cellular/framework/common/util
../features/cellular/framework/common
../features/cellular/framework/AT
../connectivity/cellular/framework/common/util
../connectivity/cellular/framework/common
../connectivity/cellular/framework/AT
../features/frameworks/mbed-client-randlib/mbed-client-randlib
)
# Source files
set(unittest-sources
../features/cellular/framework/device/ATHandler.cpp
../connectivity/cellular/framework/device/ATHandler.cpp
)
# Test files
set(unittest-test-sources
features/cellular/framework/device/athandler/athandlertest.cpp
connectivity/cellular/framework/device/athandler/athandlertest.cpp
stubs/EventQueue_stub.cpp
stubs/FileHandle_stub.cpp
stubs/us_ticker_stub.cpp

View File

@ -5,15 +5,15 @@
# Add test specific include paths
set(unittest-includes ${unittest-includes}
/features/cellular/framework/device/cellulardevice
../features/cellular/framework/device
../features/cellular/framework/common
/connectivity/cellular/framework/device/cellulardevice
../connectivity/cellular/framework/device
../connectivity/cellular/framework/common
../features/netsocket/cellular
)
# Source files
set(unittest-sources
../features/cellular/framework/device/CellularContext.cpp
../connectivity/cellular/framework/device/CellularContext.cpp
../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
@ -24,7 +24,7 @@ set(unittest-sources
# Test files
set(unittest-test-sources
features/cellular/framework/device/cellularcontext/cellularcontexttest.cpp
connectivity/cellular/framework/device/cellularcontext/cellularcontexttest.cpp
stubs/FileHandle_stub.cpp
stubs/CellularStateMachine_stub.cpp
stubs/EventQueue_stub.cpp

View File

@ -5,20 +5,20 @@
# Add test specific include paths
set(unittest-includes ${unittest-includes}
/features/cellular/framework/device/cellulardevice
../features/cellular/framework/device
../features/cellular/framework/common
/connectivity/cellular/framework/device/cellulardevice
../connectivity/cellular/framework/device
../connectivity/cellular/framework/common
../features/netsocket/cellular
)
# Source files
set(unittest-sources
../features/cellular/framework/device/CellularDevice.cpp
../connectivity/cellular/framework/device/CellularDevice.cpp
)
# Test files
set(unittest-test-sources
features/cellular/framework/device/cellulardevice/cellulardevicetest.cpp
connectivity/cellular/framework/device/cellulardevice/cellulardevicetest.cpp
stubs/FileHandle_stub.cpp
stubs/CellularStateMachine_stub.cpp
stubs/EventQueue_stub.cpp

View File

@ -5,20 +5,20 @@
# Add test specific include paths
set(unittest-includes ${unittest-includes}
/features/cellular/framework/device/cellularstatemachine
../features/cellular/framework/device
../features/cellular/framework/common
/connectivity/cellular/framework/device/cellularstatemachine
../connectivity/cellular/framework/device
../connectivity/cellular/framework/common
../features/netsocket/cellular
)
# Source files
set(unittest-sources
../features/cellular/framework/device/CellularStateMachine.cpp
../connectivity/cellular/framework/device/CellularStateMachine.cpp
)
# Test files
set(unittest-test-sources
features/cellular/framework/device/cellularstatemachine/cellularstatemachinetest.cpp
connectivity/cellular/framework/device/cellularstatemachine/cellularstatemachinetest.cpp
stubs/FileHandle_stub.cpp
stubs/CellularDevice_stub.cpp
stubs/EventQueue_stub.cpp

View File

@ -51,4 +51,4 @@ Cellular connectivity can be tested with generic Mbed OS netsocket and network i
## Unit tests
Cellular unit tests are in Mbed OS root `UNITTESTS/features/cellular`.
Cellular unit tests are in Mbed OS root `UNITTESTS/connectivity/cellular`.

View File

@ -858,9 +858,9 @@ EXCLUDE_PATTERNS = */tools/* \
*/components/802.15.4_RF/* \
*/components/wifi/* \
*/UNITTESTS/* \
*/features/cellular/framework/AT/* \
*/features/cellular/framework/device/* \
*/features/cellular/framework/common/*
*/connectivity/cellular/framework/AT/* \
*/connectivity/cellular/framework/device/* \
*/connectivity/cellular/framework/common/*
# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
# (namespaces, classes, functions, etc.) that should be excluded from the

View File

@ -82,8 +82,8 @@ typedef enum nsapi_connection_status {
*/
typedef enum nsapi_event {
NSAPI_EVENT_CONNECTION_STATUS_CHANGE = 0, /*!< network connection status has changed, the parameter = new status (nsapi_connection_status_t) */
NSAPI_EVENT_CELLULAR_STATUS_BASE = 0x1000, /*!< Cellular modem status has changed, See the enum values from enum cellular_connection_status_t in /features/cellular/framework/common/CellularCommon.h */
NSAPI_EVENT_CELLULAR_STATUS_END = 0x1FFF /*!< cellular modem status has changed, See the enum values from enum cellular_connection_status_t in /features/cellular/framework/common/CellularCommon.h */
NSAPI_EVENT_CELLULAR_STATUS_BASE = 0x1000, /*!< Cellular modem status has changed, See the enum values from enum cellular_connection_status_t in /connectivity/cellular/framework/common/CellularCommon.h */
NSAPI_EVENT_CELLULAR_STATUS_END = 0x1FFF /*!< cellular modem status has changed, See the enum values from enum cellular_connection_status_t in /connectivity/cellular/framework/common/CellularCommon.h */
} nsapi_event_t;

View File

@ -27,7 +27,7 @@
#undef BLE
/* #define PROFILE provided by Cypress PDL conflicts with u-blox PROFILE macro
* defined in ./features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularStack.h */
* defined in ./connectivity/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularStack.h */
#undef PROFILE
#endif