Skip to content

Commit 4ffceb7

Browse files
hrydgardhrydgard
authored
Merge pull request #19484 from hrydgard/add-obscure-control-mappings
Add mappable devkit-only L2/L3/R2/R3 controls
2 parents 1935bba + e0642a2 commit 4ffceb7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+200
-9
lines changed

‎Core/Debugger/WebSocket/InputSubscriber.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ const std::unordered_map<std::string, uint32_t> buttonLookup = {
5050
{ "forward", CTRL_FORWARD },
5151
{ "back", CTRL_BACK },
5252
{ "playpause", CTRL_PLAYPAUSE },
53+
// Obscure unmapped keys, see issue #17464
54+
{ "l2", CTRL_L2 },
55+
{ "l3", CTRL_L3 },
56+
{ "r2", CTRL_R2 },
57+
{ "r3", CTRL_R3 },
5358
};
5459

5560
struct WebSocketInputState : public DebuggerSubscriber {

‎Core/HLE/sceCtrl.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,16 @@ const int CTRL_STICK_RIGHT = 1;
5555
#define CTRL_BACK 0x20000000
5656
#define CTRL_PLAYPAUSE 0x40000000
5757

58+
// Obscure extra keys that were never mapped to hardware, but can be used to bring up the debug menu in SOTN, see issue #17464
59+
#define CTRL_L3 0x0002
60+
#define CTRL_R3 0x0004
61+
#define CTRL_L2 0x0400
62+
#define CTRL_R2 0x0800
63+
5864
#define CTRL_MASK_DPAD (CTRL_UP | CTRL_DOWN | CTRL_LEFT | CTRL_RIGHT)
5965
#define CTRL_MASK_ACTION (CTRL_SQUARE | CTRL_TRIANGLE | CTRL_CIRCLE | CTRL_CROSS)
6066
#define CTRL_MASK_TRIGGER (CTRL_LTRIGGER | CTRL_RTRIGGER)
61-
#define CTRL_MASK_USER (CTRL_MASK_DPAD | CTRL_MASK_ACTION | CTRL_START | CTRL_SELECT | CTRL_MASK_TRIGGER | CTRL_HOME | CTRL_HOLD | CTRL_WLAN | CTRL_REMOTE_HOLD | CTRL_VOL_UP | CTRL_VOL_DOWN | CTRL_SCREEN | CTRL_NOTE)
67+
#define CTRL_MASK_USER (CTRL_MASK_DPAD | CTRL_MASK_ACTION | CTRL_START | CTRL_SELECT | CTRL_MASK_TRIGGER | CTRL_HOME | CTRL_HOLD | CTRL_WLAN | CTRL_REMOTE_HOLD | CTRL_VOL_UP | CTRL_VOL_DOWN | CTRL_SCREEN | CTRL_NOTE | CTRL_L2 | CTRL_L3 | CTRL_R2 | CTRL_R3)
6268

6369
void __CtrlInit();
6470
void __CtrlDoState(PointerWrap &p);

‎Core/KeyMap.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,10 @@ const KeyMap_IntStrPair psp_button_names[] = {
474474
{CTRL_VOL_DOWN, "Vol -"},
475475
{CTRL_SCREEN, "Screen"},
476476
{CTRL_NOTE, "Note"},
477+
{CTRL_L2, "Dev-kit L2"},
478+
{CTRL_L3, "Dev-kit L3"},
479+
{CTRL_R2, "Dev-kit R2"},
480+
{CTRL_R3, "Dev-kit R3"},
477481
};
478482

479483
// key here can be other things than InputKeyCode.

‎Tools/langtool/Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/lang/ar_AE.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -795,6 +795,10 @@ D-pad down = D-pad down
795795
D-pad left = D-pad left
796796
D-pad right = D-pad right
797797
D-pad up = D-pad up
798+
Dev-kit L2 = Dev-kit L2
799+
Dev-kit L3 = Dev-kit L3
800+
Dev-kit R2 = Dev-kit R2
801+
Dev-kit R3 = Dev-kit R3
798802
DevMenu = ‎قائمة المطوريين
799803
Display Landscape = Display Landscape
800804
Display Landscape Reversed = Display Landscape Reversed

‎assets/lang/az_AZ.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,10 @@ D-pad down = D-pad down
787787
D-pad left = D-pad left
788788
D-pad right = D-pad right
789789
D-pad up = D-pad up
790+
Dev-kit L2 = Dev-kit L2
791+
Dev-kit L3 = Dev-kit L3
792+
Dev-kit R2 = Dev-kit R2
793+
Dev-kit R3 = Dev-kit R3
790794
DevMenu = DevMenu
791795
Display Landscape = Display Landscape
792796
Display Landscape Reversed = Display Landscape Reversed

‎assets/lang/bg_BG.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,10 @@ D-pad down = D-pad down
787787
D-pad left = D-pad left
788788
D-pad right = D-pad right
789789
D-pad up = D-pad up
790+
Dev-kit L2 = Dev-kit L2
791+
Dev-kit L3 = Dev-kit L3
792+
Dev-kit R2 = Dev-kit R2
793+
Dev-kit R3 = Dev-kit R3
790794
DevMenu = DevMenu
791795
Display Landscape = Display Landscape
792796
Display Landscape Reversed = Display Landscape Reversed

‎assets/lang/ca_ES.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,10 @@ D-pad down = D-pad down
787787
D-pad left = D-pad left
788788
D-pad right = D-pad right
789789
D-pad up = D-pad up
790+
Dev-kit L2 = Dev-kit L2
791+
Dev-kit L3 = Dev-kit L3
792+
Dev-kit R2 = Dev-kit R2
793+
Dev-kit R3 = Dev-kit R3
790794
DevMenu = DevMenu
791795
Display Landscape = Display Landscape
792796
Display Landscape Reversed = Display Landscape Reversed

‎assets/lang/cz_CZ.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,10 @@ D-pad down = D-pad down
787787
D-pad left = D-pad left
788788
D-pad right = D-pad right
789789
D-pad up = D-pad up
790+
Dev-kit L2 = Dev-kit L2
791+
Dev-kit L3 = Dev-kit L3
792+
Dev-kit R2 = Dev-kit R2
793+
Dev-kit R3 = Dev-kit R3
790794
DevMenu = Menu pro vývojáře
791795
Display Landscape = Display Landscape
792796
Display Landscape Reversed = Display Landscape Reversed

‎assets/lang/da_DK.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,10 @@ D-pad down = D-pad down
787787
D-pad left = D-pad left
788788
D-pad right = D-pad right
789789
D-pad up = D-pad up
790+
Dev-kit L2 = Dev-kit L2
791+
Dev-kit L3 = Dev-kit L3
792+
Dev-kit R2 = Dev-kit R2
793+
Dev-kit R3 = Dev-kit R3
790794
DevMenu = DevMenu
791795
Display Landscape = Display Landscape
792796
Display Landscape Reversed = Display Landscape Reversed

0 commit comments

Comments
 (0)