Disabling emulated DS4 support

Moneyl · Aug 15, 2021 · 6449274 · 6449274
1 parent af6e0a3
commit 6449274
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
@@ -947,14 +947,18 @@ public void DetachUnboundOutDev(OutSlotDevice slotDevice)
         public void PluginOutDev(int index, DS4Device device)
         {
             OutContType contType = Global.OutContType[index];
+            // Always attempt Xbox 360 controller emulation
+            contType = OutContType.X360;
 
             OutSlotDevice slotDevice = null;
             slotDevice = outputslotMan.FindExistUnboundSlotType(contType);
 
             if (useDInputOnly[index])
             {
                 bool success = false;
-                if (contType == OutContType.X360)
+                // Always attempt Xbox 360 controller emulation
+                if (true)
+                //if (contType == OutContType.X360)
                 {
                     activeOutDevType[index] = OutContType.X360;
 

diff --git a/DS4Windows/DS4Forms/BindingWindow.xaml.cs b/DS4Windows/DS4Forms/BindingWindow.xaml.cs
@@ -66,10 +66,10 @@ public BindingWindow(int deviceNum, DS4Windows.DS4ControlSettings settings,
             InitKeyBindings();
             InitInfoMaps();
 
-            if (!bindingVM.Using360Mode)
-            {
-                InitDS4Canvas();
-            }
+            //if (!bindingVM.Using360Mode)
+            //{
+            //    InitDS4Canvas();
+            //}
 
             bindingVM.ActionBinding = bindingVM.CurrentOutBind;
             if (expose == ExposeMode.Full)

diff --git a/DS4Windows/DS4Forms/PluginOutDevWindow.xaml b/DS4Windows/DS4Forms/PluginOutDevWindow.xaml
@@ -16,7 +16,7 @@
 
         <ComboBox x:Name="devTypeCombo" SelectedIndex="0" DockPanel.Dock="Top">
             <ComboBoxItem Tag="0" Content="X360" />
-            <ComboBoxItem Tag="1" Content="DS4" />
+            <!--<ComboBoxItem Tag="1" Content="DS4" />-->
         </ComboBox>
 
         <ComboBox x:Name="reserveTypeCombo" SelectedIndex="0" DockPanel.Dock="Top">

diff --git a/DS4Windows/DS4Forms/ProfileEditor.xaml b/DS4Windows/DS4Forms/ProfileEditor.xaml
@@ -1798,7 +1798,7 @@
                     <StackPanel>
                         <GroupBox Header="{lex:Loc VirtualControllerSettings}" MinHeight="50" Margin="4,4,4,0" Padding="0,4,0,4">
                             <StackPanel>
-                                <StackPanel Orientation="Horizontal" Margin="0,0,0,5">
+                                <StackPanel Orientation="Horizontal" Visibility="Collapsed" Margin="0,0,0,5">
                                     <Label Content="{lex:Loc EmulatedController}" ToolTip="{lex:Loc OutContNotice}" />
                                     <ComboBox x:Name="outConTypeCombo" SelectedIndex="{Binding TempControllerIndex, FallbackValue=0}" IsEnabled="{Binding DInputOnly, Converter={StaticResource InverseBoolConverter}}" MinWidth="140"
                                       ToolTip="{lex:Loc OutContNotice}">