ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12817 from kivaisan/improve_at_debug_flags 

Cellular: Disable AT traces when mbed-trace is disabled
pull/12823/head
Martin Kojtal 2020-04-17 09:29:15 +02:00 committed by GitHub
parent dcd863bfe9 738f9fbcf6
commit b574ff50da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
features/cellular/framework/device/ATHandler.cpp
View File

@ -35,8 +35,10 @@ using namespace mbed_cellular_util;
#include "CellularLog.h" #include "CellularLog.h"
#ifndef MBED_CONF_CELLULAR_DEBUG_AT #if defined(MBED_CONF_CELLULAR_DEBUG_AT) && (MBED_CONF_CELLULAR_DEBUG_AT) && defined(MBED_CONF_MBED_TRACE_ENABLE) && MBED_CONF_MBED_TRACE_ENABLE
#define MBED_CONF_CELLULAR_DEBUG_AT 0 #define DEBUG_AT_ENABLED 1
#else
#define DEBUG_AT_ENABLED 0
#endif #endif
// URCs should be handled fast, if you add debug traces within URC processing then you also need to increase this time // URCs should be handled fast, if you add debug traces within URC processing then you also need to increase this time
@ -89,7 +91,7 @@ ATHandler::ATHandler(FileHandle *fh, EventQueue &queue, uint32_t timeout, const
_urc_matched(false), _urc_matched(false),
_error_found(false), _error_found(false),
_max_resp_length(MAX_RESP_LENGTH), _max_resp_length(MAX_RESP_LENGTH),
_debug_on(MBED_CONF_CELLULAR_DEBUG_AT), _debug_on(DEBUG_AT_ENABLED),
_cmd_start(false), _cmd_start(false),
_use_delimiter(true), _use_delimiter(true),
_start_time(0), _start_time(0),
@ -495,7 +497,7 @@ ssize_t ATHandler::read_bytes(uint8_t *buf, size_t len)
buf[read_len] = c; buf[read_len] = c;
} }
#if MBED_CONF_CELLULAR_DEBUG_AT #if DEBUG_AT_ENABLED
if (debug_on && disabled_debug) { if (debug_on && disabled_debug) {
tr_info("read_bytes trace suppressed (total length %d)", read_len); tr_info("read_bytes trace suppressed (total length %d)", read_len);
} }
@ -651,7 +653,7 @@ ssize_t ATHandler::read_hex_string(char *buf, size_t size)
buf_idx++; buf_idx++;
} }
#if MBED_CONF_CELLULAR_DEBUG_AT #if DEBUG_AT_ENABLED
if (debug_on && disabled_debug) { if (debug_on && disabled_debug) {
tr_info("read_hex_string trace suppressed (total length %d)", buf_idx); tr_info("read_hex_string trace suppressed (total length %d)", buf_idx);
} }
@ -1379,8 +1381,8 @@ size_t ATHandler::write(const void *data, size_t len)
fhs.events = POLLOUT; fhs.events = POLLOUT;
size_t write_len = 0; size_t write_len = 0;
#if MBED_CONF_CELLULAR_DEBUG_AT #if DEBUG_AT_ENABLED
bool suppress_traced = false; bool suppress_traces = false;
#endif #endif
for (; write_len < len;) { for (; write_len < len;) {
@ -1395,13 +1397,13 @@ size_t ATHandler::write(const void *data, size_t len)
return 0; return 0;
} }
#if MBED_CONF_CELLULAR_DEBUG_AT #if DEBUG_AT_ENABLED
if (write_len + ret > DEBUG_MAXLEN) { if (write_len + ret > DEBUG_MAXLEN) {
if (_debug_on && !suppress_traced) { if (_debug_on && !suppress_traces) {
debug_print((char *)data + write_len, DEBUG_MAXLEN, AT_TX); debug_print((char *)data + write_len, DEBUG_MAXLEN, AT_TX);
tr_debug("write trace suppressed (total length %d)", len); tr_debug("write trace suppressed (total length %d)", len);
} }
suppress_traced = true; suppress_traces = true;
} else { } else {
debug_print((char *)data + write_len, ret, AT_TX); debug_print((char *)data + write_len, ret, AT_TX);
} }
@ -1451,7 +1453,7 @@ void ATHandler::flush()
void ATHandler::debug_print(const char *p, int len, ATType type) void ATHandler::debug_print(const char *p, int len, ATType type)
{ {
#if MBED_CONF_CELLULAR_DEBUG_AT #if DEBUG_AT_ENABLED
if (_debug_on) { if (_debug_on) {
const int buf_size = len * 4 + 1; // x4 -> reserve space for extra characters, +1 -> terminating null const int buf_size = len * 4 + 1; // x4 -> reserve space for extra characters, +1 -> terminating null
char *buffer = new char [buf_size]; char *buffer = new char [buf_size];
@ -1489,7 +1491,7 @@ void ATHandler::debug_print(const char *p, int len, ATType type)
tr_error("AT trace unable to allocate buffer!"); tr_error("AT trace unable to allocate buffer!");
} }
} }
#endif // MBED_CONF_CELLULAR_DEBUG_AT #endif // DEBUG_AT_ENABLED
} }
bool ATHandler::sync(int timeout_ms) bool ATHandler::sync(int timeout_ms)