Chat update

This commit is contained in:
VerstreuteSeele
2023-01-14 03:11:20 +01:00
parent e79ade605d
commit 9fb6ad2e26

View File

@@ -387,7 +387,7 @@ void subghz_cli_command_decode_raw(Cli* cli, FuriString* args, void* context) {
} }
printf( 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)); furi_string_get_cstr(file_name));
LevelDuration level_duration; LevelDuration level_duration;
@@ -521,7 +521,8 @@ static void subghz_cli_command_encrypt_raw(Cli* cli, FuriString* args) {
furi_string_free(source); 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; uint32_t frequency = 433920000;
if(furi_string_size(args)) { 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); 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); furi_string_set(input, name);
printf("%s", furi_string_get_cstr(input)); printf("%s", furi_string_get_cstr(input));
fflush(stdout); fflush(stdout);
@@ -660,7 +661,7 @@ static void subghz_cli_command_chat(Cli* cli, FuriString* args) {
case SubGhzChatEventUserEntrance: case SubGhzChatEventUserEntrance:
furi_string_printf( furi_string_printf(
sysmsg, sysmsg,
"\033[0;34m%s joined chat.\033[0m\r\n", "%s joined chat.\r\n",
furi_hal_version_get_name_ptr()); furi_hal_version_get_name_ptr());
subghz_chat_worker_write( subghz_chat_worker_write(
subghz_chat, subghz_chat,
@@ -669,7 +670,7 @@ static void subghz_cli_command_chat(Cli* cli, FuriString* args) {
break; break;
case SubGhzChatEventUserExit: case SubGhzChatEventUserExit:
furi_string_printf( 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_worker_write(
subghz_chat, subghz_chat,
(uint8_t*)furi_string_get_cstr(sysmsg), (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) { if(furi_string_cmp_str(cmd, "chat") == 0) {
subghz_cli_command_chat(cli, args); subghz_cli_command_chat(cli, args, NULL);
break; break;
} }
@@ -766,7 +767,9 @@ void subghz_on_system_start() {
Cli* cli = furi_record_open(RECORD_CLI); Cli* cli = furi_record_open(RECORD_CLI);
cli_add_command(cli, "subghz", CliCommandFlagDefault, subghz_cli_command, NULL); cli_add_command(cli, "subghz", CliCommandFlagDefault, subghz_cli_command, NULL);
cli_add_command(cli, "chat", CliCommandFlagDefault, subghz_cli_command_chat, NULL); cli_add_command(cli, "chat", CliCommandFlagDefault, subghz_cli_command_chat, NULL);
furi_record_close(RECORD_CLI); furi_record_close(RECORD_CLI);
#else #else
UNUSED(subghz_cli_command); UNUSED(subghz_cli_command);