[FL-1147] System logging (#434)

* furi_log: introduce log system
* applications: rework with furi logging
* furi_log: reset color after tag printed
* core: add log info

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
gornekich
2021-04-30 14:20:33 +03:00
committed by GitHub
parent b90d72fadf
commit dd9bd224be
10 changed files with 189 additions and 35 deletions

33
core/flipper.c Normal file → Executable file
View File

@@ -4,17 +4,22 @@
#include <version.h>
#include <api-hal-version.h>
static void flipper_print_version(const Version* version) {
static void flipper_print_version(const char* target, const Version* version) {
if(version) {
printf("\tVersion:\t%s\r\n", version_get_version(version));
printf("\tBuild date:\t%s\r\n", version_get_builddate(version));
printf(
"\tGit Commit:\t%s (%s)\r\n",
FURI_LOG_I(
"FLIPPER",
"\r\n\t%s version:\t%s\r\n"
"\tBuild date:\t\t%s\r\n"
"\tGit Commit:\t\t%s (%s)\r\n"
"\tGit Branch:\t\t%s",
target,
version_get_version(version),
version_get_builddate(version),
version_get_githash(version),
version_get_gitbranchnum(version));
printf("\tGit Branch:\t%s\r\n", version_get_gitbranch(version));
version_get_gitbranchnum(version),
version_get_gitbranch(version));
} else {
printf("\tNo build info\r\n");
FURI_LOG_I("FLIPPER", "No build info for %s", target);
}
}
@@ -22,17 +27,15 @@ void flipper_init() {
const Version* version;
version = (const Version*)api_hal_version_get_boot_version();
printf("Bootloader\r\n");
flipper_print_version(version);
flipper_print_version("Bootloader", version);
version = (const Version*)api_hal_version_get_fw_version();
printf("Firmware\r\n");
flipper_print_version(version);
flipper_print_version("Firmware", version);
printf("[flipper] starting services\r\n");
FURI_LOG_I("FLIPPER", "starting services");
for(size_t i = 0; i < FLIPPER_SERVICES_COUNT; i++) {
printf("[flipper] starting service %s\r\n", FLIPPER_SERVICES[i].name);
FURI_LOG_I("FLIPPER", "starting service %s", FLIPPER_SERVICES[i].name);
FuriThread* thread = furi_thread_alloc();
@@ -43,5 +46,5 @@ void flipper_init() {
furi_thread_start(thread);
}
printf("[flipper] services startup complete\r\n");
FURI_LOG_I("FLIPPER", "services startup complete");
}

View File

@@ -2,6 +2,7 @@
void furi_init() {
api_interrupt_init();
furi_log_init();
furi_record_init();
furi_stdglue_init();
}

View File

@@ -9,6 +9,7 @@
#include <furi/stdglue.h>
#include <furi/thread.h>
#include <furi/valuemutex.h>
#include <furi/log.h>
#include <api-hal-gpio.h>
#include <api-hal/api-interrupt-mgr.h>

52
core/furi/log.c Normal file
View File

@@ -0,0 +1,52 @@
#include "log.h"
#include <stm32wbxx_hal.h>
#include "check.h"
typedef struct {
FuriLogLevel log_level;
FuriLogPrint print;
FuriLogVPrint vprint;
FuriLogTimestamp timetamp;
} FuriLogParams;
static FuriLogParams furi_log;
void furi_log_init() {
// Set default logging parameters
furi_log.log_level = FURI_LOG_LEVEL;
furi_log.print = printf;
furi_log.vprint = vprintf;
furi_log.timetamp = HAL_GetTick;
}
void furi_log_print(FuriLogLevel level, const char* format, ...) {
va_list args;
va_start(args, format);
if(level <= furi_log.log_level) {
furi_log.print("%lu ", furi_log.timetamp());
furi_log.vprint(format, args);
}
va_end(args);
}
void furi_log_set_level(FuriLogLevel level) {
furi_log.log_level = level;
}
FuriLogLevel furi_log_get_level(void) {
return furi_log.log_level;
}
void furi_log_set_print(FuriLogPrint print, FuriLogVPrint vprint) {
furi_assert(print);
furi_assert(vprint);
furi_log.print = print;
furi_log.vprint = vprint;
}
void furi_log_set_timestamp(FuriLogTimestamp timestamp) {
furi_assert(timestamp);
furi_log.timetamp = timestamp;
}

66
core/furi/log.h Normal file
View File

@@ -0,0 +1,66 @@
#pragma once
#include <stdio.h>
#include <stdint.h>
#include <stdarg.h>
#ifdef __cplusplus
extern "C" {
#endif
#define FURI_LOG_LEVEL_DEFAULT 3
#ifndef FURI_LOG_LEVEL
#define FURI_LOG_LEVEL FURI_LOG_LEVEL_DEFAULT
#endif
#define FURI_LOG_CLR(clr) "\033[0;" clr "m"
#define FURI_LOG_CLR_RESET "\033[0m"
#define FURI_LOG_CLR_BLACK "30"
#define FURI_LOG_CLR_RED "31"
#define FURI_LOG_CLR_GREEN "32"
#define FURI_LOG_CLR_BROWN "33"
#define FURI_LOG_CLR_BLUE "34"
#define FURI_LOG_CLR_PURPLE "35"
#define FURI_LOG_CLR_E FURI_LOG_CLR(FURI_LOG_CLR_RED)
#define FURI_LOG_CLR_W FURI_LOG_CLR(FURI_LOG_CLR_BROWN)
#define FURI_LOG_CLR_I FURI_LOG_CLR(FURI_LOG_CLR_GREEN)
#define FURI_LOG_CLR_D FURI_LOG_CLR(FURI_LOG_CLR_BLUE)
#define FURI_LOG_CLR_V
typedef int (*FuriLogPrint)(const char*, ...);
typedef int (*FuriLogVPrint)(const char*, va_list);
typedef uint32_t (*FuriLogTimestamp)(void);
typedef enum {
FURI_LOG_NONE = 0,
FURI_LOG_ERROR = 1,
FURI_LOG_WARN = 2,
FURI_LOG_INFO = 3,
FURI_LOG_DEBUG = 4,
FURI_LOG_VERBOSE = 5,
} FuriLogLevel;
void furi_log_init();
void furi_log_print(FuriLogLevel level, const char* format, ...);
void furi_log_set_level(FuriLogLevel level);
FuriLogLevel furi_log_get_level();
void furi_log_set_print(FuriLogPrint print, FuriLogVPrint vprint);
void furi_log_set_timestamp(FuriLogTimestamp timestamp);
#define FURI_LOG_FORMAT(log_letter, tag, format) \
FURI_LOG_CLR_##log_letter "[" #log_letter "][" tag "]: " FURI_LOG_CLR_RESET format "\r\n"
#define FURI_LOG_SHOW(tag, format, log_level, log_letter, ...) \
furi_log_print(log_level, FURI_LOG_FORMAT(log_letter, tag, format), ##__VA_ARGS__)
#define FURI_LOG_E(tag, format, ...) FURI_LOG_SHOW(tag, format, FURI_LOG_ERROR, E, ##__VA_ARGS__)
#define FURI_LOG_W(tag, format, ...) FURI_LOG_SHOW(tag, format, FURI_LOG_WARN, W, ##__VA_ARGS__)
#define FURI_LOG_I(tag, format, ...) FURI_LOG_SHOW(tag, format, FURI_LOG_INFO, I, ##__VA_ARGS__)
#define FURI_LOG_D(tag, format, ...) FURI_LOG_SHOW(tag, format, FURI_LOG_DEBUG, D, ##__VA_ARGS__)
#define FURI_LOG_V(tag, format, ...) FURI_LOG_SHOW(tag, format, FURI_LOG_VERBOSE, V, ##__VA_ARGS__)
#ifdef __cplusplus
}
#endif