highperfocused/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2025-10-10 15:12:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert 'Expose subghz setting internal types'

Browse Source
This commit is contained in:
Willy-JL
2023-03-06 02:11:09 +00:00
parent d5e56330ec
commit ffa95381af
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/subghz/subghz_setting.c
View File

@@ -85,6 +85,27 @@ static const uint32_t subghz_hopper_frequency_list[] = {
0, 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* subghz_setting_alloc(void) {
SubGhzSetting* instance = malloc(sizeof(SubGhzSetting)); SubGhzSetting* instance = malloc(sizeof(SubGhzSetting));
FrequencyList_init(instance->frequencies); FrequencyList_init(instance->frequencies);

22
lib/subghz/subghz_setting.h
View File

@@ -4,7 +4,6 @@
#include <math.h> #include <math.h>
#include <furi.h> #include <furi.h>
#include <m-list.h> #include <m-list.h>
#include <m-array.h>
#include <furi_hal.h> #include <furi_hal.h>
#include <lib/flipper_format/flipper_format.h> #include <lib/flipper_format/flipper_format.h>
@@ -14,30 +13,11 @@ extern "C" {
#define SUBGHZ_SETTING_DEFAULT_PRESET_COUNT 4 #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) LIST_DEF(FrequencyList, uint32_t)
#define M_OPL_FrequencyList_t() LIST_OPLIST(FrequencyList) #define M_OPL_FrequencyList_t() LIST_OPLIST(FrequencyList)
typedef struct { typedef struct SubGhzSetting SubGhzSetting;
SubGhzSettingCustomPresetItemArray_t data;
} SubGhzSettingCustomPresetStruct;
typedef struct {
FrequencyList_t frequencies;
FrequencyList_t hopper_frequencies;
SubGhzSettingCustomPresetStruct* preset;
} SubGhzSetting;
SubGhzSetting* subghz_setting_alloc(void); SubGhzSetting* subghz_setting_alloc(void);