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

conversion script: fix silly bugs

Browse Source
This commit is contained in:
Lightos1
2026-05-11 19:58:08 +02:00
parent 7f1f504c36
commit 3337738dcc
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/scripts/convert_dvb.cpp
View File

@@ -70,7 +70,7 @@ u32 GetVoltageAndIndex(u32 dvbShift, u32 emc, u32 processId, DvbEntry *dvbTable,
} }
s32 GetShift(u32 oldVoltage, u32 processId, DvbEntry *dvbTable, u32 index) { s32 GetShift(u32 oldVoltage, u32 processId, DvbEntry *dvbTable, u32 index) {
return (oldVoltage - dvbTable[index].volts[processId]) / 25; return (static_cast<s32>(oldVoltage) - static_cast<s32>(dvbTable[index].volts[processId])) / 25;
} }
int main() { int main() {
@@ -81,10 +81,11 @@ int main() {
u32 emcMaxKhz = emcMaxMhz * 1000; u32 emcMaxKhz = emcMaxMhz * 1000;
u32 processId = GetProcessId(speedo); u32 processId = GetProcessId(speedo);
u32 tableIndex = 0; #define INVALID_TABLE_INDEX 32
u32 tableIndex = INVALID_TABLE_INDEX;
u32 oldVoltage = GetVoltageAndIndex(oldDvb, emcMaxKhz, processId, oldDvbTable, tableIndex); u32 oldVoltage = GetVoltageAndIndex(oldDvb, emcMaxKhz, processId, oldDvbTable, tableIndex);
if (oldVoltage == 0 || tableIndex == 0) { if (oldVoltage == 0 || tableIndex == INVALID_TABLE_INDEX) {
printf("Invalid values!\n"); printf("Invalid values!\n");
return -1; return -1;
} }

15
Source/scripts/convert_dvb.py
View File

@@ -12,7 +12,7 @@ class DvbEntry:
volts: List[u32] volts: List[u32]
old_dvb_table = [ oldDvbTable = [
DvbEntry(204000, [637, 637, 637]), DvbEntry(204000, [637, 637, 637]),
DvbEntry(1331200, [650, 637, 637]), DvbEntry(1331200, [650, 637, 637]),
DvbEntry(1600000, [675, 650, 637]), DvbEntry(1600000, [675, 650, 637]),
@@ -24,7 +24,7 @@ old_dvb_table = [
DvbEntry(3200000, [800, 800, 775]), DvbEntry(3200000, [800, 800, 775]),
] ]
new_dvb_table = [ newDvbTable = [
DvbEntry(204000, [637, 637, 637]), DvbEntry(204000, [637, 637, 637]),
DvbEntry(1331200, [650, 637, 637]), DvbEntry(1331200, [650, 637, 637]),
DvbEntry(1600000, [675, 650, 637]), DvbEntry(1600000, [675, 650, 637]),
@@ -36,7 +36,8 @@ new_dvb_table = [
DvbEntry(3200000, [1050, 1025, 1000]), DvbEntry(3200000, [1050, 1025, 1000]),
] ]
DVB_TABLE_SIZE = len(old_dvb_table) DVB_TABLE_SIZE = len(oldDvbTable)
INVALID_TABLE_INDEX = 32
def print_and_scan(message: str) -> u32: def print_and_scan(message: str) -> u32:
@@ -67,7 +68,7 @@ def get_voltage_and_index(
voltage = dvb_table[i].volts[process_id] + (25 * dvb_shift) voltage = dvb_table[i].volts[process_id] + (25 * dvb_shift)
return voltage, i return voltage, i
return 0, 0 return 0, INVALID_TABLE_INDEX
def get_shift( def get_shift(
@@ -91,17 +92,17 @@ def main():
old_dvb, old_dvb,
emc_max_khz, emc_max_khz,
process_id, process_id,
old_dvb_table, oldDvbTable,
) )
if old_voltage == 0 or table_index == 0: if old_voltage == 0 or table_index == INVALID_TABLE_INDEX:
print("Invalid values!") print("Invalid values!")
return return
new_shift = get_shift( new_shift = get_shift(
old_voltage, old_voltage,
process_id, process_id,
new_dvb_table, newDvbTable,
table_index, table_index,
) )