early-access version 3258
This commit is contained in:
parent
9a6ba6cbdc
commit
82996261c6
24 changed files with 480 additions and 288 deletions
|
@ -1,7 +1,7 @@
|
||||||
yuzu emulator early access
|
yuzu emulator early access
|
||||||
=============
|
=============
|
||||||
|
|
||||||
This is the source code for early-access 3256.
|
This is the source code for early-access 3258.
|
||||||
|
|
||||||
## Legal Notice
|
## Legal Notice
|
||||||
|
|
||||||
|
|
|
@ -64,20 +64,19 @@ enum class CameraFormat {
|
||||||
None,
|
None,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Vibration reply from the controller
|
// Different results that can happen from a device request
|
||||||
enum class VibrationError {
|
enum class DriverResult {
|
||||||
None,
|
Success,
|
||||||
|
WrongReply,
|
||||||
|
Timeout,
|
||||||
|
UnsupportedControllerType,
|
||||||
|
HandleInUse,
|
||||||
|
ErrorReadingData,
|
||||||
|
ErrorWritingData,
|
||||||
|
NoDeviceDetected,
|
||||||
|
InvalidHandle,
|
||||||
NotSupported,
|
NotSupported,
|
||||||
Disabled,
|
Disabled,
|
||||||
InvalidHandle,
|
|
||||||
Unknown,
|
|
||||||
};
|
|
||||||
|
|
||||||
// Polling mode reply from the controller
|
|
||||||
enum class PollingError {
|
|
||||||
None,
|
|
||||||
NotSupported,
|
|
||||||
InvalidHandle,
|
|
||||||
Unknown,
|
Unknown,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -94,13 +93,6 @@ enum class NfcState {
|
||||||
Unknown,
|
Unknown,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Ir camera reply from the controller
|
|
||||||
enum class CameraError {
|
|
||||||
None,
|
|
||||||
NotSupported,
|
|
||||||
Unknown,
|
|
||||||
};
|
|
||||||
|
|
||||||
// Hint for amplification curve to be used
|
// Hint for amplification curve to be used
|
||||||
enum class VibrationAmplificationType {
|
enum class VibrationAmplificationType {
|
||||||
Linear,
|
Linear,
|
||||||
|
@ -339,22 +331,24 @@ class OutputDevice {
|
||||||
public:
|
public:
|
||||||
virtual ~OutputDevice() = default;
|
virtual ~OutputDevice() = default;
|
||||||
|
|
||||||
virtual void SetLED([[maybe_unused]] const LedStatus& led_status) {}
|
virtual DriverResult SetLED([[maybe_unused]] const LedStatus& led_status) {
|
||||||
|
return DriverResult::NotSupported;
|
||||||
|
}
|
||||||
|
|
||||||
virtual VibrationError SetVibration([[maybe_unused]] const VibrationStatus& vibration_status) {
|
virtual DriverResult SetVibration([[maybe_unused]] const VibrationStatus& vibration_status) {
|
||||||
return VibrationError::NotSupported;
|
return DriverResult::NotSupported;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool IsVibrationEnabled() {
|
virtual bool IsVibrationEnabled() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual PollingError SetPollingMode([[maybe_unused]] PollingMode polling_mode) {
|
virtual DriverResult SetPollingMode([[maybe_unused]] PollingMode polling_mode) {
|
||||||
return PollingError::NotSupported;
|
return DriverResult::NotSupported;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual CameraError SetCameraFormat([[maybe_unused]] CameraFormat camera_format) {
|
virtual DriverResult SetCameraFormat([[maybe_unused]] CameraFormat camera_format) {
|
||||||
return CameraError::NotSupported;
|
return DriverResult::NotSupported;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual NfcState SupportsNfc() const {
|
virtual NfcState SupportsNfc() const {
|
||||||
|
|
|
@ -1176,7 +1176,7 @@ bool EmulatedController::SetVibration(std::size_t device_index, VibrationValue v
|
||||||
.type = type,
|
.type = type,
|
||||||
};
|
};
|
||||||
return output_devices[device_index]->SetVibration(status) ==
|
return output_devices[device_index]->SetVibration(status) ==
|
||||||
Common::Input::VibrationError::None;
|
Common::Input::DriverResult::Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool EmulatedController::IsVibrationEnabled(std::size_t device_index) {
|
bool EmulatedController::IsVibrationEnabled(std::size_t device_index) {
|
||||||
|
@ -1198,7 +1198,8 @@ bool EmulatedController::IsVibrationEnabled(std::size_t device_index) {
|
||||||
return output_devices[device_index]->IsVibrationEnabled();
|
return output_devices[device_index]->IsVibrationEnabled();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool EmulatedController::SetPollingMode(Common::Input::PollingMode polling_mode) {
|
Common::Input::DriverResult EmulatedController::SetPollingMode(
|
||||||
|
Common::Input::PollingMode polling_mode) {
|
||||||
LOG_INFO(Service_HID, "Set polling mode {}", polling_mode);
|
LOG_INFO(Service_HID, "Set polling mode {}", polling_mode);
|
||||||
auto& output_device = output_devices[static_cast<std::size_t>(DeviceIndex::Right)];
|
auto& output_device = output_devices[static_cast<std::size_t>(DeviceIndex::Right)];
|
||||||
auto& nfc_output_device = output_devices[3];
|
auto& nfc_output_device = output_devices[3];
|
||||||
|
@ -1206,8 +1207,11 @@ bool EmulatedController::SetPollingMode(Common::Input::PollingMode polling_mode)
|
||||||
const auto virtual_nfc_result = nfc_output_device->SetPollingMode(polling_mode);
|
const auto virtual_nfc_result = nfc_output_device->SetPollingMode(polling_mode);
|
||||||
const auto mapped_nfc_result = output_device->SetPollingMode(polling_mode);
|
const auto mapped_nfc_result = output_device->SetPollingMode(polling_mode);
|
||||||
|
|
||||||
return virtual_nfc_result == Common::Input::PollingError::None ||
|
if (virtual_nfc_result == Common::Input::DriverResult::Success) {
|
||||||
mapped_nfc_result == Common::Input::PollingError::None;
|
return virtual_nfc_result;
|
||||||
|
}
|
||||||
|
|
||||||
|
return mapped_nfc_result;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool EmulatedController::SetCameraFormat(
|
bool EmulatedController::SetCameraFormat(
|
||||||
|
@ -1218,13 +1222,13 @@ bool EmulatedController::SetCameraFormat(
|
||||||
auto& camera_output_device = output_devices[2];
|
auto& camera_output_device = output_devices[2];
|
||||||
|
|
||||||
if (right_output_device->SetCameraFormat(static_cast<Common::Input::CameraFormat>(
|
if (right_output_device->SetCameraFormat(static_cast<Common::Input::CameraFormat>(
|
||||||
camera_format)) == Common::Input::CameraError::None) {
|
camera_format)) == Common::Input::DriverResult::Success) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fallback to Qt camera if native device doesn't have support
|
// Fallback to Qt camera if native device doesn't have support
|
||||||
return camera_output_device->SetCameraFormat(static_cast<Common::Input::CameraFormat>(
|
return camera_output_device->SetCameraFormat(static_cast<Common::Input::CameraFormat>(
|
||||||
camera_format)) == Common::Input::CameraError::None;
|
camera_format)) == Common::Input::DriverResult::Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
Common::ParamPackage EmulatedController::GetRingParam() const {
|
Common::ParamPackage EmulatedController::GetRingParam() const {
|
||||||
|
|
|
@ -363,9 +363,9 @@ public:
|
||||||
/**
|
/**
|
||||||
* Sets the desired data to be polled from a controller
|
* Sets the desired data to be polled from a controller
|
||||||
* @param polling_mode type of input desired buttons, gyro, nfc, ir, etc.
|
* @param polling_mode type of input desired buttons, gyro, nfc, ir, etc.
|
||||||
* @return true if SetPollingMode was successfull
|
* @return driver result from this command
|
||||||
*/
|
*/
|
||||||
bool SetPollingMode(Common::Input::PollingMode polling_mode);
|
Common::Input::DriverResult SetPollingMode(Common::Input::PollingMode polling_mode);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the desired camera format to be polled from a controller
|
* Sets the desired camera format to be polled from a controller
|
||||||
|
|
|
@ -130,7 +130,8 @@ Result NfcDevice::StartDetection(NFP::TagProtocol allowed_protocol) {
|
||||||
return WrongDeviceState;
|
return WrongDeviceState;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!npad_device->SetPollingMode(Common::Input::PollingMode::NFC)) {
|
if (npad_device->SetPollingMode(Common::Input::PollingMode::NFC) !=
|
||||||
|
Common::Input::DriverResult::Success) {
|
||||||
LOG_ERROR(Service_NFC, "Nfc not supported");
|
LOG_ERROR(Service_NFC, "Nfc not supported");
|
||||||
return NfcDisabled;
|
return NfcDisabled;
|
||||||
}
|
}
|
||||||
|
|
|
@ -152,7 +152,8 @@ Result NfpDevice::StartDetection(TagProtocol allowed_protocol) {
|
||||||
return WrongDeviceState;
|
return WrongDeviceState;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!npad_device->SetPollingMode(Common::Input::PollingMode::NFC)) {
|
if (npad_device->SetPollingMode(Common::Input::PollingMode::NFC) !=
|
||||||
|
Common::Input::DriverResult::Success) {
|
||||||
LOG_ERROR(Service_NFP, "Nfc not supported");
|
LOG_ERROR(Service_NFP, "Nfc not supported");
|
||||||
return NfcDisabled;
|
return NfcDisabled;
|
||||||
}
|
}
|
||||||
|
|
|
@ -72,11 +72,11 @@ std::size_t Camera::getImageHeight() const {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Common::Input::CameraError Camera::SetCameraFormat(
|
Common::Input::DriverResult Camera::SetCameraFormat(
|
||||||
[[maybe_unused]] const PadIdentifier& identifier_,
|
[[maybe_unused]] const PadIdentifier& identifier_,
|
||||||
const Common::Input::CameraFormat camera_format) {
|
const Common::Input::CameraFormat camera_format) {
|
||||||
status.format = camera_format;
|
status.format = camera_format;
|
||||||
return Common::Input::CameraError::None;
|
return Common::Input::DriverResult::Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace InputCommon
|
} // namespace InputCommon
|
||||||
|
|
|
@ -22,7 +22,7 @@ public:
|
||||||
std::size_t getImageWidth() const;
|
std::size_t getImageWidth() const;
|
||||||
std::size_t getImageHeight() const;
|
std::size_t getImageHeight() const;
|
||||||
|
|
||||||
Common::Input::CameraError SetCameraFormat(const PadIdentifier& identifier_,
|
Common::Input::DriverResult SetCameraFormat(const PadIdentifier& identifier_,
|
||||||
Common::Input::CameraFormat camera_format) override;
|
Common::Input::CameraFormat camera_format) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
@ -324,7 +324,7 @@ bool GCAdapter::GetGCEndpoint(libusb_device* device) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
Common::Input::VibrationError GCAdapter::SetVibration(
|
Common::Input::DriverResult GCAdapter::SetVibration(
|
||||||
const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) {
|
const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) {
|
||||||
const auto mean_amplitude = (vibration.low_amplitude + vibration.high_amplitude) * 0.5f;
|
const auto mean_amplitude = (vibration.low_amplitude + vibration.high_amplitude) * 0.5f;
|
||||||
const auto processed_amplitude =
|
const auto processed_amplitude =
|
||||||
|
@ -333,9 +333,9 @@ Common::Input::VibrationError GCAdapter::SetVibration(
|
||||||
pads[identifier.port].rumble_amplitude = processed_amplitude;
|
pads[identifier.port].rumble_amplitude = processed_amplitude;
|
||||||
|
|
||||||
if (!rumble_enabled) {
|
if (!rumble_enabled) {
|
||||||
return Common::Input::VibrationError::Disabled;
|
return Common::Input::DriverResult::Disabled;
|
||||||
}
|
}
|
||||||
return Common::Input::VibrationError::None;
|
return Common::Input::DriverResult::Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GCAdapter::IsVibrationEnabled([[maybe_unused]] const PadIdentifier& identifier) {
|
bool GCAdapter::IsVibrationEnabled([[maybe_unused]] const PadIdentifier& identifier) {
|
||||||
|
|
|
@ -25,7 +25,7 @@ public:
|
||||||
explicit GCAdapter(std::string input_engine_);
|
explicit GCAdapter(std::string input_engine_);
|
||||||
~GCAdapter() override;
|
~GCAdapter() override;
|
||||||
|
|
||||||
Common::Input::VibrationError SetVibration(
|
Common::Input::DriverResult SetVibration(
|
||||||
const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) override;
|
const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) override;
|
||||||
|
|
||||||
bool IsVibrationEnabled(const PadIdentifier& identifier) override;
|
bool IsVibrationEnabled(const PadIdentifier& identifier) override;
|
||||||
|
|
|
@ -233,8 +233,8 @@ bool Joycons::IsVibrationEnabled(const PadIdentifier& identifier) {
|
||||||
return handle->IsVibrationEnabled();
|
return handle->IsVibrationEnabled();
|
||||||
}
|
}
|
||||||
|
|
||||||
Common::Input::VibrationError Joycons::SetVibration(
|
Common::Input::DriverResult Joycons::SetVibration(const PadIdentifier& identifier,
|
||||||
const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) {
|
const Common::Input::VibrationStatus& vibration) {
|
||||||
const Joycon::VibrationValue native_vibration{
|
const Joycon::VibrationValue native_vibration{
|
||||||
.low_amplitude = vibration.low_amplitude,
|
.low_amplitude = vibration.low_amplitude,
|
||||||
.low_frequency = vibration.low_frequency,
|
.low_frequency = vibration.low_frequency,
|
||||||
|
@ -243,32 +243,31 @@ Common::Input::VibrationError Joycons::SetVibration(
|
||||||
};
|
};
|
||||||
auto handle = GetHandle(identifier);
|
auto handle = GetHandle(identifier);
|
||||||
if (handle == nullptr) {
|
if (handle == nullptr) {
|
||||||
return Common::Input::VibrationError::InvalidHandle;
|
return Common::Input::DriverResult::InvalidHandle;
|
||||||
}
|
}
|
||||||
|
|
||||||
handle->SetVibration(native_vibration);
|
handle->SetVibration(native_vibration);
|
||||||
return Common::Input::VibrationError::None;
|
return Common::Input::DriverResult::Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Joycons::SetLeds(const PadIdentifier& identifier, const Common::Input::LedStatus& led_status) {
|
Common::Input::DriverResult Joycons::SetLeds(const PadIdentifier& identifier,
|
||||||
|
const Common::Input::LedStatus& led_status) {
|
||||||
auto handle = GetHandle(identifier);
|
auto handle = GetHandle(identifier);
|
||||||
if (handle == nullptr) {
|
if (handle == nullptr) {
|
||||||
return;
|
return Common::Input::DriverResult::InvalidHandle;
|
||||||
}
|
}
|
||||||
int led_config = led_status.led_1 ? 1 : 0;
|
int led_config = led_status.led_1 ? 1 : 0;
|
||||||
led_config += led_status.led_2 ? 2 : 0;
|
led_config += led_status.led_2 ? 2 : 0;
|
||||||
led_config += led_status.led_3 ? 4 : 0;
|
led_config += led_status.led_3 ? 4 : 0;
|
||||||
led_config += led_status.led_4 ? 8 : 0;
|
led_config += led_status.led_4 ? 8 : 0;
|
||||||
|
|
||||||
const auto result = handle->SetLedConfig(static_cast<u8>(led_config));
|
return static_cast<Common::Input::DriverResult>(
|
||||||
if (result != Joycon::DriverResult::Success) {
|
handle->SetLedConfig(static_cast<u8>(led_config)));
|
||||||
LOG_ERROR(Input, "Failed to set led config");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Common::Input::CameraError Joycons::SetCameraFormat(const PadIdentifier& identifier_,
|
Common::Input::DriverResult Joycons::SetCameraFormat(const PadIdentifier& identifier_,
|
||||||
Common::Input::CameraFormat camera_format) {
|
Common::Input::CameraFormat camera_format) {
|
||||||
return Common::Input::CameraError::NotSupported;
|
return Common::Input::DriverResult::NotSupported;
|
||||||
};
|
};
|
||||||
|
|
||||||
Common::Input::NfcState Joycons::SupportsNfc(const PadIdentifier& identifier_) const {
|
Common::Input::NfcState Joycons::SupportsNfc(const PadIdentifier& identifier_) const {
|
||||||
|
@ -280,32 +279,30 @@ Common::Input::NfcState Joycons::WriteNfcData(const PadIdentifier& identifier_,
|
||||||
return Common::Input::NfcState::NotSupported;
|
return Common::Input::NfcState::NotSupported;
|
||||||
};
|
};
|
||||||
|
|
||||||
Common::Input::PollingError Joycons::SetPollingMode(const PadIdentifier& identifier,
|
Common::Input::DriverResult Joycons::SetPollingMode(const PadIdentifier& identifier,
|
||||||
const Common::Input::PollingMode polling_mode) {
|
const Common::Input::PollingMode polling_mode) {
|
||||||
auto handle = GetHandle(identifier);
|
auto handle = GetHandle(identifier);
|
||||||
if (handle == nullptr) {
|
if (handle == nullptr) {
|
||||||
LOG_ERROR(Input, "Invalid handle {}", identifier.port);
|
LOG_ERROR(Input, "Invalid handle {}", identifier.port);
|
||||||
return Common::Input::PollingError::InvalidHandle;
|
return Common::Input::DriverResult::InvalidHandle;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (polling_mode) {
|
switch (polling_mode) {
|
||||||
case Common::Input::PollingMode::NFC:
|
case Common::Input::PollingMode::NFC:
|
||||||
handle->SetNfcMode();
|
return static_cast<Common::Input::DriverResult>(handle->SetNfcMode());
|
||||||
break;
|
break;
|
||||||
case Common::Input::PollingMode::Active:
|
case Common::Input::PollingMode::Active:
|
||||||
handle->SetActiveMode();
|
return static_cast<Common::Input::DriverResult>(handle->SetActiveMode());
|
||||||
break;
|
break;
|
||||||
case Common::Input::PollingMode::Pasive:
|
case Common::Input::PollingMode::Pasive:
|
||||||
handle->SetPasiveMode();
|
return static_cast<Common::Input::DriverResult>(handle->SetPasiveMode());
|
||||||
break;
|
break;
|
||||||
case Common::Input::PollingMode::Ring:
|
case Common::Input::PollingMode::Ring:
|
||||||
handle->SetRingConMode();
|
return static_cast<Common::Input::DriverResult>(handle->SetRingConMode());
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return Common::Input::PollingError::NotSupported;
|
return Common::Input::DriverResult::NotSupported;
|
||||||
}
|
}
|
||||||
|
|
||||||
return Common::Input::PollingError::None;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Joycons::OnBatteryUpdate(std::size_t port, Joycon::ControllerType type,
|
void Joycons::OnBatteryUpdate(std::size_t port, Joycon::ControllerType type,
|
||||||
|
|
|
@ -29,20 +29,20 @@ public:
|
||||||
~Joycons();
|
~Joycons();
|
||||||
|
|
||||||
bool IsVibrationEnabled(const PadIdentifier& identifier) override;
|
bool IsVibrationEnabled(const PadIdentifier& identifier) override;
|
||||||
Common::Input::VibrationError SetVibration(
|
Common::Input::DriverResult SetVibration(
|
||||||
const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) override;
|
const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) override;
|
||||||
|
|
||||||
void SetLeds(const PadIdentifier& identifier,
|
Common::Input::DriverResult SetLeds(const PadIdentifier& identifier,
|
||||||
const Common::Input::LedStatus& led_status) override;
|
const Common::Input::LedStatus& led_status) override;
|
||||||
|
|
||||||
Common::Input::CameraError SetCameraFormat(const PadIdentifier& identifier_,
|
Common::Input::DriverResult SetCameraFormat(const PadIdentifier& identifier_,
|
||||||
Common::Input::CameraFormat camera_format) override;
|
Common::Input::CameraFormat camera_format) override;
|
||||||
|
|
||||||
Common::Input::NfcState SupportsNfc(const PadIdentifier& identifier_) const override;
|
Common::Input::NfcState SupportsNfc(const PadIdentifier& identifier_) const override;
|
||||||
Common::Input::NfcState WriteNfcData(const PadIdentifier& identifier_,
|
Common::Input::NfcState WriteNfcData(const PadIdentifier& identifier_,
|
||||||
const std::vector<u8>& data) override;
|
const std::vector<u8>& data) override;
|
||||||
|
|
||||||
Common::Input::PollingError SetPollingMode(
|
Common::Input::DriverResult SetPollingMode(
|
||||||
const PadIdentifier& identifier, const Common::Input::PollingMode polling_mode) override;
|
const PadIdentifier& identifier, const Common::Input::PollingMode polling_mode) override;
|
||||||
|
|
||||||
/// Used for automapping features
|
/// Used for automapping features
|
||||||
|
|
|
@ -545,7 +545,7 @@ std::vector<Common::ParamPackage> SDLDriver::GetInputDevices() const {
|
||||||
return devices;
|
return devices;
|
||||||
}
|
}
|
||||||
|
|
||||||
Common::Input::VibrationError SDLDriver::SetVibration(
|
Common::Input::DriverResult SDLDriver::SetVibration(
|
||||||
const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) {
|
const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) {
|
||||||
const auto joystick =
|
const auto joystick =
|
||||||
GetSDLJoystickByGUID(identifier.guid.RawString(), static_cast<int>(identifier.port));
|
GetSDLJoystickByGUID(identifier.guid.RawString(), static_cast<int>(identifier.port));
|
||||||
|
@ -579,7 +579,7 @@ Common::Input::VibrationError SDLDriver::SetVibration(
|
||||||
.vibration = new_vibration,
|
.vibration = new_vibration,
|
||||||
});
|
});
|
||||||
|
|
||||||
return Common::Input::VibrationError::None;
|
return Common::Input::DriverResult::Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SDLDriver::IsVibrationEnabled(const PadIdentifier& identifier) {
|
bool SDLDriver::IsVibrationEnabled(const PadIdentifier& identifier) {
|
||||||
|
|
|
@ -63,7 +63,7 @@ public:
|
||||||
|
|
||||||
bool IsStickInverted(const Common::ParamPackage& params) override;
|
bool IsStickInverted(const Common::ParamPackage& params) override;
|
||||||
|
|
||||||
Common::Input::VibrationError SetVibration(
|
Common::Input::DriverResult SetVibration(
|
||||||
const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) override;
|
const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) override;
|
||||||
|
|
||||||
bool IsVibrationEnabled(const PadIdentifier& identifier) override;
|
bool IsVibrationEnabled(const PadIdentifier& identifier) override;
|
||||||
|
|
|
@ -22,22 +22,23 @@ VirtualAmiibo::VirtualAmiibo(std::string input_engine_) : InputEngine(std::move(
|
||||||
|
|
||||||
VirtualAmiibo::~VirtualAmiibo() = default;
|
VirtualAmiibo::~VirtualAmiibo() = default;
|
||||||
|
|
||||||
Common::Input::PollingError VirtualAmiibo::SetPollingMode(
|
Common::Input::DriverResult VirtualAmiibo::SetPollingMode(
|
||||||
[[maybe_unused]] const PadIdentifier& identifier_,
|
[[maybe_unused]] const PadIdentifier& identifier_,
|
||||||
const Common::Input::PollingMode polling_mode_) {
|
const Common::Input::PollingMode polling_mode_) {
|
||||||
polling_mode = polling_mode_;
|
polling_mode = polling_mode_;
|
||||||
|
|
||||||
if (polling_mode == Common::Input::PollingMode::NFC) {
|
switch (polling_mode) {
|
||||||
|
case Common::Input::PollingMode::NFC:
|
||||||
if (state == State::Initialized) {
|
if (state == State::Initialized) {
|
||||||
state = State::WaitingForAmiibo;
|
state = State::WaitingForAmiibo;
|
||||||
}
|
}
|
||||||
} else {
|
return Common::Input::DriverResult::Success;
|
||||||
|
default:
|
||||||
if (state == State::AmiiboIsOpen) {
|
if (state == State::AmiiboIsOpen) {
|
||||||
CloseAmiibo();
|
CloseAmiibo();
|
||||||
}
|
}
|
||||||
|
return Common::Input::DriverResult::NotSupported;
|
||||||
}
|
}
|
||||||
|
|
||||||
return Common::Input::PollingError::None;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Common::Input::NfcState VirtualAmiibo::SupportsNfc(
|
Common::Input::NfcState VirtualAmiibo::SupportsNfc(
|
||||||
|
|
|
@ -36,7 +36,7 @@ public:
|
||||||
~VirtualAmiibo() override;
|
~VirtualAmiibo() override;
|
||||||
|
|
||||||
// Sets polling mode to a controller
|
// Sets polling mode to a controller
|
||||||
Common::Input::PollingError SetPollingMode(
|
Common::Input::DriverResult SetPollingMode(
|
||||||
const PadIdentifier& identifier_, const Common::Input::PollingMode polling_mode_) override;
|
const PadIdentifier& identifier_, const Common::Input::PollingMode polling_mode_) override;
|
||||||
|
|
||||||
Common::Input::NfcState SupportsNfc(const PadIdentifier& identifier_) const override;
|
Common::Input::NfcState SupportsNfc(const PadIdentifier& identifier_) const override;
|
||||||
|
|
|
@ -238,7 +238,7 @@ void JoyconDriver::OnNewData(std::span<u8> buffer) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void JoyconDriver::SetPollingMode() {
|
DriverResult JoyconDriver::SetPollingMode() {
|
||||||
disable_input_thread = true;
|
disable_input_thread = true;
|
||||||
|
|
||||||
rumble_protocol->EnableRumble(vibration_enabled && supported_features.vibration);
|
rumble_protocol->EnableRumble(vibration_enabled && supported_features.vibration);
|
||||||
|
@ -263,7 +263,7 @@ void JoyconDriver::SetPollingMode() {
|
||||||
}
|
}
|
||||||
if (result == DriverResult::Success) {
|
if (result == DriverResult::Success) {
|
||||||
disable_input_thread = false;
|
disable_input_thread = false;
|
||||||
return;
|
return result;
|
||||||
}
|
}
|
||||||
nfc_protocol->DisableNfc();
|
nfc_protocol->DisableNfc();
|
||||||
LOG_ERROR(Input, "Error enabling NFC");
|
LOG_ERROR(Input, "Error enabling NFC");
|
||||||
|
@ -282,7 +282,7 @@ void JoyconDriver::SetPollingMode() {
|
||||||
if (result == DriverResult::Success) {
|
if (result == DriverResult::Success) {
|
||||||
ring_connected = true;
|
ring_connected = true;
|
||||||
disable_input_thread = false;
|
disable_input_thread = false;
|
||||||
return;
|
return result;
|
||||||
}
|
}
|
||||||
ring_connected = false;
|
ring_connected = false;
|
||||||
ring_protocol->DisableRingCon();
|
ring_protocol->DisableRingCon();
|
||||||
|
@ -293,7 +293,7 @@ void JoyconDriver::SetPollingMode() {
|
||||||
const auto result = generic_protocol->EnablePassiveMode();
|
const auto result = generic_protocol->EnablePassiveMode();
|
||||||
if (result == DriverResult::Success) {
|
if (result == DriverResult::Success) {
|
||||||
disable_input_thread = false;
|
disable_input_thread = false;
|
||||||
return;
|
return result;
|
||||||
}
|
}
|
||||||
LOG_ERROR(Input, "Error enabling passive mode");
|
LOG_ERROR(Input, "Error enabling passive mode");
|
||||||
}
|
}
|
||||||
|
@ -305,6 +305,7 @@ void JoyconDriver::SetPollingMode() {
|
||||||
}
|
}
|
||||||
|
|
||||||
disable_input_thread = false;
|
disable_input_thread = false;
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
JoyconDriver::SupportedFeatures JoyconDriver::GetSupportedFeatures() {
|
JoyconDriver::SupportedFeatures JoyconDriver::GetSupportedFeatures() {
|
||||||
|
@ -380,8 +381,7 @@ DriverResult JoyconDriver::SetPasiveMode() {
|
||||||
hidbus_enabled = false;
|
hidbus_enabled = false;
|
||||||
nfc_enabled = false;
|
nfc_enabled = false;
|
||||||
passive_enabled = true;
|
passive_enabled = true;
|
||||||
SetPollingMode();
|
return SetPollingMode();
|
||||||
return DriverResult::Success;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
DriverResult JoyconDriver::SetActiveMode() {
|
DriverResult JoyconDriver::SetActiveMode() {
|
||||||
|
@ -390,28 +390,42 @@ DriverResult JoyconDriver::SetActiveMode() {
|
||||||
hidbus_enabled = false;
|
hidbus_enabled = false;
|
||||||
nfc_enabled = false;
|
nfc_enabled = false;
|
||||||
passive_enabled = false;
|
passive_enabled = false;
|
||||||
SetPollingMode();
|
return SetPollingMode();
|
||||||
return DriverResult::Success;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
DriverResult JoyconDriver::SetNfcMode() {
|
DriverResult JoyconDriver::SetNfcMode() {
|
||||||
std::scoped_lock lock{mutex};
|
std::scoped_lock lock{mutex};
|
||||||
|
|
||||||
|
if (!supported_features.nfc) {
|
||||||
|
return DriverResult::NotSupported;
|
||||||
|
}
|
||||||
|
|
||||||
motion_enabled = true;
|
motion_enabled = true;
|
||||||
hidbus_enabled = false;
|
hidbus_enabled = false;
|
||||||
nfc_enabled = true;
|
nfc_enabled = true;
|
||||||
passive_enabled = false;
|
passive_enabled = false;
|
||||||
SetPollingMode();
|
return SetPollingMode();
|
||||||
return DriverResult::Success;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
DriverResult JoyconDriver::SetRingConMode() {
|
DriverResult JoyconDriver::SetRingConMode() {
|
||||||
std::scoped_lock lock{mutex};
|
std::scoped_lock lock{mutex};
|
||||||
|
|
||||||
|
if (!supported_features.hidbus) {
|
||||||
|
return DriverResult::NotSupported;
|
||||||
|
}
|
||||||
|
|
||||||
motion_enabled = true;
|
motion_enabled = true;
|
||||||
hidbus_enabled = true;
|
hidbus_enabled = true;
|
||||||
nfc_enabled = false;
|
nfc_enabled = false;
|
||||||
passive_enabled = false;
|
passive_enabled = false;
|
||||||
SetPollingMode();
|
|
||||||
return DriverResult::Success;
|
const auto result = SetPollingMode();
|
||||||
|
|
||||||
|
if (!ring_connected) {
|
||||||
|
return DriverResult::NoDeviceDetected;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool JoyconDriver::IsConnected() const {
|
bool JoyconDriver::IsConnected() const {
|
||||||
|
@ -459,23 +473,23 @@ SerialNumber JoyconDriver::GetHandleSerialNumber() const {
|
||||||
return handle_serial_number;
|
return handle_serial_number;
|
||||||
}
|
}
|
||||||
|
|
||||||
void JoyconDriver::SetCallbacks(const Joycon::JoyconCallbacks& callbacks) {
|
void JoyconDriver::SetCallbacks(const JoyconCallbacks& callbacks) {
|
||||||
joycon_poller->SetCallbacks(callbacks);
|
joycon_poller->SetCallbacks(callbacks);
|
||||||
}
|
}
|
||||||
|
|
||||||
Joycon::DriverResult JoyconDriver::GetDeviceType(SDL_hid_device_info* device_info,
|
DriverResult JoyconDriver::GetDeviceType(SDL_hid_device_info* device_info,
|
||||||
ControllerType& controller_type) {
|
ControllerType& controller_type) {
|
||||||
static constexpr std::array<std::pair<u32, Joycon::ControllerType>, 4> supported_devices{
|
static constexpr std::array<std::pair<u32, ControllerType>, 4> supported_devices{
|
||||||
std::pair<u32, Joycon::ControllerType>{0x2006, Joycon::ControllerType::Left},
|
std::pair<u32, ControllerType>{0x2006, ControllerType::Left},
|
||||||
{0x2007, Joycon::ControllerType::Right},
|
{0x2007, ControllerType::Right},
|
||||||
{0x2009, Joycon::ControllerType::Pro},
|
{0x2009, ControllerType::Pro},
|
||||||
{0x200E, Joycon::ControllerType::Grip},
|
{0x200E, ControllerType::Grip},
|
||||||
};
|
};
|
||||||
constexpr u16 nintendo_vendor_id = 0x057e;
|
constexpr u16 nintendo_vendor_id = 0x057e;
|
||||||
|
|
||||||
controller_type = Joycon::ControllerType::None;
|
controller_type = ControllerType::None;
|
||||||
if (device_info->vendor_id != nintendo_vendor_id) {
|
if (device_info->vendor_id != nintendo_vendor_id) {
|
||||||
return Joycon::DriverResult::UnsupportedControllerType;
|
return DriverResult::UnsupportedControllerType;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const auto& [product_id, type] : supported_devices) {
|
for (const auto& [product_id, type] : supported_devices) {
|
||||||
|
@ -487,10 +501,10 @@ Joycon::DriverResult JoyconDriver::GetDeviceType(SDL_hid_device_info* device_inf
|
||||||
return Joycon::DriverResult::UnsupportedControllerType;
|
return Joycon::DriverResult::UnsupportedControllerType;
|
||||||
}
|
}
|
||||||
|
|
||||||
Joycon::DriverResult JoyconDriver::GetSerialNumber(SDL_hid_device_info* device_info,
|
DriverResult JoyconDriver::GetSerialNumber(SDL_hid_device_info* device_info,
|
||||||
Joycon::SerialNumber& serial_number) {
|
SerialNumber& serial_number) {
|
||||||
if (device_info->serial_number == nullptr) {
|
if (device_info->serial_number == nullptr) {
|
||||||
return Joycon::DriverResult::Unknown;
|
return DriverResult::Unknown;
|
||||||
}
|
}
|
||||||
std::memcpy(&serial_number, device_info->serial_number, 15);
|
std::memcpy(&serial_number, device_info->serial_number, 15);
|
||||||
return Joycon::DriverResult::Success;
|
return Joycon::DriverResult::Success;
|
||||||
|
|
|
@ -46,15 +46,15 @@ public:
|
||||||
DriverResult SetNfcMode();
|
DriverResult SetNfcMode();
|
||||||
DriverResult SetRingConMode();
|
DriverResult SetRingConMode();
|
||||||
|
|
||||||
void SetCallbacks(const Joycon::JoyconCallbacks& callbacks);
|
void SetCallbacks(const JoyconCallbacks& callbacks);
|
||||||
|
|
||||||
// Returns device type from hidapi handle
|
// Returns device type from hidapi handle
|
||||||
static Joycon::DriverResult GetDeviceType(SDL_hid_device_info* device_info,
|
static DriverResult GetDeviceType(SDL_hid_device_info* device_info,
|
||||||
Joycon::ControllerType& controller_type);
|
ControllerType& controller_type);
|
||||||
|
|
||||||
// Returns serial number from hidapi handle
|
// Returns serial number from hidapi handle
|
||||||
static Joycon::DriverResult GetSerialNumber(SDL_hid_device_info* device_info,
|
static DriverResult GetSerialNumber(SDL_hid_device_info* device_info,
|
||||||
Joycon::SerialNumber& serial_number);
|
SerialNumber& serial_number);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct SupportedFeatures {
|
struct SupportedFeatures {
|
||||||
|
@ -73,7 +73,7 @@ private:
|
||||||
void OnNewData(std::span<u8> buffer);
|
void OnNewData(std::span<u8> buffer);
|
||||||
|
|
||||||
/// Updates device configuration to enable or disable features
|
/// Updates device configuration to enable or disable features
|
||||||
void SetPollingMode();
|
DriverResult SetPollingMode();
|
||||||
|
|
||||||
/// Returns true if input thread is valid and doesn't need to be stopped
|
/// Returns true if input thread is valid and doesn't need to be stopped
|
||||||
bool IsInputThreadValid() const;
|
bool IsInputThreadValid() const;
|
||||||
|
|
|
@ -284,6 +284,7 @@ enum class DriverResult {
|
||||||
NoDeviceDetected,
|
NoDeviceDetected,
|
||||||
InvalidHandle,
|
InvalidHandle,
|
||||||
NotSupported,
|
NotSupported,
|
||||||
|
Disabled,
|
||||||
Unknown,
|
Unknown,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -105,14 +105,17 @@ public:
|
||||||
void EndConfiguration();
|
void EndConfiguration();
|
||||||
|
|
||||||
// Sets a led pattern for a controller
|
// Sets a led pattern for a controller
|
||||||
virtual void SetLeds([[maybe_unused]] const PadIdentifier& identifier,
|
virtual Common::Input::DriverResult SetLeds(
|
||||||
[[maybe_unused]] const Common::Input::LedStatus& led_status) {}
|
[[maybe_unused]] const PadIdentifier& identifier,
|
||||||
|
[[maybe_unused]] const Common::Input::LedStatus& led_status) {
|
||||||
|
return Common::Input::DriverResult::NotSupported;
|
||||||
|
}
|
||||||
|
|
||||||
// Sets rumble to a controller
|
// Sets rumble to a controller
|
||||||
virtual Common::Input::VibrationError SetVibration(
|
virtual Common::Input::DriverResult SetVibration(
|
||||||
[[maybe_unused]] const PadIdentifier& identifier,
|
[[maybe_unused]] const PadIdentifier& identifier,
|
||||||
[[maybe_unused]] const Common::Input::VibrationStatus& vibration) {
|
[[maybe_unused]] const Common::Input::VibrationStatus& vibration) {
|
||||||
return Common::Input::VibrationError::NotSupported;
|
return Common::Input::DriverResult::NotSupported;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns true if device supports vibrations
|
// Returns true if device supports vibrations
|
||||||
|
@ -121,17 +124,17 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sets polling mode to a controller
|
// Sets polling mode to a controller
|
||||||
virtual Common::Input::PollingError SetPollingMode(
|
virtual Common::Input::DriverResult SetPollingMode(
|
||||||
[[maybe_unused]] const PadIdentifier& identifier,
|
[[maybe_unused]] const PadIdentifier& identifier,
|
||||||
[[maybe_unused]] const Common::Input::PollingMode polling_mode) {
|
[[maybe_unused]] const Common::Input::PollingMode polling_mode) {
|
||||||
return Common::Input::PollingError::NotSupported;
|
return Common::Input::DriverResult::NotSupported;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sets camera format to a controller
|
// Sets camera format to a controller
|
||||||
virtual Common::Input::CameraError SetCameraFormat(
|
virtual Common::Input::DriverResult SetCameraFormat(
|
||||||
[[maybe_unused]] const PadIdentifier& identifier,
|
[[maybe_unused]] const PadIdentifier& identifier,
|
||||||
[[maybe_unused]] Common::Input::CameraFormat camera_format) {
|
[[maybe_unused]] Common::Input::CameraFormat camera_format) {
|
||||||
return Common::Input::CameraError::NotSupported;
|
return Common::Input::DriverResult::NotSupported;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns success if nfc is supported
|
// Returns success if nfc is supported
|
||||||
|
|
|
@ -806,11 +806,11 @@ public:
|
||||||
explicit OutputFromIdentifier(PadIdentifier identifier_, InputEngine* input_engine_)
|
explicit OutputFromIdentifier(PadIdentifier identifier_, InputEngine* input_engine_)
|
||||||
: identifier(identifier_), input_engine(input_engine_) {}
|
: identifier(identifier_), input_engine(input_engine_) {}
|
||||||
|
|
||||||
void SetLED(const Common::Input::LedStatus& led_status) override {
|
Common::Input::DriverResult SetLED(const Common::Input::LedStatus& led_status) override {
|
||||||
input_engine->SetLeds(identifier, led_status);
|
return input_engine->SetLeds(identifier, led_status);
|
||||||
}
|
}
|
||||||
|
|
||||||
Common::Input::VibrationError SetVibration(
|
Common::Input::DriverResult SetVibration(
|
||||||
const Common::Input::VibrationStatus& vibration_status) override {
|
const Common::Input::VibrationStatus& vibration_status) override {
|
||||||
return input_engine->SetVibration(identifier, vibration_status);
|
return input_engine->SetVibration(identifier, vibration_status);
|
||||||
}
|
}
|
||||||
|
@ -819,11 +819,12 @@ public:
|
||||||
return input_engine->IsVibrationEnabled(identifier);
|
return input_engine->IsVibrationEnabled(identifier);
|
||||||
}
|
}
|
||||||
|
|
||||||
Common::Input::PollingError SetPollingMode(Common::Input::PollingMode polling_mode) override {
|
Common::Input::DriverResult SetPollingMode(Common::Input::PollingMode polling_mode) override {
|
||||||
return input_engine->SetPollingMode(identifier, polling_mode);
|
return input_engine->SetPollingMode(identifier, polling_mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
Common::Input::CameraError SetCameraFormat(Common::Input::CameraFormat camera_format) override {
|
Common::Input::DriverResult SetCameraFormat(
|
||||||
|
Common::Input::CameraFormat camera_format) override {
|
||||||
return input_engine->SetCameraFormat(identifier, camera_format);
|
return input_engine->SetCameraFormat(identifier, camera_format);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,9 @@
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <QKeyEvent>
|
#include <QKeyEvent>
|
||||||
#include <QMenu>
|
#include <QMenu>
|
||||||
|
#include <QMessageBox>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
#include <fmt/format.h>
|
||||||
|
|
||||||
#include "core/hid/emulated_controller.h"
|
#include "core/hid/emulated_controller.h"
|
||||||
#include "core/hid/hid_core.h"
|
#include "core/hid/hid_core.h"
|
||||||
|
@ -130,6 +132,13 @@ ConfigureRingController::ConfigureRingController(QWidget* parent,
|
||||||
emulated_controller->SaveCurrentConfig();
|
emulated_controller->SaveCurrentConfig();
|
||||||
emulated_controller->EnableConfiguration();
|
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();
|
LoadConfiguration();
|
||||||
|
|
||||||
for (int sub_button_id = 0; sub_button_id < ANALOG_SUB_BUTTONS_NUM; ++sub_button_id) {
|
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,
|
connect(ui->restore_defaults_button, &QPushButton::clicked, this,
|
||||||
&ConfigureRingController::RestoreDefaults);
|
&ConfigureRingController::RestoreDefaults);
|
||||||
|
|
||||||
|
connect(ui->enable_ring_controller_button, &QPushButton::clicked, this,
|
||||||
|
&ConfigureRingController::EnableRingController);
|
||||||
|
|
||||||
timeout_timer->setSingleShot(true);
|
timeout_timer->setSingleShot(true);
|
||||||
connect(timeout_timer.get(), &QTimer::timeout, [this] { SetPollingResult({}, true); });
|
connect(timeout_timer.get(), &QTimer::timeout, [this] { SetPollingResult({}, true); });
|
||||||
|
|
||||||
|
@ -202,7 +214,13 @@ ConfigureRingController::ConfigureRingController(QWidget* parent,
|
||||||
}
|
}
|
||||||
|
|
||||||
ConfigureRingController::~ConfigureRingController() {
|
ConfigureRingController::~ConfigureRingController() {
|
||||||
|
emulated_controller->SetPollingMode(Common::Input::PollingMode::Active);
|
||||||
emulated_controller->DisableConfiguration();
|
emulated_controller->DisableConfiguration();
|
||||||
|
|
||||||
|
if (is_controller_set) {
|
||||||
|
emulated_controller->DeleteCallback(callback_key);
|
||||||
|
is_controller_set = false;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
void ConfigureRingController::changeEvent(QEvent* event) {
|
void ConfigureRingController::changeEvent(QEvent* event) {
|
||||||
|
@ -256,6 +274,57 @@ void ConfigureRingController::RestoreDefaults() {
|
||||||
UpdateUI();
|
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(
|
void ConfigureRingController::HandleClick(
|
||||||
QPushButton* button, std::function<void(const Common::ParamPackage&)> new_input_setter,
|
QPushButton* button, std::function<void(const Common::ParamPackage&)> new_input_setter,
|
||||||
InputCommon::Polling::InputType type) {
|
InputCommon::Polling::InputType type) {
|
||||||
|
|
|
@ -42,6 +42,12 @@ private:
|
||||||
/// Restore all buttons to their default values.
|
/// Restore all buttons to their default values.
|
||||||
void RestoreDefaults();
|
void RestoreDefaults();
|
||||||
|
|
||||||
|
/// Sets current polling mode to ring input
|
||||||
|
void EnableRingController();
|
||||||
|
|
||||||
|
// Handles emulated controller events
|
||||||
|
void ControllerUpdate(Core::HID::ControllerTriggerType type);
|
||||||
|
|
||||||
/// Called when the button was pressed.
|
/// Called when the button was pressed.
|
||||||
void HandleClick(QPushButton* button,
|
void HandleClick(QPushButton* button,
|
||||||
std::function<void(const Common::ParamPackage&)> new_input_setter,
|
std::function<void(const Common::ParamPackage&)> new_input_setter,
|
||||||
|
@ -80,5 +86,9 @@ private:
|
||||||
InputCommon::InputSubsystem* input_subsystem;
|
InputCommon::InputSubsystem* input_subsystem;
|
||||||
Core::HID::EmulatedController* emulated_controller;
|
Core::HID::EmulatedController* emulated_controller;
|
||||||
|
|
||||||
|
bool is_ring_enabled{};
|
||||||
|
bool is_controller_set{};
|
||||||
|
int callback_key;
|
||||||
|
|
||||||
std::unique_ptr<Ui::ConfigureRingController> ui;
|
std::unique_ptr<Ui::ConfigureRingController> ui;
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>298</width>
|
<width>315</width>
|
||||||
<height>339</height>
|
<height>400</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
@ -49,12 +49,12 @@
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="RingAnalog">
|
<widget class="QGroupBox" name="RingAnalog">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Ring Sensor Parameters</string>
|
<string>Virtual Ring Sensor Parameters</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
<layout class="QVBoxLayout" name="verticalLayout_1">
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
|
@ -106,7 +106,7 @@
|
||||||
<widget class="QPushButton" name="buttonRingAnalogPull">
|
<widget class="QPushButton" name="buttonRingAnalogPull">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>68</width>
|
<width>70</width>
|
||||||
<height>0</height>
|
<height>0</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
|
@ -155,7 +155,7 @@
|
||||||
<widget class="QPushButton" name="buttonRingAnalogPush">
|
<widget class="QPushButton" name="buttonRingAnalogPush">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>68</width>
|
<width>70</width>
|
||||||
<height>0</height>
|
<height>0</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
|
@ -227,6 +227,102 @@
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="RingDriver">
|
||||||
|
<property name="title">
|
||||||
|
<string>Direct Joycon Driver</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="sizeConstraint">
|
||||||
|
<enum>QLayout::SetDefaultConstraint</enum>
|
||||||
|
</property>
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>6</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>10</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>10</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>6</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>10</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>10</number>
|
||||||
|
</property>
|
||||||
|
<property name="verticalSpacing">
|
||||||
|
<number>10</number>
|
||||||
|
</property>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<spacer name="horizontalSpacer">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeType">
|
||||||
|
<enum>QSizePolicy::Fixed</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>76</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="enable_ring_controller_label">
|
||||||
|
<property name="text">
|
||||||
|
<string>Enable Ring Input</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="2">
|
||||||
|
<widget class="QPushButton" name="enable_ring_controller_button">
|
||||||
|
<property name="text">
|
||||||
|
<string>Enable</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QLabel" name="ring_controller_sensor_label">
|
||||||
|
<property name="text">
|
||||||
|
<string>Ring Sensor Value</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="2">
|
||||||
|
<widget class="QLabel" name="ring_controller_sensor_value">
|
||||||
|
<property name="text">
|
||||||
|
<string>Not connected</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="verticalSpacer">
|
<spacer name="verticalSpacer">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
|
|
Loading…
Reference in a new issue