Skip to content

Commit 0e9a839

Browse files
author
Ari Parkkila
committed
Cellular logging to use mbed_trace
1 parent 6c56462 commit 0e9a839

File tree

19 files changed

+143
-263
lines changed

19 files changed

+143
-263
lines changed

features/cellular/TESTS/cellular/cellular_all/network.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,39 @@ using namespace mbed;
2121

2222
static bool wait_register()
2323
{
24-
log_info("Try registering to network...");
24+
tr_info("Try registering to network...");
2525
if (network->set_registration() != NSAPI_ERROR_OK) {
26-
log_error("Network registration request failed.");
26+
tr_error("Network registration request failed.");
2727
return false;
2828
}
2929

3030
CellularNetwork::RegistrationStatus status;
3131
for (int i=0; i<180; i++) {
32-
log_info("Register to network %d...", i);
32+
tr_info("Register to network %d...", i);
3333
for (int type = 0; type < CellularNetwork::C_MAX; type++) {
3434
if (network->get_registration_status((CellularNetwork::RegistrationType)type, status) == NSAPI_ERROR_OK) {
35-
log_info("status %d...", status);
35+
tr_info("status %d...", status);
3636
switch (status) {
3737
case CellularNetwork::RegisteredRoaming:
3838
// fall-through
3939
case CellularNetwork::RegisteredHomeNetwork:
40-
log_info("Registered to network.");
40+
tr_info("Registered to network.");
4141
return true;
4242
case CellularNetwork::RegisteredSMSOnlyRoaming:
4343
// fall-through
4444
case CellularNetwork::RegisteredSMSOnlyHome:
45-
log_warn("SMS only network registration!");
45+
tr_warn("SMS only network registration!");
4646
return true;
4747
case CellularNetwork::RegisteredCSFBNotPreferredRoaming:
4848
// fall-through
4949
case CellularNetwork::RegisteredCSFBNotPreferredHome:
50-
log_warn("Not preferred network registration!");
50+
tr_warn("Not preferred network registration!");
5151
return true;
5252
case CellularNetwork::AttachedEmergencyOnly:
53-
log_warn("Emergency only network registration!");
53+
tr_warn("Emergency only network registration!");
5454
return true;
5555
case CellularNetwork::RegistrationDenied:
56-
log_warn("Network registration denied!");
56+
tr_warn("Network registration denied!");
5757
wait(i);
5858
break;
5959
case CellularNetwork::NotRegistered:
@@ -71,9 +71,9 @@ static bool wait_register()
7171

7272
void test_attach()
7373
{
74-
log_info("Register to network.");
74+
tr_info("Register to network.");
7575
TEST_ASSERT(wait_register());
76-
log_info("Attach to network.");
76+
tr_info("Attach to network.");
7777
nsapi_error_t err = network->set_attach();
7878
TEST_ASSERT(!err);
7979
CellularNetwork::AttachStatus status;
@@ -91,7 +91,7 @@ void test_get_ip_address()
9191
{
9292
const char *ip = network->get_ip_address();
9393
TEST_ASSERT(ip && ip[0]);
94-
log_info("IP: %s\r\n", ip);
94+
tr_info("IP: %s\r\n", ip);
9595
}
9696

9797
void test_disconnect()

features/cellular/TESTS/cellular/cellular_all/power.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ static bool start_cellular_at(CellularPower *pwr)
3030
if (err != NSAPI_ERROR_OK && err != NSAPI_ERROR_UNSUPPORTED) {
3131
return false;
3232
}
33-
log_info("Wait for cellular device 180 seconds...");
33+
tr_info("Wait for cellular device 180 seconds...");
3434
for (int i = 0; i < 180; i++) {
3535
if (pwr->set_at_mode() == NSAPI_ERROR_OK) {
3636
return true;
@@ -44,7 +44,7 @@ void test_create_power()
4444
{
4545
TEST_ASSERT(start_cellular_at(pwr));
4646

47-
log_info("Cellular device is ready!");
47+
tr_info("Cellular device is ready!");
4848
}
4949

5050
// TODO: tests still missing for off, sleep, opt_power_save_mode, opt_receive_period

features/cellular/TESTS/cellular/cellular_all/sim.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ void test_get_sim_state()
2626
{
2727
wait(1);
2828
CellularSIM::SimState state = CellularSIM::SimStateUnknown;
29-
log_info("Wait SIM for 180 seconds...");
29+
tr_info("Wait SIM for 180 seconds...");
3030
for (int i = 0; i < 180; i++) {
3131
CellularSIM::SimState tmp_state;
3232
if ((sim->get_sim_state(tmp_state) == NSAPI_ERROR_OK) && tmp_state != CellularSIM::SimStateUnknown) {

features/cellular/TESTS/cellular/cellular_all/stack.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void test_socket_send_receive_blocking()
5454
5555
// Send to echo server
5656
while (send_tries <= max_send_tries) {
57-
log_info("ONE!!!");
57+
tr_info("ONE!!!");
5858
send_count = socket.sendto(SERVER_IP_ADDR, SERVER_UDP_PORT, send_buffer, sizeof(send_buffer));
5959
TEST_ASSERT_MESSAGE(send_count == sizeof(send_buffer), "Sent count doesnt match sent buffer!");
6060
send_tries++;
@@ -65,7 +65,7 @@ void test_socket_send_receive_blocking()
6565
// 2 tries. First recv attempt should be blocked and wait for a max 5 seconds for socket read flag
6666
int recv_tries = 2;
6767
while (recv_tries >= 0) {
68-
log_info("RECV!!!");
68+
tr_info("RECV!!!");
6969
receive_count = socket.recvfrom(&address, receive_buffer, sizeof(receive_buffer));
7070
if (receive_count > 0) {
7171
break;

features/cellular/UNITTESTS/at/at_cellularnetwork/test_at_cellularnetwork.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
using namespace mbed;
2929
using namespace events;
3030

31-
uint32_t mbed::cellular_log_time = 0;
32-
3331
void conn_stat_cb(nsapi_error_t error)
3432
{
3533

features/cellular/UNITTESTS/at/at_cellularsim/test_at_cellularsim.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
using namespace mbed;
2929
using namespace events;
3030

31-
uint32_t mbed::cellular_log_time = 0;
32-
3331
Test_AT_CellularSIM::Test_AT_CellularSIM()
3432
{
3533
ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;

features/cellular/UNITTESTS/at/at_cellularsms/test_at_cellularsms.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
using namespace mbed;
2929
using namespace events;
3030

31-
uint32_t mbed::cellular_log_time = 0;
32-
3331
Test_AT_CellularSMS::Test_AT_CellularSMS()
3432
{
3533
ATHandler_stub::return_given_size = false;

features/cellular/UNITTESTS/at/at_cellularstack/test_at_cellularstack.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
using namespace mbed;
3030
using namespace events;
3131

32-
uint32_t mbed::cellular_log_time = 0;
33-
3432
class MyStack : public AT_CellularStack {
3533
public:
3634
bool bool_value;

features/cellular/UNITTESTS/at/athandler/test_athandler.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
using namespace mbed;
3131
using namespace events;
3232

33-
uint32_t mbed::cellular_log_time = 0;
34-
3533
void urc_callback()
3634
{
3735
}

0 commit comments

Comments
 (0)