[FL-781] FURI, CLI, stdlib: stdout hooks, integration between subsystems, uniform printf usage (#311)
* FURI stdglue: stdout hooks, local and global, ISR safe printf. Uniform newlines for terminal/debug output. Power: prevent sleep while core 2 has not started. * Furi record, stdglue: check mutex allocation * remove unused test * Furi stdglue: buferized output, dynamically allocated state. Furi record: dynamically allocated state. Input dump: proper line ending. Hal VCP: dynamically allocated state. * Interrupt manager: explicitly init list. * Makefile: cleanup rules, fix broken dfu upload. F4: add compiler stack protection options. * BLE: call debug uart callback on transmission complete * FreeRTOS: add configUSE_NEWLIB_REENTRANT * API HAL Timebase: fix issue with idle thread stack corruption caused by systick interrupt. BT: cleanup debug info output. FreeRTOS: disable reentry for newlib. * F4: update stack protection CFLAGS to match used compiller * F4: disable compiller stack protection because of incompatibility with current compiller * Makefile: return openocd logs to gdb * BLE: fixed pin, moar power, ble trace info. * Prevent sleep when connection is active * Makefile: return serial port to upload rule, add workaround for mac os * Furi: prevent usage of stack for cmsis functions. * F4: add missing includes, add debugger breakpoints * Applications: per app stack size. * Furi: honor kernel state in stdglue * FreeRTOS: remove unused hooks * Cleanup and format sources Co-authored-by: DrZlo13 <who.just.the.doctor@gmail.com>
This commit is contained in:
@@ -27,32 +27,42 @@ void cli_putc(char c) {
|
||||
api_hal_vcp_tx((uint8_t*)&c, 1);
|
||||
}
|
||||
|
||||
char cli_getc(Cli* cli) {
|
||||
furi_assert(cli);
|
||||
char c;
|
||||
if(api_hal_vcp_rx((uint8_t*)&c, 1) == 0) {
|
||||
cli_reset_state(cli);
|
||||
}
|
||||
return c;
|
||||
}
|
||||
|
||||
void cli_stdout_callback(void* _cookie, const char* data, size_t size) {
|
||||
api_hal_vcp_tx((const uint8_t*)data, size);
|
||||
}
|
||||
|
||||
void cli_read(char* buffer, size_t size) {
|
||||
api_hal_vcp_rx((uint8_t*)buffer, size);
|
||||
}
|
||||
|
||||
void cli_print(const char* str) {
|
||||
api_hal_vcp_tx((uint8_t*)str, strlen(str));
|
||||
}
|
||||
|
||||
void cli_print_version() {
|
||||
cli_print("Build date:" BUILD_DATE ". "
|
||||
"Git Commit:" GIT_COMMIT ". "
|
||||
"Git Branch:" GIT_BRANCH ". "
|
||||
"Commit Number:" GIT_BRANCH_NUM ".");
|
||||
printf("Build date:" BUILD_DATE ". "
|
||||
"Git Commit:" GIT_COMMIT ". "
|
||||
"Git Branch:" GIT_BRANCH ". "
|
||||
"Commit Number:" GIT_BRANCH_NUM ".");
|
||||
}
|
||||
|
||||
void cli_motd() {
|
||||
cli_print("Flipper cli.\r\n");
|
||||
printf("Flipper cli.\r\n");
|
||||
cli_print_version();
|
||||
}
|
||||
|
||||
void cli_nl() {
|
||||
cli_print("\r\n");
|
||||
printf("\r\n");
|
||||
}
|
||||
|
||||
void cli_prompt() {
|
||||
cli_print("\r\n>: ");
|
||||
printf("\r\n>: ");
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
void cli_backspace(Cli* cli) {
|
||||
@@ -100,8 +110,8 @@ void cli_enter(Cli* cli) {
|
||||
cli_prompt();
|
||||
} else {
|
||||
cli_nl();
|
||||
cli_print("Command not found: ");
|
||||
cli_print(string_get_cstr(command));
|
||||
printf("Command not found: ");
|
||||
printf(string_get_cstr(command));
|
||||
cli_prompt();
|
||||
cli_putc(CliSymbolAsciiBell);
|
||||
}
|
||||
@@ -112,14 +122,9 @@ void cli_enter(Cli* cli) {
|
||||
}
|
||||
|
||||
void cli_process_input(Cli* cli) {
|
||||
char c;
|
||||
char c = cli_getc(cli);
|
||||
size_t r;
|
||||
|
||||
r = api_hal_vcp_rx((uint8_t*)&c, 1);
|
||||
if(r == 0) {
|
||||
cli_reset_state(cli);
|
||||
}
|
||||
|
||||
if(c == CliSymbolAsciiTab) {
|
||||
cli_putc(CliSymbolAsciiBell);
|
||||
} else if(c == CliSymbolAsciiSOH) {
|
||||
@@ -175,6 +180,7 @@ void cli_task(void* p) {
|
||||
|
||||
furi_record_create("cli", cli);
|
||||
|
||||
furi_stdglue_set_thread_stdout_callback(cli_stdout_callback);
|
||||
while(1) {
|
||||
cli_process_input(cli);
|
||||
}
|
||||
|
@@ -34,12 +34,6 @@ void cli_add_command(Cli* cli, const char* name, CliCallback callback, void* con
|
||||
*/
|
||||
void cli_read(char* buffer, size_t size);
|
||||
|
||||
/* Print to terminal
|
||||
* Do it only from inside of callback.
|
||||
* @param buffer - pointer to null terminated string to print.
|
||||
*/
|
||||
void cli_print(const char* buffer);
|
||||
|
||||
/* New line
|
||||
* Send new ine sequence
|
||||
*/
|
||||
|
@@ -5,22 +5,22 @@
|
||||
void cli_command_help(string_t args, void* context) {
|
||||
(void)args;
|
||||
Cli* cli = context;
|
||||
cli_print("Commands we have:");
|
||||
printf("Commands we have:");
|
||||
|
||||
furi_check(osMutexAcquire(cli->mutex, osWaitForever) == osOK);
|
||||
CliCommandDict_it_t it;
|
||||
for(CliCommandDict_it(it, cli->commands); !CliCommandDict_end_p(it); CliCommandDict_next(it)) {
|
||||
CliCommandDict_itref_t* ref = CliCommandDict_ref(it);
|
||||
cli_print(" ");
|
||||
cli_print(string_get_cstr(ref->key));
|
||||
printf(" ");
|
||||
printf(string_get_cstr(ref->key));
|
||||
};
|
||||
furi_check(osMutexRelease(cli->mutex) == osOK);
|
||||
|
||||
if(string_size(args) > 0) {
|
||||
cli_nl();
|
||||
cli_print("Also I have no clue what '");
|
||||
cli_print(string_get_cstr(args));
|
||||
cli_print("' is.");
|
||||
printf("Also I have no clue what '");
|
||||
printf(string_get_cstr(args));
|
||||
printf("' is.");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ void cli_command_uuid(string_t args, void* context) {
|
||||
uint8_t uid_byte = uid[i];
|
||||
string_cat_printf(byte_str, "%02X", uid_byte);
|
||||
}
|
||||
cli_print(string_get_cstr(byte_str));
|
||||
printf(string_get_cstr(byte_str));
|
||||
}
|
||||
|
||||
void cli_command_date(string_t args, void* context) {
|
||||
@@ -61,11 +61,19 @@ void cli_command_date(string_t args, void* context) {
|
||||
string_cat_printf(datetime_str, "%.2d:%.2d:%.2d ", time.Hours, time.Minutes, time.Seconds);
|
||||
string_cat_printf(datetime_str, "%.2d-%.2d-%.2d", date.Month, date.Date, 2000 + date.Year);
|
||||
|
||||
cli_print(string_get_cstr(datetime_str));
|
||||
printf(string_get_cstr(datetime_str));
|
||||
|
||||
string_clear(datetime_str);
|
||||
}
|
||||
|
||||
void cli_command_log(string_t args, void* context) {
|
||||
Cli* cli = context;
|
||||
furi_stdglue_set_global_stdout_callback(cli_stdout_callback);
|
||||
printf("Press any key to stop...\r\n");
|
||||
cli_getc(cli);
|
||||
furi_stdglue_set_global_stdout_callback(NULL);
|
||||
}
|
||||
|
||||
void cli_commands_init(Cli* cli) {
|
||||
cli_add_command(cli, "help", cli_command_help, cli);
|
||||
cli_add_command(cli, "?", cli_command_help, cli);
|
||||
@@ -73,4 +81,5 @@ void cli_commands_init(Cli* cli) {
|
||||
cli_add_command(cli, "!", cli_command_version, cli);
|
||||
cli_add_command(cli, "uid", cli_command_uuid, cli);
|
||||
cli_add_command(cli, "date", cli_command_date, cli);
|
||||
cli_add_command(cli, "log", cli_command_log, cli);
|
||||
}
|
||||
|
@@ -38,4 +38,6 @@ Cli* cli_alloc();
|
||||
void cli_free(Cli* cli);
|
||||
void cli_reset_state(Cli* cli);
|
||||
void cli_print_version();
|
||||
char cli_getc(Cli* cli);
|
||||
void cli_putc(char c);
|
||||
void cli_stdout_callback(void* _cookie, const char* data, size_t size);
|
||||
|
Reference in New Issue
Block a user