OmniNX/Horizon-OC
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sysclk: refine menu

Browse Source
This commit is contained in:
souldbminersmwc
2026-03-13 19:18:26 -04:00
parent 7735037ad9
commit e01e346dea
2 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/sys-clk/common/include/sysclk/config.h
View File

@@ -65,6 +65,7 @@ typedef enum {
HorizonOCConfigValue_GPUSchedulingMethod, HorizonOCConfigValue_GPUSchedulingMethod,
HorizonOCConfigValue_RAMVoltUsageDisplayMode, HorizonOCConfigValue_RAMVoltUsageDisplayMode,
HorizonOCConfigValue_CpuGovernorMinimumFreq,
KipConfigValue_custRev, KipConfigValue_custRev,
// KipConfigValue_mtcConf, // KipConfigValue_mtcConf,
@@ -249,7 +250,8 @@ static inline const char* sysclkFormatConfigValue(SysClkConfigValue val, bool pr
case HorizonOCConfigValue_RAMVoltUsageDisplayMode: case HorizonOCConfigValue_RAMVoltUsageDisplayMode:
return pretty ? "RAM Voltage / Usage Display Mode" : "ram_volt_usage_display_mode"; return pretty ? "RAM Voltage / Usage Display Mode" : "ram_volt_usage_display_mode";
case HorizonOCConfigValue_CpuGovernorMinimumFreq:
return pretty ? "CPU Governor Minimum Frequency" : "cpu_gov_min_freq";
// KIP config values // KIP config values
case KipConfigValue_custRev: case KipConfigValue_custRev:
return pretty ? "Custom Revision" : "kip_cust_rev"; return pretty ? "Custom Revision" : "kip_cust_rev";
@@ -448,6 +450,8 @@ static inline uint64_t sysclkDefaultConfigValue(SysClkConfigValue val)
return 9600ULL; // 8600mW will trigger on erista stock, so raise it a bit return 9600ULL; // 8600mW will trigger on erista stock, so raise it a bit
case HocClkConfigValue_LiteTDPLimit: case HocClkConfigValue_LiteTDPLimit:
return 6400ULL; // 0.5C return 6400ULL; // 0.5C
case HorizonOCConfigValue_CpuGovernorMinimumFreq:
return 612ULL; // 612MHz
default: default:
return 0ULL; return 0ULL;
} }

63
Source/sys-clk/overlay/src/ui/gui/misc_gui.cpp
View File

@@ -28,7 +28,10 @@
#pragma message("Compiling with minimal features") #pragma message("Compiling with minimal features")
#endif #endif
class SysmoduleSettingsSubMenuGui; #define A_BTN "\ue0e0"
#define R_ARROW "\u2192"
class GeneralSettingsSubMenuGui;
class GovernorSettingsSubMenuGui;
class DisplaySubMenuGui; class DisplaySubMenuGui;
class SafetySubMenuGui; class SafetySubMenuGui;
class RamSubmenuGui; class RamSubmenuGui;
@@ -38,6 +41,7 @@ class CpuSubmenuGui;
class GpuSubmenuGui; class GpuSubmenuGui;
class GpuCustomTableSubmenuGui; class GpuCustomTableSubmenuGui;
class RamTableEditor; class RamTableEditor;
MiscGui::MiscGui() MiscGui::MiscGui()
{ {
this->configList = new SysClkConfigValueList {}; this->configList = new SysClkConfigValueList {};
@@ -359,16 +363,28 @@ void MiscGui::listUI()
std::vector<NamedValue> noNamedValues = {}; std::vector<NamedValue> noNamedValues = {};
this->listElement->addItem(new tsl::elm::CategoryHeader("Settings")); this->listElement->addItem(new tsl::elm::CategoryHeader("Settings"));
tsl::elm::ListItem* sysmoduleSettingsSubMenu = new tsl::elm::ListItem("Sysmodule Settings"); tsl::elm::ListItem* sysmoduleSettingsSubMenu = new tsl::elm::ListItem("General Settings");
sysmoduleSettingsSubMenu->setClickListener([](u64 keys) { sysmoduleSettingsSubMenu->setClickListener([](u64 keys) {
if (keys & HidNpadButton_A) { if (keys & HidNpadButton_A) {
tsl::changeTo<SysmoduleSettingsSubMenuGui>(); tsl::changeTo<GeneralSettingsSubMenuGui>();
return true; return true;
} }
return false; return false;
}); });
sysmoduleSettingsSubMenu->setValue(R_ARROW);
this->listElement->addItem(sysmoduleSettingsSubMenu); this->listElement->addItem(sysmoduleSettingsSubMenu);
tsl::elm::ListItem* governorSettingsSubMenu = new tsl::elm::ListItem("Governor Settings");
governorSettingsSubMenu->setClickListener([](u64 keys) {
if (keys & HidNpadButton_A) {
tsl::changeTo<GovernorSettingsSubMenuGui>();
return true;
}
return false;
});
governorSettingsSubMenu->setValue(R_ARROW);
this->listElement->addItem(governorSettingsSubMenu);
tsl::elm::ListItem* safetySubmenu = new tsl::elm::ListItem("Safety Settings"); tsl::elm::ListItem* safetySubmenu = new tsl::elm::ListItem("Safety Settings");
safetySubmenu->setClickListener([](u64 keys) { safetySubmenu->setClickListener([](u64 keys) {
if (keys & HidNpadButton_A) { if (keys & HidNpadButton_A) {
@@ -377,9 +393,10 @@ void MiscGui::listUI()
} }
return false; return false;
}); });
safetySubmenu->setValue(R_ARROW);
this->listElement->addItem(safetySubmenu); this->listElement->addItem(safetySubmenu);
this->listElement->addItem(new tsl::elm::CategoryHeader("KIP")); // this->listElement->addItem(new tsl::elm::CategoryHeader("KIP"));
tsl::elm::ListItem* saveBtn = new tsl::elm::ListItem("Save KIP Settings"); tsl::elm::ListItem* saveBtn = new tsl::elm::ListItem("Save KIP Settings");
saveBtn->setClickListener([](u64 keys) { saveBtn->setClickListener([](u64 keys) {
@@ -393,6 +410,7 @@ void MiscGui::listUI()
} }
return false; return false;
}); });
saveBtn->setValue(A_BTN);
this->listElement->addItem(saveBtn); this->listElement->addItem(saveBtn);
tsl::elm::ListItem* ramSubmenu = new tsl::elm::ListItem("RAM Settings"); tsl::elm::ListItem* ramSubmenu = new tsl::elm::ListItem("RAM Settings");
@@ -403,6 +421,7 @@ void MiscGui::listUI()
} }
return false; return false;
}); });
ramSubmenu->setValue(R_ARROW);
this->listElement->addItem(ramSubmenu); this->listElement->addItem(ramSubmenu);
tsl::elm::ListItem* cpuSubmenu = new tsl::elm::ListItem("CPU Settings"); tsl::elm::ListItem* cpuSubmenu = new tsl::elm::ListItem("CPU Settings");
@@ -413,6 +432,7 @@ void MiscGui::listUI()
} }
return false; return false;
}); });
cpuSubmenu->setValue(R_ARROW);
this->listElement->addItem(cpuSubmenu); this->listElement->addItem(cpuSubmenu);
tsl::elm::ListItem* gpuSubmenu = new tsl::elm::ListItem("GPU Settings"); tsl::elm::ListItem* gpuSubmenu = new tsl::elm::ListItem("GPU Settings");
@@ -423,8 +443,9 @@ void MiscGui::listUI()
} }
return false; return false;
}); });
gpuSubmenu->setValue(R_ARROW);
this->listElement->addItem(gpuSubmenu); this->listElement->addItem(gpuSubmenu);
this->listElement->addItem(new tsl::elm::CategoryHeader("Display"));
tsl::elm::ListItem* displaySubMenu = new tsl::elm::ListItem("Display Settings"); tsl::elm::ListItem* displaySubMenu = new tsl::elm::ListItem("Display Settings");
displaySubMenu->setClickListener([](u64 keys) { displaySubMenu->setClickListener([](u64 keys) {
if (keys & HidNpadButton_A) { if (keys & HidNpadButton_A) {
@@ -433,7 +454,9 @@ void MiscGui::listUI()
} }
return false; return false;
}); });
displaySubMenu->setValue(R_ARROW);
this->listElement->addItem(displaySubMenu); this->listElement->addItem(displaySubMenu);
#if IS_MINIMAL == 0 #if IS_MINIMAL == 0
// std::vector<NamedValue> chargerCurrents = { // std::vector<NamedValue> chargerCurrents = {
// NamedValue("Disabled", 0), // NamedValue("Disabled", 0),
@@ -530,12 +553,13 @@ void MiscGui::listUI()
#endif #endif
} }
class SysmoduleSettingsSubMenuGui : public MiscGui { class GeneralSettingsSubMenuGui : public MiscGui {
public: public:
SysmoduleSettingsSubMenuGui() { } GeneralSettingsSubMenuGui() { }
protected: protected:
void listUI() override { void listUI() override {
this->listElement->addItem(new tsl::elm::CategoryHeader("General Settings"));
ValueThresholds thresholdsDisabled(0, 0); ValueThresholds thresholdsDisabled(0, 0);
std::vector<NamedValue> ramVoltDispModes = { std::vector<NamedValue> ramVoltDispModes = {
NamedValue("VDD2 + VDDQ", RamDisplayMode_VDD2VDDQ), NamedValue("VDD2 + VDDQ", RamDisplayMode_VDD2VDDQ),
@@ -558,12 +582,25 @@ protected:
} }
}; };
class GovernorSettingsSubMenuGui : public MiscGui {
public:
GovernorSettingsSubMenuGui() { }
protected:
void listUI() override {
this->listElement->addItem(new tsl::elm::CategoryHeader("Governor Settings"));
addFreqButton(HorizonOCConfigValue_CpuGovernorMinimumFreq, "CPU Governor Minimum Frequency", SysClkModule_CPU, BaseMenuGui::IsMariko() ? cpu_freq_label_m : cpu_freq_label_e);
}
};
class DisplaySubMenuGui : public MiscGui { class DisplaySubMenuGui : public MiscGui {
public: public:
DisplaySubMenuGui() { } DisplaySubMenuGui() { }
protected: protected:
void listUI() override { void listUI() override {
this->listElement->addItem(new tsl::elm::CategoryHeader("Display Settings"));
addConfigToggle(HorizonOCConfigValue_OverwriteRefreshRate, nullptr); addConfigToggle(HorizonOCConfigValue_OverwriteRefreshRate, nullptr);
tsl::elm::CustomDrawer* warningText = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) { tsl::elm::CustomDrawer* warningText = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
renderer->drawString("\uE150 Enabling unsafe display", false, x + 20, y + 30, 18, tsl::style::color::ColorText); renderer->drawString("\uE150 Enabling unsafe display", false, x + 20, y + 30, 18, tsl::style::color::ColorText);
@@ -692,6 +729,7 @@ protected:
} }
return false; return false;
}); });
freqSubmenu->setValue(R_ARROW);
this->listElement->addItem(freqSubmenu); this->listElement->addItem(freqSubmenu);
tsl::elm::ListItem* latenciesSubmenu = new tsl::elm::ListItem("RAM Latency Editor"); tsl::elm::ListItem* latenciesSubmenu = new tsl::elm::ListItem("RAM Latency Editor");
@@ -702,6 +740,7 @@ protected:
} }
return false; return false;
}); });
latenciesSubmenu->setValue(R_ARROW);
this->listElement->addItem(latenciesSubmenu); this->listElement->addItem(latenciesSubmenu);
tsl::elm::ListItem* timingsSubmenu = new tsl::elm::ListItem("RAM Timing Reductions"); tsl::elm::ListItem* timingsSubmenu = new tsl::elm::ListItem("RAM Timing Reductions");
@@ -712,6 +751,7 @@ protected:
} }
return false; return false;
}); });
timingsSubmenu->setValue(R_ARROW);
this->listElement->addItem(timingsSubmenu); this->listElement->addItem(timingsSubmenu);
} }
@@ -1104,7 +1144,7 @@ protected:
{}, {},
marikoMaxEmcClock, marikoMaxEmcClock,
false, false,
"\ue0e0" A_BTN
); );
} else { } else {
// 1600000, 1331200, 1065600, 800000, 665600, 408000, 204000 // 1600000, 1331200, 1065600, 800000, 665600, 408000, 204000
@@ -1166,9 +1206,9 @@ protected:
NamedValue("2400 MHz", 2400000, "JEDEC."), NamedValue("2400 MHz", 2400000, "JEDEC."),
}; };
addConfigButtonS(KipConfigValue_eristaEmcMaxClock, "", ValueRange(0, 1, 1, "", 1), "", &eristaRamThresholds, {}, eristaMaxEmcClock, false, "\ue0e0"); addConfigButtonS(KipConfigValue_eristaEmcMaxClock, "", ValueRange(0, 1, 1, "", 1), "", &eristaRamThresholds, {}, eristaMaxEmcClock, false, A_BTN);
addConfigButtonS(KipConfigValue_eristaEmcMaxClock1, "", ValueRange(0, 1, 1, "", 1), "", &eristaRamThresholds, {}, eristaMaxEmcClock, false, "\ue0e0"); addConfigButtonS(KipConfigValue_eristaEmcMaxClock1, "", ValueRange(0, 1, 1, "", 1), "", &eristaRamThresholds, {}, eristaMaxEmcClock, false, A_BTN);
addConfigButtonS(KipConfigValue_eristaEmcMaxClock2, "", ValueRange(0, 1, 1, "", 1), "", &eristaRamThresholds, {}, eristaMaxEmcClock, false, "\ue0e0"); addConfigButtonS(KipConfigValue_eristaEmcMaxClock2, "", ValueRange(0, 1, 1, "", 1), "", &eristaRamThresholds, {}, eristaMaxEmcClock, false, A_BTN);
} }
}; };
}; };
@@ -1355,6 +1395,7 @@ protected:
} }
return false; return false;
}); });
customTableSubmenu->setValue(R_ARROW);
this->listElement->addItem(customTableSubmenu); this->listElement->addItem(customTableSubmenu);
} }
}; };