From d067e4a67909c566f1f28682e5bfc9be758400a5 Mon Sep 17 00:00:00 2001
From: ESurge <s_marcelino@hotmail.com>
Date: Mon, 26 Sep 2022 00:11:52 -0700
Subject: [PATCH 1/2] Fixed iButton CLI not available when made into external
 app.

Couldn't test onewire command, but tested ikey commands
---
 applications/main/ibutton/application.fam                | 9 ---------
 applications/services/ibuttonsrv/application.fam         | 7 +++++++
 .../ibuttonsrv/ibuttonsrv_cli.c}                         | 0
 3 files changed, 7 insertions(+), 9 deletions(-)
 create mode 100644 applications/services/ibuttonsrv/application.fam
 rename applications/{main/ibutton/ibutton_cli.c => services/ibuttonsrv/ibuttonsrv_cli.c} (100%)

diff --git a/applications/main/ibutton/application.fam b/applications/main/ibutton/application.fam
index cc34cce18..1265fb788 100644
--- a/applications/main/ibutton/application.fam
+++ b/applications/main/ibutton/application.fam
@@ -8,18 +8,9 @@ App(
         "gui",
         "dialogs",
     ],
-    provides=["ibutton_start"],
     # icon="A_iButton_14",
     stack_size=2 * 1024,
     order=60,
     fap_icon="iBIcon.png",
     fap_category="Main",
 )
-
-App(
-    appid="ibutton_start",
-    apptype=FlipperAppType.STARTUP,
-    entry_point="ibutton_on_system_start",
-    requires=["ibutton"],
-    order=60,
-)
diff --git a/applications/services/ibuttonsrv/application.fam b/applications/services/ibuttonsrv/application.fam
new file mode 100644
index 000000000..e23ac786f
--- /dev/null
+++ b/applications/services/ibuttonsrv/application.fam
@@ -0,0 +1,7 @@
+App(
+    appid="ibuttonsrv",
+    apptype=FlipperAppType.STARTUP,
+    entry_point="ibutton_on_system_start",
+    requires=["ibutton"],
+    order=60,
+)
diff --git a/applications/main/ibutton/ibutton_cli.c b/applications/services/ibuttonsrv/ibuttonsrv_cli.c
similarity index 100%
rename from applications/main/ibutton/ibutton_cli.c
rename to applications/services/ibuttonsrv/ibuttonsrv_cli.c

From c00c8e6dc4182d694cacdfc188ad0c7ce31ac7cc Mon Sep 17 00:00:00 2001
From: ESurge <s_marcelino@hotmail.com>
Date: Mon, 26 Sep 2022 00:14:30 -0700
Subject: [PATCH 2/2] Added iButtonSRV to Services FAM

---
 applications/services/application.fam | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/services/application.fam b/applications/services/application.fam
index aec49b231..0389d1cba 100644
--- a/applications/services/application.fam
+++ b/applications/services/application.fam
@@ -9,5 +9,6 @@ App(
         "desktop",
         "loader",
         "power",
+		"ibuttonsrv",
     ],
 )