From 7b684a4b56694b2f4338bdd2857a63a6c98f7d40 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Tue, 6 Feb 2024 18:21:04 +0000 Subject: [PATCH] Launch SubGhz from SD (runs internal subghz) --nobuild --- applications/main/subghz/application.fam | 13 +++++++++++++ applications/main/subghz/subghz.c | 2 ++ applications/main/subghz/subghz_fap.c | 5 +++++ applications/main/subghz/subghz_fap.h | 13 +++++++++++++ targets/f7/api_symbols.csv | 2 ++ 5 files changed, 35 insertions(+) create mode 100644 applications/main/subghz/subghz_fap.c create mode 100644 applications/main/subghz/subghz_fap.h diff --git a/applications/main/subghz/application.fam b/applications/main/subghz/application.fam index c2796ef26..966662547 100644 --- a/applications/main/subghz/application.fam +++ b/applications/main/subghz/application.fam @@ -18,8 +18,21 @@ App( fap_libs=["hwdrivers"], fap_icon="icon.png", fap_category="Sub-GHz", + sdk_headers=["subghz_fap.h"], ) +App( + appid="subghz_fap", + name="SubGHz", + apptype=FlipperAppType.EXTERNAL, + entry_point="subghz_fap", + stack_size=3 * 1024, + sources=["subghz_fap.c"], + fap_icon="icon.png", + fap_category="Sub-GHz", +) + + App( appid="subghz_start", targets=["f7"], diff --git a/applications/main/subghz/subghz.c b/applications/main/subghz/subghz.c index b7f73812c..8998b5645 100644 --- a/applications/main/subghz/subghz.c +++ b/applications/main/subghz/subghz.c @@ -8,6 +8,8 @@ #include #include +#include "subghz_fap.h" + #define TAG "SubGhzApp" bool subghz_custom_event_callback(void* context, uint32_t event) { diff --git a/applications/main/subghz/subghz_fap.c b/applications/main/subghz/subghz_fap.c new file mode 100644 index 000000000..2ae06cfa1 --- /dev/null +++ b/applications/main/subghz/subghz_fap.c @@ -0,0 +1,5 @@ +#include "subghz_fap.h" + +int32_t subghz_fap(char* p) { + return subghz_app(p); +} diff --git a/applications/main/subghz/subghz_fap.h b/applications/main/subghz/subghz_fap.h new file mode 100644 index 000000000..92f2c44b3 --- /dev/null +++ b/applications/main/subghz/subghz_fap.h @@ -0,0 +1,13 @@ +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +int32_t subghz_app(char* p); + +#ifdef __cplusplus +} +#endif diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv index 6d0d04f4d..7dfcb01fa 100644 --- a/targets/f7/api_symbols.csv +++ b/targets/f7/api_symbols.csv @@ -2,6 +2,7 @@ entry,status,name,type,params Version,+,54.0,, Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,, Header,+,applications/main/archive/helpers/archive_helpers_ext.h,, +Header,+,applications/main/subghz/subghz_fap.h,, Header,+,applications/services/applications.h,, Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/cli/cli.h,, @@ -3139,6 +3140,7 @@ Function,-,strupr,char*,char* Function,-,strverscmp,int,"const char*, const char*" Function,-,strxfrm,size_t,"char*, const char*, size_t" Function,-,strxfrm_l,size_t,"char*, const char*, size_t, locale_t" +Function,+,subghz_app,int32_t,char* Function,+,subghz_block_generic_deserialize,SubGhzProtocolStatus,"SubGhzBlockGeneric*, FlipperFormat*" Function,+,subghz_block_generic_deserialize_check_count_bit,SubGhzProtocolStatus,"SubGhzBlockGeneric*, FlipperFormat*, uint16_t" Function,+,subghz_block_generic_get_preset_name,void,"const char*, FuriString*"