Changeset 4608 for developers/werner/ahrt/host/tmc/lib/wave.py

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

File:

• developers/werner/ahrt/host/tmc/lib/wave.py (modified) (3 diffs)

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):