Changeset 4608

Timestamp:

08/25/08 20:51:26 (5 years ago)

Author:

werner

Message:

This mainly adds the long-awaited screendump functionality. Also fixes
two serious bugs, namely an off-by-twelve error in Rigol USB TMC read
function and caching converted instead of unconverted values in
settings, which broke larger scripts.

• lib/wave.py: added "extend" method for all waves
• lib/scope.py: started support for piecewise wave retrieval (doesn't work yet)
• lib/instrument.py (setting.set): store the value being set, not the one converted for the instrument
• usbtmc.c, python.c: increased SIZE_IOBUFFER from 4kB to 1MB and BUF_SIZE from 8kB to 1MB, to accommodate Rigol screen dumps
• usbtmc.c: added pointer to rew's Rigol driver
• lib/scope.py: new method "screendump"
• usbtmc.c (usbtmc_read): Rigol buffer reads were off by 12 bytes
• lib/scope.py (rigol_channel_data, rigol_la_data): added 12 to offsets and corrected off-by-two error in analog wave offset

Location:

developers/werner/ahrt/host/tmc

Files:

• lib/instrument.py (modified) (2 diffs)
• lib/scope.py (modified) (8 diffs)
• lib/wave.py (modified) (3 diffs)
• python.c (modified) (1 diff)
• usbtmc.c (modified) (3 diffs)

developers/werner/ahrt/host/tmc/lib/instrument.py

@@ -39 +39 @@
             self.value = None
         elif value != self.value:
+            self.value = value
             if self.out_convert:
                 value = self.out_convert(value)
@@ -45 +46 @@
             self.instr.send((self.set_cmd, self.path)[self.set_cmd is None]+
               " "+self.args+str(value))
-            self.value = value
 
 

developers/werner/ahrt/host/tmc/lib/scope.py

@@ -3 +3 @@
 # scope.py - Oscilloscope control
 # 
+
+# Found screen dump algorithm here:
+# http://www.circuitsonline.net/forum/view/message/652573#652573
 
 #
@@ -20 +23 @@
 # TODO: make range configurable
 
-def scale_125(n, fuzz):
+def scale_125(n = None, fuzz = None, min = None, max = None):
+    res = None
     for e in range(-9, 1+1):
         for m in [1, 2, 5]:
@@ -28 +32 @@
                 s = str(m)+"0"*e
             r = float(s)
-            if r >= n*(1-fuzz) and r <= n*(1+fuzz):
+            if n is not None and r >= n*(1-fuzz) and r <= n*(1+fuzz):
                 return s
+            if min is not None and r >= min:
+                return s
+            if max is not None and r <= max:
+                res = s
+    if res is not None:
+        return res
+    raise hell
 
 
@@ -97 +108 @@
 
     def wave(self, start = None, end = None, step = None):
-        return self.scope.download_wave(self, start, end, step)
+        width = self.scope.div_hor*self.scope.hor.scale
+        if start is None and end is None:
+            start = self.scope.hor.pos
+        if start is not None and end is None:
+            end = start+width
+        elif start is None and end is not None:
+            start = end-width
+        if step is None:
+            return self.scope.download_wave(self, start, end, None)
+        else:
+            # @@@ put setting the horizontal system into download_wave
+            if step*self.scope.sampling_rate() < 1:
+                raise hell
+            span = step*self.scope.samples_per_div*self.scope.div_hor
+            if False and span >= start-end:
+                return self.scope.download_wave(self, start, end, None)
+            else:
+                scale = float(scale_125(max = step*self.scope.samples_per_div))
+                orig_pos = self.scope.hor.pos
+                orig_scale = self.scope.hor.scale
+                self.scope.hor.scale = scale
+                span = self.scope.div_hor*self.scope.hor.scale
+                wave = analog_wave()
+                pos = start
+                while pos < end:
+                    self.scope.hor.pos = pos
+                    wave.extend(self.scope.download_wave(self, pos, pos+span,
+                      None))
+                    pos += span
+                self.scope.hor.pos = orig_pos
+                self.scope.hor.scale = orig_scale
+                return wave
 
 
@@ -197 +239 @@
 def rigol_channel_data(s, t0, td, v0, vd):
     res = analog_wave()
-    i = 202
-    while i != 800:
-        div = (i-502)/50.0
+    i = 212
+    while i != 812:
+        div = (i-512)/50.0
         t = t0+div*td
         div = (125-ord(s[i]))/25.0
@@ -212 +254 @@
     for b in range(0, 16):
         res.append(digital_wave())
-    i = 412 
-    while i != 1612:
-        div = (i-1012)/100.0
+    i = 424
+    while i != 1624:
+        div = (i-1024)/100.0
         t = t0+div*td
         for b in range(0, 8):
@@ -223 +265 @@
 
 
+def rigol_to_ppm(s):
+    lut = []
+    i = 0
+    while i != 256:
+        lut.append(chr(i & 0xc0)+chr((i & 0x38) << 2)+chr((i & 3) << 5))
+        i += 1
+    res = "P6 320 234 255\n"
+    i = 0
+    while i != 320*234:
+        res += lut[ord(s[i])]
+        i += 1
+    return res
+
+
 class rigol_ds1000c(scope):
     channels = 2
     div_hor = 12
     div_vert = 10
+    samples_per_div = 600       #@@@ not exactly true. needs more investigation
 
     def __init__(self):
@@ -274 +331 @@
         data = self.query(":WAV:DATA? DIG")
         return rigol_la_data(data, self.hor.pos, self.hor.scale)
+
+    def sampling_rate(self):
+        return float(self.query(":ACQ:SAMP? CH1"))
+
+    def screendump(self):
+        self.send(":HARDCOPY")
+        return rigol_to_ppm(self.query(":LCD:DATA?"))

developers/werner/ahrt/host/tmc/lib/wave.py

@@ -111 +111 @@
             raise hell
         self.data.append((t, y))
+
+    def extend(self, wave):
+        if len(self.data) and len(wave.data) and \
+          wave.data[0][0] < self.data[-1][0]:
+            raise hell
+        self.data.extend(wave.data)
 
     def get_one(self, t):
@@ -154 +160 @@
         self.initial = None
         self.data = []
-        self.cursor = None
         self.t_end = None
 
@@ -173 +178 @@
             self.data.append(t)
         self.t_end = t
+
+    def extend(self, wave):
+        if wave.t_end is None:
+            return
+        if self.t_end is None:
+            self.t_end = wave.t_end
+            self.data = wave.data
+            self.initial = wave.initial
+            return
+        if wave.data[0] < self.t_end:
+            raise hell
+        if self.initial ^ (len(self.data) & 1) == wave.initial:
+            self.data.extend(wave.data)
+        else:
+            self.data.extend(wave.data[1:])
+        self.t_end = wave.t_end
 
     def get_one(self, t):

developers/werner/ahrt/host/tmc/python.c

@@ -18 +18 @@
 
 
-#define BUF_SIZE 8192
+#define BUF_SIZE (1024*1024)
 #define ERROR fprintf(stderr, "ERROR %d\n", __LINE__)
         /* @@@FIXME: raise exceptions */

developers/werner/ahrt/host/tmc/usbtmc.c

@@ -15 +15 @@
  * http://www.home.agilent.com/upload/cmc_upload/All/usbtmc.html
  * http://www.home.agilent.com/upload/cmc_upload/All/usbtmc.tar
+ *
+ * The Rigol protocol variant is based on this driver:
+ * http://www.circuitsonline.net/forum/view/message/652371#652371
  */
 
@@ -43 +46 @@
 #endif
 
-#define SIZE_IOBUFFER 4096
+#define SIZE_IOBUFFER (1024*1024)       /* memory is cheap ;-) */
 
 #define DEV_DEP_MSG_OUT                 1
@@ -669 +672 @@
                 if (d->rigol && payload > 64-12) {
                         got = usb_bulk_read(d->handle, d->ep_bulk_in,
-                            (void *) tmp+64-12, payload-12, d->timeout);
-                        dump("RECV", tmp+64-12, got);
+                            (void *) tmp+64, payload-(64-12), d->timeout);
+                        dump("RECV", tmp+64, got);
                 }