From 500552107ef7d1a7c6786584c417d00ef6a081d4 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sat, 13 Jan 2024 03:17:30 +0300
Subject: [PATCH] rename conflicting funcs

---
 non_catalog_apps/t5577_multiwriter/helpers/t5577.c            | 4 ++--
 non_catalog_apps/t5577_multiwriter/helpers/t5577.h            | 2 +-
 .../scenes/t5577_multiwriter_scene_write_first_key.c          | 2 +-
 .../scenes/t5577_multiwriter_scene_write_second_key.c         | 2 +-
 .../scenes/t5577_multiwriter_scene_write_third_key.c          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/non_catalog_apps/t5577_multiwriter/helpers/t5577.c b/non_catalog_apps/t5577_multiwriter/helpers/t5577.c
index ca7ff94f62d..9b432332252 100644
--- a/non_catalog_apps/t5577_multiwriter/helpers/t5577.c
+++ b/non_catalog_apps/t5577_multiwriter/helpers/t5577.c
@@ -107,7 +107,7 @@ void t5577_write(LFRFIDT5577Data* data) {
     t5577_stop();
 }
 
-void t5577_write_with_mask(LFRFIDT5577Data* data) {
+void t5577_write_with_maskis(LFRFIDT5577Data* data) {
     t5577_start();
     FURI_CRITICAL_ENTER();
 
@@ -131,7 +131,7 @@ void t5577_write_with_mask(LFRFIDT5577Data* data) {
     t5577_stop();
 }
 
-void t5577_write_with_pass(LFRFIDT5577Data* data, uint32_t password) {
+void t5577_write_with_passis(LFRFIDT5577Data* data, uint32_t password) {
     t5577_start();
     FURI_CRITICAL_ENTER();
     for(size_t i = 0; i < data->blocks_to_write; i++) {
diff --git a/non_catalog_apps/t5577_multiwriter/helpers/t5577.h b/non_catalog_apps/t5577_multiwriter/helpers/t5577.h
index 540d223e0aa..93b404be2bd 100644
--- a/non_catalog_apps/t5577_multiwriter/helpers/t5577.h
+++ b/non_catalog_apps/t5577_multiwriter/helpers/t5577.h
@@ -51,7 +51,7 @@ typedef struct {
  * @param data 
  */
 
-void t5577_write_with_mask(LFRFIDT5577Data* data);
+void t5577_write_with_maskis(LFRFIDT5577Data* data);
 
 #ifdef __cplusplus
 }
diff --git a/non_catalog_apps/t5577_multiwriter/scenes/t5577_multiwriter_scene_write_first_key.c b/non_catalog_apps/t5577_multiwriter/scenes/t5577_multiwriter_scene_write_first_key.c
index b1362855a76..30c6038b1b3 100644
--- a/non_catalog_apps/t5577_multiwriter/scenes/t5577_multiwriter_scene_write_first_key.c
+++ b/non_catalog_apps/t5577_multiwriter/scenes/t5577_multiwriter_scene_write_first_key.c
@@ -52,7 +52,7 @@ void t5577_multiwriter_scene_write_first_key_on_enter(void* context) {
     add_em41xx_data(&data_to_write, key, 1);
     set_em41xx_config(&data_to_write, 1);
 
-    t5577_write_with_mask(&data_to_write);
+    t5577_write_with_maskis(&data_to_write);
 
     t5577_multiwriter_write_first_key_callback(LFRFIDWorkerWriteOK, context);
 }
diff --git a/non_catalog_apps/t5577_multiwriter/scenes/t5577_multiwriter_scene_write_second_key.c b/non_catalog_apps/t5577_multiwriter/scenes/t5577_multiwriter_scene_write_second_key.c
index e15bf47c290..bccf6507731 100644
--- a/non_catalog_apps/t5577_multiwriter/scenes/t5577_multiwriter_scene_write_second_key.c
+++ b/non_catalog_apps/t5577_multiwriter/scenes/t5577_multiwriter_scene_write_second_key.c
@@ -52,7 +52,7 @@ void t5577_multiwriter_scene_write_second_key_on_enter(void* context) {
     add_em41xx_data(&data_to_write, key, 3);
     set_em41xx_config(&data_to_write, 2);
 
-    t5577_write_with_mask(&data_to_write);
+    t5577_write_with_maskis(&data_to_write);
 
     t5577_multiwriter_write_second_key_callback(LFRFIDWorkerWriteOK, context);
 }
diff --git a/non_catalog_apps/t5577_multiwriter/scenes/t5577_multiwriter_scene_write_third_key.c b/non_catalog_apps/t5577_multiwriter/scenes/t5577_multiwriter_scene_write_third_key.c
index ef7621030c0..8735375fb73 100644
--- a/non_catalog_apps/t5577_multiwriter/scenes/t5577_multiwriter_scene_write_third_key.c
+++ b/non_catalog_apps/t5577_multiwriter/scenes/t5577_multiwriter_scene_write_third_key.c
@@ -52,7 +52,7 @@ void t5577_multiwriter_scene_write_third_key_on_enter(void* context) {
     add_em41xx_data(&data_to_write, key, 5);
     set_em41xx_config(&data_to_write, 3);
 
-    t5577_write_with_mask(&data_to_write);
+    t5577_write_with_maskis(&data_to_write);
 
     t5577_multiwriter_write_third_key_callback(LFRFIDWorkerWriteOK, context);
 }