Moved includes to include dir, and merged changes from GUI

joel16 · Jun 9, 2017 · c0fe6d3 · c0fe6d3
1 parent 884797d
commit c0fe6d3
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 210 deletions.
diff --git a/include/frd.h b/include/frd.h
diff --git a/source/actu.h b/source/actu.h
diff --git a/source/am.h b/source/am.h
diff --git a/source/cfgs.h b/source/cfgs.h
diff --git a/source/frd.c b/source/frd.c
diff --git a/source/frd.h b/source/frd.h
diff --git a/source/fs.h b/source/fs.h
diff --git a/source/gsplcd.h b/source/gsplcd.h
diff --git a/source/main.c b/source/main.c
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
 	//-----------------------------System Info-----------------------------//
 	//=====================================================================//
 
-	printf("\x1b[31;1m*\x1b[0m Model: \x1b[31;1m%s %s\n\x1b[0m", getModel(), getRegion());
+	printf("\x1b[31;1m*\x1b[0m Model: \x1b[31;1m%s\x1b[0m (\x1b[31;1m%s\x1b[0m) \n\x1b[0m", getModel(), getRegion());
 	printf("\x1b[31;1m*\x1b[0m Screen type: \x1b[31;1m %s \n\x1b[0m", getScreenType());
 	printf("\x1b[31;1m*\x1b[0m Language: \x1b[31;1m%s\x1b[0m \n", getLang());
 	printf("\x1b[31;1m*\x1b[0m NNID: \x1b[31;1m%s\x1b[0m ", (char*)getNNID());

diff --git a/source/mcu.h b/source/mcu.h
diff --git a/source/screenshot.h b/source/screenshot.h
diff --git a/source/system.c b/source/system.c
@@ -9,21 +9,22 @@ const char * getModel()
 {
     const char *models[] = 
 	{
-        "O3DS",
-        "O3DS XL",
-        "N3DS",
-        "2DS",
-        "N3DS XL",
-        "Unknown"
+		"OLD 3DS - CTR",
+		"OLD 3DS XL - SPR",
+		"NEW 3DS - KTR",
+		"OLD 2DS - FTR",
+		"NEW 3DS XL - RED",
+		"NEW 2DS XL - JAN",
+		"Unknown"
     };
 
     u8 model = 0;
     CFGU_GetSystemModel(&model);
 
-    if (model < 5)
+    if (model < 6)
         return models[model];
     else
-        return models[5];
+        return models[6];
 }
 
 const char * getRegion()
@@ -225,4 +226,4 @@ char * getBrightness(u32 screen)
 		return "5 (100%)";
 	else
 		return "n3DS only";
-}
+}
diff --git a/source/utils.h b/source/utils.h