From c7de198d1aaa88bb12a1a7b7b9433593f8238406 Mon Sep 17 00:00:00 2001
From: TQMatvey <maybeetube@gmail.com>
Date: Tue, 20 Dec 2022 19:40:25 +0700
Subject: [PATCH 1/8] lfrfid: Add scene to clean T5577 Passwords

Co-authored-by: grvpvl <Tobirg@users.noreply.github.com>
---
 .../main/lfrfid/helpers/rfid_writer.c         | 102 +++++++++++++++
 .../main/lfrfid/helpers/rfid_writer.h         |  34 +++++
 .../lfrfid/scenes/lfrfid_scene_clear_t5577.c  | 123 ++++++++++++++++++
 .../main/lfrfid/scenes/lfrfid_scene_config.h  |   1 +
 .../scenes/lfrfid_scene_extra_actions.c       |  10 ++
 5 files changed, 270 insertions(+)
 create mode 100644 applications/main/lfrfid/helpers/rfid_writer.c
 create mode 100644 applications/main/lfrfid/helpers/rfid_writer.h
 create mode 100644 applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c

diff --git a/applications/main/lfrfid/helpers/rfid_writer.c b/applications/main/lfrfid/helpers/rfid_writer.c
new file mode 100644
index 000000000..a1da85082
--- /dev/null
+++ b/applications/main/lfrfid/helpers/rfid_writer.c
@@ -0,0 +1,102 @@
+#include "rfid_writer.h"
+#include <furi_hal.h>
+
+void writer_start() {
+    furi_hal_rfid_tim_read(125000, 0.5);
+    furi_hal_rfid_pins_read();
+    furi_hal_rfid_tim_read_start();
+
+    // do not ground the antenna
+    furi_hal_rfid_pin_pull_release();
+}
+
+void writer_stop() {
+    furi_hal_rfid_tim_read_stop();
+    furi_hal_rfid_tim_reset();
+    furi_hal_rfid_pins_reset();
+}
+
+void write_gap(uint32_t gap_time) {
+    furi_hal_rfid_tim_read_stop();
+    furi_delay_us(gap_time * 8);
+    furi_hal_rfid_tim_read_start();
+}
+
+void write_bit(T55xxTiming* t55xxtiming, bool value) {
+    if(value) {
+        furi_delay_us(t55xxtiming->data_1 * 8);
+    } else {
+        furi_delay_us(t55xxtiming->data_0 * 8);
+    }
+    write_gap(t55xxtiming->write_gap);
+}
+
+void write_byte(T55xxTiming* t55xxtiming, uint8_t value) {
+    for(uint8_t i = 0; i < 8; i++) {
+        write_bit(t55xxtiming, (value >> i) & 1);
+    }
+}
+
+void write_block(
+    T55xxTiming* t55xxtiming,
+    uint8_t page,
+    uint8_t block,
+    bool lock_bit,
+    uint32_t data,
+    bool password_enable,
+    uint32_t password) {
+    furi_delay_us(t55xxtiming->wait_time * 8);
+
+    //client: https://github.com/Proxmark/proxmark3/blob/6116334485ca77343eda51c557cdc81032afcf38/client/cmdlft55xx.c#L944
+    //hardware: https://github.com/Proxmark/proxmark3/blob/555fa197730c061bbf0ab01334e99bc47fb3dc06/armsrc/lfops.c#L1465
+    //hardware: https://github.com/Proxmark/proxmark3/blob/555fa197730c061bbf0ab01334e99bc47fb3dc06/armsrc/lfops.c#L1396
+
+    // start gap
+    write_gap(t55xxtiming->start_gap);
+
+    // opcode
+    switch(page) {
+    case 0:
+        write_bit(t55xxtiming, 1);
+        write_bit(t55xxtiming, 0);
+        break;
+    case 1:
+        write_bit(t55xxtiming, 1);
+        write_bit(t55xxtiming, 1);
+        break;
+    default:
+        furi_check(false);
+        break;
+    }
+
+    // password
+    if(password_enable) {
+        for(uint8_t i = 0; i < 32; i++) {
+            write_bit(t55xxtiming, (password >> (31 - i)) & 1);
+        }
+    }
+
+    // lock bit
+    write_bit(t55xxtiming, lock_bit);
+
+    // data
+    for(uint8_t i = 0; i < 32; i++) {
+        write_bit(t55xxtiming, (data >> (31 - i)) & 1);
+    }
+
+    // block address
+    write_bit(t55xxtiming, (block >> 2) & 1);
+    write_bit(t55xxtiming, (block >> 1) & 1);
+    write_bit(t55xxtiming, (block >> 0) & 1);
+
+    furi_delay_us(t55xxtiming->program * 8);
+
+    furi_delay_us(t55xxtiming->wait_time * 8);
+    write_reset(t55xxtiming);
+}
+
+void write_reset(T55xxTiming* t55xxtiming) {
+    write_gap(t55xxtiming->start_gap);
+    write_bit(t55xxtiming, 1);
+    write_bit(t55xxtiming, 0);
+}
\ No newline at end of file
diff --git a/applications/main/lfrfid/helpers/rfid_writer.h b/applications/main/lfrfid/helpers/rfid_writer.h
new file mode 100644
index 000000000..76bc409f1
--- /dev/null
+++ b/applications/main/lfrfid/helpers/rfid_writer.h
@@ -0,0 +1,34 @@
+#include <stdint.h>
+#include <stdbool.h>
+
+typedef struct {
+    uint16_t wait_time;
+    uint8_t start_gap;
+    uint8_t write_gap;
+    uint8_t data_0;
+    uint8_t data_1;
+    uint16_t program;
+} T55xxTiming;
+
+typedef struct {
+    uint8_t opcode_page_0;
+    uint8_t opcode_page_1;
+    uint8_t opcode_reset;
+} T55xxCmd;
+
+//static void writer_initialize(T55xxTiming* t55xxtiming, T55xxCmd* t55xxcmd);
+void writer_start();
+void writer_stop();
+void write_gap(uint32_t gap_time);
+void write_bit(T55xxTiming* t55xxtiming, bool value);
+void write_byte(T55xxTiming* t55xxtiming, uint8_t value);
+void write_block(
+    T55xxTiming* t55xxtiming,
+    uint8_t page,
+    uint8_t block,
+    bool lock_bit,
+    uint32_t data,
+    bool password_enable,
+    uint32_t password);
+
+void write_reset(T55xxTiming* t55xxtiming);
\ No newline at end of file
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
new file mode 100644
index 000000000..b2b25f08a
--- /dev/null
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
@@ -0,0 +1,123 @@
+#include "../lfrfid_i.h"
+#include "../helpers/rfid_writer.h"
+
+static void writer_initialize(T55xxTiming* t55xxtiming, T55xxCmd* t55xxcmd) {
+    t55xxcmd->opcode_page_0 = 0b10;
+    t55xxcmd->opcode_page_1 = 0b11;
+    t55xxcmd->opcode_reset = 0b00;
+
+    t55xxtiming->wait_time = 400;
+    t55xxtiming->start_gap = 30;
+    t55xxtiming->write_gap = 18;
+    t55xxtiming->data_0 = 24;
+    t55xxtiming->data_1 = 56;
+    t55xxtiming->program = 700;
+}
+
+static void lfrfid_cli_t5577_clear_password_and_config_to_EM(Cli* cli, FuriString* args, LfRfid* app) {
+    UNUSED(cli);
+    UNUSED(args);
+    T55xxTiming* t55xxtiming = malloc(sizeof(T55xxTiming));
+    T55xxCmd* t55xxcmd = malloc(sizeof(T55xxCmd));
+    Popup* popup = app->popup;
+    char curr_buf[32] = {};
+    //TODO: use .txt file in resourses for passwords.
+    const uint32_t default_passwords[] = {
+        0x51243648, 0x000D8787, 0x19920427, 0x50524F58, 0xF9DCEBA0, 0x65857569, 0x05D73B9F,
+        0x89A69E60, 0x314159E0, 0xAA55BBBB, 0xA5B4C3D2, 0x1C0B5848, 0x00434343, 0x444E4752,
+        0x4E457854, 0x44B44CAE, 0x88661858, 0xE9920427, 0x575F4F4B, 0x50520901, 0x20206666,
+        0x65857569, 0x5469616E, 0x7686962A, 0xC0F5009A, 0x07CEE75D, 0xfeedbeef, 0xdeadc0de,
+        0x00000000, 0x11111111, 0x22222222, 0x33333333, 0x44444444, 0x55555555, 0x66666666,
+        0x77777777, 0x88888888, 0x99999999, 0xAAAAAAAA, 0xBBBBBBBB, 0xCCCCCCCC, 0xDDDDDDDD,
+        0xEEEEEEEE, 0xFFFFFFFF, 0xa0a1a2a3, 0xb0b1b2b3, 0x50415353, 0x00000001, 0x00000002,
+        0x0000000a, 0x0000000b, 0x01020304, 0x02030405, 0x03040506, 0x04050607, 0x05060708,
+        0x06070809, 0x0708090A, 0x08090A0B, 0x090A0B0C, 0x0A0B0C0D, 0x0B0C0D0E, 0x0C0D0E0F,
+        0x01234567, 0x12345678, 0x10000000, 0x20000000, 0x30000000, 0x40000000, 0x50000000,
+        0x60000000, 0x70000000, 0x80000000, 0x90000000, 0xA0000000, 0xB0000000, 0xC0000000,
+        0xD0000000, 0xE0000000, 0xF0000000, 0x10101010, 0x01010101, 0x11223344, 0x22334455,
+        0x33445566, 0x44556677, 0x55667788, 0x66778899, 0x778899AA, 0x8899AABB, 0x99AABBCC,
+        0xAABBCCDD, 0xBBCCDDEE, 0xCCDDEEFF, 0x0CB7E7FC, 0xFABADA11, 0x87654321, 0x12341234,
+        0x69696969, 0x12121212, 0x12344321, 0x1234ABCD, 0x11112222, 0x13131313, 0x10041004,
+        0x31415926, 0xabcd1234, 0x20002000, 0x19721972, 0xaa55aa55, 0x55aa55aa, 0x4f271149,
+        0x07d7bb0b, 0x9636ef8f, 0xb5f44686, 0x9E3779B9, 0xC6EF3720, 0x7854794A, 0xF1EA5EED,
+        0x69314718, 0x57721566, 0x93C467E3, 0x27182818, 0x50415353};
+    const uint8_t default_passwords_len = sizeof(default_passwords) / sizeof(uint32_t);
+    const uint32_t em_config_block_data =
+        0b00000000000101001000000001000000; //no pwd&aor config block
+
+    writer_initialize(t55xxtiming, t55xxcmd);
+
+    popup_set_header(popup, "Removing\npassword", 90, 36, AlignCenter, AlignCenter);
+    popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61);
+    popup_set_text(
+            popup,
+            curr_buf,
+            90,
+            56,
+            AlignCenter,
+            AlignCenter);
+
+    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);
+
+        FURI_CRITICAL_ENTER();
+        writer_start();
+        write_block(t55xxtiming, 0, 0, false, em_config_block_data, true, default_passwords[i]);
+        write_reset(t55xxtiming);
+        writer_stop();
+        furi_delay_ms(5);
+        FURI_CRITICAL_EXIT();
+    }
+    popup_reset(app->popup);
+    free(t55xxtiming);
+    free(t55xxcmd);
+}
+
+void lfrfid_scene_clear_t5577_on_enter(void* context) {
+    LfRfid* app = context;
+    Widget* widget = app->widget;
+    Cli* cli = furi_record_open(RECORD_CLI);
+    FuriString* cmd;
+    cmd = furi_string_alloc();
+
+    // what is it?
+    lfrfid_cli_t5577_clear_password_and_config_to_EM(cli, cmd, app);
+
+    widget_add_string_element(
+        widget, 64, 14, AlignCenter, AlignTop, FontPrimary, "Done!");
+
+    widget_add_string_element(
+        widget,
+        64,
+        36,
+        AlignCenter,
+        AlignBottom,
+        FontSecondary,
+        "Test your T5577 now");
+
+    widget_add_button_element(widget, GuiButtonTypeLeft, "Exit", lfrfid_widget_callback, app);
+    view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewWidget);
+    
+    furi_string_free(cmd);
+}
+
+bool lfrfid_scene_clear_t5577_on_event(void* context, SceneManagerEvent event) {
+    LfRfid* app = context;
+    bool consumed = false;
+    SceneManager* scene_manager = app->scene_manager;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        consumed = true;
+        } if(event.event == GuiButtonTypeLeft) {
+            scene_manager_previous_scene(scene_manager);
+        }
+
+    return consumed;
+}
+
+void lfrfid_scene_clear_t5577_on_exit(void* context) {
+    LfRfid* app = context;
+    popup_reset(app->popup);
+    widget_reset(app->widget);
+}
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_config.h b/applications/main/lfrfid/scenes/lfrfid_scene_config.h
index b77ade82f..10dc46fe6 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_config.h
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_config.h
@@ -15,6 +15,7 @@ ADD_SCENE(lfrfid, saved_key_menu, SavedKeyMenu)
 ADD_SCENE(lfrfid, save_data, SaveData)
 ADD_SCENE(lfrfid, save_type, SaveType)
 ADD_SCENE(lfrfid, saved_info, SavedInfo)
+ADD_SCENE(lfrfid, clear_t5577, ClearT5577)
 ADD_SCENE(lfrfid, delete_success, DeleteSuccess)
 ADD_SCENE(lfrfid, extra_actions, ExtraActions)
 ADD_SCENE(lfrfid, raw_info, RawInfo)
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c b/applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c
index ecca7cf11..efa319c1e 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c
@@ -4,6 +4,7 @@
 typedef enum {
     SubmenuIndexASK,
     SubmenuIndexPSK,
+    SubmenuIndexClearT5577,
     SubmenuIndexRAW,
 } SubmenuIndex;
 
@@ -29,6 +30,12 @@ void lfrfid_scene_extra_actions_on_enter(void* context) {
         SubmenuIndexPSK,
         lfrfid_scene_extra_actions_submenu_callback,
         app);
+    submenu_add_item(
+        submenu,
+        "Clear T5577 Password",
+        SubmenuIndexClearT5577,
+        lfrfid_scene_extra_actions_submenu_callback,
+        app);
 
     if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
         submenu_add_item(
@@ -65,6 +72,9 @@ bool lfrfid_scene_extra_actions_on_event(void* context, SceneManagerEvent event)
             scene_manager_next_scene(app->scene_manager, LfRfidSceneRead);
             DOLPHIN_DEED(DolphinDeedRfidRead);
             consumed = true;
+        } else if(event.event == SubmenuIndexClearT5577) {
+            scene_manager_next_scene(app->scene_manager, LfRfidSceneClearT5577);
+            consumed = true;
         } else if(event.event == SubmenuIndexRAW) {
             scene_manager_next_scene(app->scene_manager, LfRfidSceneRawName);
             consumed = true;

From 19e230823b9ba3bb7569dcfb38283b2f676f3f52 Mon Sep 17 00:00:00 2001
From: TQMatvey <maybeetube@gmail.com>
Date: Wed, 21 Dec 2022 07:07:07 +0700
Subject: [PATCH 2/8] lfrdfid: t5577_clear: make animation smoother

---
 applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
index b2b25f08a..aa89f96aa 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
@@ -58,16 +58,15 @@ static void lfrfid_cli_t5577_clear_password_and_config_to_EM(Cli* cli, FuriStrin
             AlignCenter);
 
     for(uint8_t i = 0; i < default_passwords_len; i++) { 
+        FURI_CRITICAL_ENTER();
         snprintf(curr_buf, sizeof(curr_buf), "Pass %d of %d", i, default_passwords_len);
         view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);
-
-        FURI_CRITICAL_ENTER();
         writer_start();
         write_block(t55xxtiming, 0, 0, false, em_config_block_data, true, default_passwords[i]);
         write_reset(t55xxtiming);
         writer_stop();
-        furi_delay_ms(5);
         FURI_CRITICAL_EXIT();
+        furi_delay_ms(8);
     }
     popup_reset(app->popup);
     free(t55xxtiming);

From 10b55bcbd200fb0c4e4477cdcc13a804938f158a Mon Sep 17 00:00:00 2001
From: TQMatvey <maybeetube@gmail.com>
Date: Wed, 21 Dec 2022 07:09:39 +0700
Subject: [PATCH 3/8] lfrfid: t5577_clear: remove unneeded comment

---
 applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
index aa89f96aa..d857bff8d 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
@@ -80,7 +80,6 @@ void lfrfid_scene_clear_t5577_on_enter(void* context) {
     FuriString* cmd;
     cmd = furi_string_alloc();
 
-    // what is it?
     lfrfid_cli_t5577_clear_password_and_config_to_EM(cli, cmd, app);
 
     widget_add_string_element(
@@ -119,4 +118,5 @@ void lfrfid_scene_clear_t5577_on_exit(void* context) {
     LfRfid* app = context;
     popup_reset(app->popup);
     widget_reset(app->widget);
+    
 }

From 787eafd7b8c552bb9c7ea959dca41876e6f5a757 Mon Sep 17 00:00:00 2001
From: TQMatvey <maybeetube@gmail.com>
Date: Wed, 21 Dec 2022 11:34:54 +0700
Subject: [PATCH 4/8] lfrfid: clear_t5577: code cleanup, add notifications

Co-authored-by: grvpvl <Tobirg@users.noreply.github.com>
---
 .../lfrfid/scenes/lfrfid_scene_clear_t5577.c  | 59 ++++++++-----------
 1 file changed, 24 insertions(+), 35 deletions(-)

diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
index d857bff8d..1189cf34a 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
@@ -14,9 +14,7 @@ static void writer_initialize(T55xxTiming* t55xxtiming, T55xxCmd* t55xxcmd) {
     t55xxtiming->program = 700;
 }
 
-static void lfrfid_cli_t5577_clear_password_and_config_to_EM(Cli* cli, FuriString* args, LfRfid* app) {
-    UNUSED(cli);
-    UNUSED(args);
+static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) {
     T55xxTiming* t55xxtiming = malloc(sizeof(T55xxTiming));
     T55xxCmd* t55xxcmd = malloc(sizeof(T55xxCmd));
     Popup* popup = app->popup;
@@ -56,8 +54,8 @@ static void lfrfid_cli_t5577_clear_password_and_config_to_EM(Cli* cli, FuriStrin
             56,
             AlignCenter,
             AlignCenter);
-
-    for(uint8_t i = 0; i < default_passwords_len; i++) { 
+    notification_message(app->notifications, &sequence_blink_start_red);
+    for(uint8_t i = 0; i < default_passwords_len; i++) {
         FURI_CRITICAL_ENTER();
         snprintf(curr_buf, sizeof(curr_buf), "Pass %d of %d", i, default_passwords_len);
         view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);
@@ -68,6 +66,7 @@ static void lfrfid_cli_t5577_clear_password_and_config_to_EM(Cli* cli, FuriStrin
         FURI_CRITICAL_EXIT();
         furi_delay_ms(8);
     }
+    notification_message(app->notifications, &sequence_blink_stop);
     popup_reset(app->popup);
     free(t55xxtiming);
     free(t55xxcmd);
@@ -75,48 +74,38 @@ static void lfrfid_cli_t5577_clear_password_and_config_to_EM(Cli* cli, FuriStrin
 
 void lfrfid_scene_clear_t5577_on_enter(void* context) {
     LfRfid* app = context;
-    Widget* widget = app->widget;
-    Cli* cli = furi_record_open(RECORD_CLI);
-    FuriString* cmd;
-    cmd = furi_string_alloc();
-
-    lfrfid_cli_t5577_clear_password_and_config_to_EM(cli, cmd, app);
-
-    widget_add_string_element(
-        widget, 64, 14, AlignCenter, AlignTop, FontPrimary, "Done!");
-
-    widget_add_string_element(
-        widget,
-        64,
-        36,
-        AlignCenter,
-        AlignBottom,
-        FontSecondary,
-        "Test your T5577 now");
-
-    widget_add_button_element(widget, GuiButtonTypeLeft, "Exit", lfrfid_widget_callback, app);
-    view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewWidget);
+    Popup* popup = app->popup;
     
-    furi_string_free(cmd);
+    lfrfid_clear_t5577_password_and_config_to_EM(app);
+
+    notification_message(app->notifications, &sequence_success);
+    popup_set_header(popup, "Done!", 94, 3, AlignCenter, AlignTop);
+    popup_set_icon(popup, 0, 3, &I_RFIDDolphinSuccess_108x57);
+    popup_set_context(popup, app);
+    popup_set_callback(popup, lfrfid_popup_timeout_callback);
+    popup_set_timeout(popup, 1500);
+    popup_enable_timeout(popup);
+
+    view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);
+    notification_message_block(app->notifications, &sequence_set_green_255);
 }
 
 bool lfrfid_scene_clear_t5577_on_event(void* context, SceneManagerEvent event) {
     LfRfid* app = context;
     bool consumed = false;
-    SceneManager* scene_manager = app->scene_manager;
+    
+    const uint32_t prev_scene = LfRfidSceneExtraActions;
 
-    if(event.type == SceneManagerEventTypeCustom) {
+    if((event.type == SceneManagerEventTypeBack) ||
+       ((event.type == SceneManagerEventTypeCustom) && (event.event == LfRfidEventPopupClosed))) {
+        scene_manager_search_and_switch_to_previous_scene(app->scene_manager, prev_scene);
         consumed = true;
-        } if(event.event == GuiButtonTypeLeft) {
-            scene_manager_previous_scene(scene_manager);
-        }
-
+    }
     return consumed;
 }
 
 void lfrfid_scene_clear_t5577_on_exit(void* context) {
     LfRfid* app = context;
     popup_reset(app->popup);
-    widget_reset(app->widget);
-    
+    notification_message_block(app->notifications, &sequence_reset_green);
 }

From 91eed4209db74489348d33765089f7fdea89b84c Mon Sep 17 00:00:00 2001
From: TQMatvey <maybeetube@gmail.com>
Date: Wed, 21 Dec 2022 12:11:58 +0700
Subject: [PATCH 5/8] lfrfid: clear_t5577: change notification color and
 cleanup

---
 applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
index 1189cf34a..9a530db2e 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
@@ -54,7 +54,7 @@ static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) {
             56,
             AlignCenter,
             AlignCenter);
-    notification_message(app->notifications, &sequence_blink_start_red);
+    notification_message(app->notifications, &sequence_blink_start_magenta);
     for(uint8_t i = 0; i < default_passwords_len; i++) {
         FURI_CRITICAL_ENTER();
         snprintf(curr_buf, sizeof(curr_buf), "Pass %d of %d", i, default_passwords_len);
@@ -96,8 +96,7 @@ bool lfrfid_scene_clear_t5577_on_event(void* context, SceneManagerEvent event) {
     
     const uint32_t prev_scene = LfRfidSceneExtraActions;
 
-    if((event.type == SceneManagerEventTypeBack) ||
-       ((event.type == SceneManagerEventTypeCustom) && (event.event == LfRfidEventPopupClosed))) {
+    if (event.type == SceneManagerEventTypeCustom && event.event == LfRfidEventPopupClosed) {
         scene_manager_search_and_switch_to_previous_scene(app->scene_manager, prev_scene);
         consumed = true;
     }

From 060a48cdfc7a278f72756703ff1eba46a0608d25 Mon Sep 17 00:00:00 2001
From: TQMatvey <maybeetube@gmail.com>
Date: Wed, 21 Dec 2022 12:21:17 +0700
Subject: [PATCH 6/8] lfrfid: clear_t5577: move icon and text lower

---
 applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
index 9a530db2e..50861da6a 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
@@ -55,6 +55,7 @@ static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) {
             AlignCenter,
             AlignCenter);
     notification_message(app->notifications, &sequence_blink_start_magenta);
+    
     for(uint8_t i = 0; i < default_passwords_len; i++) {
         FURI_CRITICAL_ENTER();
         snprintf(curr_buf, sizeof(curr_buf), "Pass %d of %d", i, default_passwords_len);
@@ -79,8 +80,8 @@ void lfrfid_scene_clear_t5577_on_enter(void* context) {
     lfrfid_clear_t5577_password_and_config_to_EM(app);
 
     notification_message(app->notifications, &sequence_success);
-    popup_set_header(popup, "Done!", 94, 3, AlignCenter, AlignTop);
-    popup_set_icon(popup, 0, 3, &I_RFIDDolphinSuccess_108x57);
+    popup_set_header(popup, "Done!", 94, 10, AlignCenter, AlignTop);
+    popup_set_icon(popup, 0, 7, &I_RFIDDolphinSuccess_108x57);
     popup_set_context(popup, app);
     popup_set_callback(popup, lfrfid_popup_timeout_callback);
     popup_set_timeout(popup, 1500);

From 6d8ecec0519a048fb0a62a09d4406306ccd81d06 Mon Sep 17 00:00:00 2001
From: TQMatvey <maybeetube@gmail.com>
Date: Wed, 21 Dec 2022 15:00:52 +0700
Subject: [PATCH 7/8] lfrfid: clear_t5577: major code cleanup

---
 applications/main/lfrfid/helpers/rfid_writer.c         |  6 ------
 applications/main/lfrfid/helpers/rfid_writer.h         |  8 --------
 .../main/lfrfid/scenes/lfrfid_scene_clear_t5577.c      | 10 ++--------
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/applications/main/lfrfid/helpers/rfid_writer.c b/applications/main/lfrfid/helpers/rfid_writer.c
index a1da85082..7cc6326c4 100644
--- a/applications/main/lfrfid/helpers/rfid_writer.c
+++ b/applications/main/lfrfid/helpers/rfid_writer.c
@@ -31,12 +31,6 @@ void write_bit(T55xxTiming* t55xxtiming, bool value) {
     write_gap(t55xxtiming->write_gap);
 }
 
-void write_byte(T55xxTiming* t55xxtiming, uint8_t value) {
-    for(uint8_t i = 0; i < 8; i++) {
-        write_bit(t55xxtiming, (value >> i) & 1);
-    }
-}
-
 void write_block(
     T55xxTiming* t55xxtiming,
     uint8_t page,
diff --git a/applications/main/lfrfid/helpers/rfid_writer.h b/applications/main/lfrfid/helpers/rfid_writer.h
index 76bc409f1..2b97bd321 100644
--- a/applications/main/lfrfid/helpers/rfid_writer.h
+++ b/applications/main/lfrfid/helpers/rfid_writer.h
@@ -10,18 +10,10 @@ typedef struct {
     uint16_t program;
 } T55xxTiming;
 
-typedef struct {
-    uint8_t opcode_page_0;
-    uint8_t opcode_page_1;
-    uint8_t opcode_reset;
-} T55xxCmd;
-
-//static void writer_initialize(T55xxTiming* t55xxtiming, T55xxCmd* t55xxcmd);
 void writer_start();
 void writer_stop();
 void write_gap(uint32_t gap_time);
 void write_bit(T55xxTiming* t55xxtiming, bool value);
-void write_byte(T55xxTiming* t55xxtiming, uint8_t value);
 void write_block(
     T55xxTiming* t55xxtiming,
     uint8_t page,
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
index 50861da6a..78a20af6e 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
@@ -1,11 +1,7 @@
 #include "../lfrfid_i.h"
 #include "../helpers/rfid_writer.h"
 
-static void writer_initialize(T55xxTiming* t55xxtiming, T55xxCmd* t55xxcmd) {
-    t55xxcmd->opcode_page_0 = 0b10;
-    t55xxcmd->opcode_page_1 = 0b11;
-    t55xxcmd->opcode_reset = 0b00;
-
+static void writer_initialize(T55xxTiming* t55xxtiming) {
     t55xxtiming->wait_time = 400;
     t55xxtiming->start_gap = 30;
     t55xxtiming->write_gap = 18;
@@ -16,7 +12,6 @@ static void writer_initialize(T55xxTiming* t55xxtiming, T55xxCmd* t55xxcmd) {
 
 static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) {
     T55xxTiming* t55xxtiming = malloc(sizeof(T55xxTiming));
-    T55xxCmd* t55xxcmd = malloc(sizeof(T55xxCmd));
     Popup* popup = app->popup;
     char curr_buf[32] = {};
     //TODO: use .txt file in resourses for passwords.
@@ -43,7 +38,7 @@ static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) {
     const uint32_t em_config_block_data =
         0b00000000000101001000000001000000; //no pwd&aor config block
 
-    writer_initialize(t55xxtiming, t55xxcmd);
+    writer_initialize(t55xxtiming);
 
     popup_set_header(popup, "Removing\npassword", 90, 36, AlignCenter, AlignCenter);
     popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61);
@@ -70,7 +65,6 @@ static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) {
     notification_message(app->notifications, &sequence_blink_stop);
     popup_reset(app->popup);
     free(t55xxtiming);
-    free(t55xxcmd);
 }
 
 void lfrfid_scene_clear_t5577_on_enter(void* context) {

From 09f80d0086d0f3eddfd9fc69bbfa66cb48bb57a3 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Wed, 21 Dec 2022 13:00:27 +0300
Subject: [PATCH 8/8] fbt format

---
 .../lfrfid/scenes/lfrfid_scene_clear_t5577.c  | 16 +++++-----------
 .../scenes/subghz_scene_receiver_config.c     | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
index 78a20af6e..db9718669 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
@@ -42,15 +42,9 @@ static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) {
 
     popup_set_header(popup, "Removing\npassword", 90, 36, AlignCenter, AlignCenter);
     popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61);
-    popup_set_text(
-            popup,
-            curr_buf,
-            90,
-            56,
-            AlignCenter,
-            AlignCenter);
+    popup_set_text(popup, curr_buf, 90, 56, AlignCenter, AlignCenter);
     notification_message(app->notifications, &sequence_blink_start_magenta);
-    
+
     for(uint8_t i = 0; i < default_passwords_len; i++) {
         FURI_CRITICAL_ENTER();
         snprintf(curr_buf, sizeof(curr_buf), "Pass %d of %d", i, default_passwords_len);
@@ -70,7 +64,7 @@ static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) {
 void lfrfid_scene_clear_t5577_on_enter(void* context) {
     LfRfid* app = context;
     Popup* popup = app->popup;
-    
+
     lfrfid_clear_t5577_password_and_config_to_EM(app);
 
     notification_message(app->notifications, &sequence_success);
@@ -88,10 +82,10 @@ void lfrfid_scene_clear_t5577_on_enter(void* context) {
 bool lfrfid_scene_clear_t5577_on_event(void* context, SceneManagerEvent event) {
     LfRfid* app = context;
     bool consumed = false;
-    
+
     const uint32_t prev_scene = LfRfidSceneExtraActions;
 
-    if (event.type == SceneManagerEventTypeCustom && event.event == LfRfidEventPopupClosed) {
+    if(event.type == SceneManagerEventTypeCustom && event.event == LfRfidEventPopupClosed) {
         scene_manager_search_and_switch_to_previous_scene(app->scene_manager, prev_scene);
         consumed = true;
     }
diff --git a/applications/main/subghz/scenes/subghz_scene_receiver_config.c b/applications/main/subghz/scenes/subghz_scene_receiver_config.c
index 9d906f3da..82debf4c0 100644
--- a/applications/main/subghz/scenes/subghz_scene_receiver_config.c
+++ b/applications/main/subghz/scenes/subghz_scene_receiver_config.c
@@ -408,15 +408,16 @@ void subghz_scene_receiver_config_on_enter(void* context) {
         variable_item_set_current_value_text(item, rssi_threshold_text[value_index]);
 
         // Lock keyboard
-    item = variable_item_list_add(
-        subghz->variable_item_list,
-        "Sound:",
-        SPEAKER_COUNT,
-        subghz_scene_receiver_config_set_speaker,
-        subghz);
-    value_index = value_index_uint32(subghz->txrx->speaker_state, speaker_value, SPEAKER_COUNT);
-    variable_item_set_current_value_index(item, value_index);
-    variable_item_set_current_value_text(item, speaker_text[value_index]);
+        item = variable_item_list_add(
+            subghz->variable_item_list,
+            "Sound:",
+            SPEAKER_COUNT,
+            subghz_scene_receiver_config_set_speaker,
+            subghz);
+        value_index =
+            value_index_uint32(subghz->txrx->speaker_state, speaker_value, SPEAKER_COUNT);
+        variable_item_set_current_value_index(item, value_index);
+        variable_item_set_current_value_text(item, speaker_text[value_index]);
 
         variable_item_list_add(subghz->variable_item_list, "Lock Keyboard", 1, NULL, NULL);
         variable_item_list_set_enter_callback(