[FL-3331] SubGhz: add subghz_protocol_registry external API (#2712)

* [FL-3331] SubGhz: add subghz_protocol_registry external API

* F18: fix API version

---------

Co-authored-by: hedger <hedger@nanode.su>
This commit is contained in:
Skorpionm 2023-06-06 23:13:41 +04:00 committed by GitHub
parent 3e1f209d64
commit dbd48a04d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 36 additions and 13 deletions

View file

@ -1,5 +1,5 @@
entry,status,name,type,params
Version,+,28.4,,
Version,+,29.0,,
Header,+,applications/services/bt/bt_service/bt.h,,
Header,+,applications/services/cli/cli.h,,
Header,+,applications/services/cli/cli_vcp.h,,

1 entry status name type params
2 Version + 28.4 29.0
3 Header + applications/services/bt/bt_service/bt.h
4 Header + applications/services/cli/cli.h
5 Header + applications/services/cli/cli_vcp.h

View file

@ -1,5 +1,5 @@
entry,status,name,type,params
Version,+,28.4,,
Version,+,29.0,,
Header,+,applications/services/bt/bt_service/bt.h,,
Header,+,applications/services/cli/cli.h,,
Header,+,applications/services/cli/cli_vcp.h,,
@ -189,6 +189,7 @@ Header,+,lib/subghz/environment.h,,
Header,+,lib/subghz/protocols/raw.h,,
Header,+,lib/subghz/receiver.h,,
Header,+,lib/subghz/registry.h,,
Header,+,lib/subghz/subghz_protocol_registry.h,,
Header,+,lib/subghz/subghz_setting.h,,
Header,+,lib/subghz/subghz_tx_rx_worker.h,,
Header,+,lib/subghz/subghz_worker.h,,
@ -2662,12 +2663,12 @@ Function,+,subghz_environment_get_came_atomo_rainbow_table_file_name,const char*
Function,+,subghz_environment_get_keystore,SubGhzKeystore*,SubGhzEnvironment*
Function,+,subghz_environment_get_nice_flor_s_rainbow_table_file_name,const char*,SubGhzEnvironment*
Function,+,subghz_environment_get_protocol_name_registry,const char*,"SubGhzEnvironment*, size_t"
Function,+,subghz_environment_get_protocol_registry,void*,SubGhzEnvironment*
Function,+,subghz_environment_get_protocol_registry,const SubGhzProtocolRegistry*,SubGhzEnvironment*
Function,+,subghz_environment_load_keystore,_Bool,"SubGhzEnvironment*, const char*"
Function,+,subghz_environment_set_alutech_at_4n_rainbow_table_file_name,void,"SubGhzEnvironment*, const char*"
Function,+,subghz_environment_set_came_atomo_rainbow_table_file_name,void,"SubGhzEnvironment*, const char*"
Function,+,subghz_environment_set_nice_flor_s_rainbow_table_file_name,void,"SubGhzEnvironment*, const char*"
Function,+,subghz_environment_set_protocol_registry,void,"SubGhzEnvironment*, void*"
Function,+,subghz_environment_set_protocol_registry,void,"SubGhzEnvironment*, const SubGhzProtocolRegistry*"
Function,-,subghz_keystore_alloc,SubGhzKeystore*,
Function,-,subghz_keystore_free,void,SubGhzKeystore*
Function,-,subghz_keystore_get_data,SubGhzKeyArray_t*,SubGhzKeystore*
@ -3361,6 +3362,7 @@ Variable,+,sequence_success,const NotificationSequence,
Variable,+,subghz_protocol_raw,const SubGhzProtocol,
Variable,+,subghz_protocol_raw_decoder,const SubGhzProtocolDecoder,
Variable,+,subghz_protocol_raw_encoder,const SubGhzProtocolEncoder,
Variable,+,subghz_protocol_registry,const SubGhzProtocolRegistry,
Variable,-,suboptarg,char*,
Variable,+,usb_cdc_dual,FuriHalUsbInterface,
Variable,+,usb_cdc_single,FuriHalUsbInterface,

1 entry status name type params
2 Version + 28.4 29.0
3 Header + applications/services/bt/bt_service/bt.h
4 Header + applications/services/cli/cli.h
5 Header + applications/services/cli/cli_vcp.h
189 Header + lib/subghz/protocols/raw.h
190 Header + lib/subghz/receiver.h
191 Header + lib/subghz/registry.h
192 Header + lib/subghz/subghz_protocol_registry.h
193 Header + lib/subghz/subghz_setting.h
194 Header + lib/subghz/subghz_tx_rx_worker.h
195 Header + lib/subghz/subghz_worker.h
2663 Function + subghz_environment_get_keystore SubGhzKeystore* SubGhzEnvironment*
2664 Function + subghz_environment_get_nice_flor_s_rainbow_table_file_name const char* SubGhzEnvironment*
2665 Function + subghz_environment_get_protocol_name_registry const char* SubGhzEnvironment*, size_t
2666 Function + subghz_environment_get_protocol_registry void* const SubGhzProtocolRegistry* SubGhzEnvironment*
2667 Function + subghz_environment_load_keystore _Bool SubGhzEnvironment*, const char*
2668 Function + subghz_environment_set_alutech_at_4n_rainbow_table_file_name void SubGhzEnvironment*, const char*
2669 Function + subghz_environment_set_came_atomo_rainbow_table_file_name void SubGhzEnvironment*, const char*
2670 Function + subghz_environment_set_nice_flor_s_rainbow_table_file_name void SubGhzEnvironment*, const char*
2671 Function + subghz_environment_set_protocol_registry void SubGhzEnvironment*, void* SubGhzEnvironment*, const SubGhzProtocolRegistry*
2672 Function - subghz_keystore_alloc SubGhzKeystore*
2673 Function - subghz_keystore_free void SubGhzKeystore*
2674 Function - subghz_keystore_get_data SubGhzKeyArray_t* SubGhzKeystore*
3362 Variable + subghz_protocol_raw const SubGhzProtocol
3363 Variable + subghz_protocol_raw_decoder const SubGhzProtocolDecoder
3364 Variable + subghz_protocol_raw_encoder const SubGhzProtocolEncoder
3365 Variable + subghz_protocol_registry const SubGhzProtocolRegistry
3366 Variable - suboptarg char*
3367 Variable + usb_cdc_dual FuriHalUsbInterface
3368 Variable + usb_cdc_single FuriHalUsbInterface

View file

@ -18,6 +18,7 @@ env.Append(
File("blocks/generic.h"),
File("blocks/math.h"),
File("subghz_setting.h"),
File("subghz_protocol_registry.h"),
],
)

View file

@ -92,16 +92,17 @@ const char*
void subghz_environment_set_protocol_registry(
SubGhzEnvironment* instance,
void* protocol_registry_items) {
const SubGhzProtocolRegistry* protocol_registry_items) {
furi_assert(instance);
const SubGhzProtocolRegistry* protocol_registry = protocol_registry_items;
instance->protocol_registry = protocol_registry;
}
void* subghz_environment_get_protocol_registry(SubGhzEnvironment* instance) {
const SubGhzProtocolRegistry*
subghz_environment_get_protocol_registry(SubGhzEnvironment* instance) {
furi_assert(instance);
furi_assert(instance->protocol_registry);
return (void*)instance->protocol_registry;
return instance->protocol_registry;
}
const char*

View file

@ -1,6 +1,7 @@
#pragma once
#include <furi.h>
#include "registry.h"
#include "subghz_keystore.h"
@ -9,6 +10,7 @@ extern "C" {
#endif
typedef struct SubGhzEnvironment SubGhzEnvironment;
typedef struct SubGhzProtocolRegistry SubGhzProtocolRegistry;
/**
* Allocate SubGhzEnvironment.
@ -93,14 +95,15 @@ const char*
*/
void subghz_environment_set_protocol_registry(
SubGhzEnvironment* instance,
void* protocol_registry_items);
const SubGhzProtocolRegistry* protocol_registry_items);
/**
* Get list of protocols to work.
* @param instance Pointer to a SubGhzEnvironment instance
* @return Pointer to a SubGhzProtocolRegistry
*/
void* subghz_environment_get_protocol_registry(SubGhzEnvironment* instance);
const SubGhzProtocolRegistry*
subghz_environment_get_protocol_registry(SubGhzEnvironment* instance);
/**
* Get list of protocols names.

View file

@ -1,5 +1,6 @@
#pragma once
#include "../registry.h"
#include "../subghz_protocol_registry.h"
#include "princeton.h"
#include "keeloq.h"
@ -43,5 +44,3 @@
#include "alutech_at_4n.h"
#include "kinggates_stylo_4k.h"
#include "bin_raw.h"
extern const SubGhzProtocolRegistry subghz_protocol_registry;

View file

@ -9,6 +9,7 @@ extern "C" {
typedef struct SubGhzEnvironment SubGhzEnvironment;
typedef struct SubGhzProtocolRegistry SubGhzProtocolRegistry;
typedef struct SubGhzProtocol SubGhzProtocol;
struct SubGhzProtocolRegistry {
const SubGhzProtocol** items;

View file

@ -0,0 +1,13 @@
#pragma once
#include "registry.h"
#ifdef __cplusplus
extern "C" {
#endif
extern const SubGhzProtocolRegistry subghz_protocol_registry;
#ifdef __cplusplus
}
#endif

View file

@ -21,6 +21,9 @@
#define SUBGHZ_RAW_FILE_VERSION 1
#define SUBGHZ_RAW_FILE_TYPE "Flipper SubGhz RAW File"
typedef struct SubGhzProtocolRegistry SubGhzProtocolRegistry;
typedef struct SubGhzEnvironment SubGhzEnvironment;
// Radio Preset
typedef struct {
FuriString* name;
@ -115,11 +118,11 @@ typedef enum {
SubGhzProtocolFlag_BinRAW = (1 << 10),
} SubGhzProtocolFlag;
typedef struct {
struct SubGhzProtocol {
const char* name;
SubGhzProtocolType type;
SubGhzProtocolFlag flag;
const SubGhzProtocolEncoder* encoder;
const SubGhzProtocolDecoder* decoder;
} SubGhzProtocol;
};