altos/test: Get the flight software test code working again

[fw/altos] / src / test / plotmm

diff --git a/src/test/plotmm b/src/test/plotmm
index 27f8ddcdeedc832fab8a40574195551850c72c26..87f34cd9fee155de93d2b277efab6f327efc4ff5 100755 (executable)
--- a/src/test/plotmm
+++ b/src/test/plotmm
@@ -14,7 +14,7 @@ case $# in
        exit 1
 esac
 
-gnuplot -persist << EOF
+cat - /dev/tty <<EOF | gnuplot
 set ylabel "distance (m)"
 set y2label "angle (d)"
 set xlabel "time (s)"
@@ -22,8 +22,12 @@ set xtics border out nomirror
 set ytics border out nomirror
 set y2tics border out nomirror
 set title "$title"
-plot "$file" using 1:5 with lines axes x1y1 title "height",\
-"$file" using 1:7 with lines axes x1y2 title "angle",\
-"$file" using 1:13 with lines axes x1y2 title "gps angle",\
-"$file" using 1:15 with lines axes x1y2 title "sats"
+plot "$file" using 1:3 with lines axes x1y1 title "height",\
+"$file" using 1:7 with lines axes x1y1 title "speed", \
+"$file" using 1:5 with lines axes x1y1 title "accel", \
+"$file" using 1:13 with lines axes x1y1 title "k_speed",\
+"$file" using 1:15 with lines axes x1y1 title "k_accel",\
+"$file" using 1:25 with lines axes x1y2 title "angle",\
+"$file" using 1:49 with lines axes x1y2 title "pyro",\
+"$file" using 1:51 with lines axes x1y2 title "inhibited"
 EOF