Merge 9356b68f26 into cd8113dadf

add ?

.github/labeler.yml

@@ -18,10 +18,6 @@ gpu:
 - changed-files:
   - any-glob-to-any-file: ['src/Ryujinx.Graphics.Vulkan/**', 'src/Spv.Generator/**']
 
-'graphics-backend:metal':
-  - changed-files:
-      - any-glob-to-any-file: ['src/Ryujinx.Graphics.Metal/**', 'src/Ryujinx.Graphics.Metal.SharpMetalExtensions/**']
-
 gui:
 - changed-files:
   - any-glob-to-any-file: ['src/Ryujinx/**', 'src/Ryujinx.UI.Common/**', 'src/Ryujinx.UI.LocaleGenerator/**']

README.md

@@ -54,13 +54,12 @@ failing to meet this requirement may result in a poor gameplay experience or une
 
 ## Latest build
 
-Stable builds are made every so often, based on the `master` branch, that then gets put into the releases you know and love.
+Stable builds are made every so often onto a separate "release" branch that then gets put into the releases you know and love.
 These stable builds exist so that the end user can get a more **enjoyable and stable experience**.
-They are released every month or so, to ensure consistent updates, while not being an annoying amount of individual updates to download over the course of that month.
 
 You can find the latest stable release [here](https://github.com/GreemDev/Ryujinx/releases/latest).
 
-Canary builds are compiled automatically for each commit on the `master` branch.
+Canary builds are compiled automatically for each commit on the master branch.
 While we strive to ensure optimal stability and performance prior to pushing an update, these builds **may be unstable or completely broken**.
 These canary builds are only recommended for experienced users.
 
@@ -110,7 +109,7 @@ If you are planning to contribute or just want to learn more about this project
 - **Configuration**
 
   The emulator has settings for enabling or disabling some logging, remapping controllers, and more.
-  You can configure all of them through the graphical interface or manually through the config file, `Config.json`, found in the Ryujinx data folder which can be accessed by clicking `Open Ryujinx Folder` under the File menu in the GUI.
+  You can configure all of them through the graphical interface or manually through the config file, `Config.json`, found in the user folder which can be accessed by clicking `Open Ryujinx Folder` under the File menu in the GUI.
 
 ## License
 

docs/compatibility.csv

@@ -1070,7 +1070,6 @@
 010017B0102A8000,"Emma: Lost in Memories",nvdec,playable,2021-01-28 16:19:10
 010068300E08E000,"Enchanted in the Moonlight - Kiryu, Chikage & Yukinojo -",gpu;nvdec,ingame,2022-11-20 16:18:45
 01007A4008486000,"Enchanting Mahjong Match",gpu,ingame,2020-04-17 22:01:31
-0100EF901E552000,"ENDER MAGNOLIA: Bloom in the Mist",deadlock,boots,2025-01-22 17:59:00
 01004F3011F92000,"Endless Fables: Dark Moor",gpu;nvdec,ingame,2021-03-07 15:31:03
 010067B017588000,"Endless Ocean™ Luminous",services-horizon;crash,ingame,2024-05-30 02:05:57
 0100B8700BD14000,"Energy Cycle Edge",services,ingame,2021-11-30 05:02:31

src/Ryujinx.Common/Configuration/Hid/Controller/GenericControllerInputConfig.cs

@@ -78,10 +78,5 @@ namespace Ryujinx.Common.Configuration.Hid.Controller
         /// Controller Rumble Settings
         /// </summary>
         public RumbleConfigController Rumble { get; set; }
-        
-        /// <summary>
-        /// Controller LED Settings
-        /// </summary>
-        public LedConfigController Led { get; set; }
     }
 }

src/Ryujinx.Common/Configuration/Hid/Controller/LedConfigController.cs

@@ -1,25 +0,0 @@
-namespace Ryujinx.Common.Configuration.Hid.Controller
-{
-    public class LedConfigController
-    {
-        /// <summary>
-        /// Enable LED color changing by the emulator
-        /// </summary>
-        public bool EnableLed { get; set; }
-        
-        /// <summary>
-        /// Ignores the color and disables the LED entirely.
-        /// </summary>
-        public bool TurnOffLed { get; set; }
-        
-        /// <summary>
-        /// Ignores the color and uses the rainbow color functionality for the LED.
-        /// </summary>
-        public bool UseRainbow { get; set; }
-        
-        /// <summary>
-        ///     Packed RGB int of the color
-        /// </summary>
-        public uint LedColor { get; set; }
-    }
-}

src/Ryujinx.Common/Helpers/RunningPlatform.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-// ReSharper disable MemberCanBePrivate.Global
-// ReSharper disable InconsistentNaming
-
-namespace Ryujinx.Common.Helper
-{
-    public static class RunningPlatform
-    {
-        public static bool IsMacOS => OperatingSystem.IsMacOS();
-        public static bool IsWindows => OperatingSystem.IsWindows();
-        public static bool IsLinux => OperatingSystem.IsLinux();
-
-        public static bool IsIntelMac => IsMacOS && RuntimeInformation.OSArchitecture is Architecture.X64;
-        public static bool IsArmMac => IsMacOS && RuntimeInformation.OSArchitecture is Architecture.Arm64;
-        
-        public static bool IsX64Windows => IsWindows && (RuntimeInformation.OSArchitecture is Architecture.X64);
-        public static bool IsArmWindows => IsWindows && (RuntimeInformation.OSArchitecture is Architecture.Arm64);
-        
-        public static bool IsX64Linux => IsLinux && (RuntimeInformation.OSArchitecture is Architecture.X64);
-        public static bool IsArmLinux => IsLinux && (RuntimeInformation.OSArchitecture is Architecture.Arm64);
-    }
-}

src/Ryujinx.Common/TitleIDs.cs

@@ -1,6 +1,5 @@
 using Gommon;
 using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Helper;
 using System;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -9,7 +8,7 @@ namespace Ryujinx.Common
 {
     public static class TitleIDs
     {
-        public static ReactiveObject<Optional<string>> CurrentApplication { get; } = new();
+        public static ReactiveObject<Optional<string>> CurrentApplication { get; set; } = new();
         
         public static GraphicsBackend SelectGraphicsBackend(string titleId, GraphicsBackend currentBackend)
         {
@@ -22,7 +21,7 @@ namespace Ryujinx.Common
                     return currentBackend;
             }
 
-            if (!RunningPlatform.IsArmMac)
+            if (!(OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture is Architecture.Arm64))
                 return GraphicsBackend.Vulkan;
 
             return GreatMetalTitles.ContainsIgnoreCase(titleId) ? GraphicsBackend.Metal : GraphicsBackend.Vulkan;

src/Ryujinx.Common/Utilities/Rainbow.cs

@@ -1,88 +0,0 @@
-using System;
-using System.Drawing;
-
-namespace Ryujinx.Common.Utilities
-{
-    public class Rainbow
-    {
-        public static float Speed { get; set; } = 1;
-        
-        public static Color Color { get; private set; } = Color.Blue;
-
-        private static float _lastHue;
-
-        public static void Tick()
-        {
-            float currentHue = Color.GetHue();
-            float nextHue = currentHue;
-
-            if (currentHue >= 360)
-                nextHue = 0;
-            else
-                nextHue += Speed;
-            
-            Color = HsbToRgb(
-                nextHue / 360,
-                1, 
-                1
-                );
-
-            _lastHue = currentHue;
-            
-            RainbowColorUpdated?.Invoke(Color.ToArgb());
-        }
-
-        public static event Action<int> RainbowColorUpdated;
-
-        private static Color HsbToRgb(float hue, float saturation, float brightness)
-        {
-            int r = 0, g = 0, b = 0;
-            if (saturation == 0)
-            {
-                r = g = b = (int)(brightness * 255.0f + 0.5f);
-            }
-            else
-            {
-                float h = (hue - (float)Math.Floor(hue)) * 6.0f;
-                float f = h - (float)Math.Floor(h);
-                float p = brightness * (1.0f - saturation);
-                float q = brightness * (1.0f - saturation * f);
-                float t = brightness * (1.0f - (saturation * (1.0f - f)));
-                switch ((int)h)
-                {
-                    case 0:
-                        r = (int)(brightness * 255.0f + 0.5f);
-                        g = (int)(t * 255.0f + 0.5f);
-                        b = (int)(p * 255.0f + 0.5f);
-                        break;
-                    case 1:
-                        r = (int)(q * 255.0f + 0.5f);
-                        g = (int)(brightness * 255.0f + 0.5f);
-                        b = (int)(p * 255.0f + 0.5f);
-                        break;
-                    case 2:
-                        r = (int)(p * 255.0f + 0.5f);
-                        g = (int)(brightness * 255.0f + 0.5f);
-                        b = (int)(t * 255.0f + 0.5f);
-                        break;
-                    case 3:
-                        r = (int)(p * 255.0f + 0.5f);
-                        g = (int)(q * 255.0f + 0.5f);
-                        b = (int)(brightness * 255.0f + 0.5f);
-                        break;
-                    case 4:
-                        r = (int)(t * 255.0f + 0.5f);
-                        g = (int)(p * 255.0f + 0.5f);
-                        b = (int)(brightness * 255.0f + 0.5f);
-                        break;
-                    case 5:
-                        r = (int)(brightness * 255.0f + 0.5f);
-                        g = (int)(p * 255.0f + 0.5f);
-                        b = (int)(q * 255.0f + 0.5f);
-                        break;
-                }
-            }
-            return Color.FromArgb(Convert.ToByte(255), Convert.ToByte(r), Convert.ToByte(g), Convert.ToByte(b));
-        }
-    }
-}

src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs

@@ -118,7 +118,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         private static string GetDiskCachePath()
         {
             return GraphicsConfig.EnableShaderCache && GraphicsConfig.TitleId != null
-                ? Path.Combine(AppDataManager.GamesDirPath, GraphicsConfig.TitleId.ToLower(), "cache", "shader")
+                ? Path.Combine(AppDataManager.GamesDirPath, GraphicsConfig.TitleId, "cache", "shader")
                 : null;
         }
 

src/Ryujinx.HLE/FileSystem/ContentManager.cs

@@ -710,8 +710,9 @@ namespace Ryujinx.HLE.FileSystem
                         {
                             updateNcasItem.Add((nca.Header.ContentType, entry.FullName));
                         }
-                        else if (updateNcas.TryAdd(nca.Header.TitleId, new List<(NcaContentType, string)>()))
+                        else
                         {
+                            updateNcas.Add(nca.Header.TitleId, new List<(NcaContentType, string)>());
                             updateNcas[nca.Header.TitleId].Add((nca.Header.ContentType, entry.FullName));
                         }
                     }
@@ -897,8 +898,9 @@ namespace Ryujinx.HLE.FileSystem
                     {
                         updateNcasItem.Add((nca.Header.ContentType, entry.FullPath));
                     }
-                    else if (updateNcas.TryAdd(nca.Header.TitleId, new List<(NcaContentType, string)>()))
+                    else
                     {
+                        updateNcas.Add(nca.Header.TitleId, new List<(NcaContentType, string)>());
                         updateNcas[nca.Header.TitleId].Add((nca.Header.ContentType, entry.FullPath));
                     }
 

src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs

@@ -659,7 +659,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati
 
                 if (string.IsNullOrWhiteSpace(filePath))
                 {
-                    throw new InvalidSystemResourceException("JIT (010000000000003B) system title not found! The JIT will not work, provide the system archive to fix this error. (See https://github.com/Ryubing/Ryujinx#requirements for more information)");
+                    throw new InvalidSystemResourceException("JIT (010000000000003B) system title not found! The JIT will not work, provide the system archive to fix this error. (See https://github.com/GreemDev/Ryujinx#requirements for more information)");
                 }
 
                 context.Device.LoadNca(filePath);

src/Ryujinx.HLE/HOS/Services/Sdb/Pl/SharedFontManager.cs

@@ -105,7 +105,7 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pl
                                 titleName = "Unknown";
                             }
 
-                            throw new InvalidSystemResourceException($"{titleName} ({fontTitle:x8}) system title not found! This font will not work, provide the system archive to fix this error. (See https://github.com/Ryubing/Ryujinx#requirements for more information)");
+                            throw new InvalidSystemResourceException($"{titleName} ({fontTitle:x8}) system title not found! This font will not work, provide the system archive to fix this error. (See https://github.com/GreemDev/Ryujinx#requirements for more information)");
                         }
                     }
                     else

src/Ryujinx.HLE/PerformanceStatistics.cs

@@ -161,20 +161,5 @@ namespace Ryujinx.HLE
         {
             return 1000 / _frameRate[FrameTypeGame];
         }
-        
-        public string FormatGameFrameRate()
-        {
-            double frameRate = GetGameFrameRate();
-            double frameTime = GetGameFrameTime();
-
-            return $"{frameRate:00.00} FPS ({frameTime:00.00}ms)";
-        }
-        
-        public string FormatFifoPercent()
-        {
-            double fifoPercent = GetFifoPercent();
-
-            return $"FIFO: {fifoPercent:00.00}%";
-        }
     }
 }

src/Ryujinx.HLE/Switch.cs

@@ -34,8 +34,8 @@ namespace Ryujinx.HLE
 
         public int CpuCoresCount = 4; //Switch 1 has 4 cores
 
-        public VSyncMode VSyncMode { get; set; }
-        public bool CustomVSyncIntervalEnabled { get; set; }
+        public VSyncMode VSyncMode { get; set; } = VSyncMode.Switch;
+        public bool CustomVSyncIntervalEnabled { get; set; } = false;
         public int CustomVSyncInterval { get; set; }
 
         public long TargetVSyncInterval { get; set; } = 60;

src/Ryujinx.Input.SDL2/SDL2Gamepad.cs

@@ -1,9 +1,6 @@
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
 using Ryujinx.Common.Logging;
-using Ryujinx.Common.Utilities;
-using Ryujinx.HLE.HOS.Services.Hid;
-using SDL2;
 using System;
 using System.Collections.Generic;
 using System.Numerics;
@@ -88,7 +85,7 @@ namespace Ryujinx.Input.SDL2
             Id = driverId;
             Features = GetFeaturesFlag();
             _triggerThreshold = 0.0f;
-            
+
             // Enable motion tracking
             if (Features.HasFlag(GamepadFeaturesFlag.Motion))
             {
@@ -104,18 +101,6 @@ namespace Ryujinx.Input.SDL2
             }
         }
 
-        public void SetLed(uint packedRgb)
-        {
-            if (!Features.HasFlag(GamepadFeaturesFlag.Led)) return;
-
-            byte red = packedRgb > 0 ? (byte)(packedRgb >> 16) : (byte)0;
-            byte green = packedRgb > 0 ? (byte)(packedRgb >> 8) : (byte)0;
-            byte blue = packedRgb > 0 ? (byte)(packedRgb % 256) : (byte)0;
-            
-            if (SDL_GameControllerSetLED(_gamepadHandle, red, green, blue) != 0)
-                Logger.Error?.Print(LogClass.Hid, "LED is not supported on this game controller.");
-        }
-
         private GamepadFeaturesFlag GetFeaturesFlag()
         {
             GamepadFeaturesFlag result = GamepadFeaturesFlag.None;
@@ -126,16 +111,13 @@ namespace Ryujinx.Input.SDL2
                 result |= GamepadFeaturesFlag.Motion;
             }
 
-            if (SDL_GameControllerHasRumble(_gamepadHandle) == SDL_bool.SDL_TRUE)
+            int error = SDL_GameControllerRumble(_gamepadHandle, 0, 0, 100);
+
+            if (error == 0)
             {
                 result |= GamepadFeaturesFlag.Rumble;
             }
 
-            if (SDL_GameControllerHasLED(_gamepadHandle) == SDL_bool.SDL_TRUE)
-            {
-                result |= GamepadFeaturesFlag.Led;
-            }
-
             return result;
         }
 
@@ -226,32 +208,12 @@ namespace Ryujinx.Input.SDL2
 
         private static Vector3 GsToMs2(Vector3 gs) => gs / SDL_STANDARD_GRAVITY;
 
-        private void RainbowColorChanged(int packedRgb)
-        {
-            if (!_configuration.Led.UseRainbow) return;
-            
-            SetLed((uint)packedRgb);
-        }
-        
         public void SetConfiguration(InputConfig configuration)
         {
             lock (_userMappingLock)
             {
                 _configuration = (StandardControllerInputConfig)configuration;
 
-                if (Features.HasFlag(GamepadFeaturesFlag.Led) && _configuration.Led.EnableLed)
-                {
-                    if (_configuration.Led.TurnOffLed)
-                        (this as IGamepad).ClearLed();
-                    else if (_configuration.Led.UseRainbow)
-                        Rainbow.RainbowColorUpdated += RainbowColorChanged;
-                    else
-                        SetLed(_configuration.Led.LedColor);
-                    
-                    if (!_configuration.Led.UseRainbow)
-                        Rainbow.RainbowColorUpdated -= RainbowColorChanged;
-                }
-                
                 _buttonsUserMapping.Clear();
 
                 // First update sticks

src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs

@@ -1,3 +1,4 @@
+using Ryujinx.Common.Logging;
 using Ryujinx.SDL2.Common;
 using System;
 using System.Collections.Generic;
@@ -36,6 +37,7 @@ namespace Ryujinx.Input.SDL2
             SDL2Driver.Instance.Initialize();
             SDL2Driver.Instance.OnJoyStickConnected += HandleJoyStickConnected;
             SDL2Driver.Instance.OnJoystickDisconnected += HandleJoyStickDisconnected;
+            SDL2Driver.Instance.OnJoyBatteryUpdated += HandleJoyBatteryUpdated;
 
             // Add already connected gamepads
             int numJoysticks = SDL_NumJoysticks();
@@ -83,19 +85,30 @@ namespace Ryujinx.Input.SDL2
 
         private void HandleJoyStickDisconnected(int joystickInstanceId)
         {
+            bool joyConPairDisconnected = false;
             if (!_gamepadsInstanceIdsMapping.Remove(joystickInstanceId, out string id))
                 return;
 
             lock (_lock)
             {
                 _gamepadsIds.Remove(id);
+                if (!SDL2JoyConPair.IsCombinable(_gamepadsIds))
+                {
+                    _gamepadsIds.Remove(SDL2JoyConPair.Id);
+                    joyConPairDisconnected = true;
+                }
             }
 
             OnGamepadDisconnected?.Invoke(id);
+            if (joyConPairDisconnected)
+            {
+                OnGamepadDisconnected?.Invoke(SDL2JoyConPair.Id);
+            }
         }
 
         private void HandleJoyStickConnected(int joystickDeviceId, int joystickInstanceId)
         {
+            bool joyConPairConnected = false;
             if (SDL_IsGameController(joystickDeviceId) == SDL_bool.SDL_TRUE)
             {
                 if (_gamepadsInstanceIdsMapping.ContainsKey(joystickInstanceId))
@@ -120,13 +133,29 @@ namespace Ryujinx.Input.SDL2
                             _gamepadsIds.Insert(joystickDeviceId, id);
                         else
                             _gamepadsIds.Add(id);
+                        if (SDL2JoyConPair.IsCombinable(_gamepadsIds))
+                        {
+                            _gamepadsIds.Remove(SDL2JoyConPair.Id);
+                            _gamepadsIds.Add(SDL2JoyConPair.Id);
+                            joyConPairConnected = true;
+                        }
                     }
 
                     OnGamepadConnected?.Invoke(id);
+                    if (joyConPairConnected)
+                    {
+                        OnGamepadConnected?.Invoke(SDL2JoyConPair.Id);
+                    }
                 }
             }
         }
 
+        private void HandleJoyBatteryUpdated(int joystickDeviceId, SDL_JoystickPowerLevel powerLevel)
+        {
+            Logger.Info?.Print(LogClass.Hid,
+                $"{SDL_GameControllerNameForIndex(joystickDeviceId)} power level: {powerLevel}");
+        }
+
         protected virtual void Dispose(bool disposing)
         {
             if (disposing)
@@ -157,6 +186,14 @@ namespace Ryujinx.Input.SDL2
 
         public IGamepad GetGamepad(string id)
         {
+            if (id == SDL2JoyConPair.Id)
+            {
+                lock (_lock)
+                {
+                    return SDL2JoyConPair.GetGamepad(_gamepadsIds);
+                }
+            }
+
             int joystickIndex = GetJoystickIndexByGamepadId(id);
 
             if (joystickIndex == -1)
@@ -165,24 +202,17 @@ namespace Ryujinx.Input.SDL2
             }
 
             nint gamepadHandle = SDL_GameControllerOpen(joystickIndex);
-
             if (gamepadHandle == nint.Zero)
             {
                 return null;
             }
 
-            return new SDL2Gamepad(gamepadHandle, id);
-        }
-
-        public IEnumerable<IGamepad> GetGamepads()
-        {
-            lock (_gamepadsIds)
+            if (SDL_GameControllerName(gamepadHandle).StartsWith(SDL2JoyCon.Prefix))
             {
-                foreach (string gamepadId in _gamepadsIds)
-                {
-                    yield return GetGamepad(gamepadId);
-                }
+                return new SDL2JoyCon(gamepadHandle, id);    
             }
+
+            return new SDL2Gamepad(gamepadHandle, id);
         }
     }
 }

src/Ryujinx.Input.SDL2/SDL2JoyCon.cs

@@ -0,0 +1,409 @@
+using Ryujinx.Common.Configuration.Hid;
+using Ryujinx.Common.Configuration.Hid.Controller;
+using Ryujinx.Common.Logging;
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using System.Threading;
+using static SDL2.SDL;
+
+namespace Ryujinx.Input.SDL2
+{
+    internal class SDL2JoyCon : IGamepad
+    {
+        private bool HasConfiguration => _configuration != null;
+
+        private readonly record struct ButtonMappingEntry(GamepadButtonInputId To, GamepadButtonInputId From)
+        {
+            public bool IsValid => To is not GamepadButtonInputId.Unbound && From is not GamepadButtonInputId.Unbound;
+        }
+
+        private StandardControllerInputConfig _configuration;
+
+        private readonly Dictionary<GamepadButtonInputId,SDL_GameControllerButton> _leftButtonsDriverMapping = new()
+        {
+            { GamepadButtonInputId.LeftStick , SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_LEFTSTICK },
+             {GamepadButtonInputId.DpadUp ,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_Y},
+             {GamepadButtonInputId.DpadDown ,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_A},
+             {GamepadButtonInputId.DpadLeft ,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_B},
+             {GamepadButtonInputId.DpadRight ,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_X},
+             {GamepadButtonInputId.Minus ,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_START},
+             {GamepadButtonInputId.LeftShoulder,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_PADDLE2},
+             {GamepadButtonInputId.LeftTrigger,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_PADDLE4},
+             {GamepadButtonInputId.SingleRightTrigger0,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_RIGHTSHOULDER},
+             {GamepadButtonInputId.SingleLeftTrigger0,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_LEFTSHOULDER},
+        };
+        private readonly Dictionary<GamepadButtonInputId,SDL_GameControllerButton> _rightButtonsDriverMapping = new()
+        {
+             {GamepadButtonInputId.RightStick,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_LEFTSTICK},
+             {GamepadButtonInputId.A,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_B},
+             {GamepadButtonInputId.B,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_Y},
+             {GamepadButtonInputId.X,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_A},
+             {GamepadButtonInputId.Y,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_X},
+             {GamepadButtonInputId.Plus,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_START},
+             {GamepadButtonInputId.RightShoulder,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_PADDLE1},
+             {GamepadButtonInputId.RightTrigger,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_PADDLE3},
+             {GamepadButtonInputId.SingleRightTrigger1,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_RIGHTSHOULDER},
+             {GamepadButtonInputId.SingleLeftTrigger1,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_LEFTSHOULDER}
+        };
+
+        private readonly Dictionary<GamepadButtonInputId, SDL_GameControllerButton> _buttonsDriverMapping;
+        private readonly Lock _userMappingLock = new();
+
+        private readonly List<ButtonMappingEntry> _buttonsUserMapping;
+
+        private readonly StickInputId[] _stickUserMapping = new StickInputId[(int)StickInputId.Count]
+        {
+            StickInputId.Unbound, StickInputId.Left, StickInputId.Right,
+        };
+
+        public GamepadFeaturesFlag Features { get; }
+
+        private nint _gamepadHandle;
+
+        private enum JoyConType
+        {
+            Left, Right
+        }
+
+        public const string Prefix = "Nintendo Switch Joy-Con";
+        public const string LeftName = "Nintendo Switch Joy-Con (L)";
+        public const string RightName = "Nintendo Switch Joy-Con (R)";
+
+        private readonly JoyConType _joyConType;
+
+        public SDL2JoyCon(nint gamepadHandle, string driverId)
+        {
+            _gamepadHandle = gamepadHandle;
+            _buttonsUserMapping = new List<ButtonMappingEntry>(10);
+
+            Name = SDL_GameControllerName(_gamepadHandle);
+            Id = driverId;
+            Features = GetFeaturesFlag();
+
+            // Enable motion tracking
+            if (Features.HasFlag(GamepadFeaturesFlag.Motion))
+            {
+                if (SDL_GameControllerSetSensorEnabled(_gamepadHandle, SDL_SensorType.SDL_SENSOR_ACCEL,
+                        SDL_bool.SDL_TRUE) != 0)
+                {
+                    Logger.Error?.Print(LogClass.Hid,
+                        $"Could not enable data reporting for SensorType {SDL_SensorType.SDL_SENSOR_ACCEL}.");
+                }
+
+                if (SDL_GameControllerSetSensorEnabled(_gamepadHandle, SDL_SensorType.SDL_SENSOR_GYRO,
+                        SDL_bool.SDL_TRUE) != 0)
+                {
+                    Logger.Error?.Print(LogClass.Hid,
+                        $"Could not enable data reporting for SensorType {SDL_SensorType.SDL_SENSOR_GYRO}.");
+                }
+            }
+
+            switch (Name)
+            {
+                case LeftName:
+                    {
+                        _buttonsDriverMapping = _leftButtonsDriverMapping;
+                        _joyConType = JoyConType.Left;
+                        break;
+                    }
+                case RightName:
+                    {
+                        _buttonsDriverMapping = _rightButtonsDriverMapping;
+                        _joyConType = JoyConType.Right;
+                        break;
+                    }
+            }
+        }
+
+        private GamepadFeaturesFlag GetFeaturesFlag()
+        {
+            GamepadFeaturesFlag result = GamepadFeaturesFlag.None;
+
+            if (SDL_GameControllerHasSensor(_gamepadHandle, SDL_SensorType.SDL_SENSOR_ACCEL) == SDL_bool.SDL_TRUE &&
+                SDL_GameControllerHasSensor(_gamepadHandle, SDL_SensorType.SDL_SENSOR_GYRO) == SDL_bool.SDL_TRUE)
+            {
+                result |= GamepadFeaturesFlag.Motion;
+            }
+
+            int error = SDL_GameControllerRumble(_gamepadHandle, 0, 0, 100);
+
+            if (error == 0)
+            {
+                result |= GamepadFeaturesFlag.Rumble;
+            }
+
+            return result;
+        }
+
+        public string Id { get; }
+        public string Name { get; }
+        public bool IsConnected => SDL_GameControllerGetAttached(_gamepadHandle) == SDL_bool.SDL_TRUE;
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing && _gamepadHandle != nint.Zero)
+            {
+                SDL_GameControllerClose(_gamepadHandle);
+
+                _gamepadHandle = nint.Zero;
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+        }
+
+
+        public void SetTriggerThreshold(float triggerThreshold)
+        {
+
+        }
+
+        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
+        {
+            if (!Features.HasFlag(GamepadFeaturesFlag.Rumble))
+                return;
+
+            ushort lowFrequencyRaw = (ushort)(lowFrequency * ushort.MaxValue);
+            ushort highFrequencyRaw = (ushort)(highFrequency * ushort.MaxValue);
+
+            if (durationMs == uint.MaxValue)
+            {
+                if (SDL_GameControllerRumble(_gamepadHandle, lowFrequencyRaw, highFrequencyRaw, SDL_HAPTIC_INFINITY) !=
+                    0)
+                    Logger.Error?.Print(LogClass.Hid, "Rumble is not supported on this game controller.");
+            }
+            else if (durationMs > SDL_HAPTIC_INFINITY)
+            {
+                Logger.Error?.Print(LogClass.Hid, $"Unsupported rumble duration {durationMs}");
+            }
+            else
+            {
+                if (SDL_GameControllerRumble(_gamepadHandle, lowFrequencyRaw, highFrequencyRaw, durationMs) != 0)
+                    Logger.Error?.Print(LogClass.Hid, "Rumble is not supported on this game controller.");
+            }
+        }
+
+        public Vector3 GetMotionData(MotionInputId inputId)
+        {
+            SDL_SensorType sensorType = inputId switch
+            {
+                MotionInputId.Accelerometer => SDL_SensorType.SDL_SENSOR_ACCEL,
+                MotionInputId.Gyroscope => SDL_SensorType.SDL_SENSOR_GYRO,
+                _ => SDL_SensorType.SDL_SENSOR_INVALID
+            };
+
+            if (!Features.HasFlag(GamepadFeaturesFlag.Motion) || sensorType is SDL_SensorType.SDL_SENSOR_INVALID)
+                return Vector3.Zero;
+
+            const int ElementCount = 3;
+
+            unsafe
+            {
+                float* values = stackalloc float[ElementCount];
+
+                int result = SDL_GameControllerGetSensorData(_gamepadHandle, sensorType, (nint)values, ElementCount);
+
+                if (result != 0)
+                    return Vector3.Zero;
+
+                Vector3 value = _joyConType switch
+                {
+                    JoyConType.Left => new Vector3(-values[2], values[1], values[0]),
+                    JoyConType.Right => new Vector3(values[2], values[1], -values[0])
+                };
+
+                return inputId switch
+                {
+                    MotionInputId.Gyroscope => RadToDegree(value),
+                    MotionInputId.Accelerometer => GsToMs2(value),
+                    _ => value
+                };
+            }
+        }
+
+        private static Vector3 RadToDegree(Vector3 rad) => rad * (180 / MathF.PI);
+
+        private static Vector3 GsToMs2(Vector3 gs) => gs / SDL_STANDARD_GRAVITY;
+
+        public void SetConfiguration(InputConfig configuration)
+        {
+            lock (_userMappingLock)
+            {
+                _configuration = (StandardControllerInputConfig)configuration;
+
+                _buttonsUserMapping.Clear();
+
+                // First update sticks
+                _stickUserMapping[(int)StickInputId.Left] = (StickInputId)_configuration.LeftJoyconStick.Joystick;
+                _stickUserMapping[(int)StickInputId.Right] = (StickInputId)_configuration.RightJoyconStick.Joystick;
+
+
+                switch (_joyConType)
+                {
+                    case JoyConType.Left:
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftStick, (GamepadButtonInputId)_configuration.LeftJoyconStick.StickButton));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadUp, (GamepadButtonInputId)_configuration.LeftJoycon.DpadUp));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadDown, (GamepadButtonInputId)_configuration.LeftJoycon.DpadDown));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadLeft, (GamepadButtonInputId)_configuration.LeftJoycon.DpadLeft));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadRight, (GamepadButtonInputId)_configuration.LeftJoycon.DpadRight));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Minus, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonMinus));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftShoulder, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonL));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftTrigger, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonZl));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleRightTrigger0, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonSr));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleLeftTrigger0, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonSl));
+                        break;
+                    case JoyConType.Right:
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightStick, (GamepadButtonInputId)_configuration.RightJoyconStick.StickButton));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.A, (GamepadButtonInputId)_configuration.RightJoycon.ButtonA));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.B, (GamepadButtonInputId)_configuration.RightJoycon.ButtonB));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.X, (GamepadButtonInputId)_configuration.RightJoycon.ButtonX));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Y, (GamepadButtonInputId)_configuration.RightJoycon.ButtonY));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Plus, (GamepadButtonInputId)_configuration.RightJoycon.ButtonPlus));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightShoulder, (GamepadButtonInputId)_configuration.RightJoycon.ButtonR));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightTrigger, (GamepadButtonInputId)_configuration.RightJoycon.ButtonZr));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleRightTrigger1, (GamepadButtonInputId)_configuration.RightJoycon.ButtonSr));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleLeftTrigger1, (GamepadButtonInputId)_configuration.RightJoycon.ButtonSl));
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException();
+                }
+                
+                SetTriggerThreshold(_configuration.TriggerThreshold);
+            }
+        }
+
+        public GamepadStateSnapshot GetStateSnapshot()
+        {
+            return IGamepad.GetStateSnapshot(this);
+        }
+
+        public GamepadStateSnapshot GetMappedStateSnapshot()
+        {
+            GamepadStateSnapshot rawState = GetStateSnapshot();
+            GamepadStateSnapshot result = default;
+
+            lock (_userMappingLock)
+            {
+                if (_buttonsUserMapping.Count == 0)
+                    return rawState;
+
+
+                // ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
+                foreach (ButtonMappingEntry entry in _buttonsUserMapping)
+                {
+                    if (!entry.IsValid)
+                        continue;
+
+                    // Do not touch state of button already pressed
+                    if (!result.IsPressed(entry.To))
+                    {
+                        result.SetPressed(entry.To, rawState.IsPressed(entry.From));
+                    }
+                }
+
+                (float leftStickX, float leftStickY) = rawState.GetStick(_stickUserMapping[(int)StickInputId.Left]);
+                (float rightStickX, float rightStickY) = rawState.GetStick(_stickUserMapping[(int)StickInputId.Right]);
+
+                result.SetStick(StickInputId.Left, leftStickX, leftStickY);
+                result.SetStick(StickInputId.Right, rightStickX, rightStickY);
+            }
+
+            return result;
+        }
+
+
+        private static float ConvertRawStickValue(short value)
+        {
+            const float ConvertRate = 1.0f / (short.MaxValue + 0.5f);
+
+            return value * ConvertRate;
+        }
+
+        private JoyconConfigControllerStick<GamepadInputId, Common.Configuration.Hid.Controller.StickInputId>
+            GetLogicalJoyStickConfig(StickInputId inputId)
+        {
+            switch (inputId)
+            {
+                case StickInputId.Left:
+                    if (_configuration.RightJoyconStick.Joystick ==
+                        Common.Configuration.Hid.Controller.StickInputId.Left)
+                        return _configuration.RightJoyconStick;
+                    else
+                        return _configuration.LeftJoyconStick;
+                case StickInputId.Right:
+                    if (_configuration.LeftJoyconStick.Joystick ==
+                        Common.Configuration.Hid.Controller.StickInputId.Right)
+                        return _configuration.LeftJoyconStick;
+                    else
+                        return _configuration.RightJoyconStick;
+            }
+
+            return null;
+        }
+
+
+        public (float, float) GetStick(StickInputId inputId)
+        {
+            if (inputId == StickInputId.Unbound)
+                return (0.0f, 0.0f);
+
+            if (inputId == StickInputId.Left && _joyConType == JoyConType.Right || inputId == StickInputId.Right && _joyConType == JoyConType.Left)
+            {
+                return (0.0f, 0.0f);
+            }
+            
+            (short stickX, short stickY) = GetStickXY();
+
+            float resultX = ConvertRawStickValue(stickX);
+            float resultY = -ConvertRawStickValue(stickY);
+
+            if (HasConfiguration)
+            {
+                var joyconStickConfig = GetLogicalJoyStickConfig(inputId);
+
+                if (joyconStickConfig != null)
+                {
+                    if (joyconStickConfig.InvertStickX)
+                        resultX = -resultX;
+
+                    if (joyconStickConfig.InvertStickY)
+                        resultY = -resultY;
+
+                    if (joyconStickConfig.Rotate90CW)
+                    {
+                        float temp = resultX;
+                        resultX = resultY;
+                        resultY = -temp;
+                    }
+                }
+            }
+
+            return inputId switch
+            {
+                StickInputId.Left when _joyConType == JoyConType.Left => (resultY, -resultX),
+                StickInputId.Right when _joyConType == JoyConType.Right => (-resultY, resultX),
+                _ => (0.0f, 0.0f)
+            };
+        }
+
+        private (short, short) GetStickXY()
+        {
+            return (
+                SDL_GameControllerGetAxis(_gamepadHandle, SDL_GameControllerAxis.SDL_CONTROLLER_AXIS_LEFTX),
+                SDL_GameControllerGetAxis(_gamepadHandle, SDL_GameControllerAxis.SDL_CONTROLLER_AXIS_LEFTY));
+        }
+        
+        public bool IsPressed(GamepadButtonInputId inputId)
+        {
+            if (!_buttonsDriverMapping.TryGetValue(inputId, out var button))
+            {
+                return false;
+            }
+
+            return SDL_GameControllerGetButton(_gamepadHandle, button) == 1;
+        }
+    }
+}

src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs

@@ -0,0 +1,142 @@
+using Ryujinx.Common.Configuration.Hid;
+using Ryujinx.Common.Configuration.Hid.Controller;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using static SDL2.SDL;
+
+namespace Ryujinx.Input.SDL2
+{
+    internal class SDL2JoyConPair(IGamepad left, IGamepad right) : IGamepad
+    {
+        private StandardControllerInputConfig _configuration;
+
+        private readonly StickInputId[] _stickUserMapping =
+        [
+            StickInputId.Unbound,
+            StickInputId.Left,
+            StickInputId.Right
+        ];
+
+        public GamepadFeaturesFlag Features => (left?.Features ?? GamepadFeaturesFlag.None) |
+                                               (right?.Features ?? GamepadFeaturesFlag.None);
+
+        public const string Id = "JoyConPair";
+        string IGamepad.Id => Id;
+
+        public string Name => "* Nintendo Switch Joy-Con (L/R)";
+        public bool IsConnected => left is { IsConnected: true } && right is { IsConnected: true };
+
+        public void Dispose()
+        {
+            left?.Dispose();
+            right?.Dispose();
+        }
+
+        public GamepadStateSnapshot GetMappedStateSnapshot()
+        {
+            return GetStateSnapshot();
+        }
+
+        public Vector3 GetMotionData(MotionInputId inputId)
+        {
+            return inputId switch
+            {
+                MotionInputId.Accelerometer or
+                    MotionInputId.Gyroscope => left.GetMotionData(inputId),
+                MotionInputId.SecondAccelerometer => right.GetMotionData(MotionInputId.Accelerometer),
+                MotionInputId.SecondGyroscope => right.GetMotionData(MotionInputId.Gyroscope),
+                _ => Vector3.Zero
+            };
+        }
+
+        public GamepadStateSnapshot GetStateSnapshot()
+        {
+            return IGamepad.GetStateSnapshot(this);
+        }
+
+        public (float, float) GetStick(StickInputId inputId)
+        {
+            return inputId switch
+            {
+                StickInputId.Left => left.GetStick(StickInputId.Left),
+                StickInputId.Right => right.GetStick(StickInputId.Right),
+                _ => (0, 0)
+            };
+        }
+
+        public bool IsPressed(GamepadButtonInputId inputId)
+        {
+            return left.IsPressed(inputId) || right.IsPressed(inputId);
+        }
+
+        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
+        {
+            if (lowFrequency != 0)
+            {
+                right.Rumble(lowFrequency, lowFrequency, durationMs);
+            }
+
+            if (highFrequency != 0)
+            {
+                left.Rumble(highFrequency, highFrequency, durationMs);
+            }
+
+            if (lowFrequency == 0 && highFrequency == 0)
+            {
+                left.Rumble(0, 0, durationMs);
+                right.Rumble(0, 0, durationMs);
+            }
+        }
+
+        public void SetConfiguration(InputConfig configuration)
+        {
+            left.SetConfiguration(configuration);
+            right.SetConfiguration(configuration);
+        }
+
+        public void SetTriggerThreshold(float triggerThreshold)
+        {
+            left.SetTriggerThreshold(triggerThreshold);
+            right.SetTriggerThreshold(triggerThreshold);
+        }
+
+        public static bool IsCombinable(List<string> gamepadsIds)
+        {
+            (int leftIndex, int rightIndex) = DetectJoyConPair(gamepadsIds);
+            return leftIndex >= 0 && rightIndex >= 0;
+        }
+
+        private static (int leftIndex, int rightIndex) DetectJoyConPair(List<string> gamepadsIds)
+        {
+            var gamepadNames = gamepadsIds.Where(gamepadId => gamepadId != Id)
+                .Select((_, index) => SDL_GameControllerNameForIndex(index)).ToList();
+            int leftIndex = gamepadNames.IndexOf(SDL2JoyCon.LeftName);
+            int rightIndex = gamepadNames.IndexOf(SDL2JoyCon.RightName);
+
+            return (leftIndex, rightIndex);
+        }
+
+        public static IGamepad GetGamepad(List<string> gamepadsIds)
+        {
+            (int leftIndex, int rightIndex) = DetectJoyConPair(gamepadsIds);
+            if (leftIndex == -1 || rightIndex == -1)
+            {
+                return null;
+            }
+
+            nint leftGamepadHandle = SDL_GameControllerOpen(leftIndex);
+            nint rightGamepadHandle = SDL_GameControllerOpen(rightIndex);
+
+            if (leftGamepadHandle == nint.Zero || rightGamepadHandle == nint.Zero)
+            {
+                return null;
+            }
+
+
+            return new SDL2JoyConPair(new SDL2JoyCon(leftGamepadHandle, gamepadsIds[leftIndex]),
+                new SDL2JoyCon(rightGamepadHandle, gamepadsIds[rightIndex]));
+        }
+    }
+}

src/Ryujinx.Input.SDL2/SDL2Keyboard.cs

@@ -1,6 +1,5 @@
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
-using Ryujinx.Common.Logging;
 using System;
 using System.Collections.Generic;
 using System.Numerics;
@@ -386,11 +385,6 @@ namespace Ryujinx.Input.SDL2
             }
         }
 
-        public void SetLed(uint packedRgb)
-        {
-            Logger.Info?.Print(LogClass.UI, "SetLed called on an SDL2Keyboard");
-        }
-
         public void SetTriggerThreshold(float triggerThreshold)
         {
             // No operations

src/Ryujinx.Input.SDL2/SDL2Mouse.cs

@@ -1,5 +1,4 @@
 using Ryujinx.Common.Configuration.Hid;
-using Ryujinx.Common.Logging;
 using System;
 using System.Drawing;
 using System.Numerics;
@@ -77,11 +76,6 @@ namespace Ryujinx.Input.SDL2
             throw new NotImplementedException();
         }
 
-        public void SetLed(uint packedRgb)
-        {
-            Logger.Info?.Print(LogClass.UI, "SetLed called on an SDL2Mouse");
-        }
-
         public void SetTriggerThreshold(float triggerThreshold)
         {
             throw new NotImplementedException();

src/Ryujinx.Input.SDL2/SDL2MouseDriver.cs

@@ -1,7 +1,6 @@
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
 using System.Numerics;
@@ -165,8 +164,6 @@ namespace Ryujinx.Input.SDL2
             return new SDL2Mouse(this);
         }
 
-        public IEnumerable<IGamepad> GetGamepads() => [GetGamepad("0")];
-
         public void Dispose()
         {
             if (_isDisposed)

src/Ryujinx.Input.SDL2/SDLKeyboardDriver.cs

@@ -1,6 +1,5 @@
 using Ryujinx.SDL2.Common;
 using System;
-using System.Collections.Generic;
 
 namespace Ryujinx.Input.SDL2
 {
@@ -52,13 +51,5 @@ namespace Ryujinx.Input.SDL2
 
             return new SDL2Keyboard(this, _keyboardIdentifers[0], "All keyboards");
         }
-
-        public IEnumerable<IGamepad> GetGamepads()
-        {
-            foreach (var keyboardId in _keyboardIdentifers)
-            {
-                yield return GetGamepad(keyboardId);
-            }
-        }
     }
 }

src/Ryujinx.Input/GamepadFeaturesFlag.cs

@@ -24,10 +24,5 @@ namespace Ryujinx.Input
         /// <remarks>Also named sixaxis</remarks>
         /// </summary>
         Motion,
-        
-        /// <summary>
-        ///     The LED on the back of modern PlayStation controllers (DualSense &amp; DualShock 4).
-        /// </summary>
-        Led,
     }
 }

src/Ryujinx.Input/HLE/NpadController.cs

@@ -266,6 +266,7 @@ namespace Ryujinx.Input.HLE
             if (motionConfig.MotionBackend != MotionInputBackendType.CemuHook)
             {
                 _leftMotionInput = new MotionInput();
+                _rightMotionInput = new MotionInput();
             }
             else
             {
@@ -298,7 +299,20 @@ namespace Ryujinx.Input.HLE
 
                             if (controllerConfig.ControllerType == ConfigControllerType.JoyconPair)
                             {
-                                _rightMotionInput = _leftMotionInput;
+                                if (gamepad.Id== "JoyConPair")
+                                {
+                                    Vector3 rightAccelerometer = gamepad.GetMotionData(MotionInputId.SecondAccelerometer);
+                                    Vector3 rightGyroscope = gamepad.GetMotionData(MotionInputId.SecondGyroscope);
+
+                                    rightAccelerometer = new Vector3(rightAccelerometer.X, -rightAccelerometer.Z, rightAccelerometer.Y);
+                                    rightGyroscope = new Vector3(rightGyroscope.X, -rightGyroscope.Z, rightGyroscope.Y);
+
+                                    _rightMotionInput.Update(rightAccelerometer, rightGyroscope, (ulong)PerformanceCounter.ElapsedNanoseconds / 1000, controllerConfig.Motion.Sensitivity, (float)controllerConfig.Motion.GyroDeadzone);
+                                }
+                                else
+                                {
+                                    _rightMotionInput = _leftMotionInput;
+                                }
                             }
                         }
                     }
@@ -333,6 +347,7 @@ namespace Ryujinx.Input.HLE
                 // Reset states
                 State = default;
                 _leftMotionInput = null;
+                _rightMotionInput = null;
             }
         }
 

src/Ryujinx.Input/IGamepad.cs

@@ -65,15 +65,6 @@ namespace Ryujinx.Input
         /// <param name="configuration">The configuration of the gamepad</param>
         void SetConfiguration(InputConfig configuration);
 
-        /// <summary>
-        /// Set the LED on the gamepad to a given color.
-        /// </summary>
-        /// <remarks>Does nothing on a controller without LED functionality.</remarks>
-        /// <param name="packedRgb">The packed RGB integer.</param>
-        void SetLed(uint packedRgb);
-
-        public void ClearLed() => SetLed(0);
-
         /// <summary>
         /// Starts a rumble effect on the gamepad.
         /// </summary>

src/Ryujinx.Input/IGamepadDriver.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 
 namespace Ryujinx.Input
 {
@@ -34,11 +33,6 @@ namespace Ryujinx.Input
         /// <param name="id">The unique id of the gamepad</param>
         /// <returns>An instance of <see cref="IGamepad"/> associated to the gamepad id given or null if not found</returns>
         IGamepad GetGamepad(string id);
-        
-        /// <summary>
-        /// Returns an <see cref="IEnumerable{T}"/> of the connected gamepads.
-        /// </summary>
-        IEnumerable<IGamepad> GetGamepads();
 
         /// <summary>
         /// Clear the internal state of the driver.

src/Ryujinx.Input/MotionInputId.cs

@@ -21,5 +21,17 @@ namespace Ryujinx.Input
         /// </summary>
         /// <remarks>Values are in degrees</remarks>
         Gyroscope,
+
+        /// <summary>
+        /// Second accelerometer.
+        /// </summary>
+        /// <remarks>Values are in m/s^2</remarks>
+        SecondAccelerometer,
+
+        /// <summary>
+        /// Second gyroscope.
+        /// </summary>
+        /// <remarks>Values are in degrees</remarks>
+        SecondGyroscope
     }
 }

src/Ryujinx.SDL2.Common/SDL2Driver.cs

@@ -1,6 +1,5 @@
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
-using Ryujinx.Common.Utilities;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -26,14 +25,17 @@ namespace Ryujinx.SDL2.Common
 
         public static Action<Action> MainThreadDispatcher { get; set; }
 
-        private const uint SdlInitFlags = SDL_INIT_EVENTS | SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_VIDEO;
+        private const uint SdlInitFlags = SDL_INIT_EVENTS | SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK |
+                                          SDL_INIT_AUDIO | SDL_INIT_VIDEO;
 
         private bool _isRunning;
         private uint _refereceCount;
         private Thread _worker;
 
+        private const uint SDL_JOYBATTERYUPDATED = 1543;
         public event Action<int, int> OnJoyStickConnected;
         public event Action<int> OnJoystickDisconnected;
+        public event Action<int, SDL_JoystickPowerLevel> OnJoyBatteryUpdated;
 
         private ConcurrentDictionary<uint, Action<SDL_Event>> _registeredWindowHandlers;
 
@@ -79,12 +81,14 @@ namespace Ryujinx.SDL2.Common
                 // First ensure that we only enable joystick events (for connected/disconnected).
                 if (SDL_GameControllerEventState(SDL_IGNORE) != SDL_IGNORE)
                 {
-                    Logger.Error?.PrintMsg(LogClass.Application, "Couldn't change the state of game controller events.");
+                    Logger.Error?.PrintMsg(LogClass.Application,
+                        "Couldn't change the state of game controller events.");
                 }
 
                 if (SDL_JoystickEventState(SDL_ENABLE) < 0)
                 {
-                    Logger.Error?.PrintMsg(LogClass.Application, $"Failed to enable joystick event polling: {SDL_GetError()}");
+                    Logger.Error?.PrintMsg(LogClass.Application,
+                        $"Failed to enable joystick event polling: {SDL_GetError()}");
                 }
 
                 // Disable all joysticks information, we don't need them no need to flood the event queue for that.
@@ -144,7 +148,12 @@ namespace Ryujinx.SDL2.Common
 
                 OnJoystickDisconnected?.Invoke(evnt.cbutton.which);
             }
-            else if (evnt.type is SDL_EventType.SDL_WINDOWEVENT or SDL_EventType.SDL_MOUSEBUTTONDOWN or SDL_EventType.SDL_MOUSEBUTTONUP)
+            else if ((uint)evnt.type == SDL_JOYBATTERYUPDATED)
+            {
+                OnJoyBatteryUpdated?.Invoke(evnt.cbutton.which, (SDL_JoystickPowerLevel)evnt.user.code);
+            }
+            else if (evnt.type is SDL_EventType.SDL_WINDOWEVENT or SDL_EventType.SDL_MOUSEBUTTONDOWN
+                     or SDL_EventType.SDL_MOUSEBUTTONUP)
             {
                 if (_registeredWindowHandlers.TryGetValue(evnt.window.windowID, out Action<SDL_Event> handler))
                 {
@@ -168,8 +177,6 @@ namespace Ryujinx.SDL2.Common
                         HandleSDLEvent(ref evnt);
                     }
                 });
-                
-                Rainbow.Tick();
 
                 waitHandle.Wait(WaitTimeMs);
             }

src/Ryujinx/AppHost.cs

@@ -587,11 +587,6 @@ namespace Ryujinx.Ava
                 return;
             }
 
-            foreach (IGamepad gamepad in RyujinxApp.MainWindow.InputManager.GamepadDriver.GetGamepads())
-            {
-                gamepad?.ClearLed();
-            }
-
             _isStopped = true;
             Stop();
         }
@@ -1156,8 +1151,8 @@ namespace Ryujinx.Ava
                 LocaleManager.Instance[LocaleKeys.VolumeShort] + $": {(int)(Device.GetVolume() * 100)}%",
                 dockedMode,
                 ConfigurationState.Instance.Graphics.AspectRatio.Value.ToText(),
-                Device.Statistics.FormatGameFrameRate(),
-                Device.Statistics.FormatFifoPercent(),
+                $"{Device.Statistics.GetGameFrameRate():00.00} FPS ({Device.Statistics.GetGameFrameTime():00.00} ms)",
+                $"FIFO: {Device.Statistics.GetFifoPercent():00.00} %",
                 _displayCount));
         }
 

src/Ryujinx/Assets/locales.json

@@ -7622,81 +7622,6 @@
         "zh_TW": "陀螺儀無感帶:"
       }
     },
-    {
-      "ID": "ControllerSettingsLedColor",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "LED",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "ControllerSettingsLedColorDisable",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Disable",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "ControllerSettingsLedColorRainbow",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Rainbow",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
     {
       "ID": "ControllerSettingsSave",
       "Translations": {

src/Ryujinx/Headless/Options.cs

@@ -149,7 +149,7 @@ namespace Ryujinx.Headless
                 IgnoreMissingServices = configurationState.System.IgnoreMissingServices;
             
             if (NeedsOverride(nameof(IgnoreControllerApplet)))
-                IgnoreControllerApplet = configurationState.System.IgnoreApplet;
+                IgnoreControllerApplet = configurationState.IgnoreApplet;
             
             return;
             

src/Ryujinx/Input/AvaloniaKeyboard.cs

@@ -1,6 +1,5 @@
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
-using Ryujinx.Common.Logging;
 using Ryujinx.Input;
 using System;
 using System.Collections.Generic;
@@ -144,11 +143,6 @@ namespace Ryujinx.Ava.Input
             }
         }
 
-        public void SetLed(uint packedRgb)
-        {
-            Logger.Info?.Print(LogClass.UI, "SetLed called on an AvaloniaKeyboard");
-        }
-
         public void SetTriggerThreshold(float triggerThreshold) { }
 
         public void Rumble(float lowFrequency, float highFrequency, uint durationMs) { }

src/Ryujinx/Input/AvaloniaKeyboardDriver.cs

@@ -59,8 +59,6 @@ namespace Ryujinx.Ava.Input
             return new AvaloniaKeyboard(this, _keyboardIdentifers[0], LocaleManager.Instance[LocaleKeys.AllKeyboards]);
         }
 
-        public IEnumerable<IGamepad> GetGamepads() => [GetGamepad("0")];
-
         protected virtual void Dispose(bool disposing)
         {
             if (disposing)

src/Ryujinx/Input/AvaloniaMouse.cs

@@ -1,5 +1,4 @@
 using Ryujinx.Common.Configuration.Hid;
-using Ryujinx.Common.Logging;
 using Ryujinx.Input;
 using System;
 using System.Drawing;
@@ -75,11 +74,6 @@ namespace Ryujinx.Ava.Input
             throw new NotImplementedException();
         }
 
-        public void SetLed(uint packedRgb)
-        {
-            Logger.Info?.Print(LogClass.UI, "SetLed called on an AvaloniaMouse");
-        }
-
         public void SetTriggerThreshold(float triggerThreshold)
         {
             throw new NotImplementedException();

src/Ryujinx/Input/AvaloniaMouseDriver.cs

@@ -3,7 +3,6 @@ using Avalonia.Controls;
 using Avalonia.Input;
 using Ryujinx.Input;
 using System;
-using System.Collections.Generic;
 using System.Numerics;
 using MouseButton = Ryujinx.Input.MouseButton;
 using Size = System.Drawing.Size;
@@ -135,8 +134,6 @@ namespace Ryujinx.Ava.Input
             return new AvaloniaMouse(this);
         }
 
-        public IEnumerable<IGamepad> GetGamepads() => [GetGamepad("0")];
-
         public void Dispose()
         {
             if (_isDisposed)

src/Ryujinx/Program.cs

@@ -47,9 +47,9 @@ namespace Ryujinx.Ava
         {
             Version = ReleaseInformation.Version;
             
-            if (OperatingSystem.IsWindows() && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 19041))
+            if (OperatingSystem.IsWindows() && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 17134))
             {
-                _ = MessageBoxA(nint.Zero, "You are running an outdated version of Windows.\n\nRyujinx supports Windows 10 version 20H1 and newer.\n", $"Ryujinx {Version}", MbIconwarning);
+                _ = MessageBoxA(nint.Zero, "You are running an outdated version of Windows.\n\nRyujinx supports Windows 10 version 1803 and newer.\n", $"Ryujinx {Version}", MbIconwarning);
             }
 
             PreviewerDetached = true;

src/Ryujinx/UI/Applet/AvaHostUIHandler.cs

@@ -6,6 +6,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
@@ -41,7 +42,7 @@ namespace Ryujinx.Ava.UI.Applet
 
             bool okPressed = false;
 
-            if (ConfigurationState.Instance.System.IgnoreApplet)
+            if (ConfigurationState.Instance.IgnoreApplet)
                 return false;
 
             Dispatcher.UIThread.InvokeAsync(async () =>

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs

@@ -251,7 +251,7 @@ namespace Ryujinx.Ava.UI.Controls
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
             {
-                string shaderCacheDir = Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString.ToLower(), "cache", "shader");
+                string shaderCacheDir = Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "shader");
 
                 if (!Directory.Exists(shaderCacheDir))
                 {

src/Ryujinx/UI/Models/Input/GamepadInputConfig.cs

@@ -1,4 +1,3 @@
-using Avalonia.Media;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
@@ -409,58 +408,6 @@ namespace Ryujinx.Ava.UI.Models.Input
                 OnPropertyChanged();
             }
         }
-        
-        private bool _enableLedChanging;
-
-        public bool EnableLedChanging
-        {
-            get => _enableLedChanging;
-            set
-            {
-                _enableLedChanging = value;
-                OnPropertyChanged();
-            }
-        }
-        
-        public bool ShowLedColorPicker => !TurnOffLed && !UseRainbowLed;
-        
-        private bool _turnOffLed;
-        
-        public bool TurnOffLed
-        {
-            get => _turnOffLed;
-            set
-            {
-                _turnOffLed = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(ShowLedColorPicker));
-            }
-        }
-        
-        private bool _useRainbowLed;
-        
-        public bool UseRainbowLed
-        {
-            get => _useRainbowLed;
-            set
-            {
-                _useRainbowLed = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(ShowLedColorPicker));
-            }
-        }
-        
-        private Color _ledColor;
-
-        public Color LedColor
-        {
-            get => _ledColor;
-            set
-            {
-                _ledColor = value;
-                OnPropertyChanged();
-            }
-        }
 
         public GamepadInputConfig(InputConfig config)
         {
@@ -536,25 +483,12 @@ namespace Ryujinx.Ava.UI.Models.Input
                     WeakRumble = controllerInput.Rumble.WeakRumble;
                     StrongRumble = controllerInput.Rumble.StrongRumble;
                 }
-                
-                if (controllerInput.Led != null)
-                {
-                    EnableLedChanging = controllerInput.Led.EnableLed;
-                    TurnOffLed = controllerInput.Led.TurnOffLed;
-                    UseRainbowLed = controllerInput.Led.UseRainbow;
-                    uint rawColor = controllerInput.Led.LedColor;
-                    byte alpha = (byte)(rawColor >> 24);
-                    byte red = (byte)(rawColor >> 16);
-                    byte green = (byte)(rawColor >> 8);
-                    byte blue = (byte)(rawColor % 256);
-                    LedColor = new Color(alpha, red, green, blue);
-                }
             }
         }
 
         public InputConfig GetConfig()
         {
-            StandardControllerInputConfig config = new()
+            var config = new StandardControllerInputConfig
             {
                 Id = Id,
                 Backend = InputBackendType.GamepadSDL2,
@@ -606,13 +540,6 @@ namespace Ryujinx.Ava.UI.Models.Input
                     WeakRumble = WeakRumble,
                     StrongRumble = StrongRumble,
                 },
-                Led = new LedConfigController
-                {
-                    EnableLed = EnableLedChanging,
-                    TurnOffLed = this.TurnOffLed,
-                    UseRainbow = UseRainbowLed,
-                    LedColor = LedColor.ToUInt32()
-                },
                 Version = InputConfig.CurrentVersion,
                 DeadzoneLeft = DeadzoneLeft,
                 DeadzoneRight = DeadzoneRight,

src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs

@@ -432,7 +432,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             try
             {
-                HttpResponseMessage response = await _httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, "https://raw.githubusercontent.com/Ryubing/Ryujinx/refs/heads/master/assets/amiibo/Amiibo.json"));
+                HttpResponseMessage response = await _httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, "https://raw.githubusercontent.com/GreemDev/Ryujinx/refs/heads/master/assets/amiibo/Amiibo.json"));
 
                 if (response.IsSuccessStatusCode)
                 {
@@ -451,7 +451,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             try
             {
-                HttpResponseMessage response = await _httpClient.GetAsync($"https://raw.githubusercontent.com/Ryubing/Ryujinx/refs/heads/master/assets/amiibo/Amiibo.json");
+                HttpResponseMessage response = await _httpClient.GetAsync($"https://raw.githubusercontent.com/GreemDev/Ryujinx/refs/heads/master/assets/amiibo/Amiibo.json");
 
                 if (response.IsSuccessStatusCode)
                 {

src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs

@@ -1,8 +1,5 @@
 using Avalonia.Svg.Skia;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using FluentAvalonia.UI.Controls;
-using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Views.Input;
 
@@ -40,7 +37,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         [ObservableProperty] private SvgImage _image;
 
-        public InputViewModel ParentModel { get; }
+        public readonly InputViewModel ParentModel;
 
         public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config)
         {
@@ -60,16 +57,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             await RumbleInputView.Show(this);
         }
 
-        public RelayCommand LedDisabledChanged => Commands.Create(() =>
-        {
-            if (!Config.EnableLedChanging) return;
-
-            if (Config.TurnOffLed)
-                ParentModel.SelectedGamepad.ClearLed();
-            else
-                ParentModel.SelectedGamepad.SetLed(Config.LedColor.ToUInt32());
-        });
-
         public void OnParentModelChanged()
         {
             IsLeft = ParentModel.IsLeft;

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -3,7 +3,6 @@ using Avalonia.Controls;
 using Avalonia.Svg.Skia;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
-using Gommon;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
 using Ryujinx.Ava.UI.Helpers;
@@ -55,18 +54,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         private static readonly InputConfigJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
 
         public IGamepadDriver AvaloniaKeyboardDriver { get; }
-
-        private IGamepad _selectedGamepad;
-
-        public IGamepad SelectedGamepad
-        {
-            get => _selectedGamepad;
-            private set
-            {
-                _selectedGamepad = value;
-                OnPropertiesChanged(nameof(HasLed), nameof(CanClearLed));
-            }
-        }
+        public IGamepad SelectedGamepad { get; private set; }
 
         public ObservableCollection<PlayerModel> PlayerIndexes { get; set; }
         public ObservableCollection<(DeviceType Type, string Id, string Name)> Devices { get; set; }
@@ -81,9 +69,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool IsRight { get; set; }
         public bool IsLeft { get; set; }
 
-        public bool HasLed => SelectedGamepad.Features.HasFlag(GamepadFeaturesFlag.Led);
-        public bool CanClearLed => SelectedGamepad.Name.ContainsIgnoreCase("DualSense");
-
         public bool IsModified { get; set; }
         public event Action NotifyChangesEvent;
 

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -488,6 +488,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             EnableDiscordIntegration = config.EnableDiscordIntegration;
             CheckUpdatesOnStart = config.CheckUpdatesOnStart;
             ShowConfirmExit = config.ShowConfirmExit;
+            IgnoreApplet = config.IgnoreApplet;
             RememberWindowState = config.RememberWindowState;
             ShowTitleBar = config.ShowTitleBar;
             HideCursor = (int)config.HideCursor.Value;
@@ -531,7 +532,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             EnableFsIntegrityChecks = config.System.EnableFsIntegrityChecks;
             DramSize = config.System.DramSize;
             IgnoreMissingServices = config.System.IgnoreMissingServices;
-            IgnoreApplet = config.System.IgnoreApplet;
 
             // CPU
             EnablePptc = config.System.EnablePtc;
@@ -591,6 +591,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
             config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
             config.ShowConfirmExit.Value = ShowConfirmExit;
+            config.IgnoreApplet.Value = IgnoreApplet;
             config.RememberWindowState.Value = RememberWindowState;
             config.ShowTitleBar.Value = ShowTitleBar;
             config.HideCursor.Value = (HideCursorMode)HideCursor;
@@ -631,10 +632,12 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
 
             config.System.SystemTimeOffset.Value = Convert.ToInt64((CurrentDate.ToUnixTimeSeconds() + CurrentTime.TotalSeconds) - DateTimeOffset.Now.ToUnixTimeSeconds());
+            config.Graphics.VSyncMode.Value = VSyncMode;
+            config.Graphics.EnableCustomVSyncInterval.Value = EnableCustomVSyncInterval;
+            config.Graphics.CustomVSyncInterval.Value = CustomVSyncInterval;
             config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks;
             config.System.DramSize.Value = DramSize;
             config.System.IgnoreMissingServices.Value = IgnoreMissingServices;
-            config.System.IgnoreApplet.Value = IgnoreApplet;
 
             // CPU
             config.System.EnablePtc.Value = EnablePptc;
@@ -643,9 +646,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.System.UseHypervisor.Value = UseHypervisor;
 
             // Graphics
-            config.Graphics.VSyncMode.Value = VSyncMode;
-            config.Graphics.EnableCustomVSyncInterval.Value = EnableCustomVSyncInterval;
-            config.Graphics.CustomVSyncInterval.Value = CustomVSyncInterval;
             config.Graphics.GraphicsBackend.Value = (GraphicsBackend)GraphicsBackendIndex;
             config.Graphics.PreferredGpu.Value = _gpuIds.ElementAtOrDefault(PreferredGpuIndex);
             config.Graphics.EnableShaderCache.Value = EnableShaderCache;

src/Ryujinx/UI/Views/Input/ControllerInputView.axaml

@@ -4,7 +4,6 @@
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
@@ -429,7 +428,7 @@
                         </StackPanel>
                     </StackPanel>
                 </Border>
-                <!-- Motion, Rumble, LED -->
+                <!-- Motion + Rumble -->
                 <StackPanel
                     Margin="0,10,0,0"
                     Spacing="5"
@@ -487,59 +486,6 @@
                             </Button>
                         </Grid>
                     </Border>
-                    <Border
-                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                        BorderThickness="1"
-                        CornerRadius="5"
-                        HorizontalAlignment="Stretch"
-                        Margin="0,-1,0,0">
-                        <Grid IsVisible="{Binding ParentModel.HasLed}">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <CheckBox
-                                Margin="10, 10, 5, 10"
-                                MinWidth="0"
-                                Grid.Column="0"
-                                IsChecked="{Binding Config.EnableLedChanging, Mode=TwoWay}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsLedColor}" />
-                            </CheckBox>
-                            <CheckBox
-                                Margin="5, 10, 5, 10"
-                                MinWidth="0"
-                                Grid.Column="1"
-                                IsVisible="{Binding ParentModel.CanClearLed}"
-                                IsChecked="{Binding Config.TurnOffLed, Mode=TwoWay}"
-                                Command="{Binding LedDisabledChanged}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsLedColorDisable}" />
-                            </CheckBox>
-                            <CheckBox
-                                Margin="5, 10 5,10"
-                                MinWidth="0"
-                                Grid.Column="2"
-                                IsEnabled="{Binding !Config.TurnOffLed}"
-                                IsChecked="{Binding Config.UseRainbowLed, Mode=TwoWay}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsLedColorRainbow}" />
-                            </CheckBox>
-                            <ui:ColorPickerButton 
-                                Grid.Column="3"
-                                IsEnabled="{Binding Config.ShowLedColorPicker}"
-                                Margin="5, 10, 10, 10"
-                                IsMoreButtonVisible="False"
-                                UseColorPalette="False"
-                                UseColorTriangle="False"
-                                UseColorWheel="False"
-                                ShowAcceptDismissButtons="False"
-                                IsAlphaEnabled="False"
-                                AttachedToVisualTree="ColorPickerButton_OnAttachedToVisualTree"
-                                ColorChanged="ColorPickerButton_OnColorChanged"
-                                Color="{Binding Config.LedColor, Mode=TwoWay}">
-                            </ui:ColorPickerButton>
-                        </Grid>
-                    </Border>
                 </StackPanel>
             </StackPanel>
             <!-- Right Controls -->

src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs

@@ -4,14 +4,14 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
-using FluentAvalonia.UI.Controls;
+using DiscordRPC;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Common.Configuration.Hid.Controller;
+using Ryujinx.Common.Logging;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
-using System.Linq;
+using System;
 using StickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInputId;
 
 namespace Ryujinx.Ava.UI.Views.Input
@@ -85,7 +85,7 @@ namespace Ryujinx.Ava.UI.Views.Input
 
         private void Button_IsCheckedChanged(object sender, RoutedEventArgs e)
         {
-            if (sender is ToggleButton button)
+            if (sender is ToggleButton button) 
             {
                 if (button.IsChecked is true)
                 {
@@ -106,9 +106,7 @@ namespace Ryujinx.Ava.UI.Views.Input
 
                         var viewModel = (DataContext as ControllerInputViewModel);
 
-                        IKeyboard keyboard =
-                            (IKeyboard)viewModel.ParentModel.AvaloniaKeyboardDriver
-                                .GetGamepad("0"); // Open Avalonia keyboard for cancel operations.
+                        IKeyboard keyboard = (IKeyboard)viewModel.ParentModel.AvaloniaKeyboardDriver.GetGamepad("0"); // Open Avalonia keyboard for cancel operations.
                         IButtonAssigner assigner = CreateButtonAssigner(isStick);
 
                         _currentAssigner.ButtonAssigned += (sender, e) =>
@@ -236,31 +234,8 @@ namespace Ryujinx.Ava.UI.Views.Input
         protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnDetachedFromVisualTree(e);
-            
-            foreach (IGamepad gamepad in RyujinxApp.MainWindow.InputManager.GamepadDriver.GetGamepads())
-            {
-                gamepad?.ClearLed();
-            }
-            
             _currentAssigner?.Cancel();
             _currentAssigner = null;
         }
-
-        private void ColorPickerButton_OnColorChanged(ColorPickerButton sender, ColorButtonColorChangedEventArgs args)
-        {
-            if (!args.NewColor.HasValue) return;
-            if (DataContext is not ControllerInputViewModel cVm) return;
-            if (!cVm.Config.EnableLedChanging) return;
-
-            cVm.ParentModel.SelectedGamepad.SetLed(args.NewColor.Value.ToUInt32());
-        }
-
-        private void ColorPickerButton_OnAttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
-        {
-            if (DataContext is not ControllerInputViewModel cVm) return;
-            if (!cVm.Config.EnableLedChanging) return;
-
-            cVm.ParentModel.SelectedGamepad.SetLed(cVm.Config.LedColor.ToUInt32());
-        }
     }
 }

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml

@@ -264,19 +264,19 @@
                         Name="FaqMenuItem"
                         Header="{ext:Locale MenuBarHelpFaq}"
                         Icon="{ext:Icon fa-github}"
-                        CommandParameter="https://github.com/Ryubing/Ryujinx/wiki/FAQ-and-Troubleshooting"
+                        CommandParameter="https://github.com/GreemDev/Ryujinx/wiki/FAQ-and-Troubleshooting"
                         ToolTip.Tip="{ext:Locale MenuBarHelpFaqTooltip}" />
                     <MenuItem
                         Name="SetupGuideMenuItem"
                         Header="{ext:Locale MenuBarHelpSetup}"
                         Icon="{ext:Icon fa-github}"
-                        CommandParameter="https://github.com/Ryubing/Ryujinx/wiki/Ryujinx-Setup-&amp;-Configuration-Guide"
+                        CommandParameter="https://github.com/GreemDev/Ryujinx/wiki/Ryujinx-Setup-&amp;-Configuration-Guide"
                         ToolTip.Tip="{ext:Locale MenuBarHelpSetupTooltip}" />
                     <MenuItem
                         Name="LdnGuideMenuItem"
                         Header="{ext:Locale MenuBarHelpMultiplayer}"
                         Icon="{ext:Icon fa-github}"
-                        CommandParameter="https://github.com/Ryubing/Ryujinx/wiki/Multiplayer%E2%80%90(LDN%E2%80%90Local%E2%80%90Wireless)%E2%80%90Guide"
+                        CommandParameter="https://github.com/GreemDev/Ryujinx/wiki/Multiplayer%E2%80%90(LDN%E2%80%90Local%E2%80%90Wireless)%E2%80%90Guide"
                         ToolTip.Tip="{ext:Locale MenuBarHelpMultiplayerTooltip}" />
                 </MenuItem>
             </MenuItem>

src/Ryujinx/UI/Windows/AboutWindow.axaml

@@ -182,7 +182,7 @@
                     HorizontalAlignment="Left"
                     Background="Transparent"
                     Click="Button_OnClick"
-                    Tag="https://github.com/Ryubing/Ryujinx/graphs/contributors?type=a">
+                    Tag="https://github.com/GreemDev/Ryujinx/graphs/contributors?type=a">
                     <TextBlock
                         FontSize="10"
                         Text="{ext:Locale AboutRyujinxContributorsButtonHeader}"

src/Ryujinx/UI/Windows/MainWindow.axaml.cs

@@ -736,7 +736,9 @@ namespace Ryujinx.Ava.UI.Windows
             });
         }
 
-        private static bool _intelMacWarningShown = !RunningPlatform.IsIntelMac;
+        private static bool _intelMacWarningShown = !(OperatingSystem.IsMacOS() &&
+                                                     (RuntimeInformation.OSArchitecture == Architecture.X64 ||
+                                                      RuntimeInformation.OSArchitecture == Architecture.X86));
 
         public static async Task ShowIntelMacWarningAsync()
         {

src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs

@@ -4,14 +4,9 @@ using Avalonia.Input;
 using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.HLE.FileSystem;
-using Ryujinx.Input;
 using System;
-using System.Linq;
-using Key = Avalonia.Input.Key;
 
 namespace Ryujinx.Ava.UI.Windows
 {
@@ -111,12 +106,6 @@ namespace Ryujinx.Ava.UI.Windows
         protected override void OnClosing(WindowClosingEventArgs e)
         {
             HotkeysPage.Dispose();
-            
-            foreach (IGamepad gamepad in RyujinxApp.MainWindow.InputManager.GamepadDriver.GetGamepads())
-            {
-                gamepad?.ClearLed();
-            }
-            
             InputPage.Dispose();
             base.OnClosing(e);
         }

src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 61;
+        public const int CurrentVersion = 60;
 
         /// <summary>
         /// Version of the configuration file format

src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs

@@ -1,4 +1,3 @@
-using Avalonia.Media;
 using Gommon;
 using Ryujinx.Ava.Utilities.Configuration.System;
 using Ryujinx.Ava.Utilities.Configuration.UI;
@@ -46,6 +45,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             EnableDiscordIntegration.Value = cff.EnableDiscordIntegration;
             CheckUpdatesOnStart.Value = cff.CheckUpdatesOnStart;
             ShowConfirmExit.Value = cff.ShowConfirmExit;
+            IgnoreApplet.Value = cff.IgnoreApplet;
             RememberWindowState.Value = cff.RememberWindowState;
             ShowTitleBar.Value = cff.ShowTitleBar;
             EnableHardwareAcceleration.Value = cff.EnableHardwareAcceleration;
@@ -97,7 +97,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             System.MemoryManagerMode.Value = cff.MemoryManagerMode;
             System.DramSize.Value = cff.DramSize;
             System.IgnoreMissingServices.Value = cff.IgnoreMissingServices;
-            System.IgnoreApplet.Value = cff.IgnoreApplet;
             System.UseHypervisor.Value = cff.UseHypervisor;
             
             UI.GuiColumns.FavColumn.Value = cff.GuiColumns.FavColumn;
@@ -264,12 +263,15 @@ namespace Ryujinx.Ava.Utilities.Configuration
                         }),
                 (30, static cff =>
                 {
-                    foreach (StandardControllerInputConfig config in cff.InputConfig.OfType<StandardControllerInputConfig>())
+                    foreach (InputConfig config in cff.InputConfig)
                     {
-                        config.Rumble = new RumbleConfigController
+                        if (config is StandardControllerInputConfig controllerConfig)
                         {
-                            EnableRumble = false, StrongRumble = 1f, WeakRumble = 1f,
-                        };
+                            controllerConfig.Rumble = new RumbleConfigController
+                            {
+                                EnableRumble = false, StrongRumble = 1f, WeakRumble = 1f,
+                            };
+                        }
                     }
                 }),
                 (31, static cff => cff.BackendThreading = BackendThreading.Auto),
@@ -414,20 +416,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                     // so as a compromise users who want to use it will simply need to re-enable it once after updating.
                     cff.IgnoreApplet = false;
                 }),
-                (60, static cff => cff.StartNoUI = false),
-                (61, static cff =>
-                {
-                    foreach (StandardControllerInputConfig config in cff.InputConfig.OfType<StandardControllerInputConfig>())
-                    {
-                        config.Led = new LedConfigController
-                        {
-                            EnableLed = false,
-                            TurnOffLed = false,
-                            UseRainbow = false,
-                            LedColor = new Color(255, 5, 1, 253).ToUInt32()
-                        };
-                    }
-                })
+                (60, static cff => cff.StartNoUI = false)
             );
     }
 }

src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs

@@ -366,11 +366,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             /// Enable or disable ignoring missing services
             /// </summary>
             public ReactiveObject<bool> IgnoreMissingServices { get; private set; }
-            
-            /// <summary>
-            ///  Ignore Controller Applet
-            /// </summary>
-            public ReactiveObject<bool> IgnoreApplet { get; private set; }
 
             /// <summary>
             /// Uses Hypervisor over JIT if available
@@ -409,8 +404,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 DramSize.LogChangesToValue(nameof(DramSize));
                 IgnoreMissingServices = new ReactiveObject<bool>();
                 IgnoreMissingServices.LogChangesToValue(nameof(IgnoreMissingServices));
-                IgnoreApplet = new ReactiveObject<bool>();
-                IgnoreApplet.LogChangesToValue(nameof(IgnoreApplet));
                 AudioVolume = new ReactiveObject<float>();
                 AudioVolume.LogChangesToValue(nameof(AudioVolume));
                 UseHypervisor = new ReactiveObject<bool>();
@@ -752,6 +745,11 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// </summary>
         public ReactiveObject<bool> ShowConfirmExit { get; private set; }
 
+        /// <summary>
+        /// Ignore Applet
+        /// </summary>
+        public ReactiveObject<bool> IgnoreApplet { get; private set; }
+
         /// <summary>
         /// Enables or disables save window size, position and state on close.
         /// </summary>
@@ -784,6 +782,8 @@ namespace Ryujinx.Ava.Utilities.Configuration
             EnableDiscordIntegration = new ReactiveObject<bool>();
             CheckUpdatesOnStart = new ReactiveObject<bool>();
             ShowConfirmExit = new ReactiveObject<bool>();
+            IgnoreApplet = new ReactiveObject<bool>();
+            IgnoreApplet.LogChangesToValue(nameof(IgnoreApplet));
             RememberWindowState = new ReactiveObject<bool>();
             ShowTitleBar = new ReactiveObject<bool>();
             EnableHardwareAcceleration = new ReactiveObject<bool>();

src/Ryujinx/Utilities/Configuration/ConfigurationState.cs

@@ -56,6 +56,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 EnableDiscordIntegration = EnableDiscordIntegration,
                 CheckUpdatesOnStart = CheckUpdatesOnStart,
                 ShowConfirmExit = ShowConfirmExit,
+                IgnoreApplet = IgnoreApplet,
                 RememberWindowState = RememberWindowState,
                 ShowTitleBar = ShowTitleBar,
                 EnableHardwareAcceleration = EnableHardwareAcceleration,
@@ -77,7 +78,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 MemoryManagerMode = System.MemoryManagerMode,
                 DramSize = System.DramSize,
                 IgnoreMissingServices = System.IgnoreMissingServices,
-                IgnoreApplet = System.IgnoreApplet,
                 UseHypervisor = System.UseHypervisor,
                 GuiColumns = new GuiColumns
                 {
@@ -176,6 +176,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             EnableDiscordIntegration.Value = true;
             CheckUpdatesOnStart.Value = true;
             ShowConfirmExit.Value = true;
+            IgnoreApplet.Value = false;
             RememberWindowState.Value = true;
             ShowTitleBar.Value = !OperatingSystem.IsWindows();
             EnableHardwareAcceleration.Value = true;
@@ -199,7 +200,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             System.MemoryManagerMode.Value = MemoryManagerMode.HostMappedUnsafe;
             System.DramSize.Value = MemoryConfiguration.MemoryConfiguration4GiB;
             System.IgnoreMissingServices.Value = false;
-            System.IgnoreApplet.Value = false;
             System.UseHypervisor.Value = true;
             Multiplayer.LanInterfaceId.Value = "0";
             Multiplayer.Mode.Value = MultiplayerMode.Disabled;