diff options
| author | Fernando S <fsahmkow27@gmail.com> | 2022-04-16 15:51:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-16 15:51:14 +0200 |
| commit | fd49b186fa13c74a61cdf70844486c75cfc0c930 (patch) | |
| tree | aff4d01b4a955e7928ed97cb979d80b596d013f3 /src/common | |
| parent | Merge pull request #8188 from merryhime/jit-race-page-table-changed (diff) | |
| parent | yuzu: Call ignore event after ensuring it's initialized (diff) | |
| download | yuzu-fd49b186fa13c74a61cdf70844486c75cfc0c930.tar yuzu-fd49b186fa13c74a61cdf70844486c75cfc0c930.tar.gz yuzu-fd49b186fa13c74a61cdf70844486c75cfc0c930.tar.bz2 yuzu-fd49b186fa13c74a61cdf70844486c75cfc0c930.tar.lz yuzu-fd49b186fa13c74a61cdf70844486c75cfc0c930.tar.xz yuzu-fd49b186fa13c74a61cdf70844486c75cfc0c930.tar.zst yuzu-fd49b186fa13c74a61cdf70844486c75cfc0c930.zip | |
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/settings.h | 3 | ||||
| -rw-r--r-- | src/common/settings_input.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/common/settings.h b/src/common/settings.h index 86e0fa140..3b7be63b3 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -590,6 +590,9 @@ struct Values { BasicSetting<int> touch_from_button_map_index{0, "touch_from_button_map"}; std::vector<TouchFromButtonMap> touch_from_button_maps; + BasicSetting<bool> enable_ring_controller{true, "enable_ring_controller"}; + RingconRaw ringcon_analogs; + // Data Storage BasicSetting<bool> use_virtual_sd{true, "use_virtual_sd"}; BasicSetting<bool> gamecard_inserted{false, "gamecard_inserted"}; diff --git a/src/common/settings_input.h b/src/common/settings_input.h index 4ff37e186..6f42346bc 100644 --- a/src/common/settings_input.h +++ b/src/common/settings_input.h @@ -357,6 +357,7 @@ constexpr int NUM_KEYBOARD_MODS_HID = NumKeyboardMods; using AnalogsRaw = std::array<std::string, NativeAnalog::NumAnalogs>; using ButtonsRaw = std::array<std::string, NativeButton::NumButtons>; using MotionsRaw = std::array<std::string, NativeMotion::NumMotions>; +using RingconRaw = std::string; constexpr u32 JOYCON_BODY_NEON_RED = 0xFF3C28; constexpr u32 JOYCON_BUTTONS_NEON_RED = 0x1E0A0A; |