From 9fb6ad2e26451fca222f261c63e358d2626533ce Mon Sep 17 00:00:00 2001 From: VerstreuteSeele Date: Sat, 14 Jan 2023 03:11:20 +0100 Subject: [PATCH] Chat update --- applications/main/subghz/subghz_cli.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/applications/main/subghz/subghz_cli.c b/applications/main/subghz/subghz_cli.c index 6072be694..7422b6fb9 100644 --- a/applications/main/subghz/subghz_cli.c +++ b/applications/main/subghz/subghz_cli.c @@ -387,7 +387,7 @@ void subghz_cli_command_decode_raw(Cli* cli, FuriString* args, void* context) { } printf( - "Listening at \033[0;33m%s\033[0m.\r\n\r\nPress CTRL+C to stop\r\n\r\n", + "Listening at %s.\r\n\r\nPress CTRL+C to stop\r\n\r\n", furi_string_get_cstr(file_name)); LevelDuration level_duration; @@ -521,7 +521,8 @@ static void subghz_cli_command_encrypt_raw(Cli* cli, FuriString* args) { furi_string_free(source); } -static void subghz_cli_command_chat(Cli* cli, FuriString* args) { +static void subghz_cli_command_chat(Cli* cli, FuriString* args, void* context) { + UNUSED(context); uint32_t frequency = 433920000; if(furi_string_size(args)) { @@ -577,7 +578,7 @@ static void subghz_cli_command_chat(Cli* cli, FuriString* args) { NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION); - furi_string_printf(name, "\033[0;33m%s\033[0m: ", furi_hal_version_get_name_ptr()); + furi_string_printf(name, "%s: ", furi_hal_version_get_name_ptr()); furi_string_set(input, name); printf("%s", furi_string_get_cstr(input)); fflush(stdout); @@ -660,7 +661,7 @@ static void subghz_cli_command_chat(Cli* cli, FuriString* args) { case SubGhzChatEventUserEntrance: furi_string_printf( sysmsg, - "\033[0;34m%s joined chat.\033[0m\r\n", + "%s joined chat.\r\n", furi_hal_version_get_name_ptr()); subghz_chat_worker_write( subghz_chat, @@ -669,7 +670,7 @@ static void subghz_cli_command_chat(Cli* cli, FuriString* args) { break; case SubGhzChatEventUserExit: furi_string_printf( - sysmsg, "\033[0;31m%s left chat.\033[0m\r\n", furi_hal_version_get_name_ptr()); + sysmsg, "%s left chat.\r\n", furi_hal_version_get_name_ptr()); subghz_chat_worker_write( subghz_chat, (uint8_t*)furi_string_get_cstr(sysmsg), @@ -714,7 +715,7 @@ static void subghz_cli_command(Cli* cli, FuriString* args, void* context) { } if(furi_string_cmp_str(cmd, "chat") == 0) { - subghz_cli_command_chat(cli, args); + subghz_cli_command_chat(cli, args, NULL); break; } @@ -766,9 +767,11 @@ void subghz_on_system_start() { Cli* cli = furi_record_open(RECORD_CLI); cli_add_command(cli, "subghz", CliCommandFlagDefault, subghz_cli_command, NULL); + cli_add_command(cli, "chat", CliCommandFlagDefault, subghz_cli_command_chat, NULL); + furi_record_close(RECORD_CLI); #else UNUSED(subghz_cli_command); #endif -} +} \ No newline at end of file