Merge branch 'ofw-dev' into dev

applications/main/subghz/application.fam

@@ -1,10 +1,9 @@
 App(
     appid="subghz",
     name="Sub-GHz",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.MENUEXTERNAL,
     targets=["f7"],
     entry_point="subghz_app",
-    cdefines=["APP_SUBGHZ"],
     requires=[
         "gui",
         "cli",
@@ -17,13 +16,16 @@ App(
     icon="A_Sub1ghz_14",
     stack_size=3 * 1024,
     order=10,
+    fap_libs=["assets", "hwdrivers"],
+    fap_icon="icon.png",
+    fap_category="Sub-GHz",
 )
 
 App(
     appid="subghz_start",
+    targets=["f7"],
     apptype=FlipperAppType.STARTUP,
     entry_point="subghz_on_system_start",
-    requires=["subghz"],
     order=40,
 )