From 0de8ccc25fbd63e7f3f30f1fd67b9b7382c9fe58 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 6 Jan 2022 09:42:19 +0100 Subject: [PATCH 1/2] USBUtils: Add "Harmonix RB3 Keyboard for Nintendo Wii" --- Source/Core/UICommon/USBUtils.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/UICommon/USBUtils.cpp b/Source/Core/UICommon/USBUtils.cpp index 550b36fbc4..82006eb669 100644 --- a/Source/Core/UICommon/USBUtils.cpp +++ b/Source/Core/UICommon/USBUtils.cpp @@ -27,6 +27,7 @@ static const std::map, std::string_view> s_wii_peripherals{{ {{0x1bad, 0x0004}, "Harmonix Guitar Controller"}, {{0x1bad, 0x3110}, "Rock Band 3 Mustang Guitar Dongle"}, {{0x1bad, 0x3138}, "Harmonix Drum Controller for Nintendo Wii"}, + {{0x1bad, 0x3330}, "Harmonix RB3 Keyboard for Nintendo Wii"}, {{0x1bad, 0x3338}, "Harmonix RB3 MIDI Keyboard Interface for Nintendo Wii"}, {{0x1bad, 0x3538}, "Harmonix RB3 MIDI Guitar Interface for Nintendo Wii"}, {{0x1bad, 0x3430}, "Rock Band Drum Set"}, From 589c26735561741a6a520a1807611b870a586229 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 6 Jan 2022 09:46:05 +0100 Subject: [PATCH 2/2] USBUtils: Fix 1bad:3110/1bad:3430 mixup The wiki and the source code had these mismatched, and a user reported that 1bad:3430 is the Mustang guitar, so the wiki must be right. --- Source/Core/UICommon/USBUtils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/UICommon/USBUtils.cpp b/Source/Core/UICommon/USBUtils.cpp index 82006eb669..b33dc740e0 100644 --- a/Source/Core/UICommon/USBUtils.cpp +++ b/Source/Core/UICommon/USBUtils.cpp @@ -25,12 +25,12 @@ static const std::map, std::string_view> s_wii_peripherals{{ {{0x1430, 0x0100}, "Tony Hawk Ride Skateboard"}, {{0x1430, 0x0150}, "Skylanders Portal"}, {{0x1bad, 0x0004}, "Harmonix Guitar Controller"}, - {{0x1bad, 0x3110}, "Rock Band 3 Mustang Guitar Dongle"}, + {{0x1bad, 0x3110}, "Rock Band Drum Set"}, {{0x1bad, 0x3138}, "Harmonix Drum Controller for Nintendo Wii"}, {{0x1bad, 0x3330}, "Harmonix RB3 Keyboard for Nintendo Wii"}, {{0x1bad, 0x3338}, "Harmonix RB3 MIDI Keyboard Interface for Nintendo Wii"}, + {{0x1bad, 0x3430}, "Harmonix RB3 Mustang Guitar for Nintendo Wii"}, {{0x1bad, 0x3538}, "Harmonix RB3 MIDI Guitar Interface for Nintendo Wii"}, - {{0x1bad, 0x3430}, "Rock Band Drum Set"}, {{0x21a4, 0xac40}, "EA Active NFL"}, }};