new "display" command to just show the display content

[rigol] / rigol.c

diff --git a/rigol.c b/rigol.c
index ebf01fb5986cc80beeb500b4244adfb0cab0b533..93b85665c0c3c2fe7f70038d95cc313534c38d0d 100644 (file)
--- a/rigol.c
+++ b/rigol.c
@@ -24,8 +24,7 @@ rmmod uhci_hcd; modprobe uhci_hcd
 #include <readline/history.h>
 
 #include "usbtmc.h"
-#include "png.h"
-
+#include "commands.h"
 
 #define MIN(a,b) (((a)<(b))?(a):(b))
 
@@ -85,163 +84,6 @@ void add_history (char *buf)
 }
 #endif
 
-
-void do_plot (struct usb_dev_handle *sc)
-{
-       unsigned char ch1[1024], ch2[1024];
-       int i, l;
-
-       static FILE *gnuplot=NULL;
-       FILE *fp;
-
-       l = usbtmc_sendscpi(sc, ":WAV:DATA? CHANEL1", ch1, 1024);
-
-       if (l != 1024) {
-               printf ("hmm. didnt' get 1024 bytes. \n"); 
-       }
-
-       l = usbtmc_sendscpi(sc, ":WAV:DATA? CHANNEL2", ch2, 1024);
-
-       if (l != 1024) {
-               printf ("hmm. didnt' get 1024 bytes. \n"); 
-       }
-
-       if (!gnuplot) {
-               gnuplot = popen ("gnuplot", "w"); 
-       }
-
-       fp = fopen ("temp.dat", "w");
-       for (i=0xd4;i<0x32c;i++)
-               //for (i=0;i<0x400;i++)
-               fprintf (fp, "%d %d\n", 255 - ch1[i], 255 - ch2[i]);
-       fclose (fp); 
-
-       fprintf (gnuplot, "plot 'temp.dat' using 1 with lines, 'temp.dat' using 2 with lines\n");
-       fflush (gnuplot);
-}
-
-
-#define ERROR -1e100
-
-double get_float_from_scope (struct usb_dev_handle *sc, char *var)
-{
-       unsigned char buf[1024];
-       double temp;
-       int l;
-
-       l = usbtmc_sendscpi(sc, var, buf, 1024);
-       if (l > 0) {
-               sscanf ((char*)buf, "%lf", &temp); 
-               return temp;
-       }
-       return ERROR;
-}
-
-
-void do_get_buf (struct usb_dev_handle *sc)
-{
-       FILE *fp;
-       int i, j, l, bp;
-       char buf[1024];
-       unsigned char ch1[1024];
-       unsigned char data[512*1024];
-       double sampfreq;
-
-       usbtmc_sendscpi (sc, ":STOP", NULL, 0); 
-
-       sampfreq = get_float_from_scope (sc, ":ACQ:SAMP?");
-
-       printf ("Got sampling freq: %g\n", sampfreq);  
-
-       sprintf (buf, ":TIM:SCAL %.15f", 50 / sampfreq);
-       printf ("sending scale cmd: %s\n", buf); 
-       usbtmc_sendscpi (sc, buf, NULL, 0);
-
-       sleep (1);
-
-       bp=0;
-       for (i=-254*1024;i< 254*1024;i += 600) {
-               sprintf (buf, ":TIM:OFFSET %.15f", i / sampfreq);
-               printf ("Sending offset cmd:  %s\n", buf); 
-               usbtmc_sendscpi (sc, buf, NULL, 0);
-
-               l = usbtmc_sendscpi(sc, ":WAV:DATA? CHANEL1", ch1, 1024);
-
-               if (l != 1024) {
-                       printf ("hmm. didnt' get 1024 bytes. \n"); 
-               }
-
-               for (j=0;j<600;j++)
-                       data[bp++] = ch1[j+0xd4];
-       }
-       printf ("Got %d bytes of data. \n", bp);
-
-       fp = fopen ("ch1.dump", "w");
-       fwrite (data, bp, 1, fp);
-       fclose (fp); 
-
-       usbtmc_sendscpi (sc, ":TIM:OFFSET 0", NULL, 0);
-}
-
-void do_get_screen(struct usb_dev_handle *sc)
-{
-       unsigned char screen[320*234];
-       time_t lt;
-       char filename[256];
-       unsigned char *png;
-       int imglen;
-       int ret;
-       int l;
-       int fd;
-       pid_t display;
-
-       /* Hide "RMT" from screen */
-       l = usbtmc_sendscpi(sc, ":KEY:LOCK DISABLE", NULL, 0); 
-       usleep(20000);
-
-       l = usbtmc_sendscpi(sc, ":LCD:DATA?", screen, sizeof(screen));
-
-       if (l != sizeof(screen)) {
-               printf ("hmm. didnt' get %d bytes, but %d\n\n", sizeof(screen), l); 
-       }
-
-       png = lcd2png(screen, &imglen);
-
-       lt = time(NULL);
-       strftime(filename, sizeof(filename), "screen_%Y%m%d-%H%M%S.png", localtime(&lt));
-       fd=open(filename, O_CREAT|O_WRONLY, 0644);
-       if (fd == -1) {
-               perror("open");
-               exit(EXIT_FAILURE);
-       }
-
-       while(imglen > 0) {
-               ret = write(fd, png, imglen);
-               if (ret == -1) {
-                       perror("write");
-                       exit(EXIT_FAILURE);
-               }
-               imglen -= ret;
-       }
-       close(fd);
-       free(png);
-
-       printf("Waveform saved as %s\n", filename);
-
-       display = fork();
-       switch(display) {
-               case 0:
-                       execlp("display", "display", filename, NULL);
-                       exit(0);
-                       break;
-               case -1:
-                       perror("fork");
-                       break;
-               default:
-                       break;
-       }
-}
-
 void child_reaper(int sig)
 {
        pid_t child;
@@ -293,11 +135,15 @@ int main(int argc, char **argv)
                        continue;
                }
                if (strncmp (scpi, "databuf", 7) == 0) {
-                       do_get_buf (sc);
+                       do_get_buf(sc);
                        continue;
                }
                if (strncmp (scpi, "screen", 6) == 0) {
-                       do_get_screen (sc);
+                       do_get_screen(sc);
+                       continue;
+               }
+               if (strncmp (scpi, "display", 7) == 0) {
+                       do_display_screen(sc);
                        continue;
                }