tylen/SHOH-Innovation-Project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log: resolve [#51]

Browse Source
This commit is contained in:
Vasily Davydov 2023-05-19 01:43:35 +03:00
parent 845f021a50
commit cce1b2bf63
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/shoh/src/threads/logging/Log.h
View File

@ -30,11 +30,13 @@ extern QueueHandle_t logging_queue;
#ifdef LOG_COLORED_OUTPUT #ifdef LOG_COLORED_OUTPUT
#define C_INFO "\x1b[34mINFO\x1b[0m" #define C_INFO "\x1b[34mINFO\x1b[0m"
#define C_DEBUG "\x1b[35mDEBUG\x1b[0m" #define C_DEBUG "\x1b[35mDEBUG\x1b[0m"
#define C_DEBUG_ISR "\x1b[36mDEBUG_ISR\x1b[0m"
#define C_WARN "\x1b[33mWARNING\x1b[0m" #define C_WARN "\x1b[33mWARNING\x1b[0m"
#define C_ERROR "\x1b[31mERROR\x1b[0m" #define C_ERROR "\x1b[31mERROR\x1b[0m"
#else #else
#define C_INFO "INFO" #define C_INFO "INFO"
#define C_DEBUG "DEBUG" #define C_DEBUG "DEBUG"
#define C_DEBUG_ISR "DEBUG_ISR"
#define C_WARN "WARNING" #define C_WARN "WARNING"
#define C_ERROR "ERROR" #define C_ERROR "ERROR"
#endif #endif
@ -78,6 +80,30 @@ static void create_log_line(const TimeFromStart _timestamp,
} }
static void create_log_line_nots(const char * _status,
const char * _location,
const char * _func,
const size_t _line,
const char * _fmt, ...)
{
va_list args;
va_start(args, _fmt);
char message [LOG_BUFFER_MAX_CAP] = {0};
int message_len = vsnprintf(message, LOG_BUFFER_MAX_CAP, _fmt, args);
va_end(args);
char buffer [LOG_BUFFER_MAX_CAP] = {0};
int buffer_len = snprintf(buffer, LOG_BUFFER_MAX_CAP,
"[%s] In [File: %s] [Func: %s] [Line: %zu]\r\n %.*s",
_status,
_location,
_func,
_line,
message_len,
message);
_LOG_STREAMOUT(buffer, buffer_len)
}
#define LOG_INFO( fmt, ...) \ #define LOG_INFO( fmt, ...) \
create_log_line(global_clock->getTimeFromStart(), C_INFO, __FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__); create_log_line(global_clock->getTimeFromStart(), C_INFO, __FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__);
@ -90,8 +116,12 @@ static void create_log_line(const TimeFromStart _timestamp,
#if LOG_DEBUG_MESSAGES #if LOG_DEBUG_MESSAGES
#define LOG_DEBUG(fmt, ...) \ #define LOG_DEBUG(fmt, ...) \
create_log_line(global_clock->getTimeFromStart(), C_DEBUG, __FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__); create_log_line(global_clock->getTimeFromStart(), C_DEBUG, __FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__);
#define LOG_DEBUG_ISR(fmt, ...) \
create_log_line_nots(C_DEBUG_ISR, __FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__);
#else #else
#define LOG_DEBUG(fmt, ...) #define LOG_DEBUG(fmt, ...)
#define LOG_DEBUG_ISR(fmt, ...)
#endif #endif

6
source/shoh/src/threads/rotary/Rotary.cpp
View File

@ -23,7 +23,7 @@ extern "C"
xQueueSendFromISR (*p_rotary_isr_q, &data, &xHigherPriorityWoken); xQueueSendFromISR (*p_rotary_isr_q, &data, &xHigherPriorityWoken);
if(!xHigherPriorityWoken) if(!xHigherPriorityWoken)
{ {
LOG_WARNING("[PIN_INT0_IRQn] portEND_SWITCHING_ISR called with False value"); LOG_DEBUG_ISR("[PIN_INT0_IRQn] portEND_SWITCHING_ISR called with False value");
} }
portEND_SWITCHING_ISR(xHigherPriorityWoken); portEND_SWITCHING_ISR(xHigherPriorityWoken);
} }
@ -37,7 +37,7 @@ extern "C"
xQueueSendFromISR (*p_rotary_isr_q, &data, &xHigherPriorityWoken); xQueueSendFromISR (*p_rotary_isr_q, &data, &xHigherPriorityWoken);
if(!xHigherPriorityWoken) if(!xHigherPriorityWoken)
{ {
LOG_WARNING("[PIN_INT1_IRQn] portEND_SWITCHING_ISR called with False value"); LOG_DEBUG_ISR("[PIN_INT1_IRQn] portEND_SWITCHING_ISR called with False value");
} }
portEND_SWITCHING_ISR(xHigherPriorityWoken); portEND_SWITCHING_ISR(xHigherPriorityWoken);
} }
@ -51,7 +51,7 @@ extern "C"
xQueueSendFromISR (*p_rotary_isr_q, &data, &xHigherPriorityWoken); xQueueSendFromISR (*p_rotary_isr_q, &data, &xHigherPriorityWoken);
if(!xHigherPriorityWoken) if(!xHigherPriorityWoken)
{ {
LOG_WARNING("[PIN_INT2_IRQn] portEND_SWITCHING_ISR called with False value"); LOG_DEBUG_ISR("[PIN_INT2_IRQn] portEND_SWITCHING_ISR called with False value");
} }
portEND_SWITCHING_ISR(xHigherPriorityWoken); portEND_SWITCHING_ISR(xHigherPriorityWoken);
} }