diff options
Diffstat (limited to 'src/input_common/drivers')
| -rw-r--r-- | src/input_common/drivers/joycon.cpp | 4 | ||||
| -rw-r--r-- | src/input_common/drivers/joycon.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cpp index cedc94e63..4fcfb4510 100644 --- a/src/input_common/drivers/joycon.cpp +++ b/src/input_common/drivers/joycon.cpp | |||
| @@ -668,12 +668,10 @@ std::string Joycons::JoyconName(Joycon::ControllerType type) const { | |||
| 668 | return "Right Joycon"; | 668 | return "Right Joycon"; |
| 669 | case Joycon::ControllerType::Pro: | 669 | case Joycon::ControllerType::Pro: |
| 670 | return "Pro Controller"; | 670 | return "Pro Controller"; |
| 671 | case Joycon::ControllerType::Grip: | ||
| 672 | return "Grip Controller"; | ||
| 673 | case Joycon::ControllerType::Dual: | 671 | case Joycon::ControllerType::Dual: |
| 674 | return "Dual Joycon"; | 672 | return "Dual Joycon"; |
| 675 | default: | 673 | default: |
| 676 | return "Unknown Joycon"; | 674 | return "Unknown Switch Controller"; |
| 677 | } | 675 | } |
| 678 | } | 676 | } |
| 679 | } // namespace InputCommon | 677 | } // namespace InputCommon |
diff --git a/src/input_common/drivers/joycon.h b/src/input_common/drivers/joycon.h index 316d383d8..2149ab7fd 100644 --- a/src/input_common/drivers/joycon.h +++ b/src/input_common/drivers/joycon.h | |||
| @@ -15,7 +15,7 @@ using SerialNumber = std::array<u8, 15>; | |||
| 15 | struct Battery; | 15 | struct Battery; |
| 16 | struct Color; | 16 | struct Color; |
| 17 | struct MotionData; | 17 | struct MotionData; |
| 18 | enum class ControllerType; | 18 | enum class ControllerType : u8; |
| 19 | enum class DriverResult; | 19 | enum class DriverResult; |
| 20 | enum class IrsResolution; | 20 | enum class IrsResolution; |
| 21 | class JoyconDriver; | 21 | class JoyconDriver; |