From a4074001fe2e8ed72c87093f57ec972815661b81 Mon Sep 17 00:00:00 2001
From: Narr the Reg <juangerman-13@hotmail.com>
Date: Tue, 20 Dec 2022 13:09:10 -0600
Subject: core: hid: Migrate ring from emulated devices to emulated controller

---
 src/yuzu/configuration/configure_ringcon.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/yuzu/configuration/configure_ringcon.h')

diff --git a/src/yuzu/configuration/configure_ringcon.h b/src/yuzu/configuration/configure_ringcon.h
index 38a9cb716..6e693e0dd 100644
--- a/src/yuzu/configuration/configure_ringcon.h
+++ b/src/yuzu/configuration/configure_ringcon.h
@@ -13,7 +13,7 @@ class InputSubsystem;
 
 namespace Core::HID {
 class HIDCore;
-class EmulatedDevices;
+class EmulatedController;
 } // namespace Core::HID
 
 namespace Ui {
@@ -78,7 +78,7 @@ private:
     std::optional<std::function<void(const Common::ParamPackage&)>> input_setter;
 
     InputCommon::InputSubsystem* input_subsystem;
-    Core::HID::EmulatedDevices* emulated_device;
+    Core::HID::EmulatedController* emulated_controller;
 
     std::unique_ptr<Ui::ConfigureRingController> ui;
 };
-- 
cgit v1.2.3


From 5cb437703fa441a08db295f8a916caedc3a581f2 Mon Sep 17 00:00:00 2001
From: german77 <juangerman-13@hotmail.com>
Date: Mon, 26 Dec 2022 12:49:49 -0600
Subject: yuzu: Add ring controller test button

---
 src/yuzu/configuration/configure_ringcon.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/yuzu/configuration/configure_ringcon.h')

diff --git a/src/yuzu/configuration/configure_ringcon.h b/src/yuzu/configuration/configure_ringcon.h
index 6e693e0dd..b23c27906 100644
--- a/src/yuzu/configuration/configure_ringcon.h
+++ b/src/yuzu/configuration/configure_ringcon.h
@@ -42,6 +42,12 @@ private:
     /// Restore all buttons to their default values.
     void RestoreDefaults();
 
+    /// Sets current polling mode to ring input
+    void EnableRingController();
+
+    // Handles emulated controller events
+    void ControllerUpdate(Core::HID::ControllerTriggerType type);
+
     /// Called when the button was pressed.
     void HandleClick(QPushButton* button,
                      std::function<void(const Common::ParamPackage&)> new_input_setter,
@@ -80,5 +86,9 @@ private:
     InputCommon::InputSubsystem* input_subsystem;
     Core::HID::EmulatedController* emulated_controller;
 
+    bool is_ring_enabled{};
+    bool is_controller_set{};
+    int callback_key;
+
     std::unique_ptr<Ui::ConfigureRingController> ui;
 };
-- 
cgit v1.2.3