From ae19b8c04a08883fb7adddfba04c53dd7c65e45a Mon Sep 17 00:00:00 2001
From: RogueMaster <anifan115@gmail.com>
Date: Sun, 18 Sep 2022 04:51:11 -0400
Subject: [PATCH] subghzRemote Back To Internal, GPIO External

---
 applications/main/application.fam                |   4 ++--
 applications/main/gpio/application.fam           |   4 +++-
 applications/main/gpio/gpioIcon.png              | Bin 0 -> 1739 bytes
 applications/main/unirfremix/application.fam     |   8 ++++----
 .../services/desktop/scenes/desktop_scene_main.c |  11 ++++++-----
 5 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 applications/main/gpio/gpioIcon.png

diff --git a/applications/main/application.fam b/applications/main/application.fam
index 83b1f62e8..e7f9b6845 100644
--- a/applications/main/application.fam
+++ b/applications/main/application.fam
@@ -3,7 +3,7 @@ App(
     name="Basic applications for main menu",
     apptype=FlipperAppType.METAPACKAGE,
     provides=[
-        "gpio",
+        # "gpio",
         # "ibutton",
         "infrared",
         "lfrfid",
@@ -14,7 +14,7 @@ App(
         "fap_loader",
         "archive",
         # "Clock",
-        # "SubGHz_Remote",
+        "SubGHz_Remote",
         # "Spectrum_Analyzer",
     ],
 )
diff --git a/applications/main/gpio/application.fam b/applications/main/gpio/application.fam
index 64f8db5b0..fe18bd338 100644
--- a/applications/main/gpio/application.fam
+++ b/applications/main/gpio/application.fam
@@ -1,11 +1,13 @@
 App(
     appid="gpio",
     name="GPIO",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="gpio_app",
     cdefines=["APP_GPIO"],
     requires=["gui"],
     stack_size=1 * 1024,
     icon="A_GPIO_14",
     order=50,
+    fap_icon="gpioIcon.png",
+    fap_category="Main",
 )
diff --git a/applications/main/gpio/gpioIcon.png b/applications/main/gpio/gpioIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b2f4293c40f6670bb2cfec378b773fc01cd07fb
GIT binary patch
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$9NfRBym<NUD-c%uO{b|SKRjFii`@YEt^Ehx
z-OJ0%3|A-=i^Y|d74+?mUqOB|YClR8W&Kw6D=1%my{RZ~-156e>5=om<}xTTPr9Ns
z4kAD+N_~4AF@7vk<chu@Hq_sL`dLN3*H90u4soI#G4R{xv3PjC*X8HO-15}zk2coo
zV;dL(kuo$6hGAll8|sAEhWG4PQ_%#H9yioxW)U4Z`)EhT0vRQOIUy98R!KK1m0Ils
zL<uDtF*TiFN^N4;)iRo1Dwsp49(z6ep!M<897qjykfxEXX`|7oG%A;5+}Cu=vNS?9
zN--dCau%j+jKgFrCz;Z;M8ab~N_`okjF!3bByFhRaUMz#&AG#5nlH$lHfE8gmq-@c
z4Cpx5LxW(BPSV{|urhV}O5&t@776V@B=RKYV)s;p>DJ7c$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)F<h>gRV;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!#<pRjX@P6*$K&?6Q1MPPAcB
zf&_ZAEuBg8O)o;Q8p9s{<MpdQ;Tv$f(`t4%5Bc4dr%`+L`NhSTpTB+c?sw!hy7T>J
h7k{z(q)^x@D(jl^;q#Zje3N}PI=g$V7xzAW{5Q-N1-}3Q

literal 0
HcmV?d00001

diff --git a/applications/main/unirfremix/application.fam b/applications/main/unirfremix/application.fam
index acd4658ff..b7b1e59e5 100644
--- a/applications/main/unirfremix/application.fam
+++ b/applications/main/unirfremix/application.fam
@@ -1,13 +1,13 @@
 App(
     appid="SubGHz_Remote",
     name="Sub-GHz Remote",
-    apptype=FlipperAppType.EXTERNAL,
+    apptype=FlipperAppType.APP,
     entry_point="unirfremix_app",
     cdefines=["APP_UNIRFREMIX"],
     requires=["storage", "gui", "dialogs", "subghz"],
-    # icon="A_UniRFRemix_14",
+    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/services/desktop/scenes/desktop_scene_main.c b/applications/services/desktop/scenes/desktop_scene_main.c
index 32f74093a..a182b7f77 100644
--- a/applications/services/desktop/scenes/desktop_scene_main.c
+++ b/applications/services/desktop/scenes/desktop_scene_main.c
@@ -233,11 +233,12 @@ bool desktop_scene_main_on_event(void* context, SceneManagerEvent event) {
             break;
         }
         case DesktopMainEventOpenSubRemote: {
-            LoaderStatus status = loader_start(
-                desktop->loader, "Applications", EXT_PATH("/apps/Main/SubGHz_Remote.fap"));
-            if(status != LoaderStatusOk) {
-                FURI_LOG_E(TAG, "loader_start failed: %d", status);
-            }
+            loader_start(desktop->loader, FLIPPER_APPS[1].name, NULL);
+            // LoaderStatus status = loader_start(
+                // desktop->loader, "Applications", EXT_PATH("/apps/Main/SubGHz_Remote.fap"));
+            // if(status != LoaderStatusOk) {
+                // FURI_LOG_E(TAG, "loader_start failed: %d", status);
+            // }
             consumed = true;
             break;
         }