Merge branch 'dev' of github.com:justenoughlinuxos/distribution into dev

This commit is contained in:
fewtarius 2022-09-05 08:04:16 -04:00
commit 2eed9ddffd
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
15 changed files with 761 additions and 79 deletions

View file

@ -0,0 +1,148 @@
[General]
LastFilename =
ShowLag = False
ShowFrameCount = False
ISOPaths = 1
RecursiveISOPaths = False
NANDRootPath =
WirelessMac =
[Interface]
ConfirmStop = True
UsePanicHandlers = True
OnScreenDisplayMessages = True
HideCursor = False
AutoHideCursor = False
MainWindowPosX = 403
MainWindowPosY = 148
MainWindowWidth = 800
MainWindowHeight = 600
Language = 0
ShowToolbar = True
ShowStatusbar = True
ShowLogWindow = False
ShowLogConfigWindow = False
ExtendedFPSInfo = False
ThemeName40 = Clean Blue
PauseOnFocusLost = False
[Display]
FullscreenResolution = Auto
Fullscreen = True
RenderToMain = False
RenderWindowXPos = -1
RenderWindowYPos = -1
RenderWindowWidth = 640
RenderWindowHeight = 480
RenderWindowAutoSize = False
KeepWindowOnTop = False
ProgressiveScan = False
PAL60 = True
DisableScreenSaver = True
ForceNTSCJ = False
[GameList]
ListDrives = False
ListWad = True
ListElfDol = True
ListWii = True
ListGC = True
ListJap = True
ListPal = True
ListUsa = True
ListAustralia = True
ListFrance = True
ListGermany = True
ListItaly = True
ListKorea = True
ListNetherlands = True
ListRussia = True
ListSpain = True
ListTaiwan = True
ListWorld = True
ListUnknown = True
ListSort = 3
ListSortSecondary = 0
ColorCompressed = True
ColumnPlatform = True
ColumnBanner = True
ColumnNotes = True
ColumnFileName = False
ColumnID = False
ColumnRegion = True
ColumnSize = True
ColumnState = True
[Core]
HLE_BS2 = False
TimingVariance = 40
CPUCore = 4
Fastmem = True
CPUThread = True
DSPHLE = True
SkipIdle = True
SyncOnSkipIdle = True
SyncGPU = False
SyncGpuMaxDistance = 200000
SyncGpuMinDistance = -200000
SyncGpuOverclock = 1.00000000
FPRF = False
AccurateNaNs = False
DefaultISO =
DVDRoot =
Apploader =
EnableCheats = True
SelectedLanguage = 0
OverrideGCLang = False
DPL2Decoder = False
Latency = 2
MemcardAPath =
MemcardBPath =
AgpCartAPath =
AgpCartBPath =
SlotA = 1
SlotB = 255
SerialPort1 = 255
BBA_MAC =
SIDevice0 = 6
AdapterRumble0 = True
SimulateKonga0 = False
SIDevice1 = 6
AdapterRumble1 = True
SimulateKonga1 = False
SIDevice2 = 0
AdapterRumble2 = True
SimulateKonga2 = False
SIDevice3 = 0
AdapterRumble3 = True
SimulateKonga3 = False
WiiSDCard = False
WiiKeyboard = False
WiimoteContinuousScanning = False
WiimoteEnableSpeaker = False
RunCompareServer = False
RunCompareClient = False
EmulationSpeed = 1.00000000
FrameSkip = 0x00000003
Overclock = 4.00000000
OverclockEnable = False
GFXBackend =
GPUDeterminismMode = auto
PerfMapDir =
[Movie]
PauseMovie = False
Author =
DumpFrames = False
DumpFramesSilent = False
ShowInputDisplay = False
[DSP]
EnableJIT = True
DumpAudio = False
DumpUCode = False
Backend = ALSA
Volume = 100
CaptureLog = False
[Input]
BackgroundInput = False
[FifoPlayer]
LoopReplay = True
[Analytics]
ID = 5082f0c30a7e422b1220107f69d6c108
Enabled = False
PermissionAsked = True

View file

@ -0,0 +1,29 @@
[GCPad1]
Device = evdev/0/Rinputer
Buttons/A = Button 1
Buttons/B = Button 0
Buttons/Start = Button 9
Buttons/X = Button 3
Buttons/Y = Button 2
Buttons/Z = Button 7
Buttons/Hotkey = Button 8
C-Stick/Dead Zone = 25.000000000000000
C-Stick/Down = Axis 4+
C-Stick/Left = Axis 3-
C-Stick/Modifier = Control_L
C-Stick/Modifier/Range = 50.000000000000000
C-Stick/Right = Axis 3+
C-Stick/Up = Axis 4-
D-Pad/Down = Button 14
D-Pad/Left = Button 15
D-Pad/Right = Button 16
D-Pad/Up = Button 13
Main Stick/Dead Zone = 25.000000000000000
Main Stick/Down = Axis 1+
Main Stick/Left = Axis 0-
Main Stick/Modifier = Shift_L
Main Stick/Modifier/Range = 50.000000000000000
Main Stick/Right = Axis 0+
Main Stick/Up = Axis 1-
Triggers/L = Button 4
Triggers/R = Button 5

View file

@ -0,0 +1,55 @@
[Hardware]
VSync = False
Adapter = 0
[Settings]
AspectRatio = 2
Crop = False
wideScreenHack = False
UseXFB = False
UseRealXFB = False
SafeTextureCacheColorSamples = 128
ShowFPS = False
LogRenderTimeToFile = False
OverlayStats = False
OverlayProjStats = False
DumpTextures = False
HiresTextures = False
ConvertHiresTextures = False
CacheHiresTextures = False
DumpEFBTarget = False
FreeLook = False
UseFFV1 = False
EnablePixelLighting = False
FastDepthCalc = True
MSAA = 1
SSAA = False
EFBScale = 2
TexFmtOverlayEnable = False
TexFmtOverlayCenter = False
Wireframe = False
DisableFog = False
EnableShaderDebugging = False
BorderlessFullscreen = False
SWZComploc = True
SWZFreeze = True
SWDumpObjects = False
SWDumpTevStages = False
SWDumpTevTexFetches = False
SWDrawStart = 0
SWDrawEnd = 100000
[Enhancements]
ForceFiltering = False
MaxAnisotropy = 0
PostProcessingShader =
[Stereoscopy]
StereoMode = 0
StereoDepth = 20
StereoConvergencePercentage = 100
StereoSwapEyes = False
[Hacks]
EFBAccessEnable = False
BBoxEnable = False
ForceProgressive = True
EFBToTextureEnable = True
EFBScaledCopy = False
EFBEmulateFormatChanges = False

View file

@ -0,0 +1,13 @@
diff --git a/src/common/menu/menu.cpp b/src/common/menu/menu.cpp
index 4532dae1d..c81ec2e9a 100644
--- a/src/common/menu/menu.cpp
+++ b/src/common/menu/menu.cpp
@@ -702,7 +702,7 @@ bool M_Responder (event_t *ev)
mkey = MKEY_Back;
break;
- case KEY_JOY4:
+ case KEY_JOY3:
case KEY_PAD_X:
mkey = MKEY_Clear;
break;

View file

@ -0,0 +1,61 @@
diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp
index 2af6616fa0..8ef95e1358 100644
--- a/src/menu/menu.cpp
+++ b/src/menu/menu.cpp
@@ -666,17 +666,17 @@ bool M_Responder (event_t *ev)
ch = ev->data1;
switch (ch)
{
- case KEY_JOY2:
+ case KEY_JOY1: //B button
case KEY_PAD_A:
mkey = MKEY_Back;
break;
- case KEY_JOY1:
+ case KEY_JOY2: //A button
case KEY_PAD_B:
mkey = MKEY_Enter;
break;
- case KEY_JOY4:
+ case KEY_JOY3: //X button
case KEY_PAD_X:
mkey = MKEY_Clear;
break;
@@ -695,7 +695,7 @@ bool M_Responder (event_t *ev)
case KEY_PAD_LTHUMB_UP:
case KEY_JOYAXIS2MINUS:
case KEY_JOYPOV1_UP:
- case KEY_JOY9:
+ case KEY_JOY9: //Dpad up
mkey = MKEY_Up;
break;
@@ -703,7 +703,7 @@ bool M_Responder (event_t *ev)
case KEY_PAD_LTHUMB_DOWN:
case KEY_JOYAXIS2PLUS:
case KEY_JOYPOV1_DOWN:
- case KEY_JOY10:
+ case KEY_JOY10: //Dpad down
mkey = MKEY_Down;
break;
@@ -711,7 +711,7 @@ bool M_Responder (event_t *ev)
case KEY_PAD_LTHUMB_LEFT:
case KEY_JOYAXIS1MINUS:
case KEY_JOYPOV1_LEFT:
- case KEY_JOY11:
+ case KEY_JOY11: //Dpad left
mkey = MKEY_Left;
break;
@@ -719,7 +719,7 @@ bool M_Responder (event_t *ev)
case KEY_PAD_LTHUMB_RIGHT:
case KEY_JOYAXIS1PLUS:
case KEY_JOYPOV1_RIGHT:
- case KEY_JOY12:
+ case KEY_JOY12: //Dpad right
mkey = MKEY_Right;
break;
}

View file

@ -0,0 +1,74 @@
diff --git a/src/doomdef.h b/src/doomdef.h
index 34fad7318f..06e77b0dd3 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -191,6 +191,8 @@ enum ESkillLevels
#define KEY_JOY13 (KEY_FIRSTJOYBUTTON+12)
#define KEY_JOY14 (KEY_FIRSTJOYBUTTON+13)
#define KEY_JOY15 (KEY_FIRSTJOYBUTTON+14)
+#define KEY_JOY16 (KEY_FIRSTJOYBUTTON+15)
+#define KEY_JOY17 (KEY_FIRSTJOYBUTTON+16)
#define KEY_LASTJOYBUTTON 0x187
#define KEY_JOYPOV1_UP 0x188
#define KEY_JOYPOV1_RIGHT 0x189
diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp
index 2af6616fa0..cf6ff999d1 100644
--- a/src/menu/menu.cpp
+++ b/src/menu/menu.cpp
@@ -666,17 +666,17 @@ bool M_Responder (event_t *ev)
ch = ev->data1;
switch (ch)
{
- case KEY_JOY2:
+ case KEY_JOY1: //B button on rg552/rg503
case KEY_PAD_A:
mkey = MKEY_Back;
break;
- case KEY_JOY1:
+ case KEY_JOY2: //A button on rg552/rg503
case KEY_PAD_B:
mkey = MKEY_Enter;
break;
- case KEY_JOY4:
+ case KEY_JOY3: //X button on rg552/rg503
case KEY_PAD_X:
mkey = MKEY_Clear;
break;
@@ -695,7 +695,7 @@ bool M_Responder (event_t *ev)
case KEY_PAD_LTHUMB_UP:
case KEY_JOYAXIS2MINUS:
case KEY_JOYPOV1_UP:
- case KEY_JOY9:
+ case KEY_JOY14: //Dpad up on rg552/rg503
mkey = MKEY_Up;
break;
@@ -703,7 +703,7 @@ bool M_Responder (event_t *ev)
case KEY_PAD_LTHUMB_DOWN:
case KEY_JOYAXIS2PLUS:
case KEY_JOYPOV1_DOWN:
- case KEY_JOY10:
+ case KEY_JOY15: //Dpad down on rg552/rg503
mkey = MKEY_Down;
break;
@@ -711,7 +711,7 @@ bool M_Responder (event_t *ev)
case KEY_PAD_LTHUMB_LEFT:
case KEY_JOYAXIS1MINUS:
case KEY_JOYPOV1_LEFT:
- case KEY_JOY11:
+ case KEY_JOY16: //Dpad left on rg552/rg503
mkey = MKEY_Left;
break;
@@ -719,7 +719,7 @@ bool M_Responder (event_t *ev)
case KEY_PAD_LTHUMB_RIGHT:
case KEY_JOYAXIS1PLUS:
case KEY_JOYPOV1_RIGHT:
- case KEY_JOY12:
+ case KEY_JOY17: //Dpad right on rg552/rg503
mkey = MKEY_Right;
break;
}

View file

@ -0,0 +1,74 @@
diff --git a/src/doomdef.h b/src/doomdef.h
index 34fad7318f..06e77b0dd3 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -191,6 +191,8 @@ enum ESkillLevels
#define KEY_JOY13 (KEY_FIRSTJOYBUTTON+12)
#define KEY_JOY14 (KEY_FIRSTJOYBUTTON+13)
#define KEY_JOY15 (KEY_FIRSTJOYBUTTON+14)
+#define KEY_JOY16 (KEY_FIRSTJOYBUTTON+15)
+#define KEY_JOY17 (KEY_FIRSTJOYBUTTON+16)
#define KEY_LASTJOYBUTTON 0x187
#define KEY_JOYPOV1_UP 0x188
#define KEY_JOYPOV1_RIGHT 0x189
diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp
index 2af6616fa0..cf6ff999d1 100644
--- a/src/menu/menu.cpp
+++ b/src/menu/menu.cpp
@@ -666,17 +666,17 @@ bool M_Responder (event_t *ev)
ch = ev->data1;
switch (ch)
{
- case KEY_JOY2:
+ case KEY_JOY1: //B button on rg552/rg503
case KEY_PAD_A:
mkey = MKEY_Back;
break;
- case KEY_JOY1:
+ case KEY_JOY2: //A button on rg552/rg503
case KEY_PAD_B:
mkey = MKEY_Enter;
break;
- case KEY_JOY4:
+ case KEY_JOY3: //X button on rg552/rg503
case KEY_PAD_X:
mkey = MKEY_Clear;
break;
@@ -695,7 +695,7 @@ bool M_Responder (event_t *ev)
case KEY_PAD_LTHUMB_UP:
case KEY_JOYAXIS2MINUS:
case KEY_JOYPOV1_UP:
- case KEY_JOY9:
+ case KEY_JOY14: //Dpad up on rg552/rg503
mkey = MKEY_Up;
break;
@@ -703,7 +703,7 @@ bool M_Responder (event_t *ev)
case KEY_PAD_LTHUMB_DOWN:
case KEY_JOYAXIS2PLUS:
case KEY_JOYPOV1_DOWN:
- case KEY_JOY10:
+ case KEY_JOY15: //Dpad down on rg552/rg503
mkey = MKEY_Down;
break;
@@ -711,7 +711,7 @@ bool M_Responder (event_t *ev)
case KEY_PAD_LTHUMB_LEFT:
case KEY_JOYAXIS1MINUS:
case KEY_JOYPOV1_LEFT:
- case KEY_JOY11:
+ case KEY_JOY16: //Dpad left on rg552/rg503
mkey = MKEY_Left;
break;
@@ -719,7 +719,7 @@ bool M_Responder (event_t *ev)
case KEY_PAD_LTHUMB_RIGHT:
case KEY_JOYAXIS1PLUS:
case KEY_JOYPOV1_RIGHT:
- case KEY_JOY12:
+ case KEY_JOY17: //Dpad right on rg552/rg503
mkey = MKEY_Right;
break;
}

View file

@ -0,0 +1,97 @@
diff --git a/source/common/console/keydef.h b/source/common/console/keydef.h
index 108806774..726a2c432 100644
--- a/source/common/console/keydef.h
+++ b/source/common/console/keydef.h
@@ -68,15 +68,22 @@ enum EKeyCodes
KEY_FIRSTJOYBUTTON = 0x108,
KEY_JOY1 = KEY_FIRSTJOYBUTTON+0,
- KEY_JOY2,
- KEY_JOY3,
- KEY_JOY4,
- KEY_JOY5,
- KEY_JOY6,
- KEY_JOY7,
- KEY_JOY8,
- KEY_JOY14 = KEY_FIRSTJOYBUTTON+13,
- KEY_JOY15 = KEY_FIRSTJOYBUTTON+14,
+ KEY_JOY2 = KEY_FIRSTJOYBUTTON+1,
+ KEY_JOY3 = KEY_FIRSTJOYBUTTON+2,
+ KEY_JOY4 = KEY_FIRSTJOYBUTTON+3,
+ KEY_JOY5 = KEY_FIRSTJOYBUTTON+4,
+ KEY_JOY6 = KEY_FIRSTJOYBUTTON+5,
+ KEY_JOY7 = KEY_FIRSTJOYBUTTON+6,
+ KEY_JOY8 = KEY_FIRSTJOYBUTTON+7,
+ KEY_JOY9 = KEY_FIRSTJOYBUTTON+8,
+ KEY_JOY10 = KEY_FIRSTJOYBUTTON+9,
+ KEY_JOY11 = KEY_FIRSTJOYBUTTON+10,
+ KEY_JOY12 = KEY_FIRSTJOYBUTTON+11,
+ KEY_JOY13 = KEY_FIRSTJOYBUTTON+12,
+ KEY_JOY14 = KEY_FIRSTJOYBUTTON+13,
+ KEY_JOY15 = KEY_FIRSTJOYBUTTON+14,
+ KEY_JOY16 = KEY_FIRSTJOYBUTTON+15,
+ KEY_JOY17 = KEY_FIRSTJOYBUTTON+16,
KEY_LASTJOYBUTTON = 0x187,
KEY_JOYPOV1_UP = 0x188,
KEY_JOYPOV1_RIGHT = 0x189,
diff --git a/source/common/menu/menu.cpp b/source/common/menu/menu.cpp
index 89017d67b..5217897b3 100644
--- a/source/common/menu/menu.cpp
+++ b/source/common/menu/menu.cpp
@@ -692,20 +692,18 @@ bool M_Responder (event_t *ev)
ch = ev->data1;
switch (ch)
{
- case KEY_JOY1:
- case KEY_JOY3:
- case KEY_JOY15:
+ case KEY_JOY2:
+ case KEY_JOY4:
case KEY_PAD_A:
mkey = MKEY_Enter;
break;
- case KEY_JOY2:
- case KEY_JOY14:
+ case KEY_JOY1:
case KEY_PAD_B:
mkey = MKEY_Back;
break;
- case KEY_JOY4:
+ case KEY_JOY3:
case KEY_PAD_X:
mkey = MKEY_Clear;
break;
@@ -720,6 +718,7 @@ bool M_Responder (event_t *ev)
mkey = MKEY_PageDown;
break;
+ case KEY_JOY9:
case KEY_PAD_DPAD_UP:
case KEY_PAD_LTHUMB_UP:
case KEY_JOYAXIS2MINUS:
@@ -727,6 +726,7 @@ bool M_Responder (event_t *ev)
mkey = MKEY_Up;
break;
+ case KEY_JOY10:
case KEY_PAD_DPAD_DOWN:
case KEY_PAD_LTHUMB_DOWN:
case KEY_JOYAXIS2PLUS:
@@ -734,6 +734,7 @@ bool M_Responder (event_t *ev)
mkey = MKEY_Down;
break;
+ case KEY_JOY11:
case KEY_PAD_DPAD_LEFT:
case KEY_PAD_LTHUMB_LEFT:
case KEY_JOYAXIS1MINUS:
@@ -741,6 +742,7 @@ bool M_Responder (event_t *ev)
mkey = MKEY_Left;
break;
+ case KEY_JOY12:
case KEY_PAD_DPAD_RIGHT:
case KEY_PAD_LTHUMB_RIGHT:
case KEY_JOYAXIS1PLUS:

View file

@ -0,0 +1,92 @@
diff --git a/source/common/console/keydef.h b/source/common/console/keydef.h
index 108806774..deeb90de8 100644
--- a/source/common/console/keydef.h
+++ b/source/common/console/keydef.h
@@ -68,15 +68,17 @@ enum EKeyCodes
KEY_FIRSTJOYBUTTON = 0x108,
KEY_JOY1 = KEY_FIRSTJOYBUTTON+0,
- KEY_JOY2,
- KEY_JOY3,
- KEY_JOY4,
- KEY_JOY5,
- KEY_JOY6,
- KEY_JOY7,
- KEY_JOY8,
- KEY_JOY14 = KEY_FIRSTJOYBUTTON+13,
- KEY_JOY15 = KEY_FIRSTJOYBUTTON+14,
+ KEY_JOY2 = KEY_FIRSTJOYBUTTON+1,
+ KEY_JOY3 = KEY_FIRSTJOYBUTTON+2,
+ KEY_JOY4 = KEY_FIRSTJOYBUTTON+3,
+ KEY_JOY5 = KEY_FIRSTJOYBUTTON+4,
+ KEY_JOY6 = KEY_FIRSTJOYBUTTON+5,
+ KEY_JOY7 = KEY_FIRSTJOYBUTTON+6,
+ KEY_JOY8 = KEY_FIRSTJOYBUTTON+7,
+ KEY_JOY14 = KEY_FIRSTJOYBUTTON+13,
+ KEY_JOY15 = KEY_FIRSTJOYBUTTON+14,
+ KEY_JOY16 = KEY_FIRSTJOYBUTTON+15,
+ KEY_JOY17 = KEY_FIRSTJOYBUTTON+16,
KEY_LASTJOYBUTTON = 0x187,
KEY_JOYPOV1_UP = 0x188,
KEY_JOYPOV1_RIGHT = 0x189,
diff --git a/source/common/menu/menu.cpp b/source/common/menu/menu.cpp
index 89017d67b..fcd09ffb8 100644
--- a/source/common/menu/menu.cpp
+++ b/source/common/menu/menu.cpp
@@ -692,20 +692,18 @@ bool M_Responder (event_t *ev)
ch = ev->data1;
switch (ch)
{
- case KEY_JOY1:
- case KEY_JOY3:
- case KEY_JOY15:
+ case KEY_JOY2:
+ case KEY_JOY4:
case KEY_PAD_A:
mkey = MKEY_Enter;
break;
- case KEY_JOY2:
- case KEY_JOY14:
+ case KEY_JOY1:
case KEY_PAD_B:
mkey = MKEY_Back;
break;
- case KEY_JOY4:
+ case KEY_JOY3:
case KEY_PAD_X:
mkey = MKEY_Clear;
break;
@@ -720,6 +718,7 @@ bool M_Responder (event_t *ev)
mkey = MKEY_PageDown;
break;
+ case KEY_JOY14:
case KEY_PAD_DPAD_UP:
case KEY_PAD_LTHUMB_UP:
case KEY_JOYAXIS2MINUS:
@@ -727,6 +726,7 @@ bool M_Responder (event_t *ev)
mkey = MKEY_Up;
break;
+ case KEY_JOY15:
case KEY_PAD_DPAD_DOWN:
case KEY_PAD_LTHUMB_DOWN:
case KEY_JOYAXIS2PLUS:
@@ -734,6 +734,7 @@ bool M_Responder (event_t *ev)
mkey = MKEY_Down;
break;
+ case KEY_JOY16:
case KEY_PAD_DPAD_LEFT:
case KEY_PAD_LTHUMB_LEFT:
case KEY_JOYAXIS1MINUS:
@@ -741,6 +742,7 @@ bool M_Responder (event_t *ev)
mkey = MKEY_Left;
break;
+ case KEY_JOY17:
case KEY_PAD_DPAD_RIGHT:
case KEY_PAD_LTHUMB_RIGHT:
case KEY_JOYAXIS1PLUS:

View file

@ -0,0 +1,92 @@
diff --git a/source/common/console/keydef.h b/source/common/console/keydef.h
index 108806774..deeb90de8 100644
--- a/source/common/console/keydef.h
+++ b/source/common/console/keydef.h
@@ -68,15 +68,17 @@ enum EKeyCodes
KEY_FIRSTJOYBUTTON = 0x108,
KEY_JOY1 = KEY_FIRSTJOYBUTTON+0,
- KEY_JOY2,
- KEY_JOY3,
- KEY_JOY4,
- KEY_JOY5,
- KEY_JOY6,
- KEY_JOY7,
- KEY_JOY8,
- KEY_JOY14 = KEY_FIRSTJOYBUTTON+13,
- KEY_JOY15 = KEY_FIRSTJOYBUTTON+14,
+ KEY_JOY2 = KEY_FIRSTJOYBUTTON+1,
+ KEY_JOY3 = KEY_FIRSTJOYBUTTON+2,
+ KEY_JOY4 = KEY_FIRSTJOYBUTTON+3,
+ KEY_JOY5 = KEY_FIRSTJOYBUTTON+4,
+ KEY_JOY6 = KEY_FIRSTJOYBUTTON+5,
+ KEY_JOY7 = KEY_FIRSTJOYBUTTON+6,
+ KEY_JOY8 = KEY_FIRSTJOYBUTTON+7,
+ KEY_JOY14 = KEY_FIRSTJOYBUTTON+13,
+ KEY_JOY15 = KEY_FIRSTJOYBUTTON+14,
+ KEY_JOY16 = KEY_FIRSTJOYBUTTON+15,
+ KEY_JOY17 = KEY_FIRSTJOYBUTTON+16,
KEY_LASTJOYBUTTON = 0x187,
KEY_JOYPOV1_UP = 0x188,
KEY_JOYPOV1_RIGHT = 0x189,
diff --git a/source/common/menu/menu.cpp b/source/common/menu/menu.cpp
index 89017d67b..fcd09ffb8 100644
--- a/source/common/menu/menu.cpp
+++ b/source/common/menu/menu.cpp
@@ -692,20 +692,18 @@ bool M_Responder (event_t *ev)
ch = ev->data1;
switch (ch)
{
- case KEY_JOY1:
- case KEY_JOY3:
- case KEY_JOY15:
+ case KEY_JOY2:
+ case KEY_JOY4:
case KEY_PAD_A:
mkey = MKEY_Enter;
break;
- case KEY_JOY2:
- case KEY_JOY14:
+ case KEY_JOY1:
case KEY_PAD_B:
mkey = MKEY_Back;
break;
- case KEY_JOY4:
+ case KEY_JOY3:
case KEY_PAD_X:
mkey = MKEY_Clear;
break;
@@ -720,6 +718,7 @@ bool M_Responder (event_t *ev)
mkey = MKEY_PageDown;
break;
+ case KEY_JOY14:
case KEY_PAD_DPAD_UP:
case KEY_PAD_LTHUMB_UP:
case KEY_JOYAXIS2MINUS:
@@ -727,6 +726,7 @@ bool M_Responder (event_t *ev)
mkey = MKEY_Up;
break;
+ case KEY_JOY15:
case KEY_PAD_DPAD_DOWN:
case KEY_PAD_LTHUMB_DOWN:
case KEY_JOYAXIS2PLUS:
@@ -734,6 +734,7 @@ bool M_Responder (event_t *ev)
mkey = MKEY_Down;
break;
+ case KEY_JOY16:
case KEY_PAD_DPAD_LEFT:
case KEY_PAD_LTHUMB_LEFT:
case KEY_JOYAXIS1MINUS:
@@ -741,6 +742,7 @@ bool M_Responder (event_t *ev)
mkey = MKEY_Left;
break;
+ case KEY_JOY17:
case KEY_PAD_DPAD_RIGHT:
case KEY_PAD_LTHUMB_RIGHT:
case KEY_JOYAXIS1PLUS:

View file

@ -457,7 +457,7 @@ menu_rgui_full_width_layout = "true"
menu_rgui_shadows = "false"
menu_rgui_transparency = "true"
menu_savestate_resume = "true"
menu_scale_factor = "0.750000"
menu_scale_factor = "0.300000"
menu_screensaver_animation = "0"
menu_screensaver_animation_speed = "1.000000"
menu_screensaver_timeout = "0"
@ -500,7 +500,7 @@ menu_use_preferred_system_color_theme = "false"
menu_wallpaper = ""
menu_wallpaper_opacity = "1.000000"
menu_widget_scale_auto = "false"
menu_widget_scale_factor = "1.000000"
menu_widget_scale_factor = "0.350000"
menu_widget_scale_factor_windowed = "1.000000"
menu_xmb_animation_horizontal_highlight = "0"
menu_xmb_animation_move_up_down = "0"

View file

@ -36,18 +36,18 @@
<input name="down" type="button" id="14" value="1" />
<input name="hotkeyenable" type="button" id="8" value="1" />
<input name="left" type="button" id="15" value="1" />
<input name="leftanalogdown" type="axis" id="1" value="-1" />
<input name="leftanalogdown" type="axis" id="1" value="1" />
<input name="leftanalogleft" type="axis" id="0" value="-1" />
<input name="leftanalogright" type="axis" id="0" value="1" />
<input name="leftanalogup" type="axis" id="1" value="1" />
<input name="leftanalogup" type="axis" id="1" value="-1" />
<input name="leftshoulder" type="button" id="4" value="1" />
<input name="leftthumb" type="button" id="11" value="1" />
<input name="lefttrigger" type="button" id="6" value="1" />
<input name="right" type="button" id="16" value="1" />
<input name="rightanalogdown" type="axis" id="4" value="-1" />
<input name="rightanalogdown" type="axis" id="4" value="1" />
<input name="rightanalogleft" type="axis" id="3" value="-1" />
<input name="rightanalogright" type="axis" id="3" value="1" />
<input name="rightanalogup" type="axis" id="4" value="1" />
<input name="rightanalogup" type="axis" id="4" value="-1" />
<input name="rightshoulder" type="button" id="5" value="1" />
<input name="rightthumb" type="button" id="12" value="1" />
<input name="righttrigger" type="button" id="7" value="1" />

View file

@ -36,7 +36,7 @@ PKG_DEPENDS_TARGET="${PKG_EMUS} ${PKG_RETROARCH} ${LIBRETRO_CORES}"
### Emulators or cores for specific devices
case "${DEVICE}" in
RG552)
PKG_DEPENDS_TARGET+=" duckstationsa rinputer2"
PKG_DEPENDS_TARGET+=" duckstationsa dolphinsa rinputer2"
;;
RG503|RG353P)
PKG_DEPENDS_TARGET+=" duckstationsa dolphinsa"

View file

@ -1,32 +1,8 @@
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rg552.dts b/arch/arm64/boot/dts/rockchip/rk3399-rg552.dts
index 7de684ed1edc..5591a62d0298 100644
index 7de684ed1edc..2a3d939042b2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rg552.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rg552.dts
@@ -93,7 +93,7 @@ adcmux: adc-mux {
channels = "0", "1", "2", "3";
};
- analog {
+ adc-analog {
compatible = "adc-joystick";
io-channels = <&adcmux 0>, <&adcmux 1>, <&adcmux 2>, <&adcmux 3>;
#address-cells = <1>;
@@ -119,7 +119,7 @@ axis@2 {
reg = <2>;
abs-flat = <32>;
abs-fuzz = <16>;
- abs-range = <1024 0>;
+ abs-range = <0 1024>;
linux,code = <ABS_Y>;
};
@@ -127,12 +127,12 @@ axis@3 {
reg = <3>;
abs-flat = <32>;
abs-fuzz = <16>;
- abs-range = <0 1024>;
+ abs-range = <1024 0>;
linux,code = <ABS_RY>;
@@ -132,7 +132,7 @@ axis@3 {
};
};
@ -113,13 +89,13 @@ index 7de684ed1edc..5591a62d0298 100644
+ default-state= "on";
+ // retain-state-suspended;
+ };
+
+
+ led@2 {
+ gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
+ label = "battery_red";
+ // retain-state-suspended;
+ };
+
+
+ };
vibrator {
compatible = "pwm-vibrator";
@ -248,11 +224,11 @@ index 7de684ed1edc..5591a62d0298 100644
+ opp-2040000000 {
+ opp-hz = /bits/ 64 <2040000000>;
+ opp-microvolt = <1250000>;
};
+ };
+ opp-2088000000 {
+ opp-hz = /bits/ 64 <2088000000>;
+ opp-microvolt = <1250000>;
+ };
};
+ opp-2184000000 {
+ opp-hz = /bits/ 64 <2184000000>;
+ opp-microvolt = <1350000>;
@ -382,48 +358,6 @@ index 7de684ed1edc..5591a62d0298 100644
pinctrl-names = "default";
pinctrl-0 = <&vsel2_pin>;
regulator-name = "vdd_gpu";
@@ -990,15 +1114,15 @@ &pmu_io_domains {
};
&pinctrl {
- es8316 {
- hp_det_pin: hp-det-pin {
- rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
- };
+ es8316 {
+ hp_det_pin: hp-det-pin {
+ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
- spk_en_pin: spk-en-pin {
- rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_down>;
- };
- };
+ spk_en_pin: spk-en-pin {
+ rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_down>;
+ };
+ };
i2s1 {
i2s_8ch_mclk_pin: i2s-8ch-mclk-pin {
@@ -1026,12 +1150,12 @@ vsel2_pin: vsel2-pin {
};
};
- sdcard {
- sdmmc0_pwr_h: sdmmc0-pwr-h {
- rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
- };
+ sdcard {
+ sdmmc0_pwr_h: sdmmc0-pwr-h {
+ rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
- };
+ };
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
@@ -1051,6 +1175,14 @@ vcc5v0_host_en: vcc5v0-host-en {
};
};

View file

@ -0,0 +1,13 @@
diff --git a/drivers/power/supply/cw2015_battery.c b/drivers/power/supply/cw2015_battery.c
index 0146f1bfc29b..e742efd67f74 100644
--- a/drivers/power/supply/cw2015_battery.c
+++ b/drivers/power/supply/cw2015_battery.c
@@ -546,7 +546,7 @@ static enum power_supply_property cw_battery_properties[] = {
};
static const struct power_supply_desc cw2015_bat_desc = {
- .name = "cw2015-battery",
+ .name = "battery",
.type = POWER_SUPPLY_TYPE_BATTERY,
.properties = cw_battery_properties,
.num_properties = ARRAY_SIZE(cw_battery_properties),