From 7b11a34bb031035883bac97952e5ca6db0684e33 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 7 May 2018 08:56:32 -0700 Subject: altos/test: Replace state name with 10* state value in test log. Fix raw speed Using a state value means we can plot state changes along with the rest of the graph. Raw speed (simple integrated acceleration) was busted; mostly needing to skip the first accel sample. Signed-off-by: Keith Packard --- src/test/plottest | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/test/plottest') diff --git a/src/test/plottest b/src/test/plottest index 95337f10..e427604a 100755 --- a/src/test/plottest +++ b/src/test/plottest @@ -1,4 +1,5 @@ gnuplot -persist << EOF +set title "$1" set ylabel "altitude (m)" set y2label "velocity (m/s), acceleration(m/s²)" set xlabel "time (s)" @@ -13,5 +14,6 @@ plot "$1" using 1:3 with lines axes x1y1 title "raw height",\ "$1" using 1:15 with lines axes x1y2 title "accel",\ "$1" using 1:19 with lines axes x1y1 title "drogue",\ "$1" using 1:21 with lines axes x1y1 title "main",\ -"$1" using 1:23 with lines axes x1y1 title "error" +"$1" using 1:23 with lines axes x1y1 title "error",\ +"$1" using 1:9 with lines axes x1y2 title "state" EOF -- cgit v1.2.3 From 9dfbf0103a649816e98d5511b1d6bbbfc93f6632 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 5 Aug 2018 09:03:35 +0800 Subject: altos/plottest: Make linewidth bigger 1-pixel lines are harsh in 2018 Signed-off-by: Keith Packard --- src/test/plottest | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) (limited to 'src/test/plottest') diff --git a/src/test/plottest b/src/test/plottest index e427604a..5b30cfa5 100755 --- a/src/test/plottest +++ b/src/test/plottest @@ -1,3 +1,7 @@ +#!/bin/bash + +LINEWIDTH=2 + gnuplot -persist << EOF set title "$1" set ylabel "altitude (m)" @@ -6,14 +10,24 @@ set xlabel "time (s)" set xtics border out nomirror set ytics border out nomirror set y2tics border out nomirror -plot "$1" using 1:3 with lines axes x1y1 title "raw height",\ -"$1" using 1:5 with lines axes x1y2 title "raw accel",\ -"$1" using 1:7 with lines axes x1y2 title "accel speed",\ -"$1" using 1:11 with lines axes x1y1 title "height",\ -"$1" using 1:13 with lines axes x1y2 title "speed",\ -"$1" using 1:15 with lines axes x1y2 title "accel",\ -"$1" using 1:19 with lines axes x1y1 title "drogue",\ -"$1" using 1:21 with lines axes x1y1 title "main",\ -"$1" using 1:23 with lines axes x1y1 title "error",\ -"$1" using 1:9 with lines axes x1y2 title "state" +set style line 1 linewidth $LINEWIDTH +set style line 2 linewidth $LINEWIDTH +set style line 3 linewidth $LINEWIDTH +set style line 4 linewidth $LINEWIDTH +set style line 5 linewidth $LINEWIDTH +set style line 6 linewidth $LINEWIDTH +set style line 7 linewidth $LINEWIDTH dashtype 2 +set style line 8 linewidth $LINEWIDTH dashtype 2 +set style line 9 linewidth $LINEWIDTH dashtype 2 +set style line 10 linewidth $LINEWIDTH dashtype 2 +plot "$1" using 1:3 with lines axes x1y1 title "raw height" ls 1,\ +"$1" using 1:5 with lines axes x1y2 title "raw accel" ls 2,\ +"$1" using 1:7 with lines axes x1y2 title "accel speed" ls 3,\ +"$1" using 1:11 with lines axes x1y1 title "height" ls 4,\ +"$1" using 1:13 with lines axes x1y2 title "speed" ls 5,\ +"$1" using 1:15 with lines axes x1y2 title "accel" ls 6,\ +"$1" using 1:19 with lines axes x1y1 title "drogue" ls 7,\ +"$1" using 1:21 with lines axes x1y1 title "main" ls 8,\ +"$1" using 1:23 with lines axes x1y1 title "error" ls 9,\ +"$1" using 1:9 with lines axes x1y2 title "state" ls 10 EOF -- cgit v1.2.3