Expose subghz setting internal types

This commit is contained in:
Willy-JL
2023-03-06 00:32:05 +00:00
parent b9e25d3aed
commit 783eecadf0
2 changed files with 26 additions and 27 deletions

View File

@@ -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);

View File

@@ -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);