Changeset 4608 for developers/werner/ahrt/host/tmc/usbtmc.c

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/usbtmc.c (modified) (3 diffs)

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);
                 }