From cd91aff48df850042623422e32d3c1c9ff90c641 Mon Sep 17 00:00:00 2001 From: RogueMaster Date: Wed, 2 Nov 2022 19:23:51 -0400 Subject: [PATCH] Revert "other changes yet not working" This reverts commit 7848e6eab80a9f27dbdeaf6d91a4fd8d6b3004a5. --- applications/main/gpio/application.fam | 8 ++++---- applications/main/infrared/application.fam | 8 ++++---- applications/main/lfrfid/application.fam | 7 ++----- applications/main/lfrfid/gpioIcon.png | Bin 1739 -> 0 bytes applications/main/subghz/application.fam | 7 ++----- applications/main/subghz/gpioIcon.png | Bin 1739 -> 0 bytes 6 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 applications/main/lfrfid/gpioIcon.png delete mode 100644 applications/main/subghz/gpioIcon.png diff --git a/applications/main/gpio/application.fam b/applications/main/gpio/application.fam index 17a2e98c9..1d7deb6f1 100644 --- a/applications/main/gpio/application.fam +++ b/applications/main/gpio/application.fam @@ -1,13 +1,13 @@ App( appid="gpio", name="GPIO", - apptype=FlipperAppType.EXTERNAL, + apptype=FlipperAppType.APP, entry_point="gpio_app", cdefines=["APP_GPIO"], requires=["gui"], stack_size=1 * 1024, - # icon="A_GPIO_14", + icon="A_GPIO_14", order=50, - fap_icon="gpioIcon.png", - fap_category="Main", + # fap_icon="gpioIcon.png", + # fap_category="Main", ) diff --git a/applications/main/infrared/application.fam b/applications/main/infrared/application.fam index 9335e4c3b..897afdeb8 100644 --- a/applications/main/infrared/application.fam +++ b/applications/main/infrared/application.fam @@ -1,7 +1,7 @@ App( appid="infrared", name="Infrared", - apptype=FlipperAppType.EXTERNAL, + apptype=FlipperAppType.APP, entry_point="infrared_app", cdefines=["APP_INFRARED"], requires=[ @@ -9,11 +9,11 @@ App( "dialogs", ], provides=["infrared_start"], - # icon="A_Infrared_14", + icon="A_Infrared_14", stack_size=3 * 1024, order=40, - fap_icon="irIcon.png", - fap_category="Main", + # fap_icon="irIcon.png", + # fap_category="Main", ) App( diff --git a/applications/main/lfrfid/application.fam b/applications/main/lfrfid/application.fam index 0a7cfb73c..4a1498181 100644 --- a/applications/main/lfrfid/application.fam +++ b/applications/main/lfrfid/application.fam @@ -1,7 +1,7 @@ App( appid="lfrfid", name="125 kHz RFID", - apptype=FlipperAppType.EXTERNAL, + apptype=FlipperAppType.APP, entry_point="lfrfid_app", cdefines=["APP_LF_RFID"], requires=[ @@ -11,12 +11,9 @@ App( provides=[ "lfrfid_start", ], - # icon="A_125khz_14", + icon="A_125khz_14", stack_size=2 * 1024, order=20, - fap_category="Main", - fap_icon="gpioIcon.png", - ) App( diff --git a/applications/main/lfrfid/gpioIcon.png b/applications/main/lfrfid/gpioIcon.png deleted file mode 100644 index 5b2f4293c40f6670bb2cfec378b773fc01cd07fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1739 zcmcIl&u`mQ9Cw-yjaC&xyHtq7lPgV3@Z#r}#Ewlumo;UHG?%K2)b7Uf^Gjki_A|EI zq&-gJP;Jr<;{rkm@dr$Bg#%Z(?Ejd=1mcWTzK)ZSLn*mnDYm~apYP}U`|FGSz55$$ z@2n|`ve9X`4&a%+uiY%d{m0+7pTVP$9NfRBym5=om<}xTTPr9Ns z4kAD+N_~4AF@7vkDJ7c$LG4yNj#i{>v2sCMF6k_ z9Mk8fqJd0hGLZig$NcYkG?Bd%3zo{bE9G!ju>BbeqO?TNdxw7L$x(7A^JuCdS}YX} z6{<%uv9Mn0(z2~vc9p(Q$~GZ6)Pa8RSjv_IOV96}EdzBNyAviU3%TgD8Y(zd@_o;y zv}RC)FgRV;cH1G|E{xNMj;opDnTmrwix{g&h>S^6^lynQ{%fn%N_+pP3FVwfD) zdKSmJS)tgariYnc=9Cz^U`8G#uzeEyFhXp&$eMZO0b|9j>ZZvpY!U(5w8F8)U50yA ztEyM2;8o$O$m4cT#sPyq@dMTuS`_wG^p7_?awua*dXV$-tfir;!3dad`w3L=Y%(tS z>`aE{q4;d!XgUHzA5HqvW;`2%hRU=03s0RM`&T4(xe#*N(Ley{HGPr864^^fEEdf^ z6yd-7PFo_7gq>a=#&Z4fe}<8B^8pL{0v0Wd?P6ecE!#J h7k{z(q)^x@D(jl^;q#Zje3N}PI=g$V7xzAW{5Q-N1-}3Q diff --git a/applications/main/subghz/application.fam b/applications/main/subghz/application.fam index 3c6e7951e..7d31ecae5 100644 --- a/applications/main/subghz/application.fam +++ b/applications/main/subghz/application.fam @@ -1,7 +1,7 @@ App( appid="subghz", name="Sub-GHz", - apptype=FlipperAppType.EXTERNAL, + apptype=FlipperAppType.APP, entry_point="subghz_app", cdefines=["APP_SUBGHZ"], requires=[ @@ -10,12 +10,9 @@ App( "dialogs", ], provides=["subghz_start"], - # icon="A_Sub1ghz_14", + icon="A_Sub1ghz_14", stack_size=2 * 1024, order=10, - fap_category="Main", - fap_icon="gpioIcon.png", - ) App( diff --git a/applications/main/subghz/gpioIcon.png b/applications/main/subghz/gpioIcon.png deleted file mode 100644 index 5b2f4293c40f6670bb2cfec378b773fc01cd07fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1739 zcmcIl&u`mQ9Cw-yjaC&xyHtq7lPgV3@Z#r}#Ewlumo;UHG?%K2)b7Uf^Gjki_A|EI zq&-gJP;Jr<;{rkm@dr$Bg#%Z(?Ejd=1mcWTzK)ZSLn*mnDYm~apYP}U`|FGSz55$$ z@2n|`ve9X`4&a%+uiY%d{m0+7pTVP$9NfRBym5=om<}xTTPr9Ns z4kAD+N_~4AF@7vkDJ7c$LG4yNj#i{>v2sCMF6k_ z9Mk8fqJd0hGLZig$NcYkG?Bd%3zo{bE9G!ju>BbeqO?TNdxw7L$x(7A^JuCdS}YX} z6{<%uv9Mn0(z2~vc9p(Q$~GZ6)Pa8RSjv_IOV96}EdzBNyAviU3%TgD8Y(zd@_o;y zv}RC)FgRV;cH1G|E{xNMj;opDnTmrwix{g&h>S^6^lynQ{%fn%N_+pP3FVwfD) zdKSmJS)tgariYnc=9Cz^U`8G#uzeEyFhXp&$eMZO0b|9j>ZZvpY!U(5w8F8)U50yA ztEyM2;8o$O$m4cT#sPyq@dMTuS`_wG^p7_?awua*dXV$-tfir;!3dad`w3L=Y%(tS z>`aE{q4;d!XgUHzA5HqvW;`2%hRU=03s0RM`&T4(xe#*N(Ley{HGPr864^^fEEdf^ z6yd-7PFo_7gq>a=#&Z4fe}<8B^8pL{0v0Wd?P6ecE!#J h7k{z(q)^x@D(jl^;q#Zje3N}PI=g$V7xzAW{5Q-N1-}3Q