Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-23 16:25:26 +03:00
Code Issues Wiki Activity

Add DEBUG_TRACE_BUFFER_HEX[_SYNC] macros

Browse source 
They implement support for printing an arbitrarily sized buffer
in hexadecimal via DEBUG_TRACE.
This commit is contained in:
Alberto García Hierro 2018-02-13 12:27:53 +00:00
parent 2f5575c351
commit bcfc8e7189
2 changed files with 66 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/main/build/debug.c
View file

@ -47,6 +47,10 @@ int16_t debug[DEBUG16_VALUE_COUNT];
uint8_t debugMode;
#if defined(USE_DEBUG_TRACE)
#define DEBUG_TRACE_PREFIX "[%6d.%03d] "
#define DEBUG_TRACE_PREFIX_FORMATTED_SIZE 13
static serialPort_t * tracePort = NULL;
static mspPort_t * mspTracePort = NULL;
@ -105,6 +109,27 @@ static void debugTracePutcp(void *p, char ch)
*(*((char **) p))++ = ch;
}
static void debugTracePrint(bool synchronous, const char *buf, size_t size)
{
if (tracePort) {
// Send data via trace UART (if configured & connected - a safeguard against zombie VCP)
if (serialIsConnected(tracePort)) {
serialPrint(tracePort, buf);
if (synchronous) {
waitForSerialPortToFinishTransmitting(tracePort);
}
}
} else if (mspTracePort) {
mspSerialPushPort(MSP_DEBUGMSG, (uint8_t*)buf, size, mspTracePort, MSP_V2_NATIVE);
}
}
static size_t debugTraceFormatPrefix(char *buf, const timeMs_t timeMs)
{
// Write timestamp
return tfp_sprintf(buf, DEBUG_TRACE_PREFIX, timeMs / 1000, timeMs % 1000);
}
void debugTracePrintf(bool synchronous, const char *format, ...)
{
char buf[128];
@ -116,9 +141,7 @@ void debugTracePrintf(bool synchronous, const char *format, ...)
if (!feature(FEATURE_DEBUG_TRACE))
return;
// Write timestamp
const timeMs_t timeMs = millis();
charCount = tfp_sprintf(buf, "[%6d.%03d] ", timeMs / 1000, timeMs % 1000);
charCount = debugTraceFormatPrefix(buf, millis());
bufPtr = &buf[charCount];
// Write message
@ -130,16 +153,38 @@ void debugTracePrintf(bool synchronous, const char *format, ...)
charCount += 2;
va_end(va);
if (tracePort) {
// Send data via trace UART (if configured & connected - a safeguard against zombie VCP)
if (serialIsConnected(tracePort)) {
serialPrint(tracePort, buf);
if (synchronous) {
waitForSerialPortToFinishTransmitting(tracePort);
debugTracePrint(synchronous, buf, charCount);
}
void debugTracePrintBufferHex(bool synchronous, const void *buffer, size_t size)
{
// Print lines of up to maxBytes bytes. We need 5 characters per byte
// 0xAB[space|\n]
const size_t charsPerByte = 5;
const size_t maxBytes = 8;
char buf[DEBUG_TRACE_PREFIX_FORMATTED_SIZE + charsPerByte * maxBytes + 1]; // +1 for the null terminator
size_t bufPos = DEBUG_TRACE_PREFIX_FORMATTED_SIZE;
const uint8_t *inputPtr = buffer;
debugTraceFormatPrefix(buf, millis());
for (size_t ii = 0; ii < size; ii++) {
tfp_sprintf(buf + bufPos, "0x%02x ", inputPtr[ii]);
bufPos += charsPerByte;
if (bufPos == sizeof(buf)-1) {
buf[bufPos-1] = '\n';
buf[bufPos] = '\0';
debugTracePrint(synchronous, buf, bufPos + 1);
bufPos = DEBUG_TRACE_PREFIX_FORMATTED_SIZE;
}
}
} else if (mspTracePort) {
mspSerialPushPort(MSP_DEBUGMSG, (uint8_t*)buf, charCount, mspTracePort, MSP_V2_NATIVE);
if (bufPos > DEBUG_TRACE_PREFIX_FORMATTED_SIZE) {
buf[bufPos-1] = '\n';
buf[bufPos] = '\0';
debugTracePrint(synchronous, buf, bufPos + 1);
}
}
#endif

7
src/main/build/debug.h
View file

@ -15,6 +15,8 @@
* along with Cleanflight. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stddef.h>
#define DEBUG16_VALUE_COUNT 4
extern int16_t debug[DEBUG16_VALUE_COUNT];
extern uint8_t debugMode;
@ -61,9 +63,14 @@ typedef enum {
#if defined(USE_DEBUG_TRACE)
void debugTraceInit(void);
void debugTracePrintf(bool synchronous, const char *format, ...);
void debugTracePrintBufferHex(bool synchronous, const void *buffer, size_t size);
#define DEBUG_TRACE(fmt, ...) debugTracePrintf(false, fmt, ##__VA_ARGS__)
#define DEBUG_TRACE_SYNC(fmt, ...) debugTracePrintf(true, fmt, ##__VA_ARGS__)
#define DEBUG_TRACE_BUFFER_HEX(buf, size) debugTracePrintBufferHex(false, buf, size)
#define DEBUG_TRACE_BUFFER_HEX_SYNC(buf, size) debugTracePrintBufferHex(true, buf, size)
#else
#define DEBUG_TRACE(fmt, ...)
#define DEBUG_TRACE_SYNC(fmt, ...)
#define DEBUG_TRACE_BUFFER_HEX(buf, size)
#define DEBUG_TRACE_BUFFER_HEX_SYNC(buf, size)
#endif