Browse Source
Merge pull request #7680 from german77/accel_mapping
input_common: Allow to only have acceleration motion data
pull/15/merge
bunnei
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
11 additions and
2 deletions
-
src/core/hid/motion_input.cpp
-
src/input_common/input_engine.cpp
|
|
|
@ -10,6 +10,7 @@ namespace Core::HID { |
|
|
|
MotionInput::MotionInput() { |
|
|
|
// Initialize PID constants with default values
|
|
|
|
SetPID(0.3f, 0.005f, 0.0f); |
|
|
|
SetGyroThreshold(0.001f); |
|
|
|
} |
|
|
|
|
|
|
|
void MotionInput::SetPID(f32 new_kp, f32 new_ki, f32 new_kd) { |
|
|
|
|
|
|
|
@ -298,8 +298,16 @@ void InputEngine::TriggerOnMotionChange(const PadIdentifier& identifier, int mot |
|
|
|
if (!configuring || !mapping_callback.on_data) { |
|
|
|
return; |
|
|
|
} |
|
|
|
if (std::abs(value.gyro_x) < 0.6f && std::abs(value.gyro_y) < 0.6f && |
|
|
|
std::abs(value.gyro_z) < 0.6f) { |
|
|
|
bool is_active = false; |
|
|
|
if (std::abs(value.accel_x) > 1.5f || std::abs(value.accel_y) > 1.5f || |
|
|
|
std::abs(value.accel_z) > 1.5f) { |
|
|
|
is_active = true; |
|
|
|
} |
|
|
|
if (std::abs(value.gyro_x) > 0.6f || std::abs(value.gyro_y) > 0.6f || |
|
|
|
std::abs(value.gyro_z) > 0.6f) { |
|
|
|
is_active = true; |
|
|
|
} |
|
|
|
if (!is_active) { |
|
|
|
return; |
|
|
|
} |
|
|
|
mapping_callback.on_data(MappingData{ |
|
|
|
|