liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB-UART: New GUI (#826)

Browse Source 
* USB-UART: new gui
* Furi: use furi_console for logging instead of printf.
* CDC: calling open/close callbacks on interface change
* fix vcp_tx block on disconnect
* USB mode set by struct pointer
* FuriHal: proper event sequence on vcp reconnect
* disable debug prints
* HAL: add context to UART IRQ's
* Context usage in UART IRQ and CDC callbacks
* USB-UART: geting rid of baudrate limitations
* FuriHal: remove struct pollutant in usb api.

Co-authored-by: あく <alleteam@gmail.com>
Co-authored-by: DrZlo13 <who.just.the.doctor@gmail.com>
This commit is contained in:
Nikolay Minaylov
2021-11-21 18:17:43 +03:00
committed by GitHub
parent a5052a0375
commit efded63bcb
37 changed files with 1444 additions and 961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/furi/log.c
View File

@@ -1,12 +1,11 @@
#include "log.h"
#include <stm32wbxx_hal.h>
#include "check.h"
#include <cmsis_os2.h>
#include <furi-hal.h>
typedef struct {
FuriLogLevel log_level;
FuriLogPrint print;
FuriLogVPrint vprint;
FuriLogPuts puts;
FuriLogTimestamp timetamp;
osMutexId_t mutex;
} FuriLogParams;
@@ -16,8 +15,7 @@ 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.puts = furi_hal_console_puts;
furi_log.timetamp = HAL_GetTick;
furi_log.mutex = osMutexNew(NULL);
}
@@ -25,10 +23,22 @@ void furi_log_init() {
void furi_log_print(FuriLogLevel level, const char* format, ...) {
va_list args;
va_start(args, format);
if(level <= furi_log.log_level) {
osMutexAcquire(furi_log.mutex, osWaitForever);
furi_log.print("%lu ", furi_log.timetamp());
furi_log.vprint(format, args);
if(level <= furi_log.log_level && osMutexAcquire(furi_log.mutex, osWaitForever) == osOK) {
string_t string;
// Timestamp
string_init_printf(string, "%lu ", furi_log.timetamp());
furi_log.puts(string_get_cstr(string));
string_clear(string);
va_list args;
va_start(args, format);
string_init_vprintf(string, format, args);
va_end(args);
furi_log.puts(string_get_cstr(string));
string_clear(string);
osMutexRelease(furi_log.mutex);
}
va_end(args);
@@ -42,16 +52,12 @@ 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_puts(FuriLogPuts puts) {
furi_assert(puts);
furi_log.puts = puts;
}
void furi_log_set_timestamp(FuriLogTimestamp timestamp) {
furi_assert(timestamp);
furi_log.timetamp = timestamp;
}