Skip to content

psyqo Multi-tap driver and example update #1815

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

Merged
merged 23 commits into from
Feb 27, 2025
Merged

psyqo Multi-tap driver and example update #1815

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6ce813b
Add getters for adc+pad type, update multitap example
johnbaumann Dec 13, 2024
de152b9
Fix(?) adc numbering, adc styling
johnbaumann Dec 13, 2024
07b6a96
Add getter for raw halfword. Fix+tidy example
johnbaumann Dec 21, 2024
0631089
Merge branch 'grumpycoders:main' into psyqo_multitap_additions
johnbaumann Dec 31, 2024
929e76f
Bump copyright, use vprintf, play with some logic
johnbaumann Jan 8, 2025
e73f7fd
Address some of the wascally wabbit's nitpicks
johnbaumann Jan 8, 2025
7b4f815
Merge branch 'main' into psyqo_multitap_additions
johnbaumann Jan 8, 2025
af630c4
Fix documenation mistake, woops.
johnbaumann Jan 8, 2025
f3ee66e
Change Pad to enum class, add casts, more doc
johnbaumann Jan 9, 2025
131796e
Kill other adc getters, too redundant.
johnbaumann Jan 9, 2025
2e21c2f
Sneaking in more changes... Try to improve code readability
johnbaumann Jan 10, 2025
3215462
The rabbit is right... ugh
johnbaumann Jan 10, 2025
ceea701
Merge branch 'main' into psyqo_multitap_additions
johnbaumann Jan 10, 2025
a1a2ae7
Add fishingcon, more adc, resize PadData
johnbaumann Jan 23, 2025
3b85d77
Fix for analog pad with LED previously config'd off, bad pad ID
johnbaumann Feb 16, 2025
791b520
Merge branch 'main' into psyqo_multitap_additions
johnbaumann Feb 16, 2025
98aa616
Rename and add some documentation, small tweaks
johnbaumann Feb 20, 2025
6c79a91
Merge branch 'main' into psyqo_multitap_additions
johnbaumann Feb 20, 2025
c7ecace
Merge branch 'psyqo_multitap_additions' of https://github.com/johnbau…
johnbaumann Feb 20, 2025
6ee8271
Revert data type in processChanges
johnbaumann Feb 26, 2025
c61e2fb
Merge branch 'main' into psyqo_multitap_additions
johnbaumann Feb 27, 2025
0b1141a
Polyfill std::to_underlying and convert several static_casts
johnbaumann Feb 27, 2025
588f68d
Update utility-polyfill.h
johnbaumann Feb 27, 2025
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
120 changes: 104 additions & 16 deletions src/mips/psyqo/advancedpad.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

MIT License

Copyright (c) 2024 PCSX-Redux authors
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
Expand Down Expand Up @@ -63,21 +63,6 @@ class AdvancedPad {
Square = 15,
};

enum Command : uint8_t {
PadSelect = 0x01,
ReadPad = 0x42, // 'B' Read Buttons AND analog inputs
// Config mode commands
ToggleConfigMode = 0x43, // 'C' Enter/Exit Configuration Mode
SetLED = 0x44, // 'D' Set LED State (analog mode on/off)
GetLED = 0x45, // 'E' Get LED State (and whatever values)
GetMotorInfo = 0x46, // 'F' Allegedly get info about a motor
GetMotorList = 0x47, // 'G' Allegedly get list of motors
GetMotorState = 0x48, // 'H' Allegedly get motor state
GetSupportedModes = 0x4c, // 'L' Allegedly get supported modes
ConfigRequestFormat = 0x4d, // 'M' Allegedly configure poll request format
ConfigResponseFormat = 0x4f, // 'O' Allegedly configure poll response format
};

enum PadType : uint8_t {
Mouse = 0x12, // (two button mouse)
NegCon = 0x23, // (steering twist/wheel/paddle)
Expand Down Expand Up @@ -157,7 +142,110 @@ class AdvancedPad {
*/
bool isButtonPressed(Pad pad, Button button) const { return (m_padData[pad][1] & (1 << button)) == 0; }

/**
* @brief Returns the state of Analog Input 0 (if any).
*
* @details Returns the state of Analog Input 0 (if any).
*
* @param pad The pad to query.
* @return The state of the Analog Input.
*/
uint8_t getAdc0(Pad pad) const { return m_padData[pad][2] & 0xff; }

/**
* @brief Returns the state of Analog Input 1 (if any).
*
* @details Returns the state of Analog Input 1 (if any).
*
* @param pad The pad to query.
* @return The state of the Analog Input.
*/
uint8_t getAdc1(Pad pad) const { return m_padData[pad][2] >> 8; }

/**
* @brief Returns the state of Analog Input 2 (if any).
*
* @details Returns the state of Analog Input 2 (if any).
*
* @param pad The pad to query.
* @return The state of the Analog Input.
*/
uint8_t getAdc2(Pad pad) const { return m_padData[pad][3] & 0xff; }

/**
* @brief Returns the state of Analog Input 3 (if any).
*
* @details Returns the state of Analog Input 3 (if any).
*
* @param pad The pad to query.
* @return The state of the Analog Input.
*/
uint8_t getAdc3(Pad pad) const { return m_padData[pad][3] >> 8; }

/**
* @brief Returns the state of an Analog Input.
*
* @details Returns the state of an Analog Input.
*
* @param pad The pad to query.
* @param index The index of the Analog Input.
* @return The state of the Analog Input.
*/
uint8_t getAdc(Pad pad, unsigned int index) const {
switch (index) {
case 0:
return getAdc0(pad);
case 1:
return getAdc1(pad);
case 2:
return getAdc2(pad);
case 3:
return getAdc3(pad);
default:
return 0;
}
}

/**
* @brief Returns raw pad data as a 16-bit value.
*
* @details Returns the halfword value for the requested index of the given pad index.
*
* @param pad The pad to query.
* @param index The index of the halfword.
* @return The value of the halfword.
*/

uint16_t getHalfword(Pad pad, unsigned int index) const {
return m_padData[pad][index % 4];
}

/**
* @brief Returns the type of the pad.
*
* @details Returns the type of the pad.
*
* @param pad The pad to query.
* @return The type of the pad.
*/
uint8_t getPadType(Pad pad) const { return m_padData[pad][0] >> 8; }

private:
enum Command : uint8_t {
PadSelect = 0x01,
ReadPad = 0x42, // 'B' Read Buttons AND analog inputs
// Config mode commands
ToggleConfigMode = 0x43, // 'C' Enter/Exit Configuration Mode
SetLED = 0x44, // 'D' Set LED State (analog mode on/off)
GetLED = 0x45, // 'E' Get LED State (and whatever values)
GetMotorInfo = 0x46, // 'F' Allegedly get info about a motor
GetMotorList = 0x47, // 'G' Allegedly get list of motors
GetMotorState = 0x48, // 'H' Allegedly get motor state
GetSupportedModes = 0x4c, // 'L' Allegedly get supported modes
ConfigRequestFormat = 0x4d, // 'M' Allegedly configure poll request format
ConfigResponseFormat = 0x4f, // 'O' Allegedly configure poll response format
};

void busyLoop(unsigned delay) {
unsigned cycles = 0;
while (++cycles < delay) asm("");
Expand Down
158 changes: 110 additions & 48 deletions src/mips/psyqo/examples/multitap/multitap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

MIT License

Copyright (c) 2024 PCSX-Redux authors
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
Expand Down Expand Up @@ -32,6 +32,7 @@
#include "psyqo/gpu.hh"
#include "psyqo/kernel.hh"
#include "psyqo/scene.hh"
#include "psyqo/xprintf.h"

namespace {

Expand All @@ -44,7 +45,7 @@
void createScene() override;

public:
psyqo::Font<1> m_font;
psyqo::Font<> m_font;
psyqo::AdvancedPad m_input;
};

Expand All @@ -57,9 +58,10 @@

// Couple of small helpers.
void nextPad();
void print(int x, int y, bool enabled, const char *text);
void printPadStatus(psyqo::AdvancedPad::Pad pad, int column, const char *name);
void printPadConnectionStatus(psyqo::AdvancedPad::Pad pad, int row, const char *name);
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);
};

MultitapTest multitapTest;
Expand Down Expand Up @@ -96,41 +98,112 @@
m_padIndex = psyqo::AdvancedPad::Pad::Pad1a;
}

void MultitapTestScene::print(int x, int y, bool enabled, const char *text) {
y += 2;
psyqo::Vertex pos = {{.x = int16_t(x * 8), .y = int16_t(y * 16)}};
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)}};
static const auto WHITE = psyqo::Color{{.r = 255, .g = 255, .b = 255}};
static const auto GRAY = psyqo::Color{{.r = 48, .g = 48, .b = 48}};
psyqo::Color c = enabled ? WHITE : GRAY;
multitapTest.m_font.print(multitapTest.gpu(), text, pos, c);
const psyqo::Color c = enabled ? WHITE : GRAY;

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
static const char *padNames[] = {"1a", "1b", "1c", "1d", "2a", "2b", "2c", "2d"};

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, padNames[i]);
}
}

void MultitapTestScene::printPadConnectionStatus(psyqo::AdvancedPad::Pad pad, int row, const char *name) {
auto &input = multitapTest.m_input;
print(8, row, input.isPadConnected(pad), name);
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::printPadStatus(psyqo::AdvancedPad::Pad pad, int column, const char *name) {
auto &input = multitapTest.m_input;
print(column + 0, 0, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Start), "Start");
print(column + 0, 1, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Select), "Select");

print(column + 0, 3, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::L1), "L1");
print(column + 0, 4, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::R1), "R1");
print(column + 0, 5, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::L2), "L2");
print(column + 0, 6, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::R2), "R2");
print(column + 0, 7, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::L3), "L3");
print(column + 0, 8, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::R3), "R3");

print(column + 10, 0, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Up), "Up");
print(column + 10, 1, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Down), "Down");
print(column + 10, 2, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Left), "Left");
print(column + 10, 3, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Right), "Right");

print(column + 10, 5, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Cross), "Cross");
print(column + 10, 6, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Circle), "Circle");
print(column + 10, 7, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Square), "Square");
print(column + 10, 8, input.isButtonPressed(pad, psyqo::AdvancedPad::Button::Triangle), "Triangle");
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);

Check warning on line 206 in src/mips/psyqo/examples/multitap/multitap.cpp

View check run for this annotation

CodeScene Delta Analysis / CodeScene Cloud Delta Analysis (main)

❌ New issue: Complex Method 

MultitapTestScene::printPadType has a cyclomatic complexity of 13, threshold = 9. This function has many conditional statements (e.g. if, for, while), leading to lower code health. Avoid adding more conditionals and code to it without refactoring.
}

void MultitapTestScene::start(Scene::StartReason reason) {
Expand All @@ -144,20 +217,9 @@
void MultitapTestScene::frame() {
multitapTest.gpu().clear();

if (multitapTest.m_input.isPadConnected(m_padIndex)) {
print(7, m_padIndex, true, ">");
}

printPadConnectionStatus(psyqo::AdvancedPad::Pad1a, 0, "Pad 1a");
printPadConnectionStatus(psyqo::AdvancedPad::Pad1b, 1, "Pad 1b");
printPadConnectionStatus(psyqo::AdvancedPad::Pad1c, 2, "Pad 1c");
printPadConnectionStatus(psyqo::AdvancedPad::Pad1d, 3, "Pad 1d");
printPadConnectionStatus(psyqo::AdvancedPad::Pad2a, 4, "Pad 2a");
printPadConnectionStatus(psyqo::AdvancedPad::Pad2b, 5, "Pad 2b");
printPadConnectionStatus(psyqo::AdvancedPad::Pad2c, 6, "Pad 2c");
printPadConnectionStatus(psyqo::AdvancedPad::Pad2d, 7, "Pad 2d");

printPadStatus(static_cast<psyqo::AdvancedPad::Pad>(m_padIndex), 20, "Pad Status");
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(); }
Loading