From: Tomas Mudrunka <tomas@mudrunka.cz>
Date: Thu, 2 Aug 2012 23:50:15 +0000 (+0200)
Subject: Sleepcount for 300 seconds added. This is when things got riddiculously complicated...
X-Git-Url: https://git.harvie.cz/?a=commitdiff_plain;h=991ef83fab62bdf4e2d7c3dda4bb21352143f8ed;p=mirrors%2FPrograms.git

Sleepcount for 300 seconds added. This is when things got riddiculously complicated...
---

diff --git a/c/goertzel/sleepcount.sh b/c/goertzel/sleepcount.sh
index dbfda3e..920e42b 100755
--- a/c/goertzel/sleepcount.sh
+++ b/c/goertzel/sleepcount.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
-seconds=$2
+seconds="$2"
 START=$(head -n 1 "$1" | cut -f 2)
-STARTOK=$(tail -n 1 "$1.counts.$seconds" | cut -f 1)
+STARTOK=$({ tail -n 1 "$1.counts.$seconds" || echo 0; } | cut -f 1)
 STOP=$( tail -n 1 "$1" | cut -f 2)
 
+fuser "$1.counts.$seconds" &>/dev/null && exit 23;
+
 test "$STARTOK" -gt "$START" && START="$STARTOK";
 seq $START $STOP | while read MAX; do
 	MIN=$(( $MAX - $seconds  ))
diff --git a/c/goertzel/sleepmon.sh b/c/goertzel/sleepmon.sh
index 87967dd..4dfc426 100755
--- a/c/goertzel/sleepmon.sh
+++ b/c/goertzel/sleepmon.sh
@@ -15,6 +15,7 @@
 
 out=/tmp/sleeplog-"$(date +%F_%T)".txt
 speaker-test -t sine &>/dev/null &
+pid_test=$!
 tresh=10
 lastdate=0
 screen=false
@@ -39,9 +40,9 @@ arecord | ./goertzel -n i -q -l c -t $tresh -d 4 | while read line; do
 		echo -ne "\t$level After $after secs";
 	}
 	echo;
-	./sleepplot.sh "$out" &>/dev/null;
+	./sleepplot.sh "$out" &>/dev/null &
 	lastdate="$date";
 done | tee "$out"
-kill $!
+kill $pid_test
 echo
 echo "Your file: $out"
diff --git a/c/goertzel/sleepplot.sh b/c/goertzel/sleepplot.sh
index 5b5a92e..fe1c9af 100755
--- a/c/goertzel/sleepplot.sh
+++ b/c/goertzel/sleepplot.sh
@@ -6,8 +6,10 @@ test -z "$1" && {
 }
 
 #Count events:
-seconds=60
-./sleepcount.sh "$1" "$seconds"
+seconds='60 300'
+for i in $seconds; do
+	./sleepcount.sh "$1" "$i" &
+done
 
 #Approximate size of graph
 size="$(tail -n 1 "$1" | cut -d . -f 1)"
@@ -32,8 +34,10 @@ set timefmt "%s"
 set grid
 
 #set pointsize 0.5
+#"$1.counts.$seconds" using 1:(\$2/5) title "Activations in last $seconds seconds" smooth csplines
 plot "$1" using 2:5 title "Sensor state" with steps,\
-"$1.counts.$seconds" using 1:(\$2/5) title "Activations in last $seconds seconds" smooth csplines
+"$1.counts.60" using 1:(\$2/5) title "Activations in last 60 seconds" smooth csplines,\
+"$1.counts.300" using 1:(\$2/10) title "Activations in last 300 seconds" smooth csplines\
 
 EOF