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

power: Include new charger menu (separate from battery menu - previously called power menu)

Browse Source
This commit is contained in:
joel16 2023-06-08 17:11:58 -04:00
parent b925966919
commit 35db5c1a41
6 changed files with 87 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/common.hpp
View File

@ -3,6 +3,25 @@
#include <switch.h>
typedef struct {
u32 in_curr_limit;
u32 out_curr_limit;
u32 charge_curr_limit;
u32 charge_volt_limit;
u32 power_role;
u32 enable_battery_charge;
u32 charge_limits_temp;
u32 battery_temp;
u32 capacity;
u32 voltage_avg;
u32 battery_age;
u32 power_role_2;
u32 charger;
u32 charger_volt_limit;
u32 charger_curr_limit;
u32 charge_method;
} BatteryChargeInfoFields;
namespace SwitchIdent {
// Kernel
const char *GetDramDesc(void);
@ -37,6 +56,7 @@ namespace SwitchIdent {
double GetBatteryAgePercentage(void);
SetBatteryLot GetBatteryLot(void);
s32 GetBatteryTemperature(TsLocation location);
s32 GetBatteryChargeInfoFields(BatteryChargeInfoFields *batteryChargeInfoFields);
// Storage
s64 GetTotalStorage(NcmStorageId storage_id);

2
include/gui.hpp
View File

@ -4,7 +4,7 @@
#include <switch.h>
#include <SDL2/SDL.h>
extern SDL_Texture *banner, *drive, *menu_icons[7];
extern SDL_Texture *banner, *drive, *menu_icons[8];
namespace GUI {
int Init(void);

BIN
romfs/Ubuntu-Regular.ttf Normal file → Executable file
View File

Binary file not shown.

11
source/gui.cpp
View File

@ -4,7 +4,7 @@
#include "gui.hpp"
#include "SDL_FontCache.h"
SDL_Texture *banner = nullptr, *drive = nullptr, *menu_icons[7] = { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr };
SDL_Texture *banner = nullptr, *drive = nullptr, *menu_icons[8] = { 0 };
namespace GUI {
static SDL_Window *g_window = nullptr;
@ -43,10 +43,11 @@ namespace GUI {
GUI::LoadImage(&menu_icons[0], "romfs:/kernel.png");
GUI::LoadImage(&menu_icons[1], "romfs:/system.png");
GUI::LoadImage(&menu_icons[2], "romfs:/power.png");
GUI::LoadImage(&menu_icons[3], "romfs:/storage.png");
GUI::LoadImage(&menu_icons[4], "romfs:/joycon.png");
GUI::LoadImage(&menu_icons[5], "romfs:/misc.png");
GUI::LoadImage(&menu_icons[6], "romfs:/exit.png");
menu_icons[3] = menu_icons[2];
GUI::LoadImage(&menu_icons[4], "romfs:/storage.png");
GUI::LoadImage(&menu_icons[5], "romfs:/joycon.png");
GUI::LoadImage(&menu_icons[6], "romfs:/misc.png");
GUI::LoadImage(&menu_icons[7], "romfs:/exit.png");
g_font = FC_CreateFont();
FC_LoadFont(g_font, g_renderer, "romfs:/Ubuntu-Regular.ttf", 25, FC_MakeColor(0, 0, 0, 255), TTF_STYLE_NORMAL);

59
source/menus.cpp
View File

@ -27,7 +27,8 @@ namespace Menus {
enum MenuState {
STATE_KERNEL_INFO = 0,
STATE_SYSTEM_INFO,
STATE_POWER_INFO,
STATE_BATTERY_INFO,
STATE_CHARGER_INFO,
STATE_STORAGE_INFO,
STATE_JOYCON_INFO,
STATE_MISC_INFO,
@ -77,17 +78,43 @@ namespace Menus {
Menus::DrawItem(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 350, "NFC:", SwitchIdent::GetNfcEnableFlag()? "Enabled" : "Disabled");
}
void PowerInfo(void) {
void BatteryInfo(void) {
s32 int_temp = SwitchIdent::GetBatteryTemperature(TsLocation_Internal);
s32 ext_temp = SwitchIdent::GetBatteryTemperature(TsLocation_External);
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 50, "Battery percentage:", "%lu %% (%s)", SwitchIdent::GetBatteryPercentage(), SwitchIdent::IsCharging()? "charging" : "not charging");
Menus::DrawItem(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 100, "Battery voltage state:", SwitchIdent::GetVoltageState());
Menus::DrawItem(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 150, "Battery charger type:", SwitchIdent::GetChargerType());
Menus::DrawItem(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 200, "Battery charging enabled:", SwitchIdent::IsChargingEnabled()? "Yes" : "No");
Menus::DrawItem(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 250, "Battery ample power supplied:", SwitchIdent::IsEnoughPowerSupplied()? "Yes" : "No");
Menus::DrawItem(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 300, "Battery lot number:", SwitchIdent::GetBatteryLot().lot);
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 350, "Battery internal temperature:", "%d °C (%d °F)", int_temp, ((int_temp * 9/5) + 32));
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 400, "Battery external temperature:", "%d °C (%d °F)", ext_temp, ((ext_temp * 9/5) + 32));
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 50, "Percentage:", "%lu %% (%s)", SwitchIdent::GetBatteryPercentage(), SwitchIdent::IsCharging()? "charging" : "not charging");
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 100, "Age percentage:", "%.2f %%", SwitchIdent::GetBatteryAgePercentage());
Menus::DrawItem(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 150, "Voltage state:", SwitchIdent::GetVoltageState());
Menus::DrawItem(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 200, "Lot number:", SwitchIdent::GetBatteryLot().lot);
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 250, "Internal temperature:", "%d °C (%d °F)", int_temp, ((int_temp * 9/5) + 32));
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 300, "External temperature:", "%d °C (%d °F)", ext_temp, ((ext_temp * 9/5) + 32));
}
void ChargerInfo(void) {
const char *chargers[] = {
"Unknown",
"PD",
"Type-C 1.5A",
"Type-C 3.0A"
"DCP",
"CDP",
"SDP",
"Apple 500mA",
"Apple 1000mA",
"Apple 2000mA"
};
BatteryChargeInfoFields batteryChargeInfoFields = { 0 };
SwitchIdent::GetBatteryChargeInfoFields(&batteryChargeInfoFields);
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 50, "Current limit:", "(In: %d mA) (Out: %d mA)", batteryChargeInfoFields.in_curr_limit, batteryChargeInfoFields.out_curr_limit);
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 100, "Battery charging current limit:", "%d mA", batteryChargeInfoFields.charge_curr_limit);
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 150, "Battery charging voltage limit:", "%d mV", batteryChargeInfoFields.charge_volt_limit);
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 200, "Capacity:", "%d pcm (Age: %d pcm)", batteryChargeInfoFields.capacity, batteryChargeInfoFields.battery_age);
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 250, "Voltage average:", "%d mV", batteryChargeInfoFields.voltage_avg);
Menus::DrawItem(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 300, "Charger:", chargers[batteryChargeInfoFields.charger]);
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 350, "Charger voltage limit:", "%d mV", batteryChargeInfoFields.charger_volt_limit);
Menus::DrawItemf(g_start_x, g_start_y + ((g_item_dist - g_item_height) / 2) + 400, "Charger current limit:", "%d mA", batteryChargeInfoFields.charger_curr_limit);
}
void StorageInfo(void) {
@ -199,6 +226,7 @@ namespace Menus {
padInitializeDefault(&g_pad);
padUpdate(&g_pad);
// For SwitchIdent::GetJoyconFirmwareVersion()
// memset(g_unique_pad_ids, 0, sizeof(g_unique_pad_ids));
@ -212,7 +240,8 @@ namespace Menus {
const char *items[] = {
"Kernel",
"System",
"Power",
"Battery",
"Charger",
"Storage",
"Joycon",
"Misc",
@ -256,8 +285,12 @@ namespace Menus {
Menus::SystemInfo();
break;
case STATE_POWER_INFO:
Menus::PowerInfo();
case STATE_BATTERY_INFO:
Menus::BatteryInfo();
break;
case STATE_CHARGER_INFO:
Menus::ChargerInfo();
break;
case STATE_STORAGE_INFO:

14
source/power.cpp
View File

@ -17,6 +17,10 @@ namespace SwitchIdent {
static Result psmIsBatteryChargingEnabled(bool *out) {
return _psmCmdNoInOutBool(psmGetServiceSession(), out, 4);
}
static Result psmGetBatteryChargeInfoFields(BatteryChargeInfoFields *batteryChargeInfoFields) {
return serviceDispatchOut(psmGetServiceSession(), 17, *batteryChargeInfoFields);
}
u32 GetBatteryPercentage(void) {
Result ret = 0;
@ -147,4 +151,14 @@ namespace SwitchIdent {
return temp;
}
s32 GetBatteryChargeInfoFields(BatteryChargeInfoFields * batteryChargeInfoFields) {
Result ret = 0;
if (R_FAILED(ret = psmGetBatteryChargeInfoFields(batteryChargeInfoFields))) {
std::printf("psmGetBatteryChargeInfoFields() failed: 0x%x.\n\n", ret);
}
return ret;
}
}