From 783eecadf0b38f1cb43b062a7c785c8fa83bf16e Mon Sep 17 00:00:00 2001
From: Willy-JL <willy.leslie@icloud.com>
Date: Mon, 6 Mar 2023 00:32:05 +0000
Subject: [PATCH] Expose subghz setting internal types

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

diff --git a/lib/subghz/subghz_setting.c b/lib/subghz/subghz_setting.c
index 05b6a74ad..8bc6cb07c 100644
--- a/lib/subghz/subghz_setting.c
+++ b/lib/subghz/subghz_setting.c
@@ -3,7 +3,6 @@
 //#include "subghz_i.h"
 
 #include <furi.h>
-#include <m-list.h>
 #include <furi_hal_subghz_configs.h>
 
 #define TAG "SubGhzSetting"
@@ -86,31 +85,6 @@ 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)
-
-LIST_DEF(FrequencyList, uint32_t)
-
-#define M_OPL_FrequencyList_t() LIST_OPLIST(FrequencyList)
-
-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 3cb07ff6d..1ef1f863c 100644
--- a/lib/subghz/subghz_setting.h
+++ b/lib/subghz/subghz_setting.h
@@ -3,6 +3,8 @@
 
 #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>
 
@@ -12,7 +14,30 @@ extern "C" {
 
 #define SUBGHZ_SETTING_DEFAULT_PRESET_COUNT 4
 
-typedef struct SubGhzSetting SubGhzSetting;
+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;
 
 SubGhzSetting* subghz_setting_alloc(void);