From d85731636fca407a6ff41fcbb8b76239ca6c24e8 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Mon, 19 Sep 2022 04:59:28 +0300 Subject: [PATCH] move spectrum analyzer into plugins, fix debug builds --- applications/main/application.fam | 19 +++++++++++++++++- .../spectrum_analyzer/application.fam | 5 +++-- .../spectrum_analyzer/spectrum_10px.png | Bin 0 -> 135 bytes .../spectrum_analyzer/spectrum_analyzer.c | 0 .../spectrum_analyzer/spectrum_analyzer.h | 0 .../spectrum_analyzer_worker.c | 0 .../spectrum_analyzer_worker.h | 0 .../MainMenu/SpectrumAnalyzer_14/frame_0.png | Bin 1863 -> 0 bytes .../MainMenu/SpectrumAnalyzer_14/frame_1.png | Bin 1868 -> 0 bytes .../MainMenu/SpectrumAnalyzer_14/frame_2.png | Bin 1876 -> 0 bytes .../MainMenu/SpectrumAnalyzer_14/frame_3.png | Bin 1878 -> 0 bytes .../MainMenu/SpectrumAnalyzer_14/frame_4.png | Bin 1876 -> 0 bytes .../MainMenu/SpectrumAnalyzer_14/frame_5.png | Bin 1868 -> 0 bytes .../MainMenu/SpectrumAnalyzer_14/frame_rate | 1 - fbt_options.py | 2 +- 15 files changed, 22 insertions(+), 5 deletions(-) rename applications/{main => plugins}/spectrum_analyzer/application.fam (68%) create mode 100644 applications/plugins/spectrum_analyzer/spectrum_10px.png rename applications/{main => plugins}/spectrum_analyzer/spectrum_analyzer.c (100%) rename applications/{main => plugins}/spectrum_analyzer/spectrum_analyzer.h (100%) rename applications/{main => plugins}/spectrum_analyzer/spectrum_analyzer_worker.c (100%) rename applications/{main => plugins}/spectrum_analyzer/spectrum_analyzer_worker.h (100%) delete mode 100644 assets/icons/MainMenu/SpectrumAnalyzer_14/frame_0.png delete mode 100644 assets/icons/MainMenu/SpectrumAnalyzer_14/frame_1.png delete mode 100644 assets/icons/MainMenu/SpectrumAnalyzer_14/frame_2.png delete mode 100644 assets/icons/MainMenu/SpectrumAnalyzer_14/frame_3.png delete mode 100644 assets/icons/MainMenu/SpectrumAnalyzer_14/frame_4.png delete mode 100644 assets/icons/MainMenu/SpectrumAnalyzer_14/frame_5.png delete mode 100644 assets/icons/MainMenu/SpectrumAnalyzer_14/frame_rate diff --git a/applications/main/application.fam b/applications/main/application.fam index e6fca441b..e03f70953 100644 --- a/applications/main/application.fam +++ b/applications/main/application.fam @@ -15,6 +15,23 @@ App( "archive", "clock", "unirfremix", - "spectrum_analyzer", + ], +) + +App( + appid="main_apps_default", + name="Basic applications for main menu", + apptype=FlipperAppType.METAPACKAGE, + provides=[ + "gpio", + "ibutton", + "infrared", + "lfrfid", + "nfc", + "subghz", + "bad_usb", + "u2f", + "fap_loader", + "archive", ], ) diff --git a/applications/main/spectrum_analyzer/application.fam b/applications/plugins/spectrum_analyzer/application.fam similarity index 68% rename from applications/main/spectrum_analyzer/application.fam rename to applications/plugins/spectrum_analyzer/application.fam index 563e3d614..5028c999b 100644 --- a/applications/main/spectrum_analyzer/application.fam +++ b/applications/plugins/spectrum_analyzer/application.fam @@ -1,11 +1,12 @@ App( appid="spectrum_analyzer", name="Spectrum Analyzer", - apptype=FlipperAppType.APP, + apptype=FlipperAppType.EXTERNAL, entry_point="spectrum_analyzer_app", cdefines=["APP_SPECTRUM_ANALYZER"], requires=["gui"], - icon="A_SpectrumAnalyzer_14", stack_size=2 * 1024, order=12, + fap_icon="spectrum_10px.png", + fap_category="Tools", ) diff --git a/applications/plugins/spectrum_analyzer/spectrum_10px.png b/applications/plugins/spectrum_analyzer/spectrum_10px.png new file mode 100644 index 0000000000000000000000000000000000000000..743c2460b3ebde5152334c7c3e8e7a5d082b651b GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4F%}28J29*~C-V}>arAU?4ABUl zJHe5Q!GPoNoB#56FFq`r5O`{j)M`N$&IK_Obp(@iS1hOxxLkbL*pR7zitn6fx3`?% iv3hNhdGYHn54r0fTK>MN-zEw)jKR~@&t;ucLK6TuM=vx0 literal 0 HcmV?d00001 diff --git a/applications/main/spectrum_analyzer/spectrum_analyzer.c b/applications/plugins/spectrum_analyzer/spectrum_analyzer.c similarity index 100% rename from applications/main/spectrum_analyzer/spectrum_analyzer.c rename to applications/plugins/spectrum_analyzer/spectrum_analyzer.c diff --git a/applications/main/spectrum_analyzer/spectrum_analyzer.h b/applications/plugins/spectrum_analyzer/spectrum_analyzer.h similarity index 100% rename from applications/main/spectrum_analyzer/spectrum_analyzer.h rename to applications/plugins/spectrum_analyzer/spectrum_analyzer.h diff --git a/applications/main/spectrum_analyzer/spectrum_analyzer_worker.c b/applications/plugins/spectrum_analyzer/spectrum_analyzer_worker.c similarity index 100% rename from applications/main/spectrum_analyzer/spectrum_analyzer_worker.c rename to applications/plugins/spectrum_analyzer/spectrum_analyzer_worker.c diff --git a/applications/main/spectrum_analyzer/spectrum_analyzer_worker.h b/applications/plugins/spectrum_analyzer/spectrum_analyzer_worker.h similarity index 100% rename from applications/main/spectrum_analyzer/spectrum_analyzer_worker.h rename to applications/plugins/spectrum_analyzer/spectrum_analyzer_worker.h diff --git a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_0.png b/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_0.png deleted file mode 100644 index f2fc132ed5087f825214f25d85249998f021aa67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1863 zcmcIlO>f*p7J^tPu)vVIp&}@Z6l&)wvmD!o`u9daNv7PKD z+&Ca{gMR=AkN^qpMS=qt{sR9Y5*)de*ZW~YN!zFrD|tPhdFFYa_ha7qYVN$7i;fZz>JPk#M0r<^lkL+&-ap+L@Y4g{7JBC$ zbbCgDAe9wEvviV`bQbD!UJB!S+SJh;QXPc)W^EAdN4u!23W99NdnU%*tRM0spp{OPX}v-i0NMM-K8z~3iWYS<1aJ1{N5y3Bsow0x^pwA>(jtdgM)S+g-| zVcQ*80d*bfcyAMj60(3sPzQol>*9H4~iXYYCtM@O;Rwxb}O@t`-JmLD> z!9z=OOl;T1ERZp7Gj78Y47t5xd%sBF@SS#(=f`AZ`bkapGayawTT1Sm2mQ zC-%LeWL}^n!D+0DltG;&DH};M&qg}>M@?5vR1qlwF?Y_-_q*NQLdD4h7RtT5cTj(; z>sxK#$F^bBWe+mI-R-1=9G@%?(tUZj98D55uTIK%eJDbm*VP~)OpEE{f-qmsp~e2` zSOV!Ys$>BxRa{M3AvZ^mlIK>T`84q*JARII%W-%h8FqX~2&A+HIc-_caU5uCF|phL za{50?Uvl#?%SIA9tf{}aGnXs(3!VAz0eq1>Tu(9zX89yrzA3)>+fO;=gU&xbnuqP5kTi o-*4n=;_%kJFZyTqzCFWQ_nX0^!;gRbvcBs2TRXiU?tJvg-=>;FzW@LL diff --git a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_1.png b/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_1.png deleted file mode 100644 index 7bb4f38955dfb2afd1b5e17b95ac91358658a5f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1868 zcmcIlO^f727>=_b?!pQSet@Tt0ohe6sZ_p;ZJXKdcBjRR!)(Kj;DVJ(r8_&FR7^6{ zJ#!KT!JC2?j|yHqEO-(W)Po?1Cr=*4Um$oBFS5SrFUQ^4-Ca7p9 zx2~Q)_uM%}QO@@_yF2iHvbmpFgXf1YeEmMW&K8?*REnanH}_-H&)Wxz^7yyuV7J~4 zU!z=RI*Vl_^l4TAT2U^yrv>ACqE;g@O!JoZ=QrPJY8tn+>rRNnq9aD>=20oG9c>Nx z(H;+Ct^Klkc}jsG6E#z(**LH0w582>DU6$GLsMsvdatEzGzQh(a9i!jQmC$u5yzOQ zUZ9(a7K@DRvndlQsm*vnf zgCH<4F$h6`K-FPhvnk4}^(8}BRJ=@!I+eNFFtSMQ*DVc{&Rxig6>VNE!UO>`rmQeb z9XBp5fnj)mXqK(eRoy!PD+|3R5?6!6LKr)ulKUkWy#tZg>q}!XU#%_n%kj+9m>Xg& zGJsVe%v_l&MzWUGNZ!Mb)$f%z1?`lA)v_E&IbJ4ed&!~_qGR>q^)!#=q`K57S}YJ< zR*RMfStAJhh}Z+uqqapY=S6H$jOWl0>L6w{y94YDOqXJxV(Wik8K=qNX`o?9`*~Hf zoQr<9rGY3tO=FrwF7~3xMs8p;6gjqyg21y8@q;L~1YwvsGhML0EBSsCzGnTrY-7oR zV-+Dv>nA1d-8G|}WGd2`Pkq?BD^?P0Qk*V90VIAp|-PVxDh8 z$FZQTCD^n*vUL5CNMD4Nk61nw&|wYj;hi~Mxu2MayEov&9E6ljF_-6l( zHDO5PYzjJiGh7`h@Uc3SL=JH(;mG;*x84~zuIzqyV{q|l{`c+M?K2mYFaBs>P(FR{ zuUEgk`TUJbXW!ZV>KF3nM>p1<-FW85&z}0^hg%>2^!u7((yi}*zB&1)Iq&+tt?sQW HZ@v33$kjz( diff --git a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_2.png b/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_2.png deleted file mode 100644 index 3a27b10b25ccbc32eda1a9fab331203ba2d9c484..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1876 zcmcIlO^@3|7&eq5s8pm%<-*B$FD)?kc>EQQ8lv4Kbc5<;*^Sgi0*T3ZoS2P0#`bQq zD}`#N#LQnu|1ge8B?JoCKI`!Vl)vAJ>e z{JEFTDT;Ewx8B);_Y2ki+|%&<`jsC)hu8Dj`a6Z9=quIz)bwU+Us0a@Demu-JHa)| zWumiC4un2UGC(WJmDV(4d{>m}Kn&xwsolH%v!=#jQ@id2ILO*!6t5rVV*7BT&kuLG zA8M`F)hkm91c@k_I!(rDL8nb^#!KP58a6a_1}S%&+G=G`-3d0;w#KJj1iR$^f z>DqRq@tR67!3OpW6C*+>cBx~j^`(KeJdEg8=Z)GH{57>vS!UEQCXXa4b%61 z0~3P~1PD|dq$Qi8v{+d%bVR}PI4fhBsud#}$i1?ufzr7PNw%a-i#kjYFk{Lx!_;x* z(gGL+kB2775?z$teXvsNJ(0NRA7sMV5{2B$x#;eTv|L#j3;A+wwwI4*o`&2IW03%? z0Ac3RR5p^OEJpGXek`Y#-ek0$3s%a!FXecVsLch7N{EitOV{Hxl#}9erKnyYI;<2; z4YEcMZXja!O^@0ZwVYS6MKPX31E_Gm;8;8nLSAS)sNs9?aK*rK9MiYl!Auvd??}E^g|AvaFWXRZ;8;e8 znwG_ElM&=QK0_9y5>>y&= z0AJiLZTYOl5jbn9Ios{uvQ#3VRRf7n%dN@8Q z%%^f_PCFS1Abm`g%wdI$$_dNG>JU=$#40o%CB9($Pmm5t<(`0ax{we8od+?mVM52T zpshvNv^}zL{eO{Ohn0_5Iuy`h4edWTbE2%on>*Ho zA(68o=%eRl2U zj)J0bf6~4D?VYpA@1MSX=hi*<&+6Rk MbvHV<*51GI0M@=pBme*a diff --git a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_3.png b/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_3.png deleted file mode 100644 index 72e9b7f83ad90a8af15ebd4679b90db312f0e5eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1878 zcmcIlJ&fE$7&SS8AWD#~00|Jt@-+!C_W0i(WwW~5J#q{9a=NT^myX$)@ve1ikFkBX zdsk8*AsUd7prxRpNRX+KzBe=P zZEapTfA;yailUtFY_zxG{dE02c?SMJc=?NW;q_F$alKR&eWiXL8-Lb3P?RUWO1it% zZuBN$GSw-UJ)w`&9MFn#sX5Lm+Y^=A6a6G>Xn%b9wWcP#q3yU4j`EfmBpXMCxOTMJ zWk-7~wyU~`~l7&z`9V3RZ zrTU?6dX5tWuc{Wduz`KU#K^J;_K0h%v!4d56+9-}?bl{&!B;~YR8>w4V>BA+BU_h6 z-!Q{4G_Yk@76Jq+53`DnQC6lC=>j$vPOz(-rW%n=_#S;=xB?-R#jco9ubT7{sMEV@z-=Y`suv#6G(WA(yLl5sgIFV>1? z6GWRJlXr_cy|z-dMA0lQt(BRC+o|1YrQNql%3XcUo7 zR#r4)qSJ0@AWBaXPM90SA@vv-h?+=*4n-mMI0^zrT|bCzpP3U~FuyI?ex1I0{?xWy zGT>Nbh`3-(&v6B^z0gA}aBS4GEgNwf_%`FdEo^_zcC|=g=g{GC)>;(@MxTbBABR4o z47Na};A?$DZ30piNUbBe5(}3O-3v+80Ki^)>Y$H7z-mMI<@o+&BO!jiiJcAI>(?HSzYWHB8irI|*g=rf6uac7x#B ztUEa&&8G`!N;?_|Abo&Krm#}R)rb~iwGSnEs0)qzi7)BFL!_Iw&3r-Yn)+Z`CqUE> zOfZZM$6Aa{$G7I8|1Z*KX=MYN^#z=;hW6;eoX+ki*5SV!@KNe;axg}HuudIj+-ttc z*s((x3OVV5lf7;(t`zuKTuLH?JQZ-|kXwJf2-nr+PJ6X`;TF4n_il4(S^50;=CbnX zQuNVJumAGBcKxEY^#0WkfBWH?!Yno4JVvwdUjt#|$gL@G-G diff --git a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_4.png b/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_4.png deleted file mode 100644 index 3a27b10b25ccbc32eda1a9fab331203ba2d9c484..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1876 zcmcIlO^@3|7&eq5s8pm%<-*B$FD)?kc>EQQ8lv4Kbc5<;*^Sgi0*T3ZoS2P0#`bQq zD}`#N#LQnu|1ge8B?JoCKI`!Vl)vAJ>e z{JEFTDT;Ewx8B);_Y2ki+|%&<`jsC)hu8Dj`a6Z9=quIz)bwU+Us0a@Demu-JHa)| zWumiC4un2UGC(WJmDV(4d{>m}Kn&xwsolH%v!=#jQ@id2ILO*!6t5rVV*7BT&kuLG zA8M`F)hkm91c@k_I!(rDL8nb^#!KP58a6a_1}S%&+G=G`-3d0;w#KJj1iR$^f z>DqRq@tR67!3OpW6C*+>cBx~j^`(KeJdEg8=Z)GH{57>vS!UEQCXXa4b%61 z0~3P~1PD|dq$Qi8v{+d%bVR}PI4fhBsud#}$i1?ufzr7PNw%a-i#kjYFk{Lx!_;x* z(gGL+kB2775?z$teXvsNJ(0NRA7sMV5{2B$x#;eTv|L#j3;A+wwwI4*o`&2IW03%? z0Ac3RR5p^OEJpGXek`Y#-ek0$3s%a!FXecVsLch7N{EitOV{Hxl#}9erKnyYI;<2; z4YEcMZXja!O^@0ZwVYS6MKPX31E_Gm;8;8nLSAS)sNs9?aK*rK9MiYl!Auvd??}E^g|AvaFWXRZ;8;e8 znwG_ElM&=QK0_9y5>>y&= z0AJiLZTYOl5jbn9Ios{uvQ#3VRRf7n%dN@8Q z%%^f_PCFS1Abm`g%wdI$$_dNG>JU=$#40o%CB9($Pmm5t<(`0ax{we8od+?mVM52T zpshvNv^}zL{eO{Ohn0_5Iuy`h4edWTbE2%on>*Ho zA(68o=%eRl2U zj)J0bf6~4D?VYpA@1MSX=hi*<&+6Rk MbvHV<*51GI0M@=pBme*a diff --git a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_5.png b/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_5.png deleted file mode 100644 index 7bb4f38955dfb2afd1b5e17b95ac91358658a5f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1868 zcmcIlO^f727>=_b?!pQSet@Tt0ohe6sZ_p;ZJXKdcBjRR!)(Kj;DVJ(r8_&FR7^6{ zJ#!KT!JC2?j|yHqEO-(W)Po?1Cr=*4Um$oBFS5SrFUQ^4-Ca7p9 zx2~Q)_uM%}QO@@_yF2iHvbmpFgXf1YeEmMW&K8?*REnanH}_-H&)Wxz^7yyuV7J~4 zU!z=RI*Vl_^l4TAT2U^yrv>ACqE;g@O!JoZ=QrPJY8tn+>rRNnq9aD>=20oG9c>Nx z(H;+Ct^Klkc}jsG6E#z(**LH0w582>DU6$GLsMsvdatEzGzQh(a9i!jQmC$u5yzOQ zUZ9(a7K@DRvndlQsm*vnf zgCH<4F$h6`K-FPhvnk4}^(8}BRJ=@!I+eNFFtSMQ*DVc{&Rxig6>VNE!UO>`rmQeb z9XBp5fnj)mXqK(eRoy!PD+|3R5?6!6LKr)ulKUkWy#tZg>q}!XU#%_n%kj+9m>Xg& zGJsVe%v_l&MzWUGNZ!Mb)$f%z1?`lA)v_E&IbJ4ed&!~_qGR>q^)!#=q`K57S}YJ< zR*RMfStAJhh}Z+uqqapY=S6H$jOWl0>L6w{y94YDOqXJxV(Wik8K=qNX`o?9`*~Hf zoQr<9rGY3tO=FrwF7~3xMs8p;6gjqyg21y8@q;L~1YwvsGhML0EBSsCzGnTrY-7oR zV-+Dv>nA1d-8G|}WGd2`Pkq?BD^?P0Qk*V90VIAp|-PVxDh8 z$FZQTCD^n*vUL5CNMD4Nk61nw&|wYj;hi~Mxu2MayEov&9E6ljF_-6l( zHDO5PYzjJiGh7`h@Uc3SL=JH(;mG;*x84~zuIzqyV{q|l{`c+M?K2mYFaBs>P(FR{ zuUEgk`TUJbXW!ZV>KF3nM>p1<-FW85&z}0^hg%>2^!u7((yi}*zB&1)Iq&+tt?sQW HZ@v33$kjz( diff --git a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_rate b/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_rate deleted file mode 100644 index bf0d87ab1..000000000 --- a/assets/icons/MainMenu/SpectrumAnalyzer_14/frame_rate +++ /dev/null @@ -1 +0,0 @@ -4 \ No newline at end of file diff --git a/fbt_options.py b/fbt_options.py index b0d0ebea5..f7a2cc3b1 100644 --- a/fbt_options.py +++ b/fbt_options.py @@ -82,7 +82,7 @@ FIRMWARE_APPS = { # Svc "basic_services", # Apps - "main_apps", + "main_apps_default", "system_apps", # Settings "settings_apps",