Merge branch 'feat/nfc-type-4-final' into mntm-dev

applications/services/cli/application.fam

@@ -50,6 +50,14 @@ App(
     sources=["commands/subshell_demo.c"],
 )
 
+App(
+    appid="cli_buzzer",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="cli_buzzer_ep",
+    requires=["cli"],
+    sources=["commands/buzzer.c"],
+)
+
 App(
     appid="cli_src",
     targets=["f7"],

applications/services/cli/cli_main_commands.c

@@ -409,11 +409,13 @@ void cli_command_led(PipeSide* pipe, FuriString* args, void* context) {
 static void cli_command_top(PipeSide* pipe, FuriString* args, void* context) {
     UNUSED(context);
 
-    int interval = 1000;
-    args_read_int_and_trim(args, &interval);
+    uint32_t interval;
+    if(!args_read_duration(args, &interval, NULL)) {
+        interval = 1000;
+    }
 
     FuriThreadList* thread_list = furi_thread_list_alloc();
-    while(!cli_is_pipe_broken_or_is_etx_next_char(pipe)) {
+    do {
         uint32_t tick = furi_get_tick();
         furi_thread_enumerate(thread_list);
 
@@ -469,12 +471,8 @@ static void cli_command_top(PipeSide* pipe, FuriString* args, void* context) {
         printf(ANSI_ERASE_DISPLAY(ANSI_ERASE_FROM_CURSOR_TO_END));
         fflush(stdout);
 
-        if(interval > 0) {
-            furi_delay_ms(interval);
-        } else {
-            break;
-        }
-    }
+    } while(interval > 0 && cli_sleep(pipe, interval));
+
     furi_thread_list_free(thread_list);
 }
 
@@ -544,6 +542,37 @@ void cli_command_echo(PipeSide* pipe, FuriString* args, void* context) {
     }
 }
 
+/**
+ * @brief Pause for a specified duration or until Ctrl+C is pressed or the
+ * session is terminated.
+ *
+ * The duration can be specified in various units such as milliseconds (ms),
+ * seconds (s), minutes (m), or hours (h). If the unit is not specified, the
+ * second is used by default.
+ *
+ * Example:
+ *   sleep 5s
+ */
+void cli_command_sleep(PipeSide* pipe, FuriString* args, void* context) {
+    UNUSED(context);
+    FuriString* duration_string;
+    duration_string = furi_string_alloc();
+
+    do {
+        uint32_t duration_in_ms = 0;
+        if(!args_read_string_and_trim(args, duration_string) ||
+           !args_read_duration(duration_string, &duration_in_ms, "s")) {
+            cli_print_usage("sleep", "[<0-...>[<ms|s|m|h>]]", furi_string_get_cstr(args));
+            break;
+        }
+
+        cli_sleep(pipe, duration_in_ms);
+
+    } while(false);
+
+    furi_string_free(duration_string);
+}
+
 void cli_command_clear(PipeSide* pipe, FuriString* args, void* context) {
     UNUSED(pipe);
     UNUSED(args);
@@ -563,6 +592,8 @@ void cli_main_commands_init(CliRegistry* registry) {
     cli_registry_add_command(
         registry, "free_blocks", CliCommandFlagParallelSafe, cli_command_free_blocks, NULL);
     cli_registry_add_command(registry, "echo", CliCommandFlagParallelSafe, cli_command_echo, NULL);
+    cli_registry_add_command(
+        registry, "sleep", CliCommandFlagParallelSafe, cli_command_sleep, NULL);
 }
 
 CLI_COMMAND_INTERFACE(src, cli_command_src, CliCommandFlagParallelSafe, 768, CLI_APPID);

applications/services/cli/cli_vcp.h

@@ -15,7 +15,6 @@ typedef struct CliVcp CliVcp;
 
 void cli_vcp_enable(CliVcp* cli_vcp);
 void cli_vcp_disable(CliVcp* cli_vcp);
-
 #ifdef __cplusplus
 }
 #endif

applications/services/cli/commands/buzzer.c

@@ -0,0 +1,139 @@
+#include "../cli_main_commands.h"
+#include <notification/notification_app.h>
+#include <math.h>
+#include <toolbox/args.h>
+#include <toolbox/cli/cli_command.h>
+
+void cli_command_buzzer_print_usage(bool is_freq_subcommand, FuriString* args) {
+    if(is_freq_subcommand) {
+        cli_print_usage(
+            "buzzer freq", "<freq_hz> [<0-...>[<ms|s|m|h>]]", furi_string_get_cstr(args));
+
+    } else {
+        cli_print_usage("buzzer note", "<note> [<0-...>[<ms|s|m|h>]]", furi_string_get_cstr(args));
+    }
+}
+
+// Consider volume effectively zero if below this threshold
+#define BUZZER_VOLUME_EPSILON (1e-3f)
+
+float cli_command_buzzer_read_frequency(bool is_freq_subcommand, FuriString* args) {
+    float frequency = 0.0f;
+
+    if(is_freq_subcommand) {
+        args_read_float_and_trim(args, &frequency);
+        return frequency;
+    }
+
+    // Extract note frequency from name
+
+    FuriString* note_name_string;
+    note_name_string = furi_string_alloc();
+
+    do {
+        if(!args_read_string_and_trim(args, note_name_string)) {
+            break;
+        }
+        const char* note_name = furi_string_get_cstr(note_name_string);
+        frequency = notification_messages_notes_frequency_from_name(note_name);
+    } while(false);
+
+    furi_string_free(note_name_string);
+
+    return frequency;
+}
+
+void cli_command_buzzer_play(
+    PipeSide* pipe,
+    NotificationApp* notification,
+    bool is_freq_subcommand,
+    FuriString* args) {
+    FuriString* duration_string;
+    duration_string = furi_string_alloc();
+
+    do {
+        float frequency = cli_command_buzzer_read_frequency(is_freq_subcommand, args);
+        if(frequency <= 0.0f) {
+            cli_command_buzzer_print_usage(is_freq_subcommand, args);
+            break;
+        }
+
+        const NotificationMessage notification_buzzer_message = {
+            .type = NotificationMessageTypeSoundOn,
+            .data.sound.frequency = frequency,
+            .data.sound.volume = 1.0,
+        };
+
+        // Optional duration
+        uint32_t duration_ms = 100;
+        if(args_read_string_and_trim(args, duration_string)) {
+            if(!args_read_duration(duration_string, &duration_ms, NULL)) {
+                cli_command_buzzer_print_usage(is_freq_subcommand, args);
+                break;
+            }
+        }
+
+        const NotificationSequence sound_on_sequence = {
+            &notification_buzzer_message,
+            &message_do_not_reset,
+            NULL,
+        };
+
+        // Play sound
+        notification_message_block(notification, &sound_on_sequence);
+
+        cli_sleep(pipe, duration_ms);
+
+        // Stop sound
+        const NotificationSequence sound_off_sequence = {
+            &message_sound_off,
+            NULL,
+        };
+        notification_message_block(notification, &sound_off_sequence);
+
+    } while(false);
+
+    furi_string_free(duration_string);
+}
+
+void execute(PipeSide* pipe, FuriString* args, void* context) {
+    UNUSED(context);
+
+    NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION);
+
+    FuriString* command_string;
+    command_string = furi_string_alloc();
+
+    do {
+        if(!args_read_string_and_trim(args, command_string)) {
+            cli_print_usage("buzzer", "<freq|note>", furi_string_get_cstr(args));
+            break;
+        }
+
+        // Check volume
+        if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagStealthMode)) {
+            printf("Flipper is in stealth mode. Unmute the device to control buzzer.");
+            break;
+        }
+        if(fabsf(notification->settings.speaker_volume) < BUZZER_VOLUME_EPSILON) {
+            printf("Sound is disabled in settings. Increase volume to control buzzer.");
+            break;
+        }
+
+        if(furi_string_cmp(command_string, "freq") == 0) {
+            cli_command_buzzer_play(pipe, notification, true, args);
+            break;
+        } else if(furi_string_cmp(command_string, "note") == 0) {
+            cli_command_buzzer_play(pipe, notification, false, args);
+            break;
+        }
+
+        cli_print_usage("buzzer", "<freq|note>", furi_string_get_cstr(args));
+
+    } while(false);
+
+    furi_string_free(command_string);
+    furi_record_close(RECORD_NOTIFICATION);
+}
+
+CLI_COMMAND_INTERFACE(buzzer, execute, CliCommandFlagDefault, 2048, CLI_APPID);