From 0d012ede9d54c6c5c276be52778483fd020c40d7 Mon Sep 17 00:00:00 2001 From: Ivan Fedorov Date: Fri, 3 Aug 2012 01:31:36 +0400 Subject: [PATCH] sr: fix gnuplot script for USBee DX and clones - Now channels order is right - Added 16bit version --- contrib/gnuplot_usbeedx16.gpi | 62 +++++++++++++++++++ ...uplot_usbeedx.gpi => gnuplot_usbeedx8.gpi} | 21 +++---- 2 files changed, 72 insertions(+), 11 deletions(-) create mode 100644 contrib/gnuplot_usbeedx16.gpi rename contrib/{gnuplot_usbeedx.gpi => gnuplot_usbeedx8.gpi} (71%) diff --git a/contrib/gnuplot_usbeedx16.gpi b/contrib/gnuplot_usbeedx16.gpi new file mode 100644 index 00000000..ca60ed5c --- /dev/null +++ b/contrib/gnuplot_usbeedx16.gpi @@ -0,0 +1,62 @@ +## +## This file is part of the sigrok project. +## +## Copyright (C) 2010 Uwe Hermann +## Copyright (C) 2012 Ivan Fedorov +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## + +# We're setting the colors of the 16 channels to match the colors of the +# probe cables on the CWAV USBee DX: +# background = white, borders = black, axes = gray, +# ch0 = black, ch1 = brown, ch2 = red, ch3 = orange, +# ch4 = yellow, ch5 = green, ch6 = blue, ch7 = violet +# ch8 = black, ch9 = brown, chA = red, chB = orange, +# chC = yellow, chD = green, chE = blue, chF = violet +set terminal png large size 2048, 1536 xffffff x000000 x404040 \ + x000000 xc25525 xff0000 xff7c00 \ + xfbee13 x37ba34 x425adc x9500d3 \ + x000000 xc25525 xff0000 xff7c00 \ + xfbee13 x37ba34 x425adc x9500d3 +set autoscale +set grid +set ytics ("Channel F" 2, "Channel E" 4, "Channel D" 6, "Channel C" 8, \ + "Channel B" 10, "Channel A" 12, "Channel 9" 14, "Channel 8" 16, \ + "Channel 7" 18, "Channel 6" 20, "Channel 5" 22, "Channel 4" 24, \ + "Channel 3" 26, "Channel 2" 28, "Channel 1" 30, "Channel 0" 32) +set title "sigrok gnuplot output, http://www.sigrok.org, CWAV USBee DX" +set xlabel "Sample number" +set ylabel "Channel" +set output "sigrok_gnuplot.png" + +plot [0:200000] [0:34] \ +"sigrok_gnuplot.dat" using 1:($6 + 31) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($7 + 29) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($8 + 27) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($9 + 25) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($5 + 23) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($4 + 21) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($3 + 19) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($2 + 17) with lines linewidth 2 title "", \ +\ +"sigrok_gnuplot.dat" using 1:($17 + 15) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($16 + 13) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($15 + 11) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($10 + 9) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($11 + 7) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($12 + 5) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($13 + 3) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($14 + 1) with lines linewidth 2 title "" diff --git a/contrib/gnuplot_usbeedx.gpi b/contrib/gnuplot_usbeedx8.gpi similarity index 71% rename from contrib/gnuplot_usbeedx.gpi rename to contrib/gnuplot_usbeedx8.gpi index dbf05380..0afbe4cd 100644 --- a/contrib/gnuplot_usbeedx.gpi +++ b/contrib/gnuplot_usbeedx8.gpi @@ -29,20 +29,19 @@ set terminal png large size 2048, 1536 xffffff x000000 x404040 \ xfbee13 x37ba34 x425adc x9500d3 set autoscale set grid -set ytics ("Channel 3" 2, "Channel 2" 4, "Channel 1" 6, "Channel 0" 8, \ - "Channel 4" 10, "Channel 5" 12, "Channel 6" 14, "Channel 7" 16) +set ytics ("Channel 7" 2, "Channel 6" 4, "Channel 5" 6, "Channel 4" 8, \ + "Channel 3" 10, "Channel 2" 12, "Channel 1" 14, "Channel 0" 16) set title "sigrok gnuplot output, http://www.sigrok.org, CWAV USBee DX" set xlabel "Sample number" set ylabel "Channel" set output "sigrok_gnuplot.png" plot [0:200000] [0:18] \ -"sigrok_gnuplot.dat" using 1:($6 + 7) with lines linewidth 2 title "", \ -"sigrok_gnuplot.dat" using 1:($7 + 5) with lines linewidth 2 title "", \ -"sigrok_gnuplot.dat" using 1:($8 + 3) with lines linewidth 2 title "", \ -"sigrok_gnuplot.dat" using 1:($9 + 1) with lines linewidth 2 title "", \ -"sigrok_gnuplot.dat" using 1:($5 + 9) with lines linewidth 2 title "", \ -"sigrok_gnuplot.dat" using 1:($4 + 11) with lines linewidth 2 title "", \ -"sigrok_gnuplot.dat" using 1:($3 + 13) with lines linewidth 2 title "", \ -"sigrok_gnuplot.dat" using 1:($2 + 15) with lines linewidth 2 title "" - +"sigrok_gnuplot.dat" using 1:($6 + 15) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($7 + 13) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($8 + 11) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($9 + 9) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($5 + 7) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($4 + 5) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($3 + 3) with lines linewidth 2 title "", \ +"sigrok_gnuplot.dat" using 1:($2 + 1) with lines linewidth 2 title ""