joel16/3DSident
1
0
Fork 0
mirror of https://github.com/joel16/3DSident.git synced 2024-11-23 03:29:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix touch controls and mcu firm in GUI

Browse Source
This commit is contained in:
Joel16 2018-08-02 23:10:34 -05:00
parent d1fb56454f
commit f7ded94e60
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gui/source/main.c
View File

@ -25,8 +25,6 @@ static void Init_Services(void)
ptmuInit(); ptmuInit();
socInit((u32*)memalign(0x1000, 0x10000), 0x10000); socInit((u32*)memalign(0x1000, 0x10000), 0x10000);
FS_OpenArchive(&archive, ARCHIVE_SDMC);
romfsInit(); romfsInit();
gfxInitDefault(); gfxInitDefault();
C3D_Init(C3D_DEFAULT_CMDBUF_SIZE); C3D_Init(C3D_DEFAULT_CMDBUF_SIZE);
@ -39,6 +37,8 @@ static void Init_Services(void)
APT_GetAppCpuTimeLimit(&cpu_time_limit); APT_GetAppCpuTimeLimit(&cpu_time_limit);
APT_SetAppCpuTimeLimit(30); APT_SetAppCpuTimeLimit(30);
FS_OpenArchive(&archive, ARCHIVE_SDMC);
staticBuf = C2D_TextBufNew(4096); staticBuf = C2D_TextBufNew(4096);
dynamicBuf = C2D_TextBufNew(4096); dynamicBuf = C2D_TextBufNew(4096);
sizeBuf = C2D_TextBufNew(4096); sizeBuf = C2D_TextBufNew(4096);
@ -57,14 +57,14 @@ static void Term_Services(void)
C2D_TextBufDelete(dynamicBuf); C2D_TextBufDelete(dynamicBuf);
C2D_TextBufDelete(staticBuf); C2D_TextBufDelete(staticBuf);
FS_CloseArchive(archive);
if (cpu_time_limit != UINT32_MAX) if (cpu_time_limit != UINT32_MAX)
APT_SetAppCpuTimeLimit(cpu_time_limit); APT_SetAppCpuTimeLimit(cpu_time_limit);
if (Utils_IsN3DS()) if (Utils_IsN3DS())
osSetSpeedupEnable(false); osSetSpeedupEnable(false);
FS_CloseArchive(archive);
socExit(); socExit();
ptmuExit(); ptmuExit();
mcuHwcExit(); mcuHwcExit();

37
gui/source/menus.c
View File

@ -84,10 +84,10 @@ static void Menu_Battery(void)
ret = PTMU_GetAdapterState(&is_connected); ret = PTMU_GetAdapterState(&is_connected);
Menu_DrawItem(15, 156, "Adapter state:", R_FAILED(ret)? NULL : (is_connected? "connected" : "disconnected")); Menu_DrawItem(15, 156, "Adapter state:", R_FAILED(ret)? NULL : (is_connected? "connected" : "disconnected"));
if ((R_FAILED(ret = MCUHWC_GetFwVerHigh(&fw_ver_high))) && (R_FAILED(ret = MCUHWC_GetFwVerLow(&fw_ver_low)))) if ((R_SUCCEEDED(MCUHWC_GetFwVerHigh(&fw_ver_high))) && (R_SUCCEEDED(MCUHWC_GetFwVerLow(&fw_ver_low))))
Menu_DrawItem(15, 174, "MCU firmware:", "0.0");
else
Menu_DrawItem(15, 174, "MCU firmware:", "%u.%u", (fw_ver_high - 0x10), fw_ver_low); Menu_DrawItem(15, 174, "MCU firmware:", "%u.%u", (fw_ver_high - 0x10), fw_ver_low);
else
Menu_DrawItem(15, 174, "MCU firmware:", "0.0");
Menu_DrawItem(15, 192, "Power-saving mode:", Config_IsPowerSaveEnabled()? "enabled" : "disabled"); Menu_DrawItem(15, 192, "Power-saving mode:", Config_IsPowerSaveEnabled()? "enabled" : "disabled");
} }
@ -159,16 +159,17 @@ static void Menu_Misc(void)
u64 homemenuID = 0; u64 homemenuID = 0;
ret = APT_GetAppletInfo(APPID_HOMEMENU, &homemenuID, NULL, NULL, NULL, NULL); ret = APT_GetAppletInfo(APPID_HOMEMENU, &homemenuID, NULL, NULL, NULL, NULL);
Menu_DrawItem(15, 136, "Homemenu ID:", "%016llX", homemenuID); Menu_DrawItem(15, 136, "Homemenu ID:", "%016llX", (R_FAILED(ret))? ret : homemenuID);
double wifi_signal_percent = (osGetWifiStrength() * 33.3333333333); double wifi_signal_percent = (osGetWifiStrength() * 33.3333333333);
Menu_DrawItem(15, 156, "WiFi signal strength:", "%d (%.0lf%%)", osGetWifiStrength(), wifi_signal_percent); Menu_DrawItem(15, 156, "WiFi signal strength:", "%d (%.0lf%%)", osGetWifiStrength(), wifi_signal_percent);
u32 ip = gethostid(); char hostname[128];
ret = gethostname(hostname, sizeof(hostname));
if (display_info) if (display_info)
Menu_DrawItem(15, 174, "IP:", "%lu.%lu.%lu.%lu", ip & 0xFF, (ip>>8)&0xFF, (ip>>16)&0xFF, (ip>>24)&0xFF); Menu_DrawItem(15, 174, "IP:", hostname);
else else
Menu_DrawItem(15, 174, "IP:", "%lu.%lu.%lu.%lu", 0, 0, 0, 0); Menu_DrawItem(15, 174, "IP:", NULL);
} }
@ -192,7 +193,7 @@ static void Menu_WiFi(void)
if (R_SUCCEEDED(ACI_GetPassphrase(passphrase))) if (R_SUCCEEDED(ACI_GetPassphrase(passphrase)))
Menu_DrawItem(20, 62, "Pass:", "%s (%s)", display_info? passphrase : NULL, WiFi_GetSecurityMode()); Menu_DrawItem(20, 62, "Pass:", "%s (%s)", display_info? passphrase : NULL, WiFi_GetSecurityMode());
if ((R_SUCCEEDED(CFG_GetConfigInfoBlk8(CFG_WIFI_SLOT_SIZE, CFG_WIFI_BLKID + 0, (u8*)&slotData))) && (slotData.set)) if ((R_SUCCEEDED(CFG_GetConfigInfoBlk8(CFG_WIFI_SLOT_SIZE, CFG_WIFI_BLKID, (u8*)&slotData))) && (slotData.set))
{ {
if (display_info) if (display_info)
Menu_DrawItem(20, 78, "Mac address:", "%02X:%02X:%02X:%02X:%02X:%02X", slotData.mac_addr[0], slotData.mac_addr[1], slotData.mac_addr[2], Menu_DrawItem(20, 78, "Mac address:", "%02X:%02X:%02X:%02X:%02X:%02X", slotData.mac_addr[0], slotData.mac_addr[1], slotData.mac_addr[2],
@ -320,25 +321,25 @@ static void Menu_Storage(void)
static int touchButton(touchPosition *touch, int selection) static int touchButton(touchPosition *touch, int selection)
{ {
if (touch->px >= 15 && touch->px <= 300 && touch->py >= 37 && touch->py <= 56) if (touch->px >= 16 && touch->px <= 304 && touch->py >= 16 && touch->py <= 35)
selection = 0; selection = 0;
else if (touch->px >= 15 && touch->px <= 300 && touch->py >= 56 && touch->py <= 73) else if (touch->px >= 16 && touch->px <= 304 && touch->py >= 36 && touch->py <= 55)
selection = 1; selection = 1;
else if (touch->px >= 15 && touch->px <= 300 && touch->py >= 73 && touch->py <= 92) else if (touch->px >= 16 && touch->px <= 304 && touch->py >= 56 && touch->py <= 75)
selection = 2; selection = 2;
else if (touch->px >= 15 && touch->px <= 300 && touch->py >= 92 && touch->py <= 110) else if (touch->px >= 16 && touch->px <= 304 && touch->py >= 76 && touch->py <= 95)
selection = 3; selection = 3;
else if (touch->px >= 15 && touch->px <= 300 && touch->py >= 110 && touch->py <= 127) else if (touch->px >= 16 && touch->px <= 304 && touch->py >= 96 && touch->py <= 115)
selection = 4; selection = 4;
else if (touch->px >= 15 && touch->px <= 300 && touch->py >= 127 && touch->py <= 144) else if (touch->px >= 16 && touch->px <= 304 && touch->py >= 116 && touch->py <= 135)
selection = 5; selection = 5;
else if (touch->px >= 15 && touch->px <= 300 && touch->py >= 144 && touch->py <= 161) else if (touch->px >= 16 && touch->px <= 304 && touch->py >= 136 && touch->py <= 155)
selection = 6; selection = 6;
else if (touch->px >= 15 && touch->px <= 300 && touch->py >= 161 && touch->py <= 178) else if (touch->px >= 16 && touch->px <= 304 && touch->py >= 156 && touch->py <= 175)
selection = 7; selection = 7;
else if (touch->px >= 15 && touch->px <= 300 && touch->py >= 178 && touch->py <= 195) else if (touch->px >= 16 && touch->px <= 304 && touch->py >= 176 && touch->py <= 195)
selection = 8; selection = 8;
else if (touch->px >= 15 && touch->px <= 300 && touch->py >= 195 && touch->py <= 212) else if (touch->px >= 16 && touch->px <= 304 && touch->py >= 196 && touch->py <= 215)
selection = 9; selection = 9;
return selection; return selection;