From 265d2eb19679777e0a01ea63ec1bd05dc1a7315d Mon Sep 17 00:00:00 2001
From: AE6XE <joe@ayerscasa.com>
Date: Tue, 15 Dec 2015 22:45:29 -0800
Subject: [PATCH] feature:  enhance snrlog to squareLine, local TZ, fix test
 condition

---
 files/usr/local/bin/snrlog    | 3 +++
 files/www/cgi-bin/signal      | 9 +++++----
 files/www/cgi-bin/signal.json | 3 +--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/files/usr/local/bin/snrlog b/files/usr/local/bin/snrlog
index 7bf53f6d..5fc55655 100755
--- a/files/usr/local/bin/snrlog
+++ b/files/usr/local/bin/snrlog
@@ -33,6 +33,9 @@
 
 =cut
 
+#delay just after rssi_monitor has a chance to run noise floor calibration
+sleep 5;
+
 $MAXLINES=2880; # 2 days worth
 $tmpdir="/tmp/snrlog";
 $lastdat="/tmp/snr.dat";
diff --git a/files/www/cgi-bin/signal b/files/www/cgi-bin/signal
index 62280808..83e24865 100755
--- a/files/www/cgi-bin/signal
+++ b/files/www/cgi-bin/signal
@@ -40,6 +40,7 @@ $debug = 0;
 BEGIN {push @INC, '/www/cgi-bin'};
 use perlfunc;
 
+chomp ($tzone=`date +%Z`);
 read_query_string();
 
 # collect some variables
@@ -89,7 +90,7 @@ $header = <<EOF;
           verticalAlign: "center",  // top, center, bottom
         },
         axisX: { 
-           title: "Time (in UTC)",
+           title: "Time (in $tzone)",
            labelFontSize: 10,
            labelAngle: -45,
         },
@@ -99,16 +100,16 @@ $header = <<EOF;
         },
         data: [
           {
-            type: "spline",
+            type: "stepLine",
             showInLegend: true, 
             legendText: "Signal",
-            toolTipContent: "Signal: {y}db @ {label}",
+            toolTipContent: "Signal: {y}dBm @ {label}",
             dataPoints: dps[0]
           },{
             type: "line",
             showInLegend: true, 
             legendText: "Noise",
-            toolTipContent: "Noise: {y}db @ {label}",
+            toolTipContent: "Noise: {y}dBm @ {label}",
             dataPoints: dps[1]
           }
         ],
diff --git a/files/www/cgi-bin/signal.json b/files/www/cgi-bin/signal.json
index fd3081e1..db53a286 100755
--- a/files/www/cgi-bin/signal.json
+++ b/files/www/cgi-bin/signal.json
@@ -67,10 +67,9 @@ if($parms{"realtime"}) {
 } else {
   # ==== ARCHIVE DATA =====
   # --- Load the snr data into an array
-  if($parms{device} == '') { $parms{device}="strongest"; }
+  if($parms{device} eq '') { $parms{device}="strongest"; }
 
   $filename=$dirname . "/" . $parms{device};
-
   open my $fh, '<', $filename or die "Could not open file '$filename' $!";
   chomp(my @lines = <$fh>);
   close $fh;