T5577 write/clear with custom password option added

applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c

@@ -1,4 +1,5 @@
 #include "../lfrfid_i.h"
+#include "tools/t5577.h"
 #define TAG "Clear T5577"
 
 static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) {
@@ -6,7 +7,7 @@ static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) {
     char curr_buf[32] = {};
 
     uint8_t default_passwords_len;
-    const uint32_t* default_passwords = t5577_get_default_passwords(&default_passwords_len);
+    const uint32_t* default_passwords = lfrfid_get_t5577_default_passwords(&default_passwords_len);
 
     popup_set_header(popup, "Removing\npassword", 90, 36, AlignCenter, AlignCenter);
     popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61);
@@ -15,14 +16,26 @@ static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) {
 
     LFRFIDT5577 data = {
         .block[0] = 0b00000000000101001000000001000000,
-        .blocks_to_write = 1,
+        .block[7] = 0,
+        .mask = 0b10000001,
     };
 
+    // Clear custom password
+    uint32_t custom_pass = (app->password[0] << 24) | (app->password[1] << 16) |
+                           (app->password[2] << 8) | (app->password[3]);
+    snprintf(curr_buf, sizeof(curr_buf), "Custom password");
+    view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);
+
+    t5577_write_with_mask(&data, 0, true, custom_pass);
+
+    furi_delay_ms(8);
+
+    // Clear default passwords
     for(uint8_t i = 0; i < default_passwords_len; i++) {
         snprintf(curr_buf, sizeof(curr_buf), "Pass %d of %d", i, default_passwords_len);
         view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);
 
-        t5577_write_with_pass(&data, default_passwords[i]);
+        t5577_write_with_mask(&data, 0, true, default_passwords[i]);
         furi_delay_ms(8);
     }
 

applications/main/lfrfid/scenes/lfrfid_scene_config.h

@@ -6,7 +6,7 @@ ADD_SCENE(lfrfid, exit_confirm, ExitConfirm)
 ADD_SCENE(lfrfid, delete_confirm, DeleteConfirm)
 ADD_SCENE(lfrfid, read_key_menu, ReadKeyMenu)
 ADD_SCENE(lfrfid, write, Write)
-ADD_SCENE(lfrfid, write_with_pass, WriteWithPass)
+ADD_SCENE(lfrfid, write_and_set_pass, WriteAndSetPass)
 ADD_SCENE(lfrfid, write_success, WriteSuccess)
 ADD_SCENE(lfrfid, emulate, Emulate)
 ADD_SCENE(lfrfid, save_name, SaveName)
@@ -18,6 +18,7 @@ ADD_SCENE(lfrfid, save_type, SaveType)
 ADD_SCENE(lfrfid, saved_info, SavedInfo)
 ADD_SCENE(lfrfid, clear_t5577, ClearT5577)
 ADD_SCENE(lfrfid, clear_t5577_confirm, ClearT5577Confirm)
+ADD_SCENE(lfrfid, enter_password, EnterPassword)
 ADD_SCENE(lfrfid, delete_success, DeleteSuccess)
 ADD_SCENE(lfrfid, extra_actions, ExtraActions)
 ADD_SCENE(lfrfid, raw_info, RawInfo)

applications/main/lfrfid/scenes/lfrfid_scene_enter_password.c

@@ -0,0 +1,55 @@
+#include "../lfrfid_i.h"
+#include "gui/scene_manager.h"
+
+int next_scene;
+
+void lfrfid_scene_enter_password_on_enter(void* context) {
+    LfRfid* app = context;
+    ByteInput* byte_input = app->byte_input;
+
+    // true - use password for write, false - use password for clear pass
+    next_scene = scene_manager_get_scene_state(app->scene_manager, LfRfidSceneEnterPassword);
+
+    bool password_set = app->password[0] | app->password[1] | app->password[2] | app->password[3];
+
+    if(next_scene == LfRfidSceneWriteAndSetPass && !password_set) {
+        uint8_t password_list_size;
+        const uint32_t* password_list = lfrfid_get_t5577_default_passwords(&password_list_size);
+        uint32_t pass = password_list[furi_get_tick() % password_list_size];
+
+        for(uint8_t i = 0; i < 4; i++) app->password[i] = (pass >> (8 * i)) & 0xFF;
+    }
+
+    byte_input_set_header_text(byte_input, "Enter the password in hex");
+
+    byte_input_set_result_callback(
+        byte_input, lfrfid_text_input_callback, NULL, app, app->password, 4);
+
+    view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewByteInput);
+}
+
+bool lfrfid_scene_enter_password_on_event(void* context, SceneManagerEvent event) {
+    LfRfid* app = context;
+    SceneManager* scene_manager = app->scene_manager;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == LfRfidEventNext) {
+            consumed = true;
+
+            scene_manager_next_scene(scene_manager, next_scene);
+            scene_manager_set_scene_state(scene_manager, LfRfidSceneEnterPassword, 1);
+        }
+    } else if(event.type == SceneManagerEventTypeBack) {
+        uint32_t prev_scenes[] = {LfRfidSceneExtraActions, LfRfidSceneSavedKeyMenu};
+        scene_manager_set_scene_state(scene_manager, LfRfidSceneEnterPassword, 0);
+        scene_manager_search_and_switch_to_previous_scene_one_of(
+            scene_manager, prev_scenes, sizeof(prev_scenes[0]));
+    }
+
+    return consumed;
+}
+
+void lfrfid_scene_enter_password_on_exit(void* context) {
+    UNUSED(context);
+}

applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c

@@ -80,7 +80,9 @@ bool lfrfid_scene_extra_actions_on_event(void* context, SceneManagerEvent event)
             dolphin_deed(DolphinDeedRfidRead);
             consumed = true;
         } else if(event.event == SubmenuIndexClearT5577) {
-            scene_manager_next_scene(app->scene_manager, LfRfidSceneClearT5577Confirm);
+            scene_manager_set_scene_state(
+                app->scene_manager, LfRfidSceneEnterPassword, LfRfidSceneClearT5577Confirm);
+            scene_manager_next_scene(app->scene_manager, LfRfidSceneEnterPassword);
             consumed = true;
         } else if(event.event == SubmenuIndexRAW) {
             scene_manager_next_scene(app->scene_manager, LfRfidSceneRawName);

applications/main/lfrfid/scenes/lfrfid_scene_saved_key_menu.c

@@ -4,7 +4,7 @@
 typedef enum {
     SubmenuIndexEmulate,
     SubmenuIndexWrite,
-    SubmenuIndexWriteWithPass,
+    SubmenuIndexWriteAndSetPass,
     SubmenuIndexEdit,
     SubmenuIndexDelete,
     SubmenuIndexInfo,
@@ -26,8 +26,8 @@ void lfrfid_scene_saved_key_menu_on_enter(void* context) {
         submenu, "Write", SubmenuIndexWrite, lfrfid_scene_saved_key_menu_submenu_callback, app);
     submenu_add_item(
         submenu,
-        "Write with pass",
-        SubmenuIndexWriteWithPass,
+        "Write and set pass",
+        SubmenuIndexWriteAndSetPass,
         lfrfid_scene_saved_key_menu_submenu_callback,
         app);
     submenu_add_item(
@@ -55,8 +55,10 @@ bool lfrfid_scene_saved_key_menu_on_event(void* context, SceneManagerEvent event
         } else if(event.event == SubmenuIndexWrite) {
             scene_manager_next_scene(app->scene_manager, LfRfidSceneWrite);
             consumed = true;
-        } else if(event.event == SubmenuIndexWriteWithPass) {
-            scene_manager_next_scene(app->scene_manager, LfRfidSceneWriteWithPass);
+        } else if(event.event == SubmenuIndexWriteAndSetPass) {
+            scene_manager_set_scene_state(
+                app->scene_manager, LfRfidSceneEnterPassword, LfRfidSceneWriteAndSetPass);
+            scene_manager_next_scene(app->scene_manager, LfRfidSceneEnterPassword);
             consumed = true;
         } else if(event.event == SubmenuIndexEdit) {
             scene_manager_next_scene(app->scene_manager, LfRfidSceneSaveData);

applications/main/lfrfid/scenes/lfrfid_scene_write_and_set_pass.c

@@ -1,6 +1,7 @@
 #include "../lfrfid_i.h"
+#include "gui/scene_manager.h"
 
-static void lfrfid_write_with_pass_callback(LFRFIDWorkerWriteResult result, void* context) {
+static void lfrfid_write_and_set_pass_callback(LFRFIDWorkerWriteResult result, void* context) {
     LfRfid* app = context;
     uint32_t event = 0;
 
@@ -17,22 +18,11 @@ static void lfrfid_write_with_pass_callback(LFRFIDWorkerWriteResult result, void
     view_dispatcher_send_custom_event(app->view_dispatcher, event);
 }
 
-void lfrfid_scene_write_with_pass_on_enter(void* context) {
+void lfrfid_scene_write_and_set_pass_on_enter(void* context) {
     LfRfid* app = context;
     Popup* popup = app->popup;
 
-    popup_set_header(popup, "Writing", 89, 30, AlignCenter, AlignTop);
-    if(!furi_string_empty(app->file_name)) {
-        popup_set_text(popup, furi_string_get_cstr(app->file_name), 89, 43, AlignCenter, AlignTop);
-    } else {
-        popup_set_text(
-            popup,
-            protocol_dict_get_name(app->dict, app->protocol_id),
-            89,
-            43,
-            AlignCenter,
-            AlignTop);
-    }
+    popup_set_header(popup, "Writing\nwith password", 89, 30, AlignCenter, AlignTop);
     popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61);
 
     view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);
@@ -41,12 +31,12 @@ void lfrfid_scene_write_with_pass_on_enter(void* context) {
     protocol_dict_get_data(app->dict, app->protocol_id, app->old_key_data, size);
 
     lfrfid_worker_start_thread(app->lfworker);
-    lfrfid_worker_write_with_pass_start(
-        app->lfworker, (LFRFIDProtocol)app->protocol_id, lfrfid_write_with_pass_callback, app);
+    lfrfid_worker_write_and_set_pass_start(
+        app->lfworker, (LFRFIDProtocol)app->protocol_id, lfrfid_write_and_set_pass_callback, app);
     notification_message(app->notifications, &sequence_blink_start_magenta);
 }
 
-bool lfrfid_scene_write_with_pass_on_event(void* context, SceneManagerEvent event) {
+bool lfrfid_scene_write_and_set_pass_on_event(void* context, SceneManagerEvent event) {
     LfRfid* app = context;
     Popup* popup = app->popup;
     bool consumed = false;
@@ -82,7 +72,7 @@ bool lfrfid_scene_write_with_pass_on_event(void* context, SceneManagerEvent even
     return consumed;
 }
 
-void lfrfid_scene_write_with_pass_on_exit(void* context) {
+void lfrfid_scene_write_and_set_pass_on_exit(void* context) {
     LfRfid* app = context;
     notification_message(app->notifications, &sequence_blink_stop);
     popup_reset(app->popup);