From 9b3654c1f0d4d8585e097759e8bf0a23ea0fb961 Mon Sep 17 00:00:00 2001
From: gid9798 <30450294+gid9798@users.noreply.github.com>
Date: Tue, 9 May 2023 18:24:38 +0300
Subject: [PATCH] SubGhz: refactoring make  subghz_radio.h look like in OFW

---
 applications/main/subghz/subghz_radio.c | 64 ++++++++++++-------------
 applications/main/subghz/subghz_radio.h |  7 ++-
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/applications/main/subghz/subghz_radio.c b/applications/main/subghz/subghz_radio.c
index c5cb7d906..556339bc3 100644
--- a/applications/main/subghz/subghz_radio.c
+++ b/applications/main/subghz/subghz_radio.c
@@ -89,16 +89,6 @@ bool subghz_txrx_is_load_database(SubGhzTxRx* txrx) {
     return txrx->load_database;
 }
 
-void subghz_txrx_set_debug_pin_state(SubGhzTxRx* txrx, bool state) {
-    furi_assert(txrx);
-    txrx->debug_pin_state = state;
-}
-
-bool subghz_txrx_get_debug_pin_state(SubGhzTxRx* txrx) {
-    furi_assert(txrx);
-    return txrx->debug_pin_state;
-}
-
 void subghz_set_preset(
     SubGhzTxRx* txrx,
     const char* preset_name,
@@ -112,28 +102,6 @@ void subghz_set_preset(
     txrx->preset->data_size = preset_data_size;
 }
 
-void subghz_get_frequency_modulation(
-    SubGhzTxRx* txrx,
-    FuriString* frequency,
-    FuriString* modulation,
-    bool long_name) {
-    furi_assert(txrx);
-    if(frequency != NULL) {
-        furi_string_printf(
-            frequency,
-            "%03ld.%02ld",
-            txrx->preset->frequency / 1000000 % 1000,
-            txrx->preset->frequency / 10000 % 100);
-    }
-    if(modulation != NULL) {
-        if(long_name) {
-            furi_string_printf(modulation, "%s", furi_string_get_cstr(txrx->preset->name));
-        } else {
-            furi_string_printf(modulation, "%.2s", furi_string_get_cstr(txrx->preset->name));
-        }
-    }
-}
-
 const char* subghz_get_name_preset(SubGhzTxRx* txrx, const char* preset) {
     UNUSED(txrx);
     const char* preset_name = NULL;
@@ -158,6 +126,28 @@ SubGhzRadioPreset subghz_get_preset(SubGhzTxRx* txrx) {
     return *txrx->preset;
 }
 
+void subghz_get_frequency_modulation(
+    SubGhzTxRx* txrx,
+    FuriString* frequency,
+    FuriString* modulation,
+    bool long_name) {
+    furi_assert(txrx);
+    if(frequency != NULL) {
+        furi_string_printf(
+            frequency,
+            "%03ld.%02ld",
+            txrx->preset->frequency / 1000000 % 1000,
+            txrx->preset->frequency / 10000 % 100);
+    }
+    if(modulation != NULL) {
+        if(long_name) {
+            furi_string_printf(modulation, "%s", furi_string_get_cstr(txrx->preset->name));
+        } else {
+            furi_string_printf(modulation, "%.2s", furi_string_get_cstr(txrx->preset->name));
+        }
+    }
+}
+
 static void subghz_begin(SubGhzTxRx* txrx, uint8_t* preset_data) {
     furi_assert(txrx);
     furi_hal_subghz_reset();
@@ -582,6 +572,16 @@ void subghz_txrx_set_raw_file_encoder_worker_set_callback_end(
         context);
 }
 
+void subghz_txrx_set_debug_pin_state(SubGhzTxRx* txrx, bool state) {
+    furi_assert(txrx);
+    txrx->debug_pin_state = state;
+}
+
+bool subghz_txrx_get_debug_pin_state(SubGhzTxRx* txrx) {
+    furi_assert(txrx);
+    return txrx->debug_pin_state;
+}
+
 SubGhzReceiver* subghz_txrx_get_receiver(SubGhzTxRx* txrx) {
     furi_assert(txrx);
     return txrx->receiver;
diff --git a/applications/main/subghz/subghz_radio.h b/applications/main/subghz/subghz_radio.h
index 7745aa0ef..dc6834ac1 100644
--- a/applications/main/subghz/subghz_radio.h
+++ b/applications/main/subghz/subghz_radio.h
@@ -17,9 +17,6 @@ SubGhzTxRx* subghz_txrx_alloc();
 void subghz_txrx_free(SubGhzTxRx* txrx);
 bool subghz_txrx_is_load_database(SubGhzTxRx* txrx);
 
-void subghz_txrx_set_debug_pin_state(SubGhzTxRx* txrx, bool state);
-bool subghz_txrx_get_debug_pin_state(SubGhzTxRx* txrx);
-
 void subghz_set_preset(
     SubGhzTxRx* txrx,
     const char* preset_name,
@@ -36,7 +33,6 @@ void subghz_get_frequency_modulation(
     FuriString* modulation,
     bool long_name);
 bool subghz_tx_start(SubGhzTxRx* txrx, FlipperFormat* flipper_format);
-//void subghz_rx_end(SubGhzTxRx* txrx); //depricated
 void subghz_rx_start(SubGhzTxRx* txrx);
 void subghz_txrx_stop(SubGhzTxRx* txrx);
 void subghz_sleep(SubGhzTxRx* txrx);
@@ -76,6 +72,9 @@ void subghz_txrx_set_raw_file_encoder_worker_set_callback_end(
     SubGhzProtocolEncoderRAWCallbackEnd callback,
     void* context);
 
+void subghz_txrx_set_debug_pin_state(SubGhzTxRx* txrx, bool state);
+bool subghz_txrx_get_debug_pin_state(SubGhzTxRx* txrx);
+
 SubGhzReceiver* subghz_txrx_get_receiver(SubGhzTxRx* txrx); // TODO use only in DecodeRaw
 
 //#############Create  new Key##############