From ffa95381af178b16bc1df7ff9c09086b5f83d08c Mon Sep 17 00:00:00 2001
From: Willy-JL <willy.leslie@icloud.com>
Date: Mon, 6 Mar 2023 02:11:09 +0000
Subject: [PATCH] Revert 'Expose subghz setting internal types'

---
 lib/subghz/subghz_setting.c | 21 +++++++++++++++++++++
 lib/subghz/subghz_setting.h | 22 +---------------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/lib/subghz/subghz_setting.c b/lib/subghz/subghz_setting.c
index 8bc6cb07c..54e6862b1 100644
--- a/lib/subghz/subghz_setting.c
+++ b/lib/subghz/subghz_setting.c
@@ -85,6 +85,27 @@ static const uint32_t subghz_hopper_frequency_list[] = {
     0,
 };
 
+typedef struct {
+    FuriString* custom_preset_name;
+    uint8_t* custom_preset_data;
+    size_t custom_preset_data_size;
+} SubGhzSettingCustomPresetItem;
+
+ARRAY_DEF(SubGhzSettingCustomPresetItemArray, SubGhzSettingCustomPresetItem, M_POD_OPLIST)
+
+#define M_OPL_SubGhzSettingCustomPresetItemArray_t() \
+    ARRAY_OPLIST(SubGhzSettingCustomPresetItemArray, M_POD_OPLIST)
+
+typedef struct {
+    SubGhzSettingCustomPresetItemArray_t data;
+} SubGhzSettingCustomPresetStruct;
+
+struct SubGhzSetting {
+    FrequencyList_t frequencies;
+    FrequencyList_t hopper_frequencies;
+    SubGhzSettingCustomPresetStruct* preset;
+};
+
 SubGhzSetting* subghz_setting_alloc(void) {
     SubGhzSetting* instance = malloc(sizeof(SubGhzSetting));
     FrequencyList_init(instance->frequencies);
diff --git a/lib/subghz/subghz_setting.h b/lib/subghz/subghz_setting.h
index 1ef1f863c..13538e89a 100644
--- a/lib/subghz/subghz_setting.h
+++ b/lib/subghz/subghz_setting.h
@@ -4,7 +4,6 @@
 #include <math.h>
 #include <furi.h>
 #include <m-list.h>
-#include <m-array.h>
 #include <furi_hal.h>
 #include <lib/flipper_format/flipper_format.h>
 
@@ -14,30 +13,11 @@ extern "C" {
 
 #define SUBGHZ_SETTING_DEFAULT_PRESET_COUNT 4
 
-typedef struct {
-    FuriString* custom_preset_name;
-    uint8_t* custom_preset_data;
-    size_t custom_preset_data_size;
-} SubGhzSettingCustomPresetItem;
-
-ARRAY_DEF(SubGhzSettingCustomPresetItemArray, SubGhzSettingCustomPresetItem, M_POD_OPLIST)
-
-#define M_OPL_SubGhzSettingCustomPresetItemArray_t() \
-    ARRAY_OPLIST(SubGhzSettingCustomPresetItemArray, M_POD_OPLIST)
-
 LIST_DEF(FrequencyList, uint32_t)
 
 #define M_OPL_FrequencyList_t() LIST_OPLIST(FrequencyList)
 
-typedef struct {
-    SubGhzSettingCustomPresetItemArray_t data;
-} SubGhzSettingCustomPresetStruct;
-
-typedef struct {
-    FrequencyList_t frequencies;
-    FrequencyList_t hopper_frequencies;
-    SubGhzSettingCustomPresetStruct* preset;
-} SubGhzSetting;
+typedef struct SubGhzSetting SubGhzSetting;
 
 SubGhzSetting* subghz_setting_alloc(void);