LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Fix latest commit

Browse Source
This commit is contained in:
TuxSH
2020-05-15 02:06:52 +01:00
parent 22db3445a0
commit a2313d1c03
9 changed files with 152 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sysmodules/rosalina/source/menus/cheats.c
View File

@@ -1944,7 +1944,7 @@ void RosalinaMenu_Cheats(void)
Draw_FlushFramebuffer();
Draw_Unlock();
} while (!(waitInput() & BUTTON_B) && !terminationRequest);
} while (!(waitInput() & KEY_B) && !terminationRequest);
}
else
{
@@ -1991,9 +1991,9 @@ void RosalinaMenu_Cheats(void)
if (pressed != 0) break;
} while (pressed == 0 && !terminationRequest);
if (pressed & BUTTON_B)
if (pressed & KEY_B)
break;
else if ((pressed & BUTTON_A) && R_SUCCEEDED(r))
else if ((pressed & KEY_A) && R_SUCCEEDED(r))
{
if (cheats[selected]->active)
{
@@ -2004,13 +2004,13 @@ void RosalinaMenu_Cheats(void)
r = Cheat_MapMemoryAndApplyCheat(pid, cheats[selected]);
}
}
else if (pressed & BUTTON_DOWN)
else if (pressed & KEY_DOWN)
selected++;
else if (pressed & BUTTON_UP)
else if (pressed & KEY_UP)
selected--;
else if (pressed & BUTTON_LEFT)
else if (pressed & KEY_LEFT)
selected -= CHEATS_PER_MENU_PAGE;
else if (pressed & BUTTON_RIGHT)
else if (pressed & KEY_RIGHT)
{
if (selected + CHEATS_PER_MENU_PAGE < cheatCount)
selected += CHEATS_PER_MENU_PAGE;

6
sysmodules/rosalina/source/menus/debugger.c
View File

@@ -162,7 +162,7 @@ void DebuggerMenu_EnableDebugger(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(waitInput() & BUTTON_B) && !terminationRequest);
while(!(waitInput() & KEY_B) && !terminationRequest);
}
void DebuggerMenu_DisableDebugger(void)
@@ -183,7 +183,7 @@ void DebuggerMenu_DisableDebugger(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(waitInput() & BUTTON_B) && !terminationRequest);
while(!(waitInput() & KEY_B) && !terminationRequest);
}
void DebuggerMenu_DebugNextApplicationByForce(void)
@@ -232,7 +232,7 @@ void DebuggerMenu_DebugNextApplicationByForce(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(waitInput() & BUTTON_B) && !terminationRequest);
while(!(waitInput() & KEY_B) && !terminationRequest);
}
void debuggerSocketThreadMain(void)

46
sysmodules/rosalina/source/menus/miscellaneous.c
View File

@@ -95,13 +95,25 @@ void MiscellaneousMenu_SwitchBoot3dsxTargetTitle(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(waitInput() & BUTTON_B) && !terminationRequest);
while(!(waitInput() & KEY_B) && !terminationRequest);
}
static void MiscellaneousMenu_ConvertComboToString(char *out, u32 combo)
{
static const char *keys[] = { "A", "B", "Select", "Start", "Right", "Left", "Up", "Down", "R", "L", "X", "Y" };
for(s32 i = 11; i >= 0; i--)
static const char *keys[] = {
"A", "B", "Select", "Start", "Right", "Left", "Up", "Down", "R", "L", "X", "Y",
"?", "?",
"ZL", "ZR",
"?", "?", "?", "?",
"Touch",
"?", "?", "?",
"CStick Right", "CStick Left", "CStick Up", "CStick Down",
"CPad Right", "CPad Left", "CPad Up", "CPad Down",
};
char *outOrig = out;
out[0] = 0;
for(s32 i = 31; i >= 0; i--)
{
if(combo & (1 << i))
{
@@ -111,12 +123,13 @@ static void MiscellaneousMenu_ConvertComboToString(char *out, u32 combo)
}
}
out[-1] = 0;
if (out != outOrig)
out[-1] = 0;
}
void MiscellaneousMenu_ChangeMenuCombo(void)
{
char comboStrOrig[64], comboStr[64];
char comboStrOrig[128], comboStr[128];
u32 posY;
Draw_Lock();
@@ -132,9 +145,6 @@ void MiscellaneousMenu_ChangeMenuCombo(void)
posY = Draw_DrawFormattedString(10, 30, COLOR_WHITE, "The current menu combo is: %s", comboStrOrig);
posY = Draw_DrawString(10, posY + SPACING_Y, COLOR_WHITE, "Please enter the new combo:");
Draw_FlushFramebuffer();
Draw_Unlock();
menuCombo = waitCombo();
MiscellaneousMenu_ConvertComboToString(comboStr, menuCombo);
@@ -151,7 +161,7 @@ void MiscellaneousMenu_ChangeMenuCombo(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(waitInput() & BUTTON_B) && !terminationRequest);
while(!(waitInput() & KEY_B) && !terminationRequest);
}
void MiscellaneousMenu_SaveSettings(void)
@@ -217,7 +227,7 @@ void MiscellaneousMenu_SaveSettings(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(waitInput() & BUTTON_B) && !terminationRequest);
while(!(waitInput() & KEY_B) && !terminationRequest);
}
void MiscellaneousMenu_InputRedirection(void)
@@ -317,7 +327,7 @@ void MiscellaneousMenu_InputRedirection(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(waitInput() & BUTTON_B) && !terminationRequest);
while(!(waitInput() & KEY_B) && !terminationRequest);
}
void MiscellaneousMenu_SyncTimeDate(void)
@@ -351,16 +361,16 @@ void MiscellaneousMenu_SyncTimeDate(void)
input = waitInput();
if(input & BUTTON_LEFT) utcOffset = (24 + utcOffset - 1) % 24; // ensure utcOffset >= 0
if(input & BUTTON_RIGHT) utcOffset = (utcOffset + 1) % 24;
if(input & BUTTON_UP) utcOffsetMinute = (utcOffsetMinute + 1) % 60;
if(input & BUTTON_DOWN) utcOffsetMinute = (60 + utcOffsetMinute - 1) % 60;
if(input & KEY_LEFT) utcOffset = (24 + utcOffset - 1) % 24; // ensure utcOffset >= 0
if(input & KEY_RIGHT) utcOffset = (utcOffset + 1) % 24;
if(input & KEY_UP) utcOffsetMinute = (utcOffsetMinute + 1) % 60;
if(input & KEY_DOWN) utcOffsetMinute = (60 + utcOffsetMinute - 1) % 60;
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(input & (BUTTON_A | BUTTON_B)) && !terminationRequest);
while(!(input & (KEY_A | KEY_B)) && !terminationRequest);
if (input & BUTTON_B)
if (input & KEY_B)
return;
utcOffset -= 12;
@@ -400,6 +410,6 @@ void MiscellaneousMenu_SyncTimeDate(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(input & BUTTON_B) && !terminationRequest);
while(!(input & KEY_B) && !terminationRequest);
}

44
sysmodules/rosalina/source/menus/process_list.c
View File

@@ -197,7 +197,7 @@ end:
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(waitInput() & BUTTON_B) && !terminationRequest);
while(!(waitInput() & KEY_B) && !terminationRequest);
#undef TRY
}
@@ -493,21 +493,21 @@ static void ProcessListMenu_MemoryViewer(const ProcessInfo *info)
u32 pressed = waitInputWithTimeout(1000);
if(pressed & BUTTON_A)
if(pressed & KEY_A)
editing = !editing;
else if(pressed & BUTTON_X)
else if(pressed & KEY_X)
{
if(checkMode(MENU_MODE_GOTO))
finishJumping();
else
gotoAddress = __builtin_bswap32(((u32)menus[MENU_MODE_NORMAL].buf) + menus[MENU_MODE_NORMAL].selected);
}
else if(pressed & BUTTON_Y)
else if(pressed & KEY_Y)
{
if(checkMode(MENU_MODE_SEARCH))
finishSearching();
}
else if(pressed & BUTTON_SELECT)
else if(pressed & KEY_SELECT)
{
clearMenu();
ProcessListMenu_DumpMemory(info->name, menus[MENU_MODE_NORMAL].buf, menus[MENU_MODE_NORMAL].max);
@@ -517,35 +517,35 @@ static void ProcessListMenu_MemoryViewer(const ProcessInfo *info)
if(editing)
{
// Edit the highlighted byte
if(pressed & BUTTON_LEFT)
if(pressed & KEY_LEFT)
selectedByteAdd0x10();
else if(pressed & BUTTON_RIGHT)
else if(pressed & KEY_RIGHT)
selectedByteSub0x10();
else if(pressed & BUTTON_UP)
else if(pressed & KEY_UP)
selectedByteIncrement();
else if(pressed & BUTTON_DOWN)
else if(pressed & KEY_DOWN)
selectedByteDecrement();
}
else
{
// Move the cursor
if(pressed & BUTTON_LEFT)
if(pressed & KEY_LEFT)
selectedMoveLeft();
else if(pressed & BUTTON_RIGHT)
else if(pressed & KEY_RIGHT)
selectedMoveRight();
else if(pressed & BUTTON_UP)
else if(pressed & KEY_UP)
selectedMoveUp();
else if(pressed & BUTTON_DOWN)
else if(pressed & KEY_DOWN)
selectedMoveDown();
else if(pressed & BUTTON_L1)
else if(pressed & KEY_L)
{
if(menuMode == MENU_MODE_NORMAL)
viewHeap();
else if(menuMode == MENU_MODE_SEARCH)
searchPatternReduce();
}
else if(pressed & BUTTON_R1)
else if(pressed & KEY_R)
{
if(menuMode == MENU_MODE_NORMAL)
viewCode();
@@ -554,7 +554,7 @@ static void ProcessListMenu_MemoryViewer(const ProcessInfo *info)
}
}
if(pressed & BUTTON_B) // go back to the list, or the simple viewer
if(pressed & KEY_B) // go back to the list, or the simple viewer
{
if(menuMode != MENU_MODE_NORMAL)
{
@@ -700,17 +700,17 @@ void RosalinaMenu_ProcessList(void)
}
while(pressed == 0 && !terminationRequest);
if(pressed & BUTTON_B)
if(pressed & KEY_B)
break;
else if(pressed & BUTTON_A)
else if(pressed & KEY_A)
ProcessListMenu_HandleSelected(&infos[selected]);
else if(pressed & BUTTON_DOWN)
else if(pressed & KEY_DOWN)
selected++;
else if(pressed & BUTTON_UP)
else if(pressed & KEY_UP)
selected--;
else if(pressed & BUTTON_LEFT)
else if(pressed & KEY_LEFT)
selected -= PROCESSES_PER_MENU_PAGE;
else if(pressed & BUTTON_RIGHT)
else if(pressed & KEY_RIGHT)
{
if(selected + PROCESSES_PER_MENU_PAGE < processAmount)
selected += PROCESSES_PER_MENU_PAGE;

24
sysmodules/rosalina/source/menus/sysconfig.c
View File

@@ -66,7 +66,7 @@ void SysConfigMenu_ToggleLEDs(void)
u32 pressed = waitInputWithTimeout(1000);
if(pressed & BUTTON_A)
if(pressed & KEY_A)
{
mcuHwcInit();
u8 result;
@@ -75,7 +75,7 @@ void SysConfigMenu_ToggleLEDs(void)
MCUHWC_WriteRegister(0x28, &result, 1);
mcuHwcExit();
}
else if(pressed & BUTTON_B)
else if(pressed & KEY_B)
return;
}
while(!terminationRequest);
@@ -139,13 +139,13 @@ void SysConfigMenu_ToggleWireless(void)
u32 pressed = waitInputWithTimeout(1000);
if(pressed & BUTTON_A && nwmRunning)
if(pressed & KEY_A && nwmRunning)
{
nwmExtInit();
NWMEXT_ControlWirelessEnabled(!wireless);
nwmExtExit();
}
else if(pressed & BUTTON_B)
else if(pressed & KEY_B)
return;
}
while(!terminationRequest);
@@ -224,7 +224,7 @@ static bool SysConfigMenu_ForceWifiConnection(int slot)
u32 pressed = waitInputWithTimeout(1000);
if(pressed & BUTTON_B)
if(pressed & KEY_B)
break;
}
while(!terminationRequest);
@@ -259,7 +259,7 @@ void SysConfigMenu_TogglePowerButton(void)
u32 pressed = waitInputWithTimeout(1000);
if(pressed & BUTTON_A)
if(pressed & KEY_A)
{
mcuHwcInit();
MCUHWC_ReadRegister(0x18, (u8*)&mcuIRQMask, 4);
@@ -267,7 +267,7 @@ void SysConfigMenu_TogglePowerButton(void)
MCUHWC_WriteRegister(0x18, (u8*)&mcuIRQMask, 4);
mcuHwcExit();
}
else if(pressed & BUTTON_B)
else if(pressed & KEY_B)
return;
}
while(!terminationRequest);
@@ -296,7 +296,7 @@ void SysConfigMenu_ControlWifi(void)
u32 pressed = waitInputWithTimeout(1000);
if(pressed & BUTTON_A)
if(pressed & KEY_A)
{
if(SysConfigMenu_ForceWifiConnection(slot))
{
@@ -309,7 +309,7 @@ void SysConfigMenu_ControlWifi(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
else if(pressed & BUTTON_LEFT)
else if(pressed & KEY_LEFT)
{
slotString[slot * 4] = ' ';
slotString[(slot * 4) + 2] = ' ';
@@ -319,7 +319,7 @@ void SysConfigMenu_ControlWifi(void)
slotString[slot * 4] = '>';
slotString[(slot * 4) + 2] = '<';
}
else if(pressed & BUTTON_RIGHT)
else if(pressed & KEY_RIGHT)
{
slotString[slot * 4] = ' ';
slotString[(slot * 4) + 2] = ' ';
@@ -329,7 +329,7 @@ void SysConfigMenu_ControlWifi(void)
slotString[slot * 4] = '>';
slotString[(slot * 4) + 2] = '<';
}
else if(pressed & BUTTON_B)
else if(pressed & KEY_B)
return;
}
while(!terminationRequest);
@@ -352,7 +352,7 @@ void SysConfigMenu_DisableForcedWifiConnection(void)
Draw_DrawString(10, 30, COLOR_WHITE, "Forced connection successfully disabled.\nNote: auto-connection may remain broken.");
u32 pressed = waitInputWithTimeout(1000);
if(pressed & BUTTON_B)
if(pressed & KEY_B)
return;
}
while(!terminationRequest);