move type to virtual portal

portal_of_flipper_i.c

@@ -7,10 +7,10 @@
 void pof_start(PoFApp* app) {
     furi_assert(app);
 
-    if (app->type == PoFHid) {
+    if (app->virtual_portal->type == PoFHid) {
         app->pof_usb = pof_usb_start(app->virtual_portal);
     }
-    if (app->type == PoFXbox360) {
+    if (app->virtual_portal->type == PoFXbox360) {
         app->pof_usb = pof_usb_start_xbox360(app->virtual_portal);
     }
 }
@@ -18,10 +18,10 @@ void pof_start(PoFApp* app) {
 void pof_stop(PoFApp* app) {
     furi_assert(app);
 
-    if (app->type == PoFHid) {
+    if (app->virtual_portal->type == PoFHid) {
         pof_usb_stop(app->pof_usb);
     }
-    if (app->type == PoFXbox360) {
+    if (app->virtual_portal->type == PoFXbox360) {
         pof_usb_stop_xbox360(app->pof_usb);
     }
 }

portal_of_flipper_i.h

@@ -19,11 +19,6 @@
 
 typedef struct PoFApp PoFApp;
 
-typedef enum {
-    PoFHid,
-    PoFXbox360
-} PoFType;
-
 struct PoFApp {
     Gui* gui;
     ViewDispatcher* view_dispatcher;
@@ -37,7 +32,6 @@ struct PoFApp {
     VirtualPortal* virtual_portal;
 
     PoFUsb* pof_usb;
-    PoFType type;
     
 };
 

scenes/pof_scene_type_select.c

@@ -36,12 +36,12 @@ bool pof_scene_type_select_on_event(void* context, SceneManagerEvent event) {
     PoFApp* pof = context;
     if(event.type == SceneManagerEventTypeCustom) {
         if (event.event == SubmenuIndexSwapHid) {
-            pof->type = PoFHid;
+            pof->virtual_portal->type = PoFHid;
             pof_start(pof);
             scene_manager_next_scene(pof->scene_manager, PoFSceneMain);
             return true;
         } else if (event.event == SubmenuIndexSwapXbox360) {
-            pof->type = PoFXbox360;
+            pof->virtual_portal->type = PoFXbox360;
             pof_start(pof);
             scene_manager_next_scene(pof->scene_manager, PoFSceneMain);
             return true;

virtual_portal.c

@@ -124,7 +124,11 @@ int virtual_portal_reset(VirtualPortal* virtual_portal, uint8_t* message, uint8_
     uint8_t index = 0;
     response[index++] = 'R';
     response[index++] = 0x02;
-    response[index++] = 0x19;
+    if (virtual_portal->type == PoFHid) {
+        response[index++] = 0x19;
+    } else {
+        response[index++] = 0x1B;
+    }
     //response[index++] = 0x0a;
     //response[index++] = 0x03;
     //response[index++] = 0x02;

virtual_portal.h

@@ -6,12 +6,18 @@
 
 #define POF_TOKEN_LIMIT 16
 
+typedef enum {
+    PoFHid,
+    PoFXbox360
+} PoFType;
+
 typedef struct {
     PoFToken* tokens[POF_TOKEN_LIMIT];
     uint8_t sequence_number;
     bool active;
     bool speaker;
     NotificationApp* notifications;
+    PoFType type;
 } VirtualPortal;
 
 VirtualPortal* virtual_portal_alloc(NotificationApp* notifications);