Compare commits

..

No commits in common. "54f7c7bcdecc5d88830a1a32cf27ca65457dc99e" and "68fa884b4ca0895ec316df863e616a6fec31d530" have entirely different histories.

View file

@ -168,9 +168,7 @@ def clock(line):
freq.add(t, c) freq.add(t, c)
s = freq.solve() s = freq.solve()
if s is None: if s is None:
if t is None: return echo(line)
t = time.time()
return echo(line, f"{c} {t:.1f}")
return echo(line, f"{c} {t:.1f}", *("%.4g" % ss for ss in s[0])) return echo(line, f"{c} {t:.1f}", *("%.4g" % ss for ss in s[0]))
Data = {} Data = {}
@ -179,9 +177,7 @@ def data(line):
ll = line.split() ll = line.split()
try: try:
c = ll[0] c = ll[0]
d = [int(l, 16) for l in ll[1:]] Data[c] = [int(l, 16) for l in ll[1:]]
if ll[1:]:
data[c] = d
emit_data(c) emit_data(c)
return echo(line) return echo(line)
except Exception as e: except Exception as e:
@ -241,7 +237,6 @@ def emit_adc(c, cc):
if C["mode"] == turbocmd.ADC_MODE["DIFF"]: if C["mode"] == turbocmd.ADC_MODE["DIFF"]:
if a & 0x8000: if a & 0x8000:
a -= 0x10000 a -= 0x10000
a *= 2
elif C["mode"] != turbocmd.ADC_MODE["NORM"]: elif C["mode"] != turbocmd.ADC_MODE["NORM"]:
continue continue
REF = None REF = None
@ -297,7 +292,7 @@ def emit_adc_pretty():
if k == "RFP/2.5V": if k == "RFP/2.5V":
pretty = f" Vrf {A/500:.4f} V" pretty = f" Vrf {A/500:.4f} V"
if kk[1] == "VDD": if kk[1] == "VDD":
units=". Vdd" units=" Vdd"
try: try:
AA, x = ADC_mV["VDD/1V"] AA, x = ADC_mV["VDD/1V"]
mV = AA*10 mV = AA*10