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

hocmon: fix vdd2/vddq order

Browse Source
This commit is contained in:
souldbminersmwc
2026-04-03 19:25:14 -04:00
parent 901cb15191
commit 589c41d8e5
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Horizon-OC-Monitor/source/Utils.hpp
View File

@@ -225,7 +225,8 @@ uint32_t realRAM_Hz = 0;
uint32_t partLoad[HocClkPartLoad_EnumMax]; uint32_t partLoad[HocClkPartLoad_EnumMax];
uint32_t realCPU_mV = 0; uint32_t realCPU_mV = 0;
uint32_t realGPU_mV = 0; uint32_t realGPU_mV = 0;
uint32_t realRAM_mV = 0; uint32_t realVDD2_mV = 0;
uint32_t realVDDQ_mV = 0;
uint32_t realSOC_mV = 0; uint32_t realSOC_mV = 0;
uint8_t refreshRate = 0; uint8_t refreshRate = 0;
@@ -591,12 +592,9 @@ void Misc(void*) {
realCPU_mV = hocclkCTX.voltages[HocClkVoltage_CPU]; realCPU_mV = hocclkCTX.voltages[HocClkVoltage_CPU];
realGPU_mV = hocclkCTX.voltages[HocClkVoltage_GPU]; realGPU_mV = hocclkCTX.voltages[HocClkVoltage_GPU];
realRAM_mV = hocclkCTX.voltages[HocClkVoltage_EMCVDD2];
realSOC_mV = hocclkCTX.voltages[HocClkVoltage_SOC]; realSOC_mV = hocclkCTX.voltages[HocClkVoltage_SOC];
const u32 vdd2_mV = hocclkCTX.voltages[HocClkVoltage_EMCVDD2] / 1000; // µV to mV realVDD2_mV = hocclkCTX.voltages[HocClkVoltage_EMCVDD2];
const u32 vddq_mV = hocclkCTX.voltages[HocClkVoltage_EMCVDDQ] / 1000; // µV to mV realVDDQ_mV = hocclkCTX.voltages[HocClkVoltage_EMCVDDQ];
realRAM_mV = vdd2_mV * 100000 + vddq_mV * 10;
} }
} }
@@ -726,11 +724,9 @@ void Misc3(void*) {
realCPU_mV = hocclkCTX.voltages[HocClkVoltage_CPU]; realCPU_mV = hocclkCTX.voltages[HocClkVoltage_CPU];
realGPU_mV = hocclkCTX.voltages[HocClkVoltage_GPU]; realGPU_mV = hocclkCTX.voltages[HocClkVoltage_GPU];
realRAM_mV = hocclkCTX.voltages[HocClkVoltage_EMCVDD2];
realSOC_mV = hocclkCTX.voltages[HocClkVoltage_SOC]; realSOC_mV = hocclkCTX.voltages[HocClkVoltage_SOC];
const u32 vdd2_mV = hocclkCTX.voltages[HocClkVoltage_EMCVDD2] / 1000; // µV to mV realVDD2_mV = hocclkCTX.voltages[HocClkVoltage_EMCVDD2];
const u32 vddq_mV = hocclkCTX.voltages[HocClkVoltage_EMCVDDQ] / 1000; // µV to mV realVDDQ_mV = hocclkCTX.voltages[HocClkVoltage_EMCVDDQ];
realRAM_mV = vdd2_mV * 100000 + vddq_mV * 10;
} }
} }

4
Source/Horizon-OC-Monitor/source/modes/Micro.hpp
View File

@@ -1003,8 +1003,8 @@ public:
/* realRAM_mV packs VDD2 | VDDQ in 10-µV units * /* realRAM_mV packs VDD2 | VDDQ in 10-µV units *
* → split, convert to mV * → split, convert to mV
*/ */
const float mv_vdd2 = (realRAM_mV % 100000) / 10.0f; // VDD2 const float mv_vdd2 = realVDD2_mV / 1000.0f; // VDD2
const uint32_t mv_vddq = (realRAM_mV / 10000) / 10; // VDDQ const uint32_t mv_vddq = realVDDQ_mV / 1000; // VDDQ
// Build voltage string based on settings // Build voltage string based on settings
RAM_volt_c[0] = '\0'; // Start with empty string RAM_volt_c[0] = '\0'; // Start with empty string

6
Source/Horizon-OC-Monitor/source/modes/Mini.hpp
View File

@@ -1190,9 +1190,9 @@ public:
} }
if (settings.realVolts) { if (settings.realVolts) {
const float mv_vdd2_f = (realRAM_mV % 100000) / 10.0f; // VDD2 const float mv_vdd2_f = realVDD2_mV / 1000.0f; // VDD2
const uint32_t mv_vddq = (realRAM_mV / 10000) / 10; // VDDQ const uint32_t mv_vddq = realVDDQ_mV / 1000; // VDDQ
const uint32_t mv_vdd2_i = (realRAM_mV % 100000) / 10; const uint32_t mv_vdd2_i = realVDD2_mV / 1000;
if (isMariko) { if (isMariko) {
if (settings.showVDDQ && settings.showVDD2) { if (settings.showVDDQ && settings.showVDD2) {