From 12f12c6b1e0d33fe926417141f10f1b5583c241f Mon Sep 17 00:00:00 2001 From: souldbminersmwc Date: Sat, 9 May 2026 19:13:05 -0400 Subject: [PATCH] hocclk: fix cust rev detection --- .../hoc-clk/overlay/src/ui/gui/about_gui.cpp | 4 ++-- Source/hoc-clk/sysmodule/src/file/kip.cpp | 19 ++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Source/hoc-clk/overlay/src/ui/gui/about_gui.cpp b/Source/hoc-clk/overlay/src/ui/gui/about_gui.cpp index 4b4649a9..3ce4f1d0 100644 --- a/Source/hoc-clk/overlay/src/ui/gui/about_gui.cpp +++ b/Source/hoc-clk/overlay/src/ui/gui/about_gui.cpp @@ -382,7 +382,7 @@ void AboutGui::refresh() // custRevItem->setValue(std::to_string(this->context->custRev)); - kipVersionItem->setValue(std::to_string((this->context->kipVersion / 100) % 10) + "." + std::to_string((this->context->kipVersion / 10) % 10) + "." + std::to_string( this->context->kipVersion % 10)); + kipVersionItem->setValue(std::to_string((this->context->kipVersion / 100) % 10) + "." + std::to_string((this->context->kipVersion / 10) % 10) + "." + std::to_string( this->context->kipVersion % 10) + " (Cust Rev " + std::to_string(this->context->custRev) + ")"); if(!IsHoag()) sysdockStatusItem->setValue(this->context->isSysDockInstalled ? "Installed" : "Not Installed"); @@ -402,7 +402,7 @@ void AboutGui::refresh() if(millis > 0) { sprintf(strings[11], "%u.%u °C", millis / 1000U, (millis % 1000U) / 100U); } else if (millis == -125) { - sprintf(strings[11], "Not Valid"); + sprintf(strings[11], "Invalid"); } else if (millis == -126) { sprintf(strings[11], "Not Patched"); } diff --git a/Source/hoc-clk/sysmodule/src/file/kip.cpp b/Source/hoc-clk/sysmodule/src/file/kip.cpp index 196097c9..9f3a9827 100644 --- a/Source/hoc-clk/sysmodule/src/file/kip.cpp +++ b/Source/hoc-clk/sysmodule/src/file/kip.cpp @@ -53,11 +53,11 @@ namespace kip { return; } - // if(cust_get_cust_rev(&table) != CUST_REV) { - // fileUtils::LogLine("Revision: %u", cust_get_cust_rev(&table)); - // notification::writeNotification("Horizon OC\nKip version mismatch\nPlease reinstall Horizon OC"); - // return; - // } + if(cust_get_cust_rev(&table) != CUST_REV || cust_get_kip_version(&table) != KIP_VERSION) { + fileUtils::LogLine("Revision: %u", cust_get_cust_rev(&table)); + notification::writeNotification("Horizon OC\nKip version mismatch\nPlease reinstall Horizon OC"); + return; + } // CUST_WRITE_FIELD_BATCH(&table, mtcConf, config::GetConfigValue(KipConfigValue_mtcConf)); CUST_WRITE_FIELD_BATCH(&table, hpMode, config::GetConfigValue(KipConfigValue_hpMode)); @@ -202,11 +202,13 @@ namespace kip { clockManager::gContext.custRev = cust_get_cust_rev(&table); u16 kipVersion = cust_get_kip_version(&table); - if (kipVersion != KIP_VERSION) { + if (kipVersion != KIP_VERSION || cust_get_cust_rev(&table) != CUST_REV) { notification::writeNotification("Horizon OC\nKip version mismatch detected!"); + return; } clockManager::gContext.kipVersion = kipVersion; + configValues.values[KipConfigValue_custRev] = cust_get_cust_rev(&table); configValues.values[KipConfigValue_hpMode] = cust_get_hp_mode(&table); configValues.values[KipConfigValue_commonEmcMemVolt] = cust_get_common_emc_volt(&table); @@ -280,11 +282,6 @@ namespace kip { configValues.values[KipConfigValue_t7_tWTR_fine_tune] = cust_get_tWTR_fine_tune(&table); configValues.values[KipConfigValue_t6_tRTW_fine_tune] = cust_get_tRTW_fine_tune(&table); - - - // if(cust_get_cust_rev(&table) == KIP_CUST_REV) - // return; - if (sizeof(HocClkConfigValueList) <= sizeof(configValues)) { if (config::SetConfigValues(&configValues, false)) { fileUtils::LogLine("[kip] KIP loaded. CRC32: %ld (Cust Rev %ld)", configValues.values[KipCrc32], configValues.values[KipConfigValue_custRev]);