psyqo Multi-tap driver and example update #1815
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| MIT License | ||
|
|
||
| Copyright (c) 2025 PCSX-Redux authors | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
|
|
@@ -32,6 +32,7 @@ SOFTWARE. | |
| #include "psyqo/gpu.hh" | ||
| #include "psyqo/kernel.hh" | ||
| #include "psyqo/scene.hh" | ||
| #include "psyqo/xprintf.h" | ||
|
|
||
| namespace { | ||
|
|
||
|
|
@@ -44,7 +45,7 @@ class MultitapTest final : public psyqo::Application { | |
| void createScene() override; | ||
|
|
||
| public: | ||
| psyqo::Font<> m_font; | ||
| psyqo::AdvancedPad m_input; | ||
| }; | ||
|
|
||
|
|
@@ -57,9 +58,14 @@ class MultitapTestScene final : public psyqo::Scene { | |
|
|
||
| // Couple of small helpers. | ||
| void nextPad(); | ||
| void print(int x, int y, bool enabled, const char *format, ...); | ||
| void printPadList(int column); | ||
| void printPadStatus(psyqo::AdvancedPad::Pad pad, int column); | ||
| void printPadType(psyqo::AdvancedPad::Pad pad, int column, const char *name); | ||
|
|
||
| const char *c_padNames[8] = {"1a", "1b", "1c", "1d", "2a", "2b", "2c", "2d"}; | ||
| const psyqo::Color c_colorWhite = {{.r = 255, .g = 255, .b = 255}}; | ||
| const psyqo::Color c_colorGray = {{.r = 48, .g = 48, .b = 48}}; | ||
| }; | ||
|
|
||
| MultitapTest multitapTest; | ||
|
|
@@ -96,41 +102,108 @@ void MultitapTestScene::nextPad() { | |
| m_padIndex = psyqo::AdvancedPad::Pad::Pad1a; | ||
| } | ||
|
|
||
| void MultitapTestScene::print(int x, int y, bool enabled, const char *format, ...) { | ||
| va_list args; | ||
| const psyqo::Vertex pos = {{.x = int16_t(x * 8), .y = int16_t(y * 16)}}; | ||
| const psyqo::Color c = enabled ? c_colorWhite : c_colorGray; | ||
|
|
||
| va_start(args, format); | ||
| multitapTest.m_font.vprintf(multitapTest.gpu(), pos, c, format, args); | ||
| va_end(args); | ||
| } | ||
|
|
||
| void MultitapTestScene::printPadList(int column) { | ||
| // Print pad names and selected pad indicator | ||
| for (int i = 0; i < 8; i++) { | ||
| const auto pad = static_cast<psyqo::AdvancedPad::Pad>(i); | ||
| const bool isConnected = multitapTest.m_input.isPadConnected(pad); | ||
| const char padIndicator = (m_padIndex == pad && isConnected) ? '>' : ' '; | ||
| print(column, i + 2, isConnected, "%cPad %s", padIndicator, c_padNames[i]); | ||
| } | ||
| } | ||
|
|
||
| void MultitapTestScene::printPadStatus(psyqo::AdvancedPad::Pad pad, int column) { | ||
| const auto &input = multitapTest.m_input; | ||
| print(column + 0, 2, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Start), "Start"); | ||
| print(column + 0, 3, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Select), "Select"); | ||
|
|
||
| print(column + 0, 5, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::L1), "L1"); | ||
| print(column + 0, 6, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::R1), "R1"); | ||
| print(column + 0, 7, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::L2), "L2"); | ||
| print(column + 0, 8, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::R2), "R2"); | ||
| print(column + 0, 9, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::L3), "L3"); | ||
| print(column + 0, 10, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::R3), "R3"); | ||
|
|
||
| print(column + 10, 2, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Up), "Up"); | ||
| print(column + 10, 3, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Down), "Down"); | ||
| print(column + 10, 4, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Left), "Left"); | ||
| print(column + 10, 5, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Right), "Right"); | ||
|
|
||
| print(column + 10, 7, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Cross), "Cross"); | ||
| print(column + 10, 8, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Circle), "Circle"); | ||
| print(column + 10, 9, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Square), "Square"); | ||
| print(column + 10, 10, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Triangle), "Triangle"); | ||
|
|
||
| const auto padType = input.getPadType(pad); | ||
|
|
||
| // The lower 4-bits of the pad type indicate the number of half-words of pad data | ||
| // The 1st half-word is for the digital switches | ||
| const auto halfWords = padType & 0xf; | ||
| const auto adcBytes = (halfWords - 1) * 2; | ||
|
|
||
| if (halfWords > 1 && padType != psyqo::AdvancedPad::PadType::None) { | ||
| print(column + 0, 11, false, "ADC[0-%d]", adcBytes - 1); | ||
|
|
||
| for (int i = 0; i < adcBytes && i < 4; i++) { | ||
| print(column + 10 + (i * 3), 11, true, "%02X ", input.getAdc(pad, i)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| void MultitapTestScene::printPadType(psyqo::AdvancedPad::Pad pad, int column, const char *name) { | ||
| const auto padType = multitapTest.m_input.getPadType(pad); | ||
| const char *padTypeStr; | ||
|
|
||
| switch (padType) { | ||
| case psyqo::AdvancedPad::PadType::Mouse: | ||
| padTypeStr = "Mouse"; | ||
| break; | ||
| case psyqo::AdvancedPad::PadType::NegCon: | ||
| padTypeStr = "NegCon"; | ||
| break; | ||
| case psyqo::AdvancedPad::PadType::KonamiLightgun: | ||
| padTypeStr = "KonamiLightgun"; | ||
| break; | ||
| case psyqo::AdvancedPad::PadType::DigitalPad: | ||
| padTypeStr = "DigitalPad"; | ||
| break; | ||
| case psyqo::AdvancedPad::PadType::AnalogStick: | ||
| padTypeStr = "AnalogStick"; | ||
| break; | ||
| case psyqo::AdvancedPad::PadType::NamcoLightgun: | ||
| padTypeStr = "NamcoLightgun"; | ||
| break; | ||
| case psyqo::AdvancedPad::PadType::AnalogPad: | ||
| padTypeStr = "AnalogPad"; | ||
| break; | ||
| case psyqo::AdvancedPad::PadType::Multitap: | ||
| padTypeStr = "Multitap"; | ||
| break; | ||
| case psyqo::AdvancedPad::PadType::Jogcon: | ||
| padTypeStr = "Jogcon"; | ||
| break; | ||
| case psyqo::AdvancedPad::PadType::ConfigMode: | ||
| padTypeStr = "ConfigMode"; | ||
| break; | ||
| case psyqo::AdvancedPad::PadType::None: | ||
| padTypeStr = "None"; | ||
| break; | ||
| default: | ||
| padTypeStr = "Unknown"; | ||
| break; | ||
| } | ||
| print(column + 0, 13, true, name); | ||
| print(column + 10, 13, true, padTypeStr); | ||
| } | ||
|
|
||
| void MultitapTestScene::start(Scene::StartReason reason) { | ||
|
|
@@ -144,20 +217,9 @@ void MultitapTestScene::start(Scene::StartReason reason) { | |
| void MultitapTestScene::frame() { | ||
| multitapTest.gpu().clear(); | ||
|
|
||
| printPadList(1); | ||
| printPadStatus(static_cast<psyqo::AdvancedPad::Pad>(m_padIndex), 16); | ||
| printPadType(static_cast<psyqo::AdvancedPad::Pad>(m_padIndex), 16, "Type"); | ||
| } | ||
|
|
||
| int main() { return multitapTest.run(); } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might be prettier to use
std::to_underlying(pad)instead of the static_cast throughout this file. It comes from<utility>, and it's been added in C++23.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's a bit shorter, but looks like we'd need to bump the whole SDK version for that change(currently on C++ 20). I'm ok with working around this with the casts for now if changing the minimum version is undesirable.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah.
We could theoretically polyfill it somewhere in the codebase: https://godbolt.org/z/7r4T6nq3e
As you wish, really.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I gave this a shot in the latest commit