Commit 4e424a66abc2de85b01c9bb70d969712f01e7422
1 parent
05ab07cc3f
Exists in
master
-
Showing 1 changed file with 8 additions and 8 deletions Side-by-side Diff
instruments/AG34972A.py
| ... | ... | @@ -15,13 +15,13 @@ |
| 15 | 15 | def __init__(self, channels, vtypes, adress): |
| 16 | 16 | self.adress = adress |
| 17 | 17 | self.port = 5025 |
| 18 | - self.channels = channels | |
| 18 | + self.channels = channels | |
| 19 | 19 | self.vtypes = vtypes |
| 20 | 20 | |
| 21 | 21 | def model(self): |
| 22 | 22 | #self.send("*IDN?") |
| 23 | 23 | #return self.read() |
| 24 | - return "AG34972A" | |
| 24 | + return "AG34972A" | |
| 25 | 25 | |
| 26 | 26 | def connect(self): |
| 27 | 27 | print('Connecting to device @%s:%s...' %(self.adress, self.port)) |
| 28 | 28 | |
| 29 | 29 | |
| ... | ... | @@ -37,16 +37,16 @@ |
| 37 | 37 | |
| 38 | 38 | def configure(self): |
| 39 | 39 | self.strCh = '' |
| 40 | - for ch in self.channels: | |
| 40 | + for ch in self.channels: | |
| 41 | 41 | self.send('%s (@%s)'%(CONF_VAL_TYPE[ALL_VAL_TYPE.index(self.vtypes[self.channels.index(ch)])], ch)) |
| 42 | - self.strCh = self.strCh + ch + ',' | |
| 43 | - self.strCh = self.strCh[0:-1] | |
| 44 | - self.send("ROUT:SCAN (@%s)"%self.strCh) | |
| 45 | - self.send("TRIG:COUN 1") | |
| 42 | + self.strCh = self.strCh + ch + ',' | |
| 43 | + self.strCh = self.strCh[0:-1] | |
| 44 | + self.send("ROUT:SCAN (@%s)"%self.strCh) | |
| 45 | + self.send("TRIG:COUN 1") | |
| 46 | 46 | |
| 47 | 47 | def getValue(self): |
| 48 | 48 | self.send("INIT") |
| 49 | - self.send("FETC?") | |
| 49 | + self.send("FETC?") | |
| 50 | 50 | return self.read() |
| 51 | 51 | |
| 52 | 52 | def read(self): |