mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-13 01:38:35 -07:00
Merge fixes
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
#include "assets_icons.h"
|
||||
#include "toolbox/path.h"
|
||||
#include <furi.h>
|
||||
#include "../archive_i.h"
|
||||
#include "archive_browser_view.h"
|
||||
#include "../helpers/archive_browser.h"
|
||||
|
||||
|
||||
@@ -43,7 +43,6 @@
|
||||
|
||||
#define SUBGHZ_MAX_LEN_NAME 64
|
||||
#define SUBGHZ_EXT_PRESET_NAME true
|
||||
#define SUBGHZ_RAW_THRESHOLD_MIN (-90.0f)
|
||||
#define SUBGHZ_MEASURE_LOADING false
|
||||
|
||||
typedef struct {
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
#include <assets_icons.h>
|
||||
#include <m-array.h>
|
||||
|
||||
#include "subghz_read_raw.h"
|
||||
|
||||
#define FRAME_HEIGHT 12
|
||||
#define MAX_LEN_PX 111
|
||||
#define MENU_ITEMS 4u
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
#include "../helpers/subghz_types.h"
|
||||
#include "../helpers/subghz_custom_event.h"
|
||||
|
||||
#define SUBGHZ_RAW_THRESHOLD_MIN -90.0f
|
||||
|
||||
typedef struct SubGhzReadRAW SubGhzReadRAW;
|
||||
|
||||
typedef void (*SubGhzReadRAWCallback)(SubGhzCustomEvent event, void* context);
|
||||
|
||||
Reference in New Issue
Block a user