From 6ad58276f89cbf92a86800e94d9b7bd007ce99ac Mon Sep 17 00:00:00 2001
From: gid9798 <30450294+gid9798@users.noreply.github.com>
Date: Tue, 30 May 2023 22:21:47 +0300
Subject: [PATCH] Cleanup and rename

---
 applications/main/subghz/helpers/subghz_txrx.c               | 2 +-
 applications/main/subghz/helpers/subghz_txrx.h               | 2 +-
 applications/main/subghz/scenes/subghz_scene_receiver_info.c | 4 +---
 applications/main/subghz/scenes/subghz_scene_rpc.c           | 4 +---
 applications/main/subghz/scenes/subghz_scene_transmitter.c   | 4 +---
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/applications/main/subghz/helpers/subghz_txrx.c b/applications/main/subghz/helpers/subghz_txrx.c
index 79d05b5be..3275b7288 100644
--- a/applications/main/subghz/helpers/subghz_txrx.c
+++ b/applications/main/subghz/helpers/subghz_txrx.c
@@ -558,7 +558,7 @@ bool subghz_txrx_get_debug_pin_state(SubGhzTxRx* instance) {
     return instance->debug_pin_state;
 }
 
-void subghz_txrx_reset_dynamic(SubGhzTxRx* instance) {
+void subghz_txrx_reset_dynamic_and_custom_btns(SubGhzTxRx* instance) {
     furi_assert(instance);
     subghz_environment_reset_keeloq(instance->environment);
 
diff --git a/applications/main/subghz/helpers/subghz_txrx.h b/applications/main/subghz/helpers/subghz_txrx.h
index 6c28cc5f0..6ad5d97bd 100644
--- a/applications/main/subghz/helpers/subghz_txrx.h
+++ b/applications/main/subghz/helpers/subghz_txrx.h
@@ -293,6 +293,6 @@ void subghz_txrx_set_raw_file_encoder_worker_callback_end(
 void subghz_txrx_set_debug_pin_state(SubGhzTxRx* instance, bool state);
 bool subghz_txrx_get_debug_pin_state(SubGhzTxRx* instance);
 
-void subghz_txrx_reset_dynamic(SubGhzTxRx* instance);
+void subghz_txrx_reset_dynamic_and_custom_btns(SubGhzTxRx* instance);
 
 SubGhzReceiver* subghz_txrx_get_receiver(SubGhzTxRx* instance); // TODO use only in DecodeRaw
diff --git a/applications/main/subghz/scenes/subghz_scene_receiver_info.c b/applications/main/subghz/scenes/subghz_scene_receiver_info.c
index b0c538a58..e3ff485d2 100644
--- a/applications/main/subghz/scenes/subghz_scene_receiver_info.c
+++ b/applications/main/subghz/scenes/subghz_scene_receiver_info.c
@@ -1,7 +1,5 @@
 #include "../subghz_i.h"
 #include "../helpers/subghz_custom_event.h"
-#include <lib/subghz/protocols/keeloq.h>
-#include <lib/subghz/protocols/star_line.h>
 
 #include <lib/subghz/blocks/custom_btn.h>
 
@@ -190,5 +188,5 @@ void subghz_scene_receiver_info_on_exit(void* context) {
     SubGhz* subghz = context;
 
     widget_reset(subghz->widget);
-    subghz_txrx_reset_dynamic(subghz->txrx);
+    subghz_txrx_reset_dynamic_and_custom_btns(subghz->txrx);
 }
diff --git a/applications/main/subghz/scenes/subghz_scene_rpc.c b/applications/main/subghz/scenes/subghz_scene_rpc.c
index edadc89bb..7b3c940a5 100644
--- a/applications/main/subghz/scenes/subghz_scene_rpc.c
+++ b/applications/main/subghz/scenes/subghz_scene_rpc.c
@@ -1,6 +1,4 @@
 #include "../subghz_i.h"
-#include <lib/subghz/protocols/keeloq.h>
-#include <lib/subghz/protocols/star_line.h>
 
 #include <lib/subghz/blocks/custom_btn.h>
 
@@ -110,5 +108,5 @@ void subghz_scene_rpc_on_exit(void* context) {
     popup_set_text(popup, NULL, 0, 0, AlignCenter, AlignTop);
     popup_set_icon(popup, 0, 0, NULL);
 
-    subghz_txrx_reset_dynamic(subghz->txrx);
+    subghz_txrx_reset_dynamic_and_custom_btns(subghz->txrx);
 }
diff --git a/applications/main/subghz/scenes/subghz_scene_transmitter.c b/applications/main/subghz/scenes/subghz_scene_transmitter.c
index dba8d13c7..ab5605f95 100644
--- a/applications/main/subghz/scenes/subghz_scene_transmitter.c
+++ b/applications/main/subghz/scenes/subghz_scene_transmitter.c
@@ -1,8 +1,6 @@
 #include "../subghz_i.h"
 #include "../views/transmitter.h"
 #include <dolphin/dolphin.h>
-#include <lib/subghz/protocols/keeloq.h>
-#include <lib/subghz/protocols/star_line.h>
 
 #include <lib/subghz/blocks/custom_btn.h>
 
@@ -107,5 +105,5 @@ void subghz_scene_transmitter_on_exit(void* context) {
     SubGhz* subghz = context;
     subghz->state_notifications = SubGhzNotificationStateIDLE;
 
-    subghz_txrx_reset_dynamic(subghz->txrx);
+    subghz_txrx_reset_dynamic_and_custom_btns(subghz->txrx);
 }