Add controller port configuration GUI and support virtual SB controller with feedback status #1196

jackchentwkh · 2018-05-22T12:28:27Z

Using dialog to let user assign which host controller he want to assign to each xbox port.
add preliminary support for virtual SteelBatallion controller. input mapped to 1st Xinput and directinput,
key mapping will be provided later.
also add a new dialog via CxbxVSBC.dll for virtual SteelBatallion controller feedback status.
later I will add GUI input support via the same dialog.

besides the virtual SteelBatallion controller, the user configuration for host controller assignment is a major change.
I also add some new structures together with my new findings for the DeviceTable and DeviceInfo of xbox devices.

EDIT by RadWolfie:
Here's the new change to GUI. (Used to have option toggle XInput option.)

Only with Steel Batallion title, controller feedback status will open.

…event mis-use host equivalent. Add newly findings for device table related info.

now the XINPUT_STATE is correctly refering to host type, no need to specify the name space.

Prepare for configurabale host input, and virtual xbox controller.

always set state to enable rumble.

using console as controller output. using XInput and direct input combined keys

now registry works.

SBC controller feedback add possibility of using same dialog for virtual controller input.

sort of working. revert the dlg message handling from wnd.cpp

modeless dialog got issues. modal dialog will occupy focus. only way is to use a DLL, load the DLL when cxbx-r emulation child process started, and create a dummy window from DLL then create a modal dialog. lots of code change and clean up.

jackchentwkh · 2018-05-22T12:34:23Z

you'll need to patch the default.xbe to run SteelBatallion because of the DirectSound initialization issue.
as for the virtual SB controller.
here is the current configuration, you need 1 xinput controller and 1 direct input to get enough input.

currently it's enough to get into the game.
but so far the game only got black screen. but you can hear sound effect when you fire weapon/turn the sight view

PatrickvL · 2018-05-22T12:47:40Z

Please add a marker (like OLD_INPUT or something like that) to all code-blocks that you've disabled, and create an issue to remove all thusly marked code (otherwise, a lot of crap keeps lingering on).

PatrickvL · 2018-05-22T12:49:17Z

Nearly all files in src/CxbxVSBC are marked binary - that can't be right!

Intentation and comment-style aren't consistent, please try to match existing code style.

~~Also, a number of .tlog files crept in - those don't seem necessary, so add them to .gitignore~~

EDIT by @RadWolfie:
Add src/CxbxVSBC/Release and src/CxbxVSBC/Debug to .gitignore. We should not include compiled build in main repo. Plus this is where .tlog files came from.

RadWolfie

See my comments for change request.

I don't see why submodules need to be updated in this pull request. If we need to update the submodules, it must be on its own pull request.

As for files on github show "Binary file not shown.", are you saving them with windows' newline? If so, I'm not sure why it's showing the message.

RadWolfie · 2018-05-22T13:03:09Z

build/win32/Cxbx.vcxproj

@@ -223,7 +223,7 @@
      </HeaderFileName>
    </Midl>
    <ClCompile>
-      <Optimization>Full</Optimization>
+      <Optimization>Disabled</Optimization>


Cannot be unoptimized in master branch.

RadWolfie · 2018-05-22T13:10:30Z

build/win32/Cxbx.sln

@@ -128,13 +128,33 @@ Global
 		{B8D9AFC2-B38F-4714-846D-8A2754F076C9}.Debug_Direct3D9|Any CPU.Build.0 = Release|Win32
 		{B8D9AFC2-B38F-4714-846D-8A2754F076C9}.Debug_Direct3D9|Win32.ActiveCfg = Debug|Win32
 		{B8D9AFC2-B38F-4714-846D-8A2754F076C9}.Debug_Direct3D9|Win32.Build.0 = Debug|Win32
+		{B8D9AFC2-B38F-4714-846D-8A2754F076C9}.Debug_Direct3D9|x64.ActiveCfg = Debug|x64


Cannot have x64 build as Cxbx is only design to compile in x86 executable.

See below as well.

removed with added commit

RadWolfie · 2018-05-22T13:12:16Z

build/win32/Cxbx.vcxproj

  </ItemGroup>
  <ItemGroup>
    <None Include="..\..\CONTRIBUTORS" />
    <None Include="..\..\COPYING" />
    <None Include="..\..\README.md" />
    <None Include="..\..\resource\.editorconfig" />
    <None Include="..\..\resource\Logo.bmp" />
+    <None Include="..\..\resource\ribbon1.mfcribbon-ms" />


I do not see ribbon1.mfcribbon-ms file in this pull request.

Also, I don't think it should be in here since I never heard of mfcribbon-ms file extension.

RadWolfie · 2018-05-22T13:29:04Z

src/CxbxKrnl/EmuXapi.cpp

+
+
+
+void XTL::Load(const char *szRegistryKey)


Wrong place to put it. It should remain inside XBController.cpp file or different file inside /src/Common/Win32 directory. (part 1/4)

XBcontroller is for directinput, that's what I have in my mind.
are you sure the xbcontroller is generalized with xinput?

It may not contain any xinput. If you want to keep it separate, you can make a new file in src/Common/Win32 folder. I thought you had a new file in src/Common/Win32 directory for Xinput? All registry settings are in there to separate from main source code of Cxbx and CxbxKrnl's folders.

ok, let me check what I can do

RadWolfie · 2018-05-22T13:29:21Z

src/CxbxKrnl/EmuXapi.cpp

+// ******************************************************************
+// * func: XTL::Save
+// ******************************************************************
+void XTL::Save(const char *szRegistryKey)


Wrong place to put it. It should remain inside XBController.cpp file or different file inside /src/Common/Win32 directory. (part 2/4)

RadWolfie · 2018-05-22T13:29:33Z

src/CxbxKrnl/EmuXapi.cpp

+}
+
+//Set HostType and HostPort setting from global array per xbox port. The setted value will take effect from next time xbe loading.
+void XTL::SetXboxPortToHostPort(DWORD dwXboxPort, DWORD dwHostType, DWORD dwHostPort)


Wrong place to put it. It should remain inside XBController.cpp file or different file inside /src/Common/Win32 directory. (part 3/4)

RadWolfie · 2018-05-22T13:29:50Z

src/CxbxKrnl/EmuXapi.cpp

+    g_XboxPortMapHostPort[dwXboxPort] = dwHostPort;
+}
+//retrieve HostType and HostPort setting from global array per xbox port.
+void XTL::GetXboxPortToHostPort(DWORD dwXboxPort, DWORD &dwHostType, DWORD &dwHostPort)


Wrong place to put it. It should remain inside XBController.cpp file or different file inside /src/Common/Win32 directory. (part 4/4)

RadWolfie · 2018-05-22T13:33:32Z

build/win32/Cxbx.vcxproj.filters

@@ -633,6 +640,7 @@
    <None Include="..\..\resource\.editorconfig">
      <Filter>Code Format\resource</Filter>
    </None>
+    <None Include="..\..\resource\ribbon1.mfcribbon-ms" />


the ribbon1 is added by VS, I don't know why it's there. I will remove it.

RadWolfie · 2018-05-22T14:32:20Z

src/CxbxVSBC/CxbxVSBC.vcxproj

+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>


I believe this is the fault. Also PlatformToolset is recommended to use $(DefaultPlatformToolset) above.

RadWolfie · 2018-05-22T15:17:52Z

build/win32/Cxbx.vcxproj

@@ -162,7 +162,7 @@
      </HeaderFileName>
    </Midl>
    <ClCompile>
-      <Optimization>Disabled</Optimization>
+      <Optimization>Full</Optimization>


Um... Debug should never have optimization? I think you choose "all configurations" to set full optimization by mistake.

RadWolfie · 2018-05-22T15:19:00Z

build/win32/Cxbx.vcxproj

@@ -101,7 +101,7 @@
      </HeaderFileName>
    </Midl>
    <ClCompile>
-      <Optimization>Disabled</Optimization>
+      <Optimization>Full</Optimization>


Same here, see comment below.

ghost · 2018-05-23T08:23:53Z

src/CxbxKrnl/EmuXapi.h

+// ******************************************************************
+// accroding to XDK document, all game controller use 0x01 GAMEPAD device type. then specify the subtype in returned Capabilities when XInputGetCapabilities called.
+#define X_XINPUT_DEVTYPE_GAMEPAD              0x01
+// SteelBatalion controller is the only one with special device type other than 1.


I repeat my previous comment: I suggest to drop references to the XDK in the code/comments, since it's technically illegal to have. Just say what the variable(s) is/are for, and we are good. Same for other instances in this PR

What we can't do is copy and paste exact from source code. Reading/reviewing the help documentation is okay to mention if there are more complicated process need to explain (just can't have the word xdk in it).

For this type of note, I don't think it's worth mention the document here.

EDIT: Fix my wording.

I agree. Direct mentioning to official resource will be removed.

PatrickvL · 2018-05-25T12:53:07Z

@jackchentwkh @RadWolfie have either of you decided on what to do on the above mentioned review comments? It'd be nice to get this merged in soon! (Once deemed stable, that is)

RadWolfie · 2018-05-25T14:17:55Z

There are variety needs to be fix, haven't seen new commits to resolve them from his end.

Right now, there's a merge conflict for build/win32/Cxbx.vcxproj.filters file.

jackchentwkh · 2018-05-25T14:33:07Z

Sorry I was busy this week. Shall find some time this weekend.

Co-Authored-By: anita999 <anita999@ms12.hinet.net>

Thank you very much, RadWolfie! you're always helping and helpful!

RadWolfie · 2018-05-26T05:31:40Z

After all the reviews been fixed. Verifying on my end to ensure configuration is working before approve to merge.

RadWolfie

lgtm!

EDIT: My recommendation is to use squash and merge option.

Plus I do not own both Steel Battalion and hardware device. So I can't verify this part.

PatrickvL · 2018-05-26T11:59:45Z

Lgtm - great job all around!

This should be the last fixup for pull request.

RadWolfie · 2018-05-26T14:28:43Z

I took a peek in AppVeyor to find out both release and debug zipped folder doesn't contain CxbxVSBC.dll file. New commit should resolve it.

jackchentwkh · 2018-05-28T14:34:29Z

the newly merged LLE/HLE status altered the resource file which introduced conflicts.
I would suggest to merge this PR is there is no other objections.
I am working on USB pass through SB controller support and it's almost done.
this PR must be merged first so I can rebase my new code on it.
resource/Cxbx.aps shall be ignored

ObiKKa · 2018-05-28T19:00:34Z

Such wonderful GUI windows as seen in the original post. But I have found six typos that could be fixed before testing begins for alpha 0.1.
Plus, also, why is the line "Main Monitor Zoom" in mostly lower capital when almost all other letters on the second window are capitalised? Also why are there two copies of "Tuner Dial" in the same sector?

Typos:
STEEL BATALLION (In the title bar of the second window. It's "Steel Battalion". Double t, single l.)
Virtual SteelBatalion (Also this one with multiple handles in the first window. See line above here.)
MAIN WAPON CONTROL (Weapon)
SUB WAPON CTONTROL (Weapon Control)
COCKIT HATCH (Cockpit)
IGINITION (Ignition)

Maybe this one too?
FILT CONTROL SYSTEM (Filter?)

jackchentwkh · 2018-05-29T04:00:39Z

@ObiKKa thanks a lot for the corrections for typo.
every correction is correct except the FILT which is what's one the original controller.
here is the original controller's layout.

I will issue a new commit to fix those typos and rebase conflict.

jackchentwkh · 2018-05-29T05:35:21Z

I got trouble rebasing this PR to master.
after rebase, the project won't compile, and lots of include path settings are not taking effect.
Can someone help me solve the merge conflict and merge the PR as is.
then I can issue new PR for the typo correction and add USB pass through support for SB controller?

RadWolfie · 2018-05-29T06:12:23Z

I'm working on it. Then we can resolve the merge conflict to get this in master soon as possible.

EDIT: Waiting for pull request jackchentwkh#4 to be merge. Then merge conflict should be resolve.

Jc controller merge resolve

This reverts commit 034039d.

LukeUsher · 2018-06-18T15:43:38Z

@jackchentwkh please document any important information about the Steel Battalion on the Xbox Dev Wiki .

There's not much info there, and you've obviously done a great deal of research getting it into Cxbx-R

anita999 added 14 commits May 22, 2018 20:18

Add XB_ prefix for xbox XInput related structures and variables to pr…

1cfc86f

…event mis-use host equivalent. Add newly findings for device table related info.

Revert g_Controller ZeroMemory() calls.

ba94781

now the XINPUT_STATE is correctly refering to host type, no need to specify the name space.

Add X_CONTROLLER_HOST_BRIDGE structure type.

d6171b4

Prepare for configurabale host input, and virtual xbox controller.

Fix DeviceInfo initialization when device table is not found.

dc28952

always set state to enable rumble.

experimenting virtual SteelBatalion controller.

c2091e5

using console as controller output. using XInput and direct input combined keys

first attem to emulat SteelBatalion controller works.

6ba086e

add dialog file to solution

a5b4592

Restore missing dialog files and functions

74d7125

Minor fix

da4b293

fix dialog control grouping

d391f17

now registry works.

refine some controller related constants

56167d2

Using Dialog for showing

be9efac

SBC controller feedback add possibility of using same dialog for virtual controller input.

using EmuUpdateTickCount() as modeless dialog message handler.

26a645a

sort of working. revert the dlg message handling from wnd.cpp

RadWolfie requested changes May 22, 2018

View reviewed changes

RadWolfie reviewed May 22, 2018

View reviewed changes

anita999 added 3 commits May 22, 2018 22:46

fix debug build, use same character set setting for all configurations.

06e7645

restore C++ optimiztion setting in master

dff44ca

remove unitended included ribbon resources

d3ebce9

RadWolfie reviewed May 22, 2018

View reviewed changes

ghost reviewed May 23, 2018

View reviewed changes

anita999 added 2 commits May 25, 2018 22:51

removed necessary official document mentioning

c1bb1d3

Add src/CxbxVSBC/Release and src/CxbxVSBC/Debug to .gitignore

8b04f32

RadWolfie and others added 7 commits May 26, 2018 00:00

Relocate project to build/Win32 folder

073173d

Co-Authored-By: anita999 <anita999@ms12.hinet.net>

Restore sln file base on master

5d70fad

Include project dependency to build

bdd8a4c

Merge pull request #3 from RadWolfie/jc-sb-controller-fixup

8cab3ff

Thank you very much, RadWolfie! you're always helping and helpful!

Final fixup for sln file

88d5a9a

Restore original new line code

1409a5b

Update Wnd.cpp

8152d6c

RadWolfie approved these changes May 26, 2018

View reviewed changes

Remove old include

2043570

jackchentwkh mentioned this pull request May 26, 2018

Review old code in EmuXapi.cpp regarding Xinput api #1209

Closed

Include CxbxVSBC.dll into AppVeyor

8e06879

This should be the last fixup for pull request.

RadWolfie and others added 6 commits May 29, 2018 01:59

Fix merge-conflict

795a0d4

Fix files encode format to UTF-8

a96f8e9

Merge conflict from master branch

e1abe2c

Merge pull request #4 from RadWolfie/jc-controller-merge-resolve

8931ed1

Jc controller merge resolve

treat .rc file as text instead of binary

034039d

Revert "treat .rc file as text instead of binary"

17a71fa

This reverts commit 034039d.

LukeUsher merged commit 6edf293 into Cxbx-Reloaded:master May 29, 2018

RadWolfie mentioned this pull request Jun 25, 2018

Input on controllers other than P1 #902

Closed

ergo720 mentioned this pull request Jun 18, 2019

Steel Batallion Controller support #1165

Closed

ergo720 mentioned this pull request Dec 13, 2020

WIP: Reimplement Steel Battalion controller #2068

Closed

Add controller port configuration GUI and support virtual SB controller with feedback status #1196

Add controller port configuration GUI and support virtual SB controller with feedback status #1196

Conversation

jackchentwkh commented May 22, 2018 • edited by RadWolfie Loading

jackchentwkh commented May 22, 2018 • edited Loading

PatrickvL commented May 22, 2018

PatrickvL commented May 22, 2018 • edited by RadWolfie Loading

RadWolfie left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

RadWolfie May 23, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PatrickvL commented May 25, 2018

RadWolfie commented May 25, 2018

jackchentwkh commented May 25, 2018

RadWolfie commented May 26, 2018

RadWolfie left a comment • edited Loading

Choose a reason for hiding this comment

PatrickvL commented May 26, 2018

RadWolfie commented May 26, 2018

jackchentwkh commented May 28, 2018 • edited Loading

ObiKKa commented May 28, 2018 • edited Loading

jackchentwkh commented May 29, 2018

jackchentwkh commented May 29, 2018

RadWolfie commented May 29, 2018 • edited Loading

LukeUsher commented Jun 18, 2018

jackchentwkh commented May 22, 2018 •

edited by RadWolfie

Loading

jackchentwkh commented May 22, 2018 •

edited

Loading

PatrickvL commented May 22, 2018 •

edited by RadWolfie

Loading

RadWolfie May 23, 2018 •

edited

Loading

RadWolfie left a comment •

edited

Loading

jackchentwkh commented May 28, 2018 •

edited

Loading

ObiKKa commented May 28, 2018 •

edited

Loading

RadWolfie commented May 29, 2018 •

edited

Loading