mirror of
https://github.com/yuzu-emu/yuzu-android.git
synced 2025-06-14 00:08:39 -05:00
yuzu: Add ring controller test button
This commit is contained in:
@ -4,7 +4,9 @@
|
||||
#include <memory>
|
||||
#include <QKeyEvent>
|
||||
#include <QMenu>
|
||||
#include <QMessageBox>
|
||||
#include <QTimer>
|
||||
#include <fmt/format.h>
|
||||
|
||||
#include "core/hid/emulated_controller.h"
|
||||
#include "core/hid/hid_core.h"
|
||||
@ -130,6 +132,13 @@ ConfigureRingController::ConfigureRingController(QWidget* parent,
|
||||
emulated_controller->SaveCurrentConfig();
|
||||
emulated_controller->EnableConfiguration();
|
||||
|
||||
Core::HID::ControllerUpdateCallback engine_callback{
|
||||
.on_change = [this](Core::HID::ControllerTriggerType type) { ControllerUpdate(type); },
|
||||
.is_npad_service = false,
|
||||
};
|
||||
callback_key = emulated_controller->SetCallback(engine_callback);
|
||||
is_controller_set = true;
|
||||
|
||||
LoadConfiguration();
|
||||
|
||||
for (int sub_button_id = 0; sub_button_id < ANALOG_SUB_BUTTONS_NUM; ++sub_button_id) {
|
||||
@ -187,6 +196,9 @@ ConfigureRingController::ConfigureRingController(QWidget* parent,
|
||||
connect(ui->restore_defaults_button, &QPushButton::clicked, this,
|
||||
&ConfigureRingController::RestoreDefaults);
|
||||
|
||||
connect(ui->enable_ring_controller_button, &QPushButton::clicked, this,
|
||||
&ConfigureRingController::EnableRingController);
|
||||
|
||||
timeout_timer->setSingleShot(true);
|
||||
connect(timeout_timer.get(), &QTimer::timeout, [this] { SetPollingResult({}, true); });
|
||||
|
||||
@ -202,7 +214,13 @@ ConfigureRingController::ConfigureRingController(QWidget* parent,
|
||||
}
|
||||
|
||||
ConfigureRingController::~ConfigureRingController() {
|
||||
emulated_controller->SetPollingMode(Common::Input::PollingMode::Active);
|
||||
emulated_controller->DisableConfiguration();
|
||||
|
||||
if (is_controller_set) {
|
||||
emulated_controller->DeleteCallback(callback_key);
|
||||
is_controller_set = false;
|
||||
}
|
||||
};
|
||||
|
||||
void ConfigureRingController::changeEvent(QEvent* event) {
|
||||
@ -256,6 +274,57 @@ void ConfigureRingController::RestoreDefaults() {
|
||||
UpdateUI();
|
||||
}
|
||||
|
||||
void ConfigureRingController::EnableRingController() {
|
||||
const auto dialog_title = tr("Error enabling ring input");
|
||||
|
||||
is_ring_enabled = false;
|
||||
ui->ring_controller_sensor_value->setText(tr("Not connected"));
|
||||
|
||||
if (!Settings::values.enable_joycon_driver) {
|
||||
QMessageBox::warning(this, dialog_title, tr("Direct Joycon driver is not enabled"));
|
||||
return;
|
||||
}
|
||||
|
||||
ui->enable_ring_controller_button->setEnabled(false);
|
||||
ui->enable_ring_controller_button->setText(tr("Configuring"));
|
||||
// SetPollingMode is blocking. Allow to update the button status before calling the command
|
||||
repaint();
|
||||
|
||||
const auto result = emulated_controller->SetPollingMode(Common::Input::PollingMode::Ring);
|
||||
switch (result) {
|
||||
case Common::Input::DriverResult::Success:
|
||||
is_ring_enabled = true;
|
||||
break;
|
||||
case Common::Input::DriverResult::NotSupported:
|
||||
QMessageBox::warning(this, dialog_title,
|
||||
tr("The current mapped device doesn't support the ring controller"));
|
||||
break;
|
||||
case Common::Input::DriverResult::NoDeviceDetected:
|
||||
QMessageBox::warning(this, dialog_title,
|
||||
tr("The current mapped device doesn't have a ring attached"));
|
||||
break;
|
||||
default:
|
||||
QMessageBox::warning(this, dialog_title,
|
||||
tr("Unexpected driver result %1").arg(static_cast<int>(result)));
|
||||
break;
|
||||
}
|
||||
ui->enable_ring_controller_button->setEnabled(true);
|
||||
ui->enable_ring_controller_button->setText(tr("Enable"));
|
||||
}
|
||||
|
||||
void ConfigureRingController::ControllerUpdate(Core::HID::ControllerTriggerType type) {
|
||||
if (!is_ring_enabled) {
|
||||
return;
|
||||
}
|
||||
if (type != Core::HID::ControllerTriggerType::RingController) {
|
||||
return;
|
||||
}
|
||||
|
||||
const auto value = emulated_controller->GetRingSensorValues();
|
||||
const auto tex_value = QString::fromStdString(fmt::format("{:.3f}", value.raw_value));
|
||||
ui->ring_controller_sensor_value->setText(tex_value);
|
||||
}
|
||||
|
||||
void ConfigureRingController::HandleClick(
|
||||
QPushButton* button, std::function<void(const Common::ParamPackage&)> new_input_setter,
|
||||
InputCommon::Polling::InputType type) {
|
||||
|
Reference in New Issue
Block a user