kraken: Fix errors from rebase and format files

This commit is contained in:
german77
2021-10-15 19:07:47 -05:00
committed by Narr the Reg
parent 06a5ef5874
commit e0da5c1bbc
20 changed files with 83 additions and 53 deletions

View File

@ -322,7 +322,8 @@ bool GCAdapter::GetGCEndpoint(libusb_device* device) {
return true;
}
Input::VibrationError GCAdapter::SetRumble(const PadIdentifier& identifier, const Input::VibrationStatus vibration) {
Input::VibrationError GCAdapter::SetRumble(const PadIdentifier& identifier,
const Input::VibrationStatus vibration) {
const auto mean_amplitude = (vibration.low_amplitude + vibration.high_amplitude) * 0.5f;
const auto processed_amplitude =
static_cast<u8>((mean_amplitude + std::pow(mean_amplitude, 0.3f)) * 0.5f * 0x8);

View File

@ -25,7 +25,7 @@ public:
~GCAdapter();
Input::VibrationError SetRumble(const PadIdentifier& identifier,
const Input::VibrationStatus vibration) override;
const Input::VibrationStatus vibration) override;
/// Used for automapping features
std::vector<Common::ParamPackage> GetInputDevices() const override;

View File

@ -59,7 +59,7 @@ public:
u8 GetHatButtonId(const std::string direction_name) const override;
Input::VibrationError SetRumble(const PadIdentifier& identifier,
const Input::VibrationStatus vibration) override;
const Input::VibrationStatus vibration) override;
private:
void InitJoystick(int joystick_index);