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

Remove dupes, more consistency + break wifi slot info into separate lines

Browse Source 
So many dupes
This commit is contained in:
Joel 2017-07-17 02:57:18 -04:00
parent f8769ed82d
commit 661932e95d
5 changed files with 62 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/kernel.h
View File

@ -3,6 +3,8 @@
#include <3ds.h> #include <3ds.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h>
char * getVersion(int version); char * getVersion(int version);
char * getCID(int type); char * getCID(int type);

1
include/system.h
View File

@ -15,7 +15,6 @@ u32 getDeviceId(void);
u64 getSoapId(void); u64 getSoapId(void);
char * getDeviceCert(void); char * getDeviceCert(void);
char * getNNIDInfo(u32 size, u32 blkId); char * getNNIDInfo(u32 size, u32 blkId);
char * isDebugModeEnabled(void);
char * getBrightness(u32 screen); char * getBrightness(u32 screen);
char * getCardSlotStatus(void); char * getCardSlotStatus(void);

13
source/kernel.c
View File

@ -1,5 +1,5 @@
#include "actu.h"
#include "kernel.h" #include "kernel.h"
#include "system.h"
char * getVersion(int version) char * getVersion(int version)
{ {
@ -14,7 +14,7 @@ char * getVersion(int version)
GET_VERSION_REVISION(os_ver) GET_VERSION_REVISION(os_ver)
); );
snprintf(str_ver, 255, "%lu.%lu-%lu\n", snprintf(str_ver, 255, "%lu.%lu-%lu",
GET_VERSION_MAJOR(firm_ver), GET_VERSION_MAJOR(firm_ver),
GET_VERSION_MINOR(firm_ver), GET_VERSION_MINOR(firm_ver),
GET_VERSION_REVISION(firm_ver) GET_VERSION_REVISION(firm_ver)
@ -27,12 +27,13 @@ char * getVersion(int version)
if (ret) if (ret)
snprintf(str_sysver, 100, "0x%08liX", ret); snprintf(str_sysver, 100, "0x%08liX", ret);
else else
snprintf(str_sysver, 100, "%d.%d.%d-%d", snprintf(str_sysver, 100, "%d.%d.%d-%d%c",
cver->mainver, cver->mainver,
cver->minor, cver->minor,
cver->build, cver->build,
nver->mainver nver->mainver,
); getFirmRegion()
);
if (version == 0) if (version == 0)
return str_kernel; return str_kernel;
@ -45,7 +46,7 @@ char * getVersion(int version)
char * getCID(int type) char * getCID(int type)
{ {
u8 buf[16]; u8 buf[16];
static char cid[32]; static char cid[33];
if (type == 0) //SDMC if (type == 0) //SDMC
FSUSER_GetSdmcCid(buf, 0x10); FSUSER_GetSdmcCid(buf, 0x10);

111
source/main.c
View File

@ -3,6 +3,7 @@
#include "actu.h" #include "actu.h"
#include "cfgs.h" #include "cfgs.h"
#include "fs.h" #include "fs.h"
#include "kernel.h"
#include "mcu.h" #include "mcu.h"
#include "misc.h" #include "misc.h"
#include "power.h" #include "power.h"
@ -59,17 +60,15 @@ int main(int argc, char *argv[])
//------------------------Variable Declaration-------------------------// //------------------------Variable Declaration-------------------------//
//=====================================================================// //=====================================================================//
char *str_ver = (char *)malloc(sizeof(char) * 255), *str_sysver = (char *)malloc(sizeof(char) * 255);
double wifiPercent, volPercent, _3dSliderPercent; double wifiPercent, volPercent, _3dSliderPercent;
unsigned long long transferableID = 0, homemenuID = 0; unsigned long long transferableID = 0, homemenuID = 0;
u32 os_ver = osGetKernelVersion(), firm_ver = osGetKernelVersion(), ip; u32 ip;
unsigned int principalID = 0, persistentID = 0; unsigned int principalID = 0, persistentID = 0;
u16 info[0x16]; u16 info[0x16];
u8 buf[16], batteryPercent = 0, batteryVolt = 0, volume = 0, mcuFwMajor = 0, mcuFwMinor = 0; u8 batteryPercent = 0, batteryVolt = 0, volume = 0, mcuFwMajor = 0, mcuFwMinor = 0;
bool isConnected = false; bool isConnected = false;
OS_VersionBin *nver = (OS_VersionBin *)malloc(sizeof(OS_VersionBin)), *cver = (OS_VersionBin *)malloc(sizeof(OS_VersionBin));
char sdFreeSize[16], sdTotalSize[16], ctrFreeSize[16], ctrTotalSize[16], name[0x16]; char sdFreeSize[16], sdTotalSize[16], ctrFreeSize[16], ctrTotalSize[16], name[0x16];
Result ret = 0, wifiRet = 0; Result ret = 0;
wifiBlock slotData; wifiBlock slotData;
consoleInit(GFX_BOTTOM, NULL); consoleInit(GFX_BOTTOM, NULL);
@ -114,34 +113,52 @@ int main(int argc, char *argv[])
//------------------------------WIFI Info------------------------------// //------------------------------WIFI Info------------------------------//
//=====================================================================// //=====================================================================//
wifiRet = CFG_GetConfigInfoBlk8(CFG_WIFI_SLOT_SIZE, CFG_WIFI_BLKID + 0, (u8*)&slotData); ret = CFG_GetConfigInfoBlk8(CFG_WIFI_SLOT_SIZE, CFG_WIFI_BLKID + 0, (u8*)&slotData);
if ((!wifiRet) && (slotData.exists)) if ((!ret) && (slotData.exists))
{ {
if (slotData.network.use) if (slotData.network.use)
printf("\x1b[32;1m*\x1b[0m WiFi Slot 1: \x1b[32;1m%s\x1b[0m (\x1b[32;1m%s\x1b[0m)\n", slotData.network.SSID, slotData.network.password); {
else if (slotData.network_WPS.use) printf("\x1b[32;1m*\x1b[0m WiFi 1 SSID: \x1b[32;1m%s\x1b[0m\n", slotData.network.SSID);
printf("\x1b[32;1m*\x1b[0m WiFi Slot 1: \x1b[32;1m%s\x1b[0m (\x1b[32;1m%s\x1b[0m)\n", slotData.network_WPS.SSID, slotData.network_WPS.password); printf("\x1b[32;1m*\x1b[0m WiFi 1 pass: \x1b[32;1m%s\x1b[0m\n\n", slotData.network.password);
}
else if (slotData.network_WPS.use)
{
printf("\x1b[32;1m*\x1b[0m WiFi 1 SSID: \x1b[32;1m%s\x1b[0m\n", slotData.network_WPS.SSID);
printf("\x1b[32;1m*\x1b[0m WiFi 1 pass: \x1b[32;1m%s\x1b[0m\n\n", slotData.network_WPS.password);
}
} }
wifiRet = CFG_GetConfigInfoBlk8(CFG_WIFI_SLOT_SIZE, CFG_WIFI_BLKID + 1, (u8*)&slotData); ret = CFG_GetConfigInfoBlk8(CFG_WIFI_SLOT_SIZE, CFG_WIFI_BLKID + 1, (u8*)&slotData);
if ((!wifiRet) && (slotData.exists)) if ((!ret) && (slotData.exists))
{ {
if (slotData.network.use) if (slotData.network.use)
printf("\x1b[32;1m*\x1b[0m WiFi Slot 2: \x1b[32;1m%s\x1b[0m (\x1b[32;1m%s\x1b[0m)\n", slotData.network.SSID, slotData.network.password); {
else if (slotData.network_WPS.use) printf("\x1b[32;1m*\x1b[0m WiFi 2 SSID: \x1b[32;1m%s\x1b[0m\n", slotData.network.SSID);
printf("\x1b[32;1m*\x1b[0m WiFi Slot 2: \x1b[32;1m%s\x1b[0m (\x1b[32;1m%s\x1b[0m)\n", slotData.network_WPS.SSID, slotData.network_WPS.password); printf("\x1b[32;1m*\x1b[0m WiFi 2 pass: \x1b[32;1m%s\x1b[0m\n\n", slotData.network.password);
}
else if (slotData.network_WPS.use)
{
printf("\x1b[32;1m*\x1b[0m WiFi 2 SSID: \x1b[32;1m%s\x1b[0m\n", slotData.network_WPS.SSID);
printf("\x1b[32;1m*\x1b[0m WiFi 2 pass: \x1b[32;1m%s\x1b[0m\n\n", slotData.network_WPS.password);
}
} }
wifiRet = CFG_GetConfigInfoBlk8(CFG_WIFI_SLOT_SIZE, CFG_WIFI_BLKID + 2, (u8*)&slotData); ret = CFG_GetConfigInfoBlk8(CFG_WIFI_SLOT_SIZE, CFG_WIFI_BLKID + 2, (u8*)&slotData);
if ((!wifiRet) && (slotData.exists)) if ((!ret) && (slotData.exists))
{ {
if (slotData.network.use) if (slotData.network.use)
printf("\x1b[32;1m*\x1b[0m WiFi Slot 3: \x1b[32;1m%s\x1b[0m (\x1b[32;1m%s\x1b[0m)\n", slotData.network.SSID, slotData.network.password); {
else if (slotData.network_WPS.use) printf("\x1b[32;1m*\x1b[0m WiFi 3 SSID: \x1b[32;1m%s\x1b[0m\n", slotData.network.SSID);
printf("\x1b[32;1m*\x1b[0m WiFi Slot 3: \x1b[32;1m%s\x1b[0m (\x1b[32;1m%s\x1b[0m)\n", slotData.network_WPS.SSID, slotData.network_WPS.password); printf("\x1b[32;1m*\x1b[0m WiFi 3 pass: \x1b[32;1m%s\x1b[0m\n\n", slotData.network.password);
}
else if (slotData.network_WPS.use)
{
printf("\x1b[32;1m*\x1b[0m WiFi 3 SSID: \x1b[32;1m%s\x1b[0m\n", slotData.network_WPS.SSID);
printf("\x1b[32;1m*\x1b[0m WiFi 3 pass: \x1b[32;1m%s\x1b[0m\n\n", slotData.network_WPS.password);
}
} }
printf("\n\x1b[32;1m> Press any key to exit =)\x1b[0m"); printf("\x1b[32;1m> Press any key to exit =)\x1b[0m");
consoleInit(GFX_TOP, NULL); consoleInit(GFX_TOP, NULL);
@ -151,35 +168,12 @@ int main(int argc, char *argv[])
//=====================================================================// //=====================================================================//
//------------------------------Firm Info------------------------------// //------------------------------Firm Info------------------------------//
//=====================================================================// //=====================================================================//
snprintf(str_ver, 255, "\x1b[33;1m*\x1b[0m Kernel version: \x1b[33;1m%lu.%lu-%lu\n*\x1b[0m FIRM version is: \x1b[33;1m%lu.%lu-%lu\x1b[0m \n", printf("\x1b[33;1m*\x1b[0m Kernel version: \x1b[33;1m%s\n", getVersion(0));
GET_VERSION_MAJOR(os_ver),
GET_VERSION_MINOR(os_ver), printf("\x1b[33;1m*\x1b[0m Firm version: \x1b[33;1m%s\n", getVersion(1));
GET_VERSION_REVISION(os_ver),
GET_VERSION_MAJOR(firm_ver), printf("\x1b[33;1m*\x1b[0m System version: \x1b[33;1m%s\n\n", getVersion(2));
GET_VERSION_MINOR(firm_ver),
GET_VERSION_REVISION(firm_ver)
);
printf(str_ver);
memset(nver, 0, sizeof(OS_VersionBin));
memset(cver, 0, sizeof(OS_VersionBin));
ret = osGetSystemVersionData(nver, cver);
if (ret)
printf("\x1b[33;1m*\x1b[0m System version: \x1b[33;1m0x%08liX\x1b[0m\n\n", ret);
snprintf(str_sysver, 100, "\x1b[33;1m*\x1b[0m System version: \x1b[33;1m%d.%d.%d-%d%c\x1b[0m\n\n",
cver->mainver,
cver->minor,
cver->build,
nver->mainver,
getFirmRegion()
);
if (!ret)
printf(str_sysver);
//=====================================================================// //=====================================================================//
//-----------------------------System Info-----------------------------// //-----------------------------System Info-----------------------------//
@ -195,17 +189,9 @@ int main(int argc, char *argv[])
printf("\x1b[31;1m*\x1b[0m MAC Address: \x1b[31;1m%s\x1b[0m \n", getMacAddress()); printf("\x1b[31;1m*\x1b[0m MAC Address: \x1b[31;1m%s\x1b[0m \n", getMacAddress());
printf("\x1b[31;1m*\x1b[0m Serial number: \x1b[31;1m%s\x1b[0m \n", getSerialNum()); printf("\x1b[31;1m*\x1b[0m Serial number: \x1b[31;1m%s\x1b[0m \n", getSerialNum());
FSUSER_GetSdmcCid(buf, 0x10); printf("\x1b[31;1m*\x1b[0m SDMC CID: \x1b[31;1m%s\x1b[0m \n", getCID(0));
printf("\x1b[31;1m*\x1b[0m SDMC CID: \x1b[31;1m%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X\x1b[0m \n",
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5],
buf[6], buf[7], buf[8], buf[9], buf[10], buf[11],
buf[12], buf[13], buf[14], buf[15]);
FSUSER_GetNandCid(buf, 0x10); printf("\x1b[31;1m*\x1b[0m NAND CID: \x1b[31;1m%s\x1b[0m \n", getCID(1));
printf("\x1b[31;1m*\x1b[0m NAND CID: \x1b[31;1m%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X\x1b[0m \n",
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5],
buf[6], buf[7], buf[8], buf[9], buf[10], buf[11],
buf[12], buf[13], buf[14], buf[15]);
ret = APT_GetAppletInfo(APPID_HOMEMENU, &homemenuID, NULL, NULL, NULL, NULL); ret = APT_GetAppletInfo(APPID_HOMEMENU, &homemenuID, NULL, NULL, NULL, NULL);
printf("\x1b[31;1m*\x1b[0m Homemenu ID: \x1b[31;1m%016llX\x1b[0m \n\n", homemenuID); printf("\x1b[31;1m*\x1b[0m Homemenu ID: \x1b[31;1m%016llX\x1b[0m \n\n", homemenuID);
@ -277,11 +263,6 @@ int main(int argc, char *argv[])
gfxSwapBuffers(); gfxSwapBuffers();
} }
free(nver);
free(cver);
free(str_ver);
free(str_sysver);
termServices(); termServices();
return 0; return 0;
} }

27
source/system.c
View File

@ -130,10 +130,10 @@ char * getScreenType(void)
switch ((screens >> 4) & 0xF) switch ((screens >> 4) & 0xF)
{ {
case 1: case 1: // 0x01 = JDI => IPS
sprintf(uScreenType, "Upper: IPS"); sprintf(uScreenType, "Upper: IPS");
break; break;
case 0xC: case 0xC: // 0x0C = SHARP => TN
sprintf(uScreenType, "Upper: TN"); sprintf(uScreenType, "Upper: TN");
break; break;
default: default:
@ -142,10 +142,10 @@ char * getScreenType(void)
} }
switch (screens & 0xF) switch (screens & 0xF)
{ {
case 1: case 1: // 0x01 = JDI => IPS
sprintf(dScreenType, " | Lower: IPS"); sprintf(dScreenType, " | Lower: IPS");
break; break;
case 0xC: case 0xC: // 0x0C = SHARP => TN
sprintf(dScreenType, " | Lower: TN"); sprintf(dScreenType, " | Lower: TN");
break; break;
default: default:
@ -157,9 +157,7 @@ char * getScreenType(void)
strcat(screenType, dScreenType); strcat(screenType, dScreenType);
} }
else else
{ sprintf(screenType, "Upper: TN | Lower: TN");
sprintf(screenType, "Upper: TN | Lower: TN");
}
return screenType; return screenType;
} }
@ -216,17 +214,6 @@ char * getNNIDInfo(u32 size, u32 blkId)
return str; return str;
} }
char * isDebugModeEnabled(void)
{
u8 debugMode = 0;
CFG_GetConfig(4, 0x130000, &debugMode);
if (debugMode == 0x10)
return "enabled";
else
return "disabled";
}
char * getBrightness(u32 screen) char * getBrightness(u32 screen)
{ {
u32 brightness = 0; u32 brightness = 0;
@ -239,13 +226,13 @@ char * getBrightness(u32 screen)
if (brightness == 0x10) if (brightness == 0x10)
return "1 (20%)"; return "1 (20%)";
else if (brightness == 0x1c) else if (brightness == 0x1C)
return "2 (40%)"; return "2 (40%)";
else if (brightness == 0x30) else if (brightness == 0x30)
return "3 (60%)"; return "3 (60%)";
else if (brightness == 0x52) else if (brightness == 0x52)
return "4 (80%)"; return "4 (80%)";
else if (brightness == 0x8e) else if (brightness == 0x8E)
return "5 (100%)"; return "5 (100%)";
else else
return "n3DS only"; return "n3DS only";