joel16/SwitchIdent
1
0
Fork 0
mirror of https://github.com/joel16/SwitchIdent.git synced 2024-11-23 11:49:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

joy-con: Fix hiddbgGetFirmwareVersion

Browse Source
This commit is contained in:
joel16 2023-06-18 00:20:06 -04:00
parent f01352a931
commit 3e44a00637
4 changed files with 33 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/common.hpp
View File

@ -22,6 +22,14 @@ typedef struct {
u32 charge_method; u32 charge_method;
} BatteryChargeInfoFields; } BatteryChargeInfoFields;
typedef struct {
u8 major;
u8 minor;
u8 micro;
u8 rev;
u8 device_identifier[0xC];
} HIDFirmwareVersion;
namespace SwitchIdent { namespace SwitchIdent {
// Kernel // Kernel
const char *GetDramDesc(void); const char *GetDramDesc(void);
@ -77,7 +85,7 @@ namespace SwitchIdent {
u32 GetWlanRSSI(void); u32 GetWlanRSSI(void);
// Joycon // Joycon
u128 GetJoyconFirmwareVersion(HidsysUniquePadId unique_pad_id); Result GetJoyconFirmwareVersion(HidDeviceTypeBits deviceType, HIDFirmwareVersion *version);
HidPowerInfo GetJoyconPowerInfo(HidNpadIdType id); HidPowerInfo GetJoyconPowerInfo(HidNpadIdType id);
HidPowerInfo GetJoyconPowerInfoL(HidNpadIdType id); HidPowerInfo GetJoyconPowerInfoL(HidNpadIdType id);
HidPowerInfo GetJoyconPowerInfoR(HidNpadIdType id); HidPowerInfo GetJoyconPowerInfoR(HidNpadIdType id);

26
source/joycon.cpp
View File

@ -3,30 +3,22 @@
#include "common.hpp" #include "common.hpp"
namespace SwitchIdent { namespace SwitchIdent {
// TODO: Fix this static Result hiddbgGetFirmwareVersion(HidNpadIdType id, u8 deviceType, HIDFirmwareVersion *version) {
static Result hiddbgGetFirmwareVersion(HidsysUniquePadId unique_pad_id, u128 *out) { const struct {
if (hosversionBefore(6,0,0)) HidNpadIdType a;
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); u8 b;
} in = { id, deviceType };
u128 temp = 0;
Result ret = serviceDispatchInOut(hiddbgGetServiceSession(), 205, unique_pad_id.id, temp);
if (R_SUCCEEDED(ret) && out) {
*out = temp;
}
else
std::printf("serviceDispatchInOut failed: 0x%x\n", ret);
return ret; return serviceDispatchInOut(hiddbgGetServiceSession(), 205, in, *version);
} }
u128 GetJoyconFirmwareVersion(HidsysUniquePadId unique_pad_id) { Result GetJoyconFirmwareVersion(HidDeviceTypeBits deviceType, HIDFirmwareVersion *version) {
Result ret = 0; Result ret = 0;
u128 version = 0;
if (R_FAILED(ret = hiddbgGetFirmwareVersion(unique_pad_id, &version))) if (R_FAILED(ret = hiddbgGetFirmwareVersion(HidNpadIdType_No1, deviceType, version)))
std::printf("hiddbgGetFirmwareVersion() failed: 0x%x.\n\n", ret); std::printf("hiddbgGetFirmwareVersion() failed: 0x%x.\n\n", ret);
return version; return ret;
} }
HidPowerInfo GetJoyconPowerInfo(HidNpadIdType id) { HidPowerInfo GetJoyconPowerInfo(HidNpadIdType id) {

11
source/main.cpp
View File

@ -6,8 +6,7 @@
namespace Services { namespace Services {
void Exit(void) { void Exit(void) {
// hiddbgExit(); hiddbgExit();
// hidsysExit();
tsExit(); tsExit();
wlaninfExit(); wlaninfExit();
@ -101,11 +100,9 @@ namespace Services {
std::printf("tsInitialize() failed: 0x%x.\n\n", ret); std::printf("tsInitialize() failed: 0x%x.\n\n", ret);
} }
// if (R_FAILED(ret = hidsysInitialize())) if (R_FAILED(ret = hiddbgInitialize())) {
// std::printf("hidsysInitialize() failed: 0x%x.\n\n", ret); std::printf("hiddbgInitialize() failed: 0x%x.\n\n", ret);
}
// if (R_FAILED(ret = hiddbgInitialize()))
// std::printf("hiddbgInitialize() failed: 0x%x.\n\n", ret);
GUI::Init(); GUI::Init();
} }

29
source/menus.cpp
View File

@ -9,7 +9,6 @@ namespace Menus {
// Globals // Globals
static int g_item_height = 0; static int g_item_height = 0;
static bool g_is_sd_inserted = false, g_is_gamecard_inserted = false; static bool g_is_sd_inserted = false, g_is_gamecard_inserted = false;
static HidsysUniquePadId g_unique_pad_ids[2] = {0};
static PadState g_pad; static PadState g_pad;
static const int g_item_dist = 67; static const int g_item_dist = 67;
static const int g_start_x = 450; static const int g_start_x = 450;
@ -173,14 +172,19 @@ namespace Menus {
} }
void JoyconInfo(void) { void JoyconInfo(void) {
// TODO: account for HidNpadIdType_Other; // TODO: Get info on other connected controllers
// Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 60, "JC fw:", "%llu", SwitchIdent::GetJoyconFirmwareVersion(g_unique_pad_ids[0]));
HidPowerInfo info_left = SwitchIdent::GetJoyconPowerInfoL(padIsHandheld(&g_pad) ? HidNpadIdType_Handheld : HidNpadIdType_No1); HidPowerInfo info_left = SwitchIdent::GetJoyconPowerInfoL(padIsHandheld(&g_pad) ? HidNpadIdType_Handheld : HidNpadIdType_No1);
HidPowerInfo info_right = SwitchIdent::GetJoyconPowerInfoR(padIsHandheld(&g_pad) ? HidNpadIdType_Handheld : HidNpadIdType_No1); HidPowerInfo info_right = SwitchIdent::GetJoyconPowerInfoR(padIsHandheld(&g_pad) ? HidNpadIdType_Handheld : HidNpadIdType_No1);
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 60, "Left Joycon battery:", "%lu %% (%s)", (info_left.battery_level * 25), info_left.is_charging? "charging" : "not charging"); HIDFirmwareVersion version_left;
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 120, "Right Joycon battery:", "%lu %% (%s)", (info_right.battery_level * 25), info_right.is_charging? "charging" : "not charging"); HIDFirmwareVersion version_right;
SwitchIdent::GetJoyconFirmwareVersion(padIsHandheld(&g_pad) ? HidDeviceTypeBits_HandheldLeft : HidDeviceTypeBits_JoyLeft, &version_left);
SwitchIdent::GetJoyconFirmwareVersion(padIsHandheld(&g_pad) ? HidDeviceTypeBits_HandheldRight : HidDeviceTypeBits_JoyRight, &version_right);
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 60, "Left Joy-con battery:", "%lu %% (%s)", (info_left.battery_level * 25), info_left.is_charging? "charging" : "not charging");
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 120, "Right Joy-con battery:", "%lu %% (%s)", (info_right.battery_level * 25), info_right.is_charging? "charging" : "not charging");
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 180, "Left Joy-con firmware:", "%d.%d.%d", version_left.major, version_left.minor, version_left.micro);
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 240, "Right Joy-con firmware:", "%d.%d.%d", version_right.major, version_right.minor, version_right.micro);
} }
void MiscInfo(void) { void MiscInfo(void) {
@ -222,24 +226,13 @@ namespace Menus {
padConfigureInput(1, HidNpadStyleSet_NpadStandard); padConfigureInput(1, HidNpadStyleSet_NpadStandard);
padInitializeDefault(&g_pad); padInitializeDefault(&g_pad);
padUpdate(&g_pad); padUpdate(&g_pad);
// For SwitchIdent::GetJoyconFirmwareVersion()
// memset(g_unique_pad_ids, 0, sizeof(g_unique_pad_ids));
// s32 total_entries = 0;
// if (R_FAILED(ret = hidsysGetUniquePadsFromNpad(padIsHandheld(&g_pad) ? HidNpadIdType_Handheld : HidNpadIdType_No1, g_unique_pad_ids, 2, &total_entries)))
// std::printf("hidsysGetUniquePadsFromNpad(): 0x%x.\n\n", ret);
// if (R_SUCCEEDED(ret))
// std::printf("hidsysGetUniquePadsFromNpad: total_entries (%d)\n", total_entries);
const char *items[] = { const char *items[] = {
"Kernel", "Kernel",
"System", "System",
"Battery", "Battery",
"Storage", "Storage",
"Joycon", "Joy-con",
"Misc", "Misc",
"Exit" "Exit"
}; };