From 0a4c09e721049a11ee47e9797018e39e86352773 Mon Sep 17 00:00:00 2001 From: Dan White Date: Tue, 16 Oct 2012 15:18:33 -0500 Subject: [PATCH] Change name to _config(), add remaining --- python-lib/usbio.py | 69 ++++++++++++++++++++++++++++++++------------- 1 file changed, 50 insertions(+), 19 deletions(-) diff --git a/python-lib/usbio.py b/python-lib/usbio.py index b16958b..6082cfd 100644 --- a/python-lib/usbio.py +++ b/python-lib/usbio.py @@ -291,6 +291,19 @@ class I2C(object): self.port[clk_pin] = intbv(value, max=2**1) ftdi.write_data(self.context, chr(self.port), 1) + def dump_config(self): + """Return a dict suitable for sending to __init__() to restore + state. + """ + s = {} + s['interface'] = self.interface + s['scl'] = int(self.scl) + s['sda'] = int(self.sda) + s['vid'] = int(self.vid) + s['pid'] = int(self.pid) + s['delay'] = self.DELAY + s['timeout'] = self.TIMEOUT + return s def uint16str(v): @@ -619,6 +632,20 @@ class SPI(object): #print ' ', str2hex(r) return r + def dump_config(self): + """Return a dict appropriate for sending to __init__() to restore a + previous state. + """ + s = {} + s['interface'] = self.interface #needed?? + s['cs'] = self.cs + s['freq'] = self.freq + s['vid'] = self.vid + s['pid'] = self.pid + s['pindir'] = self.pindir + s['pinstate'] = self.pinstate + s['latency'] = self.latency + return s @@ -653,7 +680,7 @@ class NCO(object): v = intbv(value, max=2**self.FCW_WIDTH) self._word[self.FCW_WIDTH:] = v - def dump_settings(self): + def dump_config(self): """Return a dict appropriate for passing to constructor to restore the amplifier state.""" s = {} @@ -782,7 +809,7 @@ class OTA(object): v = (v ^ (1 << (self.OFFSET_WIDTH-1)))[self.OFFSET_WIDTH:] self._word[a:b] = v - def dump_settings(self): + def dump_config(self): """Return a dict appropriate for passing to constructor to restore the amplifier state.""" s = {} @@ -827,7 +854,7 @@ class MuxOTA(OTA): a = b + self.MODE_WIDTH self._word[a:b] = v - def dump_settings(self): + def dump_config(self): """Return a dict appropriate for passing to constructor to restore the amplifier state.""" s = {} @@ -898,14 +925,14 @@ class Harmonic(object): b = [w[i:i-8] for i in range(self.HARMONIC_WIDTH, 0, -8)] return tuple(b) - def dump_settings(self): + def dump_config(self): """Return a dict appropriate for passing to constructor to restore the harmonic's state.""" s = {} s['cal'] = int(self.cal) - s['nco'] = self.nco.dump_settings() - s['otaA'] = self.otaA.dump_settings() - s['otaB'] = self.otaB.dump_settings() + s['nco'] = self.nco.dump_config() + s['otaA'] = self.otaA.dump_config() + s['otaB'] = self.otaB.dump_config() return s @@ -943,12 +970,13 @@ class Chain(object): #self.bus.Stop() return out - def dump_settings(self): + def dump_config(self): """Return a dict appropriate for passing to constructor to restore the chain's state.""" s = {} + s['csname'] = self.csname s['length'] = int(self.length) - s['harmonics'] = [hi.dump_settings() for hi in self.h] + s['harmonics'] = [hi.dump_config() for hi in self.h] return s @@ -1032,14 +1060,15 @@ class Mux(object): #self.bus.Stop() return out - def dump_settings(self): + def dump_config(self): """Return a dict appropriate for passing to constructor to restore the mux's state.""" s = {} + s['csname'] = self.csname s['selA'] = int(self.selA) s['selB'] = int(self.selB) - s['otaA'] = self.otaA.dump_settings() - s['otaB'] = self.otaB.dump_settings() + s['otaA'] = self.otaA.dump_config() + s['otaB'] = self.otaB.dump_config() return s @@ -1216,10 +1245,11 @@ class AD524x(object): val = self.bus.read(1) return val[0] - def dump_settings(self): + def dump_config(self): """Return a dict of settings which can be passed to constructor to restore the state.""" s = {} + s['addr'] = int(self.addr) s['posA'] = int(self.posA) s['posB'] = int(self.posB) s['gpo1'] = int(self.gpo1) @@ -1262,7 +1292,7 @@ class DAC8568(object): def __init__(self, spibus, cs='dac'): self.bus = spibus - self.cs = 'dac' + self.cs = cs self._word = 0 #intbv(0)[self.CTL_WIDTH:] self._chpos = [0 for i in range(8)] @@ -1831,10 +1861,10 @@ class DigiReg(AD524x): setattr(DigiReg, dest+'_min', self.vb_min) setattr(DigiReg, dest+'_max', self.vb_max) - def dump_settings(self): + def dump_config(self): """Return a dict of settings which can be passed to constructor to restore the state.""" - s = super(DigiReg, self).dump_settings() + s = super(DigiReg, self).dump_config() s['va_range'] = (self.va_min, self.va_max) s['vb_range'] = (self.vb_min, self.vb_max) s['aliases'] = self.aliases @@ -1858,11 +1888,11 @@ class BiasGen(AD524x): super(DigiReg, self).__init__(i2cbus, addr, posA=posA, posB=posB) - def dump_settings(self): + def dump_config(self): """Return a dict of settings appropriate to send to __init__() to restore the state.""" # raw settings of Rpot - s = super(BiasGen, self).dump_settings() + s = super(BiasGen, self).dump_config() return s @@ -1957,10 +1987,11 @@ class DAC_atoi(DAC8568): self.setv(3, v, mode) return self._pos2v(self._chpos[3]) - def dump_settings(self): + def dump_config(self): """Return a dict of settings appropriate to send to __init__() to restore the DAC's state.""" s = {} + s['cs'] = self.cs s['vina'] = self.vina() s['vinb'] = self.vinb() s['vcmi'] = self.vcmi() -- 2.25.1