diff --git a/Source/sys-clk/overlay/src/ui/gui/freq_choice_gui.cpp b/Source/sys-clk/overlay/src/ui/gui/freq_choice_gui.cpp index 79b6418b..c2ca5f48 100644 --- a/Source/sys-clk/overlay/src/ui/gui/freq_choice_gui.cpp +++ b/Source/sys-clk/overlay/src/ui/gui/freq_choice_gui.cpp @@ -44,7 +44,7 @@ FreqChoiceGui::FreqChoiceGui(std::uint32_t selectedHz, this->module = module; this->listener = listener; this->checkMax = checkMax; - this->labels = labels; // NEW + this->labels = labels; this->configList = new SysClkConfigValueList {}; } @@ -128,9 +128,9 @@ void FreqChoiceGui::listUI() this->configList->values[HocClkConfigValue_MarikoMaxGpuClock] < mhz) continue; - if (moduleName == "mem" && - this->configList->values[HocClkConfigValue_MarikoMaxMemClock] < mhz) - continue; + // if (moduleName == "mem" && + // this->configList->values[HocClkConfigValue_MarikoMaxMemClock] < mhz) + // continue; } else if (checkMax && IsErista()) { if (moduleName == "cpu" && @@ -141,9 +141,9 @@ void FreqChoiceGui::listUI() this->configList->values[HocClkConfigValue_EristaMaxGpuClock] < mhz) continue; - if (moduleName == "mem" && - this->configList->values[HocClkConfigValue_EristaMaxMemClock] < mhz) - continue; + // if (moduleName == "mem" && + // this->configList->values[HocClkConfigValue_EristaMaxMemClock] < mhz) + // continue; } if (moduleName == "mem" && mhz <= 600) diff --git a/Source/sys-clk/overlay/src/ui/gui/misc_gui.cpp b/Source/sys-clk/overlay/src/ui/gui/misc_gui.cpp index 3e1fae58..453e25fd 100644 --- a/Source/sys-clk/overlay/src/ui/gui/misc_gui.cpp +++ b/Source/sys-clk/overlay/src/ui/gui/misc_gui.cpp @@ -268,7 +268,7 @@ void MiscGui::listUI() ); - std::map cpu_freq_label_m = { + std::map cpu_freq_label_m = { {612000000, "Sleep Mode"}, {1020000000, "Stock"}, {1224000000, "Dev OC"}, @@ -329,11 +329,11 @@ void MiscGui::listUI() if(IsMariko()) { addFreqButton(HocClkConfigValue_MarikoMaxCpuClock, nullptr, SysClkModule_CPU, cpu_freq_label_m); addFreqButton(HocClkConfigValue_MarikoMaxGpuClock, nullptr, SysClkModule_GPU, gpu_freq_label_m); - addFreqButton(HocClkConfigValue_MarikoMaxMemClock, nullptr, SysClkModule_MEM, emc_freq_label_m); + // addFreqButton(HocClkConfigValue_MarikoMaxMemClock, nullptr, SysClkModule_MEM, emc_freq_label_m); } else { addFreqButton(HocClkConfigValue_EristaMaxCpuClock, nullptr, SysClkModule_CPU, cpu_freq_label_e); addFreqButton(HocClkConfigValue_EristaMaxGpuClock, nullptr, SysClkModule_GPU, gpu_freq_label_e); - addFreqButton(HocClkConfigValue_EristaMaxMemClock, nullptr, SysClkModule_MEM, emc_freq_label_e); + // addFreqButton(HocClkConfigValue_EristaMaxMemClock, nullptr, SysClkModule_MEM, emc_freq_label_e); } this->listElement->addItem(new tsl::elm::CategoryHeader("KIP Editing")); @@ -357,6 +357,11 @@ void MiscGui::listUI() ); this->listElement->addItem(new tsl::elm::CategoryHeader("KIP Settings")); + if(IsMariko()) + addFreqButton(KipConfigValue_marikoCpuBoostClock, nullptr, SysClkModule_CPU, cpu_freq_label_m); + else + addFreqButton(KipConfigValue_eristaCpuBoostClock, nullptr, SysClkModule_CPU, cpu_freq_label_e); + std::vector autoAdjOptions = { NamedValue("AUTO_ADJ", 0), NamedValue("AUTO_ADJ_BL", 1) @@ -625,7 +630,6 @@ void MiscGui::listUI() ); - std::vector marikoTableConf = { NamedValue("Auto", 0), NamedValue("Default", 1), @@ -780,6 +784,8 @@ void MiscGui::listUI() addConfigToggle(KipConfigValue_marikoGpuFullUnlock, "GPU Full Unlock"); + this->listElement->addItem(new tsl::elm::CategoryHeader("GPU Custom Table")); + if(IsMariko()) { addConfigButton( KipConfigValue_g_volt_76800, diff --git a/dist/README.md b/dist/README.md index 242747ff..01eae567 100644 --- a/dist/README.md +++ b/dist/README.md @@ -9,6 +9,7 @@ ![Nintendo Switch](https://img.shields.io/badge/Nintendo_Switch-E60012?style=for-the-badge\&logo=nintendo-switch\&logoColor=white) [![Discord](https://img.shields.io/badge/Discord-5865F2?style=for-the-badge\&logo=discord\&logoColor=white)](https://discord.com/invite/S3eX47dHsB) ![VSCode](https://img.shields.io/badge/VSCode-0078D4?style=for-the-badge\&logo=visual%20studio%20code\&logoColor=white) +![Made with Notepad++](assets/np++.png?raw=true) ![C++](https://img.shields.io/badge/C%2B%2B-00599C?style=for-the-badge\&logo=c%2B%2B\&logoColor=white) ![Downloads](https://img.shields.io/github/downloads/souldbminersmwc/Horizon-OC/total.svg?style=for-the-badge) diff --git a/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp b/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp index c4ff5f2d..25a9d4a9 100644 Binary files a/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp and b/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp differ