Lessen ViGEmBus restriction for now. Allow connecting to ViGEmBus 1.1…

…6.112.0 PLEASE DON'T MAKE ME REGRET THIS
UHD630 · Apr 15, 2021 · ae6574b · ae6574b
1 parent 25a3fb9
commit ae6574b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
@@ -1273,7 +1273,7 @@ public bool Start(bool showlog = true)
                 }
                 else if (!Global.IsRunningSupportedViGEmBus())
                 {
-                    logMessage = "Unsupported ViGEmBus found. Please install at least ViGEmBus 1.17.333.0";
+                    logMessage = string.Format("Unsupported ViGEmBus found ({0}). Please install at least ViGEmBus 1.17.333.0", Global.vigembusVersion);
                 }
                 else
                 {

diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
@@ -466,7 +466,7 @@ public static bool IsWin10OrGreater()
         public static Version vigemBusVersionInfo =
             new Version(!string.IsNullOrEmpty(vigembusVersion) ? vigembusVersion :
                 BLANK_VIGEMBUS_VERSION);
-        public static Version minSupportedViGEmBusVersionInfo = new Version("1.17.333.0");
+        public static Version minSupportedViGEmBusVersionInfo = new Version("1.16.112.0");
         public const int CONFIG_VERSION = 5;
         public const int APP_CONFIG_VERSION = 2;
         public const string ASSEMBLY_RESOURCE_PREFIX = "pack://application:,,,/DS4Windows;";

diff --git a/DS4Windows/DS4Forms/WelcomeDialog.xaml.cs b/DS4Windows/DS4Forms/WelcomeDialog.xaml.cs
@@ -43,7 +43,12 @@ public WelcomeDialog(bool loadConfig = false)
 
             InitializeComponent();
 
-            if (!Environment.Is64BitOperatingSystem)
+            if (!DS4Windows.Global.IsWin10OrGreater())
+            {
+                installDL = InstallerDL1_16;
+                installFileName = InstFileName1_16;
+            }
+            else if (!Environment.Is64BitOperatingSystem)
             {
                 installDL = InstallerDLX86;
                 installFileName = InstFileNameX86;
@@ -53,7 +58,10 @@ public WelcomeDialog(bool loadConfig = false)
 
             // Disable Xbox 360 driver installer button if running on Windows 8 or greater.
             // Driver comes pre-installed on a standard OS install
-            step2Btn.IsEnabled = false;
+            if (DS4Windows.Global.IsWin8OrGreater())
+            {
+                step2Btn.IsEnabled = false;
+            }
         }
 
         private void FinishedBtn_Click(object sender, RoutedEventArgs e)
-Original file line number
+Diff line change
@@ Expand Up / @@ -1273,7 +1273,7 @@ public bool Start(bool showlog = true) @@
                     }
                     else if (!Global.IsRunningSupportedViGEmBus())
                     {
-                        logMessage = "Unsupported ViGEmBus found. Please install at least ViGEmBus 1.17.333.0";
+                        logMessage = string.Format("Unsupported ViGEmBus found ({0}). Please install at least ViGEmBus 1.17.333.0", Global.vigembusVersion);
                     }
                     else
                     {
@@ Expand Down @@