octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

settings: adjust button configs for Switch controllers

Browse Source
This commit is contained in:
shinyquagsire23
2018-01-15 00:24:23 -07:00
parent e08c132175
commit 74aa14c9b4
1 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/core/settings.h
View File

@@ -16,17 +16,32 @@ enum Values {
B, B,
X, X,
Y, Y,
Up, LStick,
Down, RStick,
Left,
Right,
L, L,
R, R,
Start,
Select,
ZL, ZL,
ZR, ZR,
Plus,
Minus,
DLeft,
DUp,
DRight,
DDown,
LStick_Left,
LStick_Up,
LStick_Right,
LStick_Down,
RStick_Left,
RStick_Up,
RStick_Right,
RStick_Down,
SL,
SR,
Home, Home,
@@ -34,34 +49,52 @@ enum Values {
}; };
constexpr int BUTTON_HID_BEGIN = A; constexpr int BUTTON_HID_BEGIN = A;
constexpr int BUTTON_IR_BEGIN = ZL;
constexpr int BUTTON_NS_BEGIN = Home; constexpr int BUTTON_NS_BEGIN = Home;
constexpr int BUTTON_HID_END = BUTTON_IR_BEGIN; constexpr int BUTTON_HID_END = BUTTON_NS_BEGIN;
constexpr int BUTTON_IR_END = BUTTON_NS_BEGIN;
constexpr int BUTTON_NS_END = NumButtons; constexpr int BUTTON_NS_END = NumButtons;
constexpr int NUM_BUTTONS_HID = BUTTON_HID_END - BUTTON_HID_BEGIN; constexpr int NUM_BUTTONS_HID = BUTTON_HID_END - BUTTON_HID_BEGIN;
constexpr int NUM_BUTTONS_IR = BUTTON_IR_END - BUTTON_IR_BEGIN;
constexpr int NUM_BUTTONS_NS = BUTTON_NS_END - BUTTON_NS_BEGIN; constexpr int NUM_BUTTONS_NS = BUTTON_NS_END - BUTTON_NS_BEGIN;
static const std::array<const char*, NumButtons> mapping = {{ static const std::array<const char*, NumButtons> mapping = {{
"button_a", "button_b", "button_x", "button_y", "button_up", "button_down", "button_left", "button_a",
"button_right", "button_l", "button_r", "button_start", "button_select", "button_zl", "button_b",
"button_zr", "button_home", "button_x",
"button_y",
"button_lstick",
"button_rstick",
"button_l",
"button_r",
"button_zl",
"button_zr",
"button_plus",
"button_minus",
"button_dleft",
"button_dup",
"button_dright",
"button_ddown",
"button_lstick_left",
"button_lstick_up",
"button_lstick_right",
"button_lstick_down",
"button_sl",
"button_sr",
"button_home",
}}; }};
} // namespace NativeButton } // namespace NativeButton
namespace NativeAnalog { namespace NativeAnalog {
enum Values { enum Values {
CirclePad, LStick,
CStick, RStick,
NumAnalogs, NumAnalogs,
}; };
static const std::array<const char*, NumAnalogs> mapping = {{ static const std::array<const char*, NumAnalogs> mapping = {{
"circle_pad", "c_stick", "lstick",
"rstick",
}}; }};
} // namespace NativeAnalog } // namespace NativeAnalog