From c7db7a76325d15acab094b93ddec9474b37b0875 Mon Sep 17 00:00:00 2001 From: souldbminersmwc Date: Sun, 12 Apr 2026 16:51:52 -0400 Subject: [PATCH] hocclk: fix compilation --- Source/hoc-clk/common/include/hocclk/config.h | 4 ++-- Source/hoc-clk/overlay/src/ui/gui/base_menu_gui.cpp | 12 ++++++------ .../hoc-clk/overlay/src/ui/gui/freq_choice_gui.cpp | 2 +- .../overlay/src/ui/gui/global_override_gui.cpp | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Source/hoc-clk/common/include/hocclk/config.h b/Source/hoc-clk/common/include/hocclk/config.h index 02241c72..8b3700d6 100644 --- a/Source/hoc-clk/common/include/hocclk/config.h +++ b/Source/hoc-clk/common/include/hocclk/config.h @@ -261,10 +261,10 @@ static inline const char* hocclkFormatConfigValue(HocClkConfigValue val, bool pr return pretty ? "Display Voltage" : "display_voltage"; case HocClkConfigValue_MemoryFrequencyMeasurementMode: - return pretty ? "Memory Frequency Measurement Mode" : "mem_freq_measurement_mode"; + return pretty ? "RAM Frequency Measurement Mode" : "mem_freq_measurement_mode"; case HocClkConfigValue_RamDisplayUnit: - return pretty ? "Memory Frequency Display Unit" : "mem_display_unit"; + return pretty ? "RAM Frequency Display Unit" : "RAM_display_unit"; // KIP config values case KipConfigValue_custRev: diff --git a/Source/hoc-clk/overlay/src/ui/gui/base_menu_gui.cpp b/Source/hoc-clk/overlay/src/ui/gui/base_menu_gui.cpp index a16ab95f..e8bf8352 100644 --- a/Source/hoc-clk/overlay/src/ui/gui/base_menu_gui.cpp +++ b/Source/hoc-clk/overlay/src/ui/gui/base_menu_gui.cpp @@ -230,15 +230,15 @@ void BaseMenuGui::refresh() sprintf(displayStrings[3], "%u.%u MHz", hz / 1000000U, (hz / 100000U) % 10U); hz = context->freqs[HocClkModule_MEM]; // MEM - std::uint32_t unit = configList.values[HocClkConfigValue_MemDisplayUnit]; + std::uint32_t unit = configList.values[HocClkConfigValue_RamDisplayUnit]; std::uint32_t mhz = hz / 1000000U; std::uint32_t mts = mhz * 2; std::uint32_t tenth = (hz / 100000U) % 10U; - if(unit == MemDisplayUnit_MTs) + if(unit == RamDisplayUnit_MTs) sprintf(displayStrings[4], "%u MT/s", mts); - else if(unit == MemDisplayUnit_MHz) + else if(unit == RamDisplayUnit_MHz) sprintf(displayStrings[4], "%u.%u MHz", mhz, tenth); - else if(unit == MemDisplayUnit_Both) { + else if(unit == RamDisplayUnit_MHzMTs) { hz = context->realFreqs[HocClkModule_MEM]; mhz = hz / 1000000U; tenth = (hz / 100000U) % 10U; @@ -253,11 +253,11 @@ void BaseMenuGui::refresh() sprintf(displayStrings[6], "%u.%u MHz", hz / 1000000U, (hz / 100000U) % 10U); hz = context->realFreqs[HocClkModule_MEM]; // MEM - unit = configList.values[HocClkConfigValue_MemDisplayUnit]; + unit = configList.values[HocClkConfigValue_RamDisplayUnit]; mhz = hz / 1000000U; mts = mhz * 2; tenth = (hz / 100000U) % 10U; - if(unit == MemDisplayUnit_MTs || unit == MemDisplayUnit_Both) + if(unit == RamDisplayUnit_MTs || unit == RamDisplayUnit_MHzMTs) sprintf(displayStrings[7], "%u MT/s", mts); else sprintf(displayStrings[7], "%u.%u MHz", mhz, tenth); diff --git a/Source/hoc-clk/overlay/src/ui/gui/freq_choice_gui.cpp b/Source/hoc-clk/overlay/src/ui/gui/freq_choice_gui.cpp index 77605946..cc1325d2 100644 --- a/Source/hoc-clk/overlay/src/ui/gui/freq_choice_gui.cpp +++ b/Source/hoc-clk/overlay/src/ui/gui/freq_choice_gui.cpp @@ -57,7 +57,7 @@ tsl::elm::ListItem* FreqChoiceGui::createFreqListItem(std::uint32_t hz, bool sel { std::string text; if(module == HocClkModule_MEM) - text = formatListFreqHzMem(hz, (MemDisplayUnit)this->configList->values[HocClkConfigValue_MemDisplayUnit]); + text = formatListFreqHzMem(hz, (RamDisplayUnit)this->configList->values[HocClkConfigValue_RamDisplayUnit]); else text = formatListFreqHz(hz); diff --git a/Source/hoc-clk/overlay/src/ui/gui/global_override_gui.cpp b/Source/hoc-clk/overlay/src/ui/gui/global_override_gui.cpp index 9dbef586..32f0bf4a 100644 --- a/Source/hoc-clk/overlay/src/ui/gui/global_override_gui.cpp +++ b/Source/hoc-clk/overlay/src/ui/gui/global_override_gui.cpp @@ -246,7 +246,7 @@ void GlobalOverrideGui::addModuleListItem(HocClkModule module) { tsl::elm::ListItem *listItem = new tsl::elm::ListItem(hocclkFormatModule(module, true)); - MemDisplayUnit memUnit = (MemDisplayUnit)configList.values[HocClkConfigValue_MemDisplayUnit]; + RamDisplayUnit memUnit = (RamDisplayUnit)configList.values[HocClkConfigValue_RamDisplayUnit]; listItem->setValue(module == HocClkModule_MEM ? formatListFreqMem(0, memUnit) : formatListFreqMHz(0)); listItem->setClickListener([this, module](u64 keys) { if ((keys & HidNpadButton_A) == HidNpadButton_A) { @@ -263,7 +263,7 @@ void GlobalOverrideGui::addModuleListItem(HocClkModule module) this->context->overrideFreqs[module] = 0; this->listHz[module] = 0; - this->listItems[module]->setValue(module == HocClkModule_MEM ? formatListFreqMem(0, (MemDisplayUnit)configList.values[HocClkConfigValue_MemDisplayUnit]) : formatListFreqHz(0)); + this->listItems[module]->setValue(module == HocClkModule_MEM ? formatListFreqMem(0, (RamDisplayUnit)configList.values[HocClkConfigValue_RamDisplayUnit]) : formatListFreqHz(0)); return true; } @@ -411,7 +411,7 @@ void GlobalOverrideGui::refresh() } else { this->listItems[m]->setValue( m == HocClkModule_MEM - ? formatListFreqHzMem(this->context->overrideFreqs[m], (MemDisplayUnit)configList.values[HocClkConfigValue_MemDisplayUnit]) + ? formatListFreqHzMem(this->context->overrideFreqs[m], (RamDisplayUnit)configList.values[HocClkConfigValue_RamDisplayUnit]) : formatListFreqHz(this->context->overrideFreqs[m])); }