diff --git a/source/shoh/src/main.cpp b/source/shoh/src/main.cpp index f054cb4..830b548 100644 --- a/source/shoh/src/main.cpp +++ b/source/shoh/src/main.cpp @@ -37,8 +37,9 @@ extern "C" { Chip_SCT_Init (LPC_SCT1); LPC_SCT1->CONFIG = SCT_CONFIG_32BIT_COUNTER; - LPC_SCT1->CTRL_U = SCT_CTRL_PRE_L (255) - | SCT_CTRL_CLRCTR_L; // set prescaler to 256 (255 + + //LPC_SCT1->CTRL_U = SCT_CTRL_PRE_L (255) + // | SCT_CTRL_CLRCTR_L; // set prescaler to 256 (255 + // 1), and start timer + LPC_SCT1->CTRL_U = SCT_CTRL_CLRCTR_L; } } diff --git a/source/shoh/src/threads/logging/Log.h b/source/shoh/src/threads/logging/Log.h index 9c64851..4f80c00 100644 --- a/source/shoh/src/threads/logging/Log.h +++ b/source/shoh/src/threads/logging/Log.h @@ -46,8 +46,10 @@ extern QueueHandle_t logging_queue; xQueueSend(logging_queue, (void*)message, portMAX_DELAY); \ } -static void create_log_line(const char * _status, +static void create_log_line(const size_t _timestamp, + const char * _status, const char * _location, + const char * _func, const size_t _line, const char * _fmt, ...) { @@ -58,9 +60,11 @@ static void create_log_line(const char * _status, va_end(args); char buffer [LOG_BUFFER_MAX_CAP] = {0}; int buffer_len = snprintf(buffer, LOG_BUFFER_MAX_CAP, - "[%s] [File: %s] [Line: %d] %.*s", + "[%zu]:[%s] In [File: %s] [Func: %s] [Line: %zu]\r\n %.*s", + _timestamp, _status, _location, + _func, _line, message_len, message); @@ -68,18 +72,18 @@ static void create_log_line(const char * _status, } -#define LOG_INFO(fmt, ...) \ - create_log_line(C_INFO, __FILE__, __LINE__, fmt, ##__VA_ARGS__); +#define LOG_INFO( fmt, ...) \ + create_log_line(LPC_SCT1->COUNT_U, C_INFO, __FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__); #define LOG_WARNING(fmt, ...) \ - create_log_line(C_WARN, __FILE__, __LINE__, fmt, ##__VA_ARGS__); + create_log_line(LPC_SCT1->COUNT_U, C_WARN, __FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__); #define LOG_ERROR(fmt, ...) \ - create_log_line(C_ERROR, __FILE__, __LINE__, fmt, ##__VA_ARGS__); + create_log_line(LPC_SCT1->COUNT_U, C_ERROR, __FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__); #if LOG_DEBUG_MESSAGES #define LOG_DEBUG(fmt, ...) \ - create_log_line(C_DEBUG, __FILE__, __LINE__, fmt, ##__VA_ARGS__); + create_log_line(LPC_SCT1->COUNT_U, C_DEBUG, __FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__); #else #define LOG_DEBUG(fmt, ...) #endif