diff options
| author | bunnei <bunneidev@gmail.com> | 2020-11-17 20:02:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 20:02:27 -0800 |
| commit | afa4ced6e4695e15487b4ffc8e67d9eced18998a (patch) | |
| tree | 0bf3bab90e2155a3a16ffa21eabbc2a4c8f9d39d /src/input_common/settings.cpp | |
| parent | 7803b6dfa7d81265b37535c7a2acdbb1b353b81f (diff) | |
| parent | f5ee5e7f3c4113caf932c1342843b4318a88fc98 (diff) | |
Merge pull request #4866 from Morph1984/mjolnir-p3-prod
Project Mjölnir: Part 3 - Controller Profiles and Vibration Rework
Diffstat (limited to 'src/input_common/settings.cpp')
| -rw-r--r-- | src/input_common/settings.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/input_common/settings.cpp b/src/input_common/settings.cpp index b66c05856b..557e7a9a0c 100644 --- a/src/input_common/settings.cpp +++ b/src/input_common/settings.cpp @@ -14,13 +14,6 @@ const std::array<const char*, NumButtons> mapping = {{ }}; } -namespace NativeMotion { -const std::array<const char*, NumMotions> mapping = {{ - "motionleft", - "motionright", -}}; -} - namespace NativeAnalog { const std::array<const char*, NumAnalogs> mapping = {{ "lstick", @@ -28,6 +21,20 @@ const std::array<const char*, NumAnalogs> mapping = {{ }}; } +namespace NativeVibration { +const std::array<const char*, NumVibrations> mapping = {{ + "left_vibration_device", + "right_vibration_device", +}}; +} + +namespace NativeMotion { +const std::array<const char*, NumMotions> mapping = {{ + "motionleft", + "motionright", +}}; +} + namespace NativeMouseButton { const std::array<const char*, NumMouseButtons> mapping = {{ "left", |