R4 profile, XInput backend improvements, etc. #58

avahe-kellenberger · 2023-08-11T13:16:13Z

Github is currently showing many changes in files which actually have no difference between the master branch and my fork. I'm partially opening this PR to see if it fixes the comparison.

Deleted all \r characters from Ultimate.cpp

- Can crouch on platforms with modX and modY - Can shield tilt with modY - ModX is now fastest walking speed

- Cleaned up DInputBackend buttons to more closely resemble SDL buttons.

- Fixed issue with ftilts while using mod_x.

…mulator)

- Gamecube not working (directly connect) - Unable to test N64?

- Hold R + Y (wavedash) to disable, on plugin.

- Fixed left trigger output.

- Press the top right button

ModY + Diagonal + Cstick Left was a duplicate of ModY + Diagonal + Cstick Down. Fixed so that it provides the correct angle.

Resolves JonnyHaystack#45

Resolves JonnyHaystack#35

…tack#51) Co-authored-by: Eric Iniguez <eric@iniguez.dev>

* build: add devcontainer.json * build: add clang-format * build: use debian base image for dev container * build: switch to Ubuntu 22.04 as base image * build: move clang-format stuff from settings.json to devcontainer.json in case people running it locally don't have clang-format installed * style: replace tabs with spaces

* feat: SOCD cleaning rework socd_type is no longer a required parameter of InputMode. Instead, a SocdType is included as part of each SocdPair, allowing SOCD resolution method to be defined per-axis without the need to override HandleSocd(). New SOCD resolution methods SOCD_DIR1_PRIORITY and SOCD_DIR2_PRIORITY have been added, which was made possible by the above change. These would previously not have been useful, without the ability to define SocdType per SocdPair. The constructor of FgcMode now accepts two parameters, horizontal_socd and vertical_socd, which can be used to set the SOCD resolution method for the horizontal and vertical axes separately. The default vertical SOCD resolution for FgcMode is now neutral, due to this being a requirement in some rulesets. This can easily be changed by passing socd::SOCD_DIR2_PRIORITY as the second argument to the constructor in mode_selection.hpp. * fix: correct function names

- Can crouch on platforms with modX and modY - Can shield tilt with modY - ModX is now fastest walking speed

Rebase master into my fork

- Fixed XInput issue with triggers

Rebase from master repo

ribbanya · 2023-12-17T23:30:30Z

@avahe-kellenberger Could you summarize any changes in this PR (or other findings you've come across) that would pertain to #26? I'd like to get that merged at some point.

ribbanya · 2023-12-17T23:35:18Z

By the way, if you use a two-dot comparison then the problem mentioned in the OP should resolve, like this.

avahe-kellenberger · 2023-12-20T10:19:28Z

HAL/pico/src/comms/XInputBackend.cpp

-    _report.lb = _outputs.buttonL;
-    _report.rb = _outputs.buttonR;
-    _report.lt = _outputs.triggerLDigital ? 255 : _outputs.triggerLAnalog;
-    _report.rt = _outputs.triggerRDigital ? 255 : _outputs.triggerRAnalog;
+
+    _report.lb = _outputs.triggerLDigital;
+    _report.rb = _outputs.triggerRDigital;
+    _report.lt = _outputs.buttonL ? 255 : _outputs.triggerLAnalog;
+    _report.rt = _outputs.buttonR ? 255 : _outputs.triggerRAnalog;


These seemed to not be working until flipped (lt <-> lb, rt <-> rb).
255 is the max value for when the digital press is registered.

If there are any concerns or issues, let me know. I was testing these settings from yuzu and some steam games.

avahe-kellenberger · 2023-12-20T10:19:42Z

The problem showing randomly changed files was fixed, which is nice.

The primary changes of the PR are adding an Ultimate mode for the R4 B0xx. It works well.
I've also made minor changes to DInput and XInput which fixed some small issues, I'll leave some comments on the code.

avahe-kellenberger · 2023-12-20T10:20:56Z

HAL/pico/src/comms/DInputBackend.cpp

+    // See https://wiki.libsdl.org/SDL2/SDL_GameControllerButton
+    _gamepad->setButton(0, _outputs.a);
+    _gamepad->setButton(1, _outputs.b);
+    _gamepad->setButton(2, _outputs.x);
+    _gamepad->setButton(3, _outputs.y);
+    _gamepad->setButton(4, _outputs.select);
+    _gamepad->setButton(5, _outputs.home);
+    _gamepad->setButton(6, _outputs.start);
+    _gamepad->setButton(7, _outputs.leftStickClick);
+    _gamepad->setButton(8, _outputs.rightStickClick);
+    _gamepad->setButton(9, _outputs.buttonL);
+    _gamepad->setButton(10, _outputs.buttonR);
+    _gamepad->setButton(11, _outputs.triggerLDigital);
+    _gamepad->setButton(12, _outputs.triggerRDigital);


Unnecessary, but helped when using DInput in my game engine. Doesn't really affect anything.

avahe-kellenberger · 2023-12-20T10:21:29Z

HAL/pico/src/comms/DInputBackend.cpp

-    _gamepad->triggerLAnalog(_outputs.triggerLAnalog + 1);
-    _gamepad->triggerRAnalog(_outputs.triggerRAnalog + 1);
+
+    // NOTE: This is wrong! ...But works for my needs.
+    // Not sure why L and R aren't working in yuzu with triggerLAnalog and triggerRAnalog.
+    _gamepad->triggerLAnalog(_outputs.triggerLDigital + 1);
+    _gamepad->triggerRAnalog(_outputs.triggerRDigital + 1);


Can revert if needed, reasoning in the comments.

avahe-kellenberger · 2023-12-20T10:23:28Z

HAL/pico/src/comms/NintendoSwitchBackend.cpp

+  // TODO: This flips R1/R2 and L1/L2 but the game actually sees b0xx L and R as the triggers.
+  // Maybe the pinout needs to change? Unsure.
+  _report.l = _outputs.triggerLDigital;
+  _report.r = _outputs.triggerRDigital;
+  _report.zl = _outputs.buttonL;
+  _report.zr = _outputs.buttonR;


This seems consistent with 3rd party "Pro Controllers", these are always flipped.
Not sure if we could actually fix this in a better way, but I expect not.
Doing this allows for us to reset training mode.

avahe-kellenberger · 2023-12-20T10:24:29Z

HAL/pico/src/comms/NintendoSwitchBackend.cpp

+  // Left Stick outputs                             ||     Scaling    ||    || Offset ||
+  _report.lx =        ((_outputs.leftStickX  - 128)   * 1.266  + 128)         + 0.49;     // Rightwards
+  _report.ly = (255 - ((_outputs.leftStickY  - 128)   * 1.256  + 128))        + 1.48;     // Downwards
+
+  // Right Stick outputs
+  _report.rx =        ((_outputs.rightStickX - 128)   * 1.266  + 128)         + 0.49;
+  _report.ry = (255 - ((_outputs.rightStickY - 128)   * 1.256  + 128))        + 1.48;


I believe these scaling values were taken from a PR written by @ribbanya but I'm not seeing them looking back.
Maybe ribbanya can comment on this, seems to be working alright but it's not absolutely perfect atm.

I honestly don't remember? I just remember the creation of Ultimate2 a while ago but that wasn't me.

avahe-kellenberger · 2023-12-20T10:25:42Z

config/b0xx_r4/config.cpp

+
+  /* Select communication backend. */
+  CommunicationBackend *primary_backend;
+  if (console == ConnectedConsole::NONE) {


If we want to change buttons holds to fit some uniform standard, that's fine by me.

I do enjoy requiring no button holds for Smash Ultimate on the Switch, though.

avahe-kellenberger · 2023-12-20T10:26:07Z

config/mode_selection.hpp

+            // TODO: Should I make this switch to UltimateR4?
            set_mode(backend, new Ultimate(socd::SOCD_2IP));


Decision to be made

ribbanya · 2023-12-20T18:48:19Z

That all makes sense! Thanks for taking the time to explain.

- TODO: Check if the "255 - ..." section is needed It seems to be working fine, needs more testing

avahe-kellenberger and others added 30 commits February 2, 2023 21:16

Default to Ultimate mode, some changes values.

9de2c6d

Updated Ultimate values, added cli build script.

cb1afd1

Deleted all \r characters from Ultimate.cpp

ModX/Y changes

79e6834

- Can crouch on platforms with modX and modY - Can shield tilt with modY - ModX is now fastest walking speed

Crouch from run with modX + down

c761a7b

R4 config.

14cc29a

Working on PC when holding Z on plug-in.

8b01987

Added select and home buttons for UltimateR4.

d3214b9

- Cleaned up DInputBackend buttons to more closely resemble SDL buttons.

Fixed select and home buttons.

f19bf1e

Switched to XInput backend.

bc95977

- Fixed issue with ftilts while using mod_x.

Code cleanup.

2957636

Fixed XInputBackend so we can restart training mode (smash ultimate e…

8af8082

…mulator)

Implementing more modes.

4f308d8

- Gamecube not working (directly connect) - Unable to test N64?

Found the correct pinout for the r4

2c911b3

Default GameCube to use SOCD Reactivation.

66a4403

- Hold R + Y (wavedash) to disable, on plugin.

Fixed pivot dtilt/utilt usin modY (credit to Alelor)

40b7334

Y hold for FGC mode.

bf2ee01

- Fixed left trigger output.

Added zL input for the UltimateR4 profile.

00a3f48

- Press the top right button

Fix duplicate DI angle (JonnyHaystack#48)

3dad1eb

ModY + Diagonal + Cstick Left was a duplicate of ModY + Diagonal + Cstick Down. Fixed so that it provides the correct angle.

Clean up comments in HollowKnight mode

9f11ff2

Clean up Melee20Button modifier logic

4afc7e3

Add LS and MS = L and R in Ultimate mode

d436bae

Resolves JonnyHaystack#45

Add Mac Slippi controller profile path to README

5ac2d45

Resolves JonnyHaystack#35

feat: Allow tilt attacks with mod x in RivalsOfAether mode (JonnyHays…

90ca941

…tack#51) Co-authored-by: Eric Iniguez <eric@iniguez.dev>

Add GitHub Actions workflow

ccf846e

Add contents write permission to workflow

8ab5466

ModX/Y changes

a992b99

- Can crouch on platforms with modX and modY - Can shield tilt with modY - ModX is now fastest walking speed

Fixed SOCD changes for R4.

b109324

Merge pull request #2 from avahe-kellenberger/merge-original

28fdbc9

Rebase master into my fork

avahe-kellenberger added 9 commits August 11, 2023 09:17

Merge branch 'master' into master

ae6f492

Deleted commented out code.

6f5733e

ModX/ModY for new DSC tech.

0b555c9

B hold for slippi

25241c7

- Fixed XInput issue with triggers

Angled tilts/aerials with ModX/ModY.

bc48bec

Allow shielding during up b angles.

e91e768

Merge pull request #3 from JonnyHaystack/master

0493d17

Rebase from master repo

Fixed angled tilts to work with tap jump.

bdb29b6

Diagonal special while running will now be down special.

eae232a

Fixed bug when doing angled specials.

1420a6c

avahe-kellenberger commented Dec 20, 2023

View reviewed changes

avahe-kellenberger changed the title ~~[WIP]: R4 profile, XInput backend improvements, etc.~~ R4 profile, XInput backend improvements, etc. Dec 20, 2023

Reorganized code.

44131a7

avahe-kellenberger added 3 commits December 21, 2023 10:15

Full shield tilting when double-shielding with ModX/Y

c41d24d

Scaling XInputBackend to match NintendoSwitchBackend.

1972e28

- TODO: Check if the "255 - ..." section is needed It seems to be working fine, needs more testing

Fixed bug with modx up b

1e2d38e

JonnyHaystack closed this Feb 13, 2024

		// TODO: Should I make this switch to UltimateR4?
		set_mode(backend, new Ultimate(socd::SOCD_2IP));

Uh oh!

R4 profile, XInput backend improvements, etc. #58

R4 profile, XInput backend improvements, etc. #58

Uh oh!

Conversation

avahe-kellenberger commented Aug 11, 2023

Uh oh!

ribbanya commented Dec 17, 2023

Uh oh!

ribbanya commented Dec 17, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

avahe-kellenberger commented Dec 20, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ribbanya commented Dec 20, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants