configurator: update and modularize

This commit is contained in:
souldbminersmwc
2025-10-01 19:10:21 -04:00
parent 3dfb95f542
commit bfa20ca526
33 changed files with 738 additions and 690 deletions

View File

@@ -3,157 +3,22 @@ import struct
from defaults import d
import common as c
import gpu as g
import cpu
import defaults as df
import re
import ctypes
import settings as s
g_freq_str = None
kip_file_path = None
variables = [
("custRev", "u32"),
("mtcConf", "u32"),
("commonCpuBoostClock", "u32"),
("commonEmcMemVolt", "u32"),
("eristaCpuMaxVolt", "u32"),
("eristaEmcMaxClock", "u32"),
("marikoCpuMaxVolt", "u32"),
("marikoEmcMaxClock", "u32"),
("marikoEmcVddqVolt", "u32"),
("marikoCpuUV", "u32"),
("marikoGpuUV", "u32"),
("eristaCpuUV", "u32"),
("eristaGpuUV", "u32"),
("enableMarikoGpuUnsafeFreqs", "u32"),
("enableEristaGpuUnsafeFreqs", "u32"),
("enableMarikoCpuUnsafeFreqs", "u32"),
("enableEristaCpuUnsafeFreqs", "u32"),
("commonGpuVoltOffset", "u32"),
("marikoEmcDvbShift", "u32"),
# advanced config
("t1_tRCD", "u32"),
("t2_tRP", "u32"),
("t3_tRAS", "u32"),
("t4_tRRD", "u32"),
("t5_tRFC", "u32"),
("t6_tRTW", "u32"),
("t7_tWTR", "u32"),
("t8_tREFI", "u32"),
("mem_burst_latency", "u32"),
("g_volt_76800", "u32"),
("g_volt_153600", "u32"),
("g_volt_230400", "u32"),
("g_volt_307200", "u32"),
("g_volt_384000", "u32"),
("g_volt_460800", "u32"),
("g_volt_537600", "u32"),
("g_volt_614400", "u32"),
("g_volt_691200", "u32"),
("g_volt_768000", "u32"),
("g_volt_844800", "u32"),
("g_volt_921600", "u32"),
("g_volt_998400", "u32"),
("g_volt_1075200", "u32"),
("g_volt_1152000", "u32"),
("g_volt_1228800", "u32"),
("g_volt_1267200", "u32"),
("g_volt_1305600", "u32"),
("g_volt_1344000", "u32"),
("g_volt_1382400", "u32"),
("g_volt_1420800", "u32"),
("g_volt_1459200", "u32"),
("g_volt_1497600", "u32"),
("g_volt_1536000", "u32"),
("g_volt_e_76800", "u32"),
("g_volt_e_153600", "u32"),
("g_volt_e_230400", "u32"),
("g_volt_e_307200", "u32"),
("g_volt_e_384000", "u32"),
("g_volt_e_460800", "u32"),
("g_volt_e_537600", "u32"),
("g_volt_e_614400", "u32"),
("g_volt_e_691200", "u32"),
("g_volt_e_768000", "u32"),
("g_volt_e_844800", "u32"),
("g_volt_e_921600", "u32"),
("g_volt_e_998400", "u32"),
("g_volt_e_1075200", "u32"),
# ("g_volt_e_1152000", "u32"),
# ("g_volt_e_1228800", "u32"),
("marikoCpuVmin", "u32"),
("eristaGpuVmin", "u32"),
("marikoGpuVmin", "u32"),
("marikoGpuVmax", "u32"),
]
fmt_map = {
"u32": "I",
"double": "d",
}
def make_struct_format(vars_list):
fmt = "="
for name, t in vars_list:
fmt += fmt_map[t]
fmt += s.fmt_map[t]
if name == "tFAW":
fmt += "4x" # i hate hardcoding but this is what it is
return fmt
def load_all_vars():
c.load_entry_object("custRev", 0)
c.load_entry_object("mtcConf", 0)
c.load_entry_object("commonCpuBoostClock", 1)
c.load_entry_object("commonEmcMemVolt", 2)
c.load_entry_object("eristaCpuMaxVolt", 3)
c.load_entry_object("eristaEmcMaxClock", 1)
c.load_entry_object("marikoCpuMaxVolt", 3)
c.load_entry_object("marikoEmcMaxClock", 1)
c.load_entry_object("marikoEmcVddqVolt", 2)
c.load_entry_object("marikoCpuUV", 5)
c.load_entry_object("marikoGpuUV", 4)
c.load_entry_object("eristaCpuUV", 5)
c.load_entry_object("eristaGpuUV", 4)
c.load_entry_object("enableMarikoGpuUnsafeFreqs", 0)
c.load_entry_object("enableEristaGpuUnsafeFreqs", 0)
c.load_entry_object("enableMarikoCpuUnsafeFreqs", 0)
c.load_entry_object("enableEristaCpuUnsafeFreqs", 0)
c.load_entry_object("commonGpuVoltOffset", 3)
c.load_entry_object("marikoEmcDvbShift", 0)
# Advanced memory config
c.load_entry_object("t1_tRCD", 5)
c.load_entry_object("t2_tRP", 5)
c.load_entry_object("t3_tRAS", 5)
c.load_entry_object("t4_tRRD", 5)
c.load_entry_object("t5_tRFC", 5)
c.load_entry_object("t6_tRTW", 5)
c.load_entry_object("t7_tWTR", 5)
c.load_entry_object("t8_tREFI", 5)
c.load_entry_object("mem_burst_latency", 5)
# GPU voltage arrays
for freq in [
"76800", "153600", "230400", "307200", "384000", "460800", "537600",
"614400", "691200", "768000", "844800", "921600", "998400", "1075200",
"1152000", "1228800", "1267200", "1305600", "1344000", "1382400",
"1420800", "1459200", "1497600", "1536000"
]:
c.load_entry_object(f"g_volt_{freq}", 3)
for e_freq in [
"76800", "153600", "230400", "307200", "384000", "460800", "537600",
"614400", "691200", "768000", "844800", "921600", "998400", "1075200"# ,
# "1152000", "1228800"
]:
c.load_entry_object(f"g_volt_e_{e_freq}", 3)
c.load_entry_object("marikoCpuVmin", 3)
c.load_entry_object("eristaGpuVmin", 3)
c.load_entry_object("marikoGpuVmin", 3)
c.load_entry_object("marikoGpuVmax", 3)
def freq_to_label(freq):
if freq > 1382400:
@@ -168,7 +33,7 @@ def store(sender, app_data):
kip_file_path = app_data['file_path_name']
print("Selected" + kip_file_path)
read_kip(kip_file_path)
load_all_vars()
s.load_all_vars()
def grab_kip_storage_values(sender, app_data):
tag = dpg.get_item_alias(sender)
@@ -217,7 +82,7 @@ def grab_value_freq_conversion(sender, app_data):
def write_kip():
global kip_file_path
MAGIC = b"CUST"
struct_fmt = make_struct_format(variables)
struct_fmt = make_struct_format(s.variables)
struct_size = struct.calcsize(struct_fmt)
if kip_file_path is None:
msg = "You need to select a file to use Autosave!" if d.autosave else "You need to select a file to save the KIP!"
@@ -231,7 +96,7 @@ def write_kip():
return
pos = idx + len(MAGIC)
values = []
for attr_name, t in variables:
for attr_name, t in s.variables:
val = getattr(d, attr_name)
if t == "u32":
val = int(val) & 0xFFFFFFFF
@@ -250,7 +115,7 @@ def write_kip():
def read_kip(filename):
MAGIC = b"CUST"
struct_fmt = make_struct_format(variables)
struct_fmt = make_struct_format(s.variables)
struct_size = struct.calcsize(struct_fmt)
with open(filename, "rb") as f:
data = f.read()
@@ -260,12 +125,12 @@ def read_kip(filename):
pos = idx + len(MAGIC)
raw = data[pos:pos + struct_size]
values = struct.unpack(struct_fmt, raw)
for (attr_name, _), val in zip(variables, values):
for (attr_name, _), val in zip(s.variables, values):
setattr(d, attr_name, val)
print("=== value layout ===")
offset = 0
for (attr_name, t) in variables:
code = fmt_map[t]
for (attr_name, t) in s.variables:
code = s.fmt_map[t]
align = 8 if code == "d" else 4
padding = (-offset) % align
if padding: