diff options
Diffstat (limited to 'src/common/input.h')
| -rw-r--r-- | src/common/input.h | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/src/common/input.h b/src/common/input.h index d27b1d772..1e5ba038d 100644 --- a/src/common/input.h +++ b/src/common/input.h | |||
| @@ -51,6 +51,8 @@ enum class PollingMode { | |||
| 51 | NFC, | 51 | NFC, |
| 52 | // Enable infrared camera polling | 52 | // Enable infrared camera polling |
| 53 | IR, | 53 | IR, |
| 54 | // Enable ring controller polling | ||
| 55 | Ring, | ||
| 54 | }; | 56 | }; |
| 55 | 57 | ||
| 56 | enum class CameraFormat { | 58 | enum class CameraFormat { |
| @@ -67,6 +69,7 @@ enum class VibrationError { | |||
| 67 | None, | 69 | None, |
| 68 | NotSupported, | 70 | NotSupported, |
| 69 | Disabled, | 71 | Disabled, |
| 72 | InvalidHandle, | ||
| 70 | Unknown, | 73 | Unknown, |
| 71 | }; | 74 | }; |
| 72 | 75 | ||
| @@ -74,6 +77,7 @@ enum class VibrationError { | |||
| 74 | enum class PollingError { | 77 | enum class PollingError { |
| 75 | None, | 78 | None, |
| 76 | NotSupported, | 79 | NotSupported, |
| 80 | InvalidHandle, | ||
| 77 | Unknown, | 81 | Unknown, |
| 78 | }; | 82 | }; |
| 79 | 83 | ||
| @@ -190,6 +194,8 @@ struct TouchStatus { | |||
| 190 | struct BodyColorStatus { | 194 | struct BodyColorStatus { |
| 191 | u32 body{}; | 195 | u32 body{}; |
| 192 | u32 buttons{}; | 196 | u32 buttons{}; |
| 197 | u32 left_grip{}; | ||
| 198 | u32 right_grip{}; | ||
| 193 | }; | 199 | }; |
| 194 | 200 | ||
| 195 | // HD rumble data | 201 | // HD rumble data |
| @@ -228,17 +234,31 @@ enum class ButtonNames { | |||
| 228 | Engine, | 234 | Engine, |
| 229 | // This will display the button by value instead of the button name | 235 | // This will display the button by value instead of the button name |
| 230 | Value, | 236 | Value, |
| 237 | |||
| 238 | // Joycon button names | ||
| 231 | ButtonLeft, | 239 | ButtonLeft, |
| 232 | ButtonRight, | 240 | ButtonRight, |
| 233 | ButtonDown, | 241 | ButtonDown, |
| 234 | ButtonUp, | 242 | ButtonUp, |
| 235 | TriggerZ, | ||
| 236 | TriggerR, | ||
| 237 | TriggerL, | ||
| 238 | ButtonA, | 243 | ButtonA, |
| 239 | ButtonB, | 244 | ButtonB, |
| 240 | ButtonX, | 245 | ButtonX, |
| 241 | ButtonY, | 246 | ButtonY, |
| 247 | ButtonPlus, | ||
| 248 | ButtonMinus, | ||
| 249 | ButtonHome, | ||
| 250 | ButtonCapture, | ||
| 251 | ButtonStickL, | ||
| 252 | ButtonStickR, | ||
| 253 | TriggerL, | ||
| 254 | TriggerZL, | ||
| 255 | TriggerSL, | ||
| 256 | TriggerR, | ||
| 257 | TriggerZR, | ||
| 258 | TriggerSR, | ||
| 259 | |||
| 260 | // GC button names | ||
| 261 | TriggerZ, | ||
| 242 | ButtonStart, | 262 | ButtonStart, |
| 243 | 263 | ||
| 244 | // DS4 button names | 264 | // DS4 button names |