From 4709ad4c0c960d378c7efe81e5bf7ac33ea693df Mon Sep 17 00:00:00 2001
From: ESurge <s_marcelino@hotmail.com>
Date: Fri, 4 Nov 2022 14:26:40 -0700
Subject: [PATCH] Restored Infrared and RFID CLI

---
 applications/main/infrared/application.fam                 | 2 +-
 applications/main/infrared/infrared_i.h                    | 2 +-
 applications/main/infrared/infrared_remote_button.h        | 2 +-
 applications/main/lfrfid/application.fam                   | 4 +---
 applications/main/lfrfid/lfrfid_i.h                        | 1 -
 applications/services/application.fam                      | 2 ++
 applications/services/infraredsrv/application.fam          | 7 +++++++
 .../infraredsrv}/infrared_brute_force.c                    | 0
 .../infraredsrv}/infrared_brute_force.h                    | 0
 .../infrared => services/infraredsrv}/infrared_signal.c    | 0
 .../infrared => services/infraredsrv}/infrared_signal.h    | 0
 .../infraredsrv/infraredsrv_cli.c}                         | 0
 applications/services/lfrfidsrv/application.fam            | 7 +++++++
 .../{main/lfrfid => services/lfrfidsrv}/lfrfid_cli.c       | 0
 14 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 applications/services/infraredsrv/application.fam
 rename applications/{main/infrared => services/infraredsrv}/infrared_brute_force.c (100%)
 rename applications/{main/infrared => services/infraredsrv}/infrared_brute_force.h (100%)
 rename applications/{main/infrared => services/infraredsrv}/infrared_signal.c (100%)
 rename applications/{main/infrared => services/infraredsrv}/infrared_signal.h (100%)
 rename applications/{main/infrared/infrared_cli.c => services/infraredsrv/infraredsrv_cli.c} (100%)
 create mode 100644 applications/services/lfrfidsrv/application.fam
 rename applications/{main/lfrfid => services/lfrfidsrv}/lfrfid_cli.c (100%)

diff --git a/applications/main/infrared/application.fam b/applications/main/infrared/application.fam
index 291b3eadd..dd2bec757 100644
--- a/applications/main/infrared/application.fam
+++ b/applications/main/infrared/application.fam
@@ -8,7 +8,7 @@ App(
         "gui",
         "dialogs",
     ],
-    provides=["infrared_start"],
+    # provides=["infrared_start"],
     # icon="A_Infrared_14",
     stack_size=3 * 1024,
     order=40,
diff --git a/applications/main/infrared/infrared_i.h b/applications/main/infrared/infrared_i.h
index 4bf0631f5..075721475 100644
--- a/applications/main/infrared/infrared_i.h
+++ b/applications/main/infrared/infrared_i.h
@@ -23,7 +23,7 @@
 
 #include "infrared.h"
 #include "infrared_remote.h"
-#include "infrared_brute_force.h"
+#include "../../services/infraredsrv/infrared_brute_force.h"
 #include "infrared_custom_event.h"
 
 #include "scenes/infrared_scene.h"
diff --git a/applications/main/infrared/infrared_remote_button.h b/applications/main/infrared/infrared_remote_button.h
index f25b759b5..918b6085f 100644
--- a/applications/main/infrared/infrared_remote_button.h
+++ b/applications/main/infrared/infrared_remote_button.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "infrared_signal.h"
+#include "../../services/infraredsrv/infrared_signal.h"
 
 typedef struct InfraredRemoteButton InfraredRemoteButton;
 
diff --git a/applications/main/lfrfid/application.fam b/applications/main/lfrfid/application.fam
index 7385fccf4..ccffcb933 100644
--- a/applications/main/lfrfid/application.fam
+++ b/applications/main/lfrfid/application.fam
@@ -8,9 +8,7 @@ App(
         "gui",
         "dialogs",
     ],
-    provides=[
-        "lfrfid_start",
-    ],
+    # provides=[ "lfrfid_start", ],
     # icon="A_125khz_14",
     stack_size=2 * 1024,
     order=20,
diff --git a/applications/main/lfrfid/lfrfid_i.h b/applications/main/lfrfid/lfrfid_i.h
index c6abc63f4..c3cde6018 100644
--- a/applications/main/lfrfid/lfrfid_i.h
+++ b/applications/main/lfrfid/lfrfid_i.h
@@ -7,7 +7,6 @@
 #include <gui/view.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
-#include <cli/cli.h>
 #include <notification/notification_messages.h>
 
 #include <gui/modules/submenu.h>
diff --git a/applications/services/application.fam b/applications/services/application.fam
index 8d7d8168a..47601a436 100644
--- a/applications/services/application.fam
+++ b/applications/services/application.fam
@@ -10,6 +10,8 @@ App(
         "loader",
         "power",
 		"ibuttonsrv",
+		"infraredsrv",
+		"lfrfidsrv",
         "namechangersrv",
     ],
 )
diff --git a/applications/services/infraredsrv/application.fam b/applications/services/infraredsrv/application.fam
new file mode 100644
index 000000000..53168216c
--- /dev/null
+++ b/applications/services/infraredsrv/application.fam
@@ -0,0 +1,7 @@
+App(
+    appid="infraredsrv",
+    apptype=FlipperAppType.STARTUP,
+    entry_point="infrared_on_system_start",
+    requires=["infrared"],
+    order=20,
+)
diff --git a/applications/main/infrared/infrared_brute_force.c b/applications/services/infraredsrv/infrared_brute_force.c
similarity index 100%
rename from applications/main/infrared/infrared_brute_force.c
rename to applications/services/infraredsrv/infrared_brute_force.c
diff --git a/applications/main/infrared/infrared_brute_force.h b/applications/services/infraredsrv/infrared_brute_force.h
similarity index 100%
rename from applications/main/infrared/infrared_brute_force.h
rename to applications/services/infraredsrv/infrared_brute_force.h
diff --git a/applications/main/infrared/infrared_signal.c b/applications/services/infraredsrv/infrared_signal.c
similarity index 100%
rename from applications/main/infrared/infrared_signal.c
rename to applications/services/infraredsrv/infrared_signal.c
diff --git a/applications/main/infrared/infrared_signal.h b/applications/services/infraredsrv/infrared_signal.h
similarity index 100%
rename from applications/main/infrared/infrared_signal.h
rename to applications/services/infraredsrv/infrared_signal.h
diff --git a/applications/main/infrared/infrared_cli.c b/applications/services/infraredsrv/infraredsrv_cli.c
similarity index 100%
rename from applications/main/infrared/infrared_cli.c
rename to applications/services/infraredsrv/infraredsrv_cli.c
diff --git a/applications/services/lfrfidsrv/application.fam b/applications/services/lfrfidsrv/application.fam
new file mode 100644
index 000000000..9a6044d00
--- /dev/null
+++ b/applications/services/lfrfidsrv/application.fam
@@ -0,0 +1,7 @@
+App(
+    appid="lfrfidsrv",
+    apptype=FlipperAppType.STARTUP,
+    entry_point="lfrfid_on_system_start",
+    requires=["lfrfid"],
+    order=50,
+)
diff --git a/applications/main/lfrfid/lfrfid_cli.c b/applications/services/lfrfidsrv/lfrfid_cli.c
similarity index 100%
rename from applications/main/lfrfid/lfrfid_cli.c
rename to applications/services/lfrfidsrv/lfrfid_cli.c