diff --git a/applications/main/application.fam b/applications/main/application.fam index 94aff522e..f8898ce88 100644 --- a/applications/main/application.fam +++ b/applications/main/application.fam @@ -17,7 +17,8 @@ App( "fap_loader", "archive", # "Clock", - "SubGHz_Remote", + #"SubGHz_Remote", + "SubGHz_Remote_loader", # "Spectrum_Analyzer", ], ) diff --git a/applications/main/unirfremix_loader/application.fam b/applications/main/unirfremix_loader/application.fam new file mode 100644 index 000000000..070bc9cf7 --- /dev/null +++ b/applications/main/unirfremix_loader/application.fam @@ -0,0 +1,11 @@ +App( + appid="SubGHz_Remote_loader", + name="Sub-GHz Remote", + apptype=FlipperAppType.APP, + entry_point="unirfremix_loader_app", + requires=["gui"], + stack_size=int(1.5 * 1024), + icon="A_UniRFRemix_14", + order=11, + link="/ext/apps/Main/SubGHz_Remote.fap", +) diff --git a/applications/main/unirfremix_loader/unirfremix_loader_app.c b/applications/main/unirfremix_loader/unirfremix_loader_app.c new file mode 100644 index 000000000..1acfe41fb --- /dev/null +++ b/applications/main/unirfremix_loader/unirfremix_loader_app.c @@ -0,0 +1,9 @@ +#include + +#define TAG "unirfremix_loader_app" + +int32_t unirfremix_loader_app(void* p) { + UNUSED(p); + + return 0; +} \ No newline at end of file diff --git a/applications/main/unirfremix/application.fam b/applications/plugins/unirfremix/application.fam similarity index 73% rename from applications/main/unirfremix/application.fam rename to applications/plugins/unirfremix/application.fam index b7b1e59e5..3d90924ae 100644 --- a/applications/main/unirfremix/application.fam +++ b/applications/plugins/unirfremix/application.fam @@ -1,13 +1,13 @@ App( appid="SubGHz_Remote", name="Sub-GHz Remote", - apptype=FlipperAppType.APP, + apptype=FlipperAppType.EXTERNAL, entry_point="unirfremix_app", cdefines=["APP_UNIRFREMIX"], requires=["storage", "gui", "dialogs", "subghz"], icon="A_UniRFRemix_14", stack_size=4 * 1024, order=11, - # fap_icon="unirfIcon.png", - # fap_category="Main", + fap_icon="unirfIcon.png", + fap_category="Main", ) diff --git a/applications/main/unirfremix/unirfIcon.png b/applications/plugins/unirfremix/unirfIcon.png similarity index 100% rename from applications/main/unirfremix/unirfIcon.png rename to applications/plugins/unirfremix/unirfIcon.png diff --git a/applications/main/unirfremix/unirfremix_app.c b/applications/plugins/unirfremix/unirfremix_app.c similarity index 99% rename from applications/main/unirfremix/unirfremix_app.c rename to applications/plugins/unirfremix/unirfremix_app.c index 02f67f403..c31cd5c91 100644 --- a/applications/main/unirfremix/unirfremix_app.c +++ b/applications/plugins/unirfremix/unirfremix_app.c @@ -25,6 +25,26 @@ #define TAG "UniRF Remix" +static const char* mfname; + +static int kl_type; + +void keeloq_reset_mfname() { + mfname = ""; +} + +void keeloq_reset_kl_type() { + kl_type = 0; +} + +void star_line_reset_mfname() { + mfname = ""; +} + +void star_line_reset_kl_type() { + kl_type = 0; +} + typedef struct { uint32_t frequency; FuriString* name; diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv index de670a4e1..7221af8b2 100644 --- a/firmware/targets/f7/api_symbols.csv +++ b/firmware/targets/f7/api_symbols.csv @@ -1,5 +1,5 @@ entry,status,name,type,params -Version,+,4.13,, +Version,+,4.14,, Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/cli/cli.h,, Header,+,applications/services/cli/cli_vcp.h,, @@ -2346,7 +2346,7 @@ Function,+,subghz_protocol_blocks_lfsr_digest8,uint8_t,"const uint8_t[], unsigne Function,+,subghz_protocol_blocks_lfsr_digest8_reflect,uint8_t,"const uint8_t[], int, uint8_t, uint8_t" Function,+,subghz_protocol_blocks_reverse_key,uint64_t,"uint64_t, uint8_t" Function,+,subghz_protocol_blocks_set_bit_array,void,"_Bool, uint8_t[], size_t, size_t" -Function,-,subghz_protocol_decoder_base_deserialize,_Bool,"SubGhzProtocolDecoderBase*, FlipperFormat*" +Function,+,subghz_protocol_decoder_base_deserialize,_Bool,"SubGhzProtocolDecoderBase*, FlipperFormat*" Function,+,subghz_protocol_decoder_base_get_hash_data,uint8_t,SubGhzProtocolDecoderBase* Function,+,subghz_protocol_decoder_base_get_string,_Bool,"SubGhzProtocolDecoderBase*, FuriString*" Function,+,subghz_protocol_decoder_base_serialize,_Bool,"SubGhzProtocolDecoderBase*, FlipperFormat*, SubGhzRadioPreset*"