edrx change set
Revision 1:bc228becc45d, committed 2017-06-12
- Comitter:
- rob.meades@u-blox.com
- Date:
- Mon Jun 12 23:04:27 2017 +0100
- Parent:
- 0:7ccf0e7e8a83
- Child:
- 2:c89190eda594
- Child:
- 3:c998512df3d0
- Commit message:
- Tested on C027.
Changed in this revision
--- a/TESTS/unit_tests/default/main.cpp Mon Jun 12 21:32:21 2017 +0000 +++ b/TESTS/unit_tests/default/main.cpp Mon Jun 12 23:04:27 2017 +0100 @@ -1,4 +1,4 @@ -#include "ublox_modem_driver/UbloxATCellularInterface.h" +#include "UbloxATCellularInterface.h" #include "greentea-client/test_env.h" #include "unity.h" #include "utest.h" @@ -7,10 +7,10 @@ #include "mbed_trace.h" #define TRACE_GROUP "TEST" #else -#define tr_debug(format, ...) debug(format, ## __VA_ARGS__) -#define tr_info(format, ...) debug(format, ## __VA_ARGS__) -#define tr_warn(format, ...) debug(format, ## __VA_ARGS__) -#define tr_error(format, ...) debug(format, ## __VA_ARGS__) +#define tr_debug(format, ...) debug(format "\n", ## __VA_ARGS__) +#define tr_info(format, ...) debug(format "\n", ## __VA_ARGS__) +#define tr_warn(format, ...) debug(format "\n", ## __VA_ARGS__) +#define tr_error(format, ...) debug(format "\n", ## __VA_ARGS__) #endif using namespace utest::v1;
--- a/UbloxATCellularInterface.cpp Mon Jun 12 21:32:21 2017 +0000 +++ b/UbloxATCellularInterface.cpp Mon Jun 12 23:04:27 2017 +0100 @@ -21,10 +21,10 @@ #include "mbed_trace.h" #define TRACE_GROUP "UACI" #else -#define tr_debug(format, ...) debug(format, ## __VA_ARGS__) -#define tr_info(format, ...) debug(format, ## __VA_ARGS__) -#define tr_warn(format, ...) debug(format, ## __VA_ARGS__) -#define tr_error(format, ...) debug(format, ## __VA_ARGS__) +#define tr_debug(format, ...) debug(format "\n", ## __VA_ARGS__) +#define tr_info(format, ...) debug(format "\n", ## __VA_ARGS__) +#define tr_warn(format, ...) debug(format "\n", ## __VA_ARGS__) +#define tr_error(format, ...) debug(format "\n", ## __VA_ARGS__) #endif /**********************************************************************
--- a/UbloxATCellularInterface.h Mon Jun 12 21:32:21 2017 +0000 +++ b/UbloxATCellularInterface.h Mon Jun 12 23:04:27 2017 +0100 @@ -13,11 +13,11 @@ * limitations under the License. */ -#ifndef _UBLOX_CELLULAR_DRIVER_GEN_AT_DATA_ -#define _UBLOX_CELLULAR_DRIVER_GEN_AT_DATA_ +#ifndef _UBLOX_AT_CELLULAR_INTERFACE_ +#define _UBLOX_AT_CELLULAR_INTERFACE_ -#include "ublox_modem_driver/UbloxCellularBase.h" -#include "netsocket/CellularBase.h" +#include "UbloxCellularBase.h" +#include "CellularBase.h" #include "NetworkStack.h" /** UbloxATCellularInterface class. @@ -621,5 +621,5 @@ void UUPSDD_URC(); }; -#endif // _UBLOX_CELLULAR_DRIVER_GEN_AT_DATA_ +#endif // _UBLOX_AT_CELLULAR_INTERFACE_