sleeplog format update

diff --git a/c/goertzel/sleepmon.sh b/c/goertzel/sleepmon.sh
index b0505091e06e99d17a24762f7d744df93a144c0f..72c827530ab6c3f5c78aca90644be6c72a9d6bc5 100755 (executable)
--- a/c/goertzel/sleepmon.sh
+++ b/c/goertzel/sleepmon.sh
@@ -28,6 +28,8 @@ historylen='10 30 60 90 120'
 screen=false
 graph=false
 
+export LC_ALL=C
+
 while getopts "sg" OPT; do
        test "$OPT" == 's' && screen=true;
        test "$OPT" == 'g' && graph=true;
@@ -44,7 +46,7 @@ arecord | ./goertzel -n i -q -l c -t $tresh -d 4 | while read line; do
        $state && statenum=1 || statenum=0;
        $state && statename='MOTION!' || statename='Nothing';
 
-       echo -ne "$time\t$date $(date '+%F %T') $statenum"
+       printf  "%.2f\t %s %s %d" "$time" "$date" "$(date '+%F %T')" "$statenum"
 
        #History
        after=$(( $date - $lastdate))
@@ -53,12 +55,12 @@ arecord | ./goertzel -n i -q -l c -t $tresh -d 4 | while read line; do
                for len in $historylen; do
                        on="$(echo -n ${history::$len} | tr -d 0 | wc -c)"
                        on="$(echo "scale=2; $on/$len" | bc)"
-                       LC_ALL=C printf " %.2f" "$on"
+                       printf " %.2f" "$on"
                done
        }
 
        #Debug
-       printf "\t(%s %3d After %4d secs)\n" "$statename" "$level" "$after";
+       printf " (%s %3d After %4d secs)\n" "$statename" "$level" "$after";
 
        #Fun with values
        $state && {

diff --git a/c/goertzel/sleepplot.sh b/c/goertzel/sleepplot.sh
index 0e8ed5eef79f0beb99379187a905f1e2100ecb91..ea0bac2ac296b138c7aedc24b22e46826723b3d4 100755 (executable)
--- a/c/goertzel/sleepplot.sh
+++ b/c/goertzel/sleepplot.sh
@@ -10,11 +10,11 @@ graphout="${in%%.*}.png"
 test -n "$2" && graphout="$2";
 
 #Last state
-last="$(tail -n 1 "$in" | cut -d ' ' -f 4)"
+last="$(tail -n 1 "$in" | cut -d ' ' -f 5)"
 test "$last" -gt 0 && last="motion" || last="peace";
 
 #Approximate size of graph
-size="$(tail -n 1 "$in" | cut -d . -f 1)"
+size="$(tail -n 1 "$in" | cut -d . -f 1 | sed -e 's/^0*//' | tee /tmp/lol)"
 test $size -gt 3600 && size="$(( $size/10 ))" #For prolonged periods
 size="$(( 600 + $size ))"