Merge branch 'flipperdevices:dev' into dev

This commit is contained in:
Eng1n33r
2022-04-14 17:52:45 +03:00
committed by GitHub
149 changed files with 2368 additions and 529 deletions

View File

@@ -31,18 +31,11 @@
#include <lib/subghz/transmitter.h>
#include "subghz_history.h"
#include "subghz_setting.h"
#include <gui/modules/variable_item_list.h>
#define SUBGHZ_MAX_LEN_NAME 21
extern const char* const subghz_frequencies_text[];
extern const uint32_t subghz_frequencies[];
extern const uint32_t subghz_hopper_frequencies[];
extern const uint32_t subghz_frequencies_count;
extern const uint32_t subghz_hopper_frequencies_count;
extern const uint32_t subghz_frequencies_433_92;
extern const uint32_t subghz_frequencies_315_00;
#define SUBGHZ_MAX_LEN_NAME 40
/** SubGhzNotification state */
typedef enum {
@@ -145,6 +138,7 @@ struct SubGhz {
SubGhzTestCarrier* subghz_test_carrier;
SubGhzTestPacket* subghz_test_packet;
string_t error_str;
SubGhzSetting* setting;
};
typedef enum {