upd protopirate

Author: xMasterX

base_pack/protopirate/helpers/protopirate_storage.c

@@ -276,6 +276,52 @@ static bool protopirate_storage_write_capture_data(
     return status;
 }
 
+bool protopirate_storage_save_capture_to_path(
+    FlipperFormat* flipper_format,
+    const char* full_path) {
+    furi_check(flipper_format);
+    furi_check(full_path);
+
+    if(!protopirate_storage_init()) {
+        FURI_LOG_E(TAG, "Failed to create app folder");
+        return false;
+    }
+
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    FlipperFormat* save_file = flipper_format_file_alloc(storage);
+    bool result = false;
+
+    do {
+        // Remove if it already exists (overwrite)
+        if(storage_file_exists(storage, full_path)) {
+            storage_simply_remove(storage, full_path);
+        }
+
+        if(!flipper_format_file_open_new(save_file, full_path)) {
+            FURI_LOG_E(TAG, "Failed to create file: %s", full_path);
+            break;
+        }
+
+        if(!flipper_format_write_header_cstr(save_file, "Flipper SubGhz Key File", 1)) {
+            FURI_LOG_E(TAG, "Failed to write header");
+            break;
+        }
+
+        if(!protopirate_storage_write_capture_data(save_file, flipper_format)) {
+            FURI_LOG_E(TAG, "Failed to write capture data");
+            break;
+        }
+
+        result = true;
+        FURI_LOG_I(TAG, "Saved capture to %s", full_path);
+
+    } while(false);
+
+    flipper_format_free(save_file);
+    furi_record_close(RECORD_STORAGE);
+    return result;
+}
+
 bool protopirate_storage_save_temp(FlipperFormat* flipper_format) {
     if(!protopirate_storage_init()) {
         FURI_LOG_E(TAG, "Failed to create app folder");
@@ -415,4 +461,4 @@ bool protopirate_storage_file_exists(const char* file_path) {
     furi_record_close(RECORD_STORAGE);
 
     return exists;
-}
+}

base_pack/protopirate/helpers/protopirate_storage.h

@@ -77,12 +77,17 @@
 // Initialize storage (create folder if needed)
 bool protopirate_storage_init(void);
 
-// Save a capture to a new file
+// Save a capture to a new file (auto-generated name)
 bool protopirate_storage_save_capture(
     FlipperFormat* flipper_format,
     const char* protocol_name,
     FuriString* out_path);
 
+// Save a capture to a specific file path (user-chosen name)
+bool protopirate_storage_save_capture_to_path(
+    FlipperFormat* flipper_format,
+    const char* full_path);
+
 // Save to temp file for emulation
 bool protopirate_storage_save_temp(FlipperFormat* flipper_format);
 
@@ -102,4 +107,4 @@ FlipperFormat* protopirate_storage_load_file(const char* file_path);
 void protopirate_storage_close_file(FlipperFormat* flipper_format);
 
 // Check if file exists
-bool protopirate_storage_file_exists(const char* file_path);
+bool protopirate_storage_file_exists(const char* file_path);

base_pack/protopirate/helpers/protopirate_types.h

@@ -12,6 +12,7 @@ typedef enum {
     ProtoPirateViewReceiverInfo,
     ProtoPirateViewAbout,
     ProtoPirateViewFileBrowser,
+    ProtoPirateViewTextInput,
 } ProtoPirateView;
 
 typedef enum {
@@ -25,6 +26,7 @@ typedef enum {
     ProtoPirateCustomEventSceneSettingLock,
     // File management
     ProtoPirateCustomEventReceiverInfoSave,
+    ProtoPirateCustomEventReceiverInfoSaveConfirm,
     ProtoPirateCustomEventReceiverInfoEmulate,
     ProtoPirateCustomEventReceiverInfoBruteforceStart,
     ProtoPirateCustomEventReceiverInfoBruteforceCancel,
@@ -70,4 +72,4 @@ typedef enum {
     ProtoPirateRxKeyStateBack,
     ProtoPirateRxKeyStateStart,
     ProtoPirateRxKeyStateAddKey,
-} ProtoPirateRxKeyState;
+} ProtoPirateRxKeyState;

base_pack/protopirate/protocols/kia_v0.c

@@ -13,6 +13,7 @@ static const SubGhzBlockConst subghz_protocol_kia_const = {
 // Multi-burst configuration
 #define KIA_TOTAL_BURSTS       2
 #define KIA_INTER_BURST_GAP_US 25000
+#define KIA_HEADER_PULSES      64
 
 struct SubGhzProtocolDecoderKIA {
     SubGhzProtocolDecoderBase base;
@@ -139,7 +140,7 @@ void* subghz_protocol_encoder_kia_alloc(SubGhzEnvironment* environment) {
     instance->button = 0;
     instance->counter = 0;
 
-    instance->encoder.size_upload = (32 + 2 + 118 + 1) * KIA_TOTAL_BURSTS + (KIA_TOTAL_BURSTS - 1);
+    instance->encoder.size_upload = (KIA_HEADER_PULSES + 2 + 118 + 1) * KIA_TOTAL_BURSTS + (KIA_TOTAL_BURSTS - 1);
     instance->encoder.upload = malloc(instance->encoder.size_upload * sizeof(LevelDuration));
     instance->encoder.repeat =
         10; // High repeat count for continuous transmission while button is held
@@ -202,7 +203,7 @@ static void subghz_protocol_encoder_kia_get_upload(SubGhzProtocolEncoderKIA* ins
             instance->encoder.upload[index++] = level_duration_make(false, KIA_INTER_BURST_GAP_US);
         }
 
-        for(int i = 0; i < 32; i++) {
+        for(int i = 0; i < KIA_HEADER_PULSES; i++) {
             bool is_high = (i % 2) == 0;
             instance->encoder.upload[index++] =
                 level_duration_make(is_high, subghz_protocol_kia_const.te_short);

base_pack/protopirate/protopirate_app.c

@@ -86,6 +86,15 @@ ProtoPirateApp* protopirate_app_alloc() {
     view_dispatcher_add_view(
         app->view_dispatcher, ProtoPirateViewWidget, widget_get_view(app->widget));
 
+    // Text Input
+    app->text_input = text_input_alloc();
+    view_dispatcher_add_view(
+        app->view_dispatcher, ProtoPirateViewTextInput, text_input_get_view(app->text_input));
+    app->save_protocol = NULL;
+    app->save_from_saved_info = false;
+    app->save_history_idx = 0;
+    memset(app->save_filename, 0, sizeof(app->save_filename));
+
     // File Browser path
     app->file_path = furi_string_alloc();
     furi_string_set(app->file_path, PROTOPIRATE_APP_FOLDER);
@@ -442,6 +451,15 @@ void protopirate_app_free(ProtoPirateApp* app) {
     view_dispatcher_remove_view(app->view_dispatcher, ProtoPirateViewWidget);
     widget_free(app->widget);
 
+    // Text Input
+    FURI_LOG_D(TAG, "Removing text_input view");
+    view_dispatcher_remove_view(app->view_dispatcher, ProtoPirateViewTextInput);
+    text_input_free(app->text_input);
+    if(app->save_protocol) {
+        furi_string_free(app->save_protocol);
+        app->save_protocol = NULL;
+    }
+
     // Receiver
     FURI_LOG_D(TAG, "Removing receiver view");
     view_dispatcher_remove_view(app->view_dispatcher, ProtoPirateViewReceiver);
@@ -537,4 +555,4 @@ int32_t protopirate_app(char* p) {
     furi_hal_power_suppress_charge_exit();
 
     return 0;
-}
+}

base_pack/protopirate/protopirate_app_i.h

@@ -15,6 +15,7 @@
 #include <gui/modules/submenu.h>
 #include <gui/modules/variable_item_list.h>
 #include <gui/modules/widget.h>
+#include <gui/modules/text_input.h>
 #include <notification/notification_messages.h>
 #include <lib/subghz/subghz_setting.h>
 #include <lib/subghz/subghz_worker.h>
@@ -54,6 +55,7 @@ struct ProtoPirateApp {
     VariableItemList* variable_item_list;
     Submenu* submenu;
     Widget* widget;
+    TextInput* text_input;
     View* view_about;
     FuriString* file_path;
     ProtoPirateReceiver* protopirate_receiver;
@@ -69,6 +71,10 @@ struct ProtoPirateApp {
     uint8_t tx_power;
     PsaBfState* psa_bf_state;
     FuriThread* psa_bf_thread;
+    char save_filename[64];
+    FuriString* save_protocol;
+    uint16_t save_history_idx;
+    bool save_from_saved_info;
 };
 
 typedef enum {
@@ -114,4 +120,4 @@ static const NotificationSequence sequence_tx = {
     &message_delay_25,
     &message_sound_off,
     NULL,
-};
+};

base_pack/protopirate/scenes/protopirate_scene_receiver_info.c

@@ -12,6 +12,12 @@ static void protopirate_scene_receiver_info_widget_callback(
     InputType type,
     void* context);
 
+static void protopirate_scene_receiver_info_text_input_callback(void* context) {
+    ProtoPirateApp* app = context;
+    view_dispatcher_send_custom_event(
+        app->view_dispatcher, ProtoPirateCustomEventReceiverInfoSaveConfirm);
+}
+
 static void psa_bf_done_cb_receiver_info(void* context) {
     ProtoPirateApp* app = context;
     view_dispatcher_send_custom_event(
@@ -416,27 +422,98 @@ bool protopirate_scene_receiver_info_on_event(void* context, SceneManagerEvent e
             FlipperFormat* ff =
                 protopirate_history_get_raw_data(app->txrx->history, app->txrx->idx_menu_chosen);
             if(ff) {
+                // Read protocol name for default filename
                 FuriString* protocol = furi_string_alloc();
                 flipper_format_rewind(ff);
                 if(!flipper_format_read_string(ff, "Protocol", protocol)) {
                     furi_string_set_str(protocol, "Unknown");
                 }
-                FuriString* saved_path = furi_string_alloc();
-                if(protopirate_storage_save_capture(
-                       ff, furi_string_get_cstr(protocol), saved_path)) {
+
+                // Clean protocol name for filename
+                furi_string_replace_all(protocol, "/", "_");
+                furi_string_replace_all(protocol, " ", "_");
+
+                // Get the next auto-generated filename (just the name part)
+                FuriString* auto_path = furi_string_alloc();
+                if(protopirate_storage_get_next_filename(
+                       furi_string_get_cstr(protocol), auto_path)) {
+                    // Extract just the filename without folder and extension
+                    const char* full = furi_string_get_cstr(auto_path);
+                    const char* slash = strrchr(full, '/');
+                    const char* name_start = slash ? slash + 1 : full;
+
+                    // Copy without extension
+                    size_t name_len = strlen(name_start);
+                    const char* dot = strrchr(name_start, '.');
+                    if(dot) name_len = dot - name_start;
+                    if(name_len >= sizeof(app->save_filename))
+                        name_len = sizeof(app->save_filename) - 1;
+
+                    memcpy(app->save_filename, name_start, name_len);
+                    app->save_filename[name_len] = '\0';
+                } else {
+                    snprintf(app->save_filename, sizeof(app->save_filename), "capture");
+                }
+                furi_string_free(auto_path);
+
+                // Store context for when text input confirms
+                if(app->save_protocol) furi_string_free(app->save_protocol);
+                app->save_protocol = protocol; // transfer ownership
+                app->save_history_idx = app->txrx->idx_menu_chosen;
+                app->save_from_saved_info = false;
+
+                // Configure and show text input
+                text_input_reset(app->text_input);
+                text_input_set_header_text(app->text_input, "Save filename:");
+                text_input_set_result_callback(
+                    app->text_input,
+                    protopirate_scene_receiver_info_text_input_callback,
+                    app,
+                    app->save_filename,
+                    sizeof(app->save_filename),
+                    false); // don't clear default text
+
+                view_dispatcher_switch_to_view(app->view_dispatcher, ProtoPirateViewTextInput);
+            }
+            consumed = true;
+        }
+
+        if(event.event == ProtoPirateCustomEventReceiverInfoSaveConfirm) {
+            // User confirmed the filename in text input
+            FlipperFormat* ff =
+                protopirate_history_get_raw_data(app->txrx->history, app->save_history_idx);
+            if(ff) {
+                // Build full path: folder/filename.psf
+                FuriString* save_path = furi_string_alloc_printf(
+                    "%s/%s%s",
+                    PROTOPIRATE_APP_FOLDER,
+                    app->save_filename,
+                    PROTOPIRATE_APP_EXTENSION);
+
+                if(protopirate_storage_save_capture_to_path(
+                       ff, furi_string_get_cstr(save_path))) {
                     notification_message(app->notifications, &sequence_success);
-                    FURI_LOG_I(TAG, "Saved to: %s", furi_string_get_cstr(saved_path));
+                    FURI_LOG_I(TAG, "Saved to: %s", furi_string_get_cstr(save_path));
                 } else {
                     notification_message(app->notifications, &sequence_error);
                     FURI_LOG_E(TAG, "Save failed");
                 }
-                furi_string_free(protocol);
-                furi_string_free(saved_path);
+                furi_string_free(save_path);
             }
+
+            // Clean up save protocol string
+            if(app->save_protocol) {
+                furi_string_free(app->save_protocol);
+                app->save_protocol = NULL;
+            }
+
+            // Return to the receiver info widget
+            view_dispatcher_switch_to_view(app->view_dispatcher, ProtoPirateViewWidget);
             consumed = true;
         }
+
 #ifdef ENABLE_EMULATE_FEATURE
-        else if(event.event == ProtoPirateCustomEventReceiverInfoEmulate && !is_emu_off) {
+        if(event.event == ProtoPirateCustomEventReceiverInfoEmulate && !is_emu_off) {
             FlipperFormat* ff =
                 protopirate_history_get_raw_data(app->txrx->history, app->txrx->idx_menu_chosen);
             if(ff) {
@@ -464,4 +541,4 @@ void protopirate_scene_receiver_info_on_exit(void* context) {
     furi_check(context);
     ProtoPirateApp* app = context;
     widget_reset(app->widget);
-}
+}