Make things ready for the final release

- Remove screenshot function since rosalina can now be used. - Fixed device ID display on GUI. - Lowered size for WiFi and Storage menu in GUI - Console will now exit with any button excluding the rosalina activation buttons.
joel16 · Aug 3, 2018 · bdf282a · bdf282a
1 parent f7ded94
commit bdf282a
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 286 deletions.
diff --git a/common/fs.c b/common/fs.c
@@ -24,19 +24,6 @@ Result FS_CloseArchive(FS_Archive archive)
 	return 0;
 }
 
-Result FS_MakeDir(FS_Archive archive, const char *path)
-{	
-	Result ret = 0;
-
-	u16 path_u16[strlen(path) + 1];
-	Utils_U8_To_U16(path_u16, path, strlen(path) + 1);
-
-	if (R_FAILED(ret = FSUSER_CreateDirectory(archive, fsMakePath(PATH_UTF16, path_u16), 0)))
-		return ret;
-
-	return 0;
-}
-
 bool FS_FileExists(FS_Archive archive, const char *path)
 {
 	Handle handle;
@@ -52,19 +39,3 @@ bool FS_FileExists(FS_Archive archive, const char *path)
 
 	return true;
 }
-
-bool FS_DirExists(FS_Archive archive, const char *path)
-{
-	Handle handle;
-
-	u16 path_u16[strlen(path) + 1];
-	Utils_U8_To_U16(path_u16, path, strlen(path) + 1);
-
-	if (R_FAILED(FSUSER_OpenDirectory(&handle, archive, fsMakePath(PATH_UTF16, path_u16))))
-		return false;
-
-	if (R_FAILED(FSDIR_Close(handle)))
-		return false;
-
-	return true;
-}
diff --git a/common/fs.h b/common/fs.h
@@ -7,8 +7,6 @@ FS_Archive archive;
 
 Result FS_OpenArchive(FS_Archive *archive, FS_ArchiveID archiveID);
 Result FS_CloseArchive(FS_Archive archive);
-Result FS_MakeDir(FS_Archive archive, const char *path);
 bool FS_FileExists(FS_Archive archive, const char *path);
-bool FS_DirExists(FS_Archive archive, const char *path);
 
-#endif
+#endif
diff --git a/common/screenshot.c b/common/screenshot.c
diff --git a/common/screenshot.h b/common/screenshot.h
diff --git a/console/source/main.c b/console/source/main.c
@@ -5,18 +5,16 @@
 
 #include "ac.h"
 #include "actu.h"
-#include "fs.h"
 #include "hardware.h"
 #include "kernel.h"
 #include "misc.h"
-#include "screenshot.h"
 #include "storage.h"
 #include "system.h"
 #include "utils.h"
 #include "wifi.h"
 
-#define ANY_KEY (KEY_TOUCH | KEY_A | KEY_B | KEY_X | KEY_Y | KEY_START | \
-		KEY_UP | KEY_DOWN | KEY_LEFT | KEY_RIGHT  | KEY_ZL | KEY_ZR | \
+#define ANY_KEY (KEY_TOUCH | KEY_A | KEY_B | KEY_X | KEY_Y | KEY_START | KEY_R | \
+		KEY_UP | KEY_CPAD_DOWN | KEY_LEFT | KEY_RIGHT  | KEY_ZL | KEY_ZR | \
 		KEY_CSTICK_UP | KEY_CSTICK_DOWN | KEY_CSTICK_LEFT | KEY_CSTICK_RIGHT)
 
 static u32 cpu_time_limit = 0;
@@ -45,14 +43,10 @@ void Init_Services(void)
 
 	APT_GetAppCpuTimeLimit(&cpu_time_limit);
 	APT_SetAppCpuTimeLimit(30);
-
-	FS_OpenArchive(&archive, ARCHIVE_SDMC);
 }
 
 void Term_Services(void)
-{
-	FS_CloseArchive(archive);
-
+{	
 	if (cpu_time_limit != UINT32_MAX)
 		APT_SetAppCpuTimeLimit(cpu_time_limit);
 
@@ -292,13 +286,8 @@ int main(int argc, char *argv[])
 
 		gspWaitForVBlank();
 		hidScanInput();
-		u32 kDown = hidKeysDown();
-		u32 kHeld = hidKeysHeld();
-
-		if (((kHeld & KEY_L) && (kDown & KEY_R)) || ((kHeld & KEY_R) && (kDown & KEY_L)))
-			Screenshot_Capture();
 
-		else if (kDown & ANY_KEY)
+		if (hidKeysDown() & ANY_KEY)
 			break;
 
 		gfxFlushBuffers();

diff --git a/gui/source/main.c b/gui/source/main.c
@@ -5,7 +5,6 @@
 #include "actu.h"
 #include "C2D_helper.h"
 #include "common.h"
-#include "fs.h"
 #include "menus.h"
 #include "sprites.h"
 #include "textures.h"
@@ -37,8 +36,6 @@ static void Init_Services(void)
 	APT_GetAppCpuTimeLimit(&cpu_time_limit);
 	APT_SetAppCpuTimeLimit(30);
 
-	FS_OpenArchive(&archive, ARCHIVE_SDMC);
-
 	staticBuf = C2D_TextBufNew(4096);
 	dynamicBuf = C2D_TextBufNew(4096);
 	sizeBuf = C2D_TextBufNew(4096);
@@ -57,8 +54,6 @@ static void Term_Services(void)
 	C2D_TextBufDelete(dynamicBuf);
 	C2D_TextBufDelete(staticBuf);
 
-	FS_CloseArchive(archive);
-
 	if (cpu_time_limit != UINT32_MAX)
 		APT_SetAppCpuTimeLimit(cpu_time_limit);