Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wii guitar range adjustments and analog trigger handling #946

Merged
merged 3 commits into from
Apr 8, 2024
Merged

Wii guitar range adjustments and analog trigger handling #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb79dad
Fixes full range on both Wii Les Paul and World Tour guitars
mikepparks Apr 5, 2024
d9988c9
Returned ranges for Les Paul back to expected values.
mikepparks Apr 7, 2024
0cf577d
Adds analog trigger switch to Wii modes that allow single direction a…
mikepparks Apr 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/WiiExtension/extensions/GuitarExtension.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ void GuitarExtension::init(uint8_t dataType) {
_analogCalibration[WiiAnalogs::WII_ANALOG_LEFT_Y].center = WII_GUITAR_GATE_CENTER;
_analogCalibration[WiiAnalogs::WII_ANALOG_LEFT_Y].maximum = WII_GUITAR_GATE_CENTER+WII_GUITAR_GATE_SIZE;

_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_X].minimum = 243;
_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_X].center = 246;
_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_X].maximum = 249;
_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_X].useOffset = false;
_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_X].minimum = 131;
_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_X].center = 169;
_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_X].maximum = 207;
_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_X].useOffset = true;

_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_Y].minimum = 0;
_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_Y].center = WII_GUITAR_GATE_CENTER;
Expand Down Expand Up @@ -101,8 +101,8 @@ void GuitarExtension::process(uint8_t *inputData) {

_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_X].minimum = 15;
_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_X].center = 19;
_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_X].maximum = 26;
_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_X].useOffset = false;
_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_X].maximum = 20;
_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_X].useOffset = true;

_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_Y].minimum = 0;
_analogCalibration[WiiAnalogs::WII_ANALOG_RIGHT_Y].center = WII_GUITAR_GATE_CENTER;
Expand Down
8 changes: 6 additions & 2 deletions src/addons/wiiext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,8 @@ void WiiExtensionInput::update() {

triggerLeft = 0;
triggerRight = 0;

isAnalogTriggers = true;
} else if (wii->extensionType == WII_EXTENSION_TAIKO) {
buttonL = wii->getController()->buttons[TaikoButtons::TATA_KAT_LEFT];
buttonR = wii->getController()->buttons[TaikoButtons::TATA_KAT_RIGHT];
Expand All @@ -200,6 +202,8 @@ void WiiExtensionInput::update() {

triggerLeft = 0;
triggerRight = 0;

isAnalogTriggers = true;
} else if (wii->extensionType == WII_EXTENSION_TURNTABLE) {
buttonSelect = wii->getController()->buttons[WiiButtons::WII_BUTTON_MINUS];
buttonStart = wii->getController()->buttons[WiiButtons::WII_BUTTON_PLUS];
Expand Down Expand Up @@ -427,11 +431,11 @@ void WiiExtensionInput::updateAnalogState() {
break;
case WII_ANALOG_TYPE_LEFT_TRIGGER:
axisToChange = WII_ANALOG_TYPE_LEFT_TRIGGER;
adjustedValue = bounds(analogValue,minValue,maxValue);
adjustedValue = map(analogValue,minValue,maxValue,GAMEPAD_TRIGGER_MIN,GAMEPAD_TRIGGER_MAX);
break;
case WII_ANALOG_TYPE_RIGHT_TRIGGER:
axisToChange = WII_ANALOG_TYPE_RIGHT_TRIGGER;
adjustedValue = bounds(analogValue,minValue,maxValue);
adjustedValue = map(analogValue,minValue,maxValue,GAMEPAD_TRIGGER_MIN,GAMEPAD_TRIGGER_MAX);
break;
// advanced types
case WII_ANALOG_TYPE_LEFT_STICK_X_PLUS:
Expand Down