Merge pull request #58 from jprochazka/noise

Noise level added to signal level graph.

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 The following is a history of the changes made to this project.
 
+## January 14th, 2016
+
+* When the portal is installed the argument --measure-noise is added to the dump1090-mutability init script.
+* Added "noise" level line and information to the signal level performance graph.
+
 ## January 8th, 2016
 
 * The dump1090-mutability install Script now asks user for the latitude and longitude of the feeder.

bash/portal/graphs.sh

@@ -37,6 +37,16 @@ BUILDDIR=$PWD
 RAWDOCUMENTROOT=`/usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf -p | grep server.document-root`
 DOCUMENTROOT=`sed 's/.*"\(.*\)"[^"]*$/\1/' <<< $RAWDOCUMENTROOT`
 
+## MODIFY THE DUMP1090-MUTABILITY INIT SCRIPT TO MEASURE AND RETAIN NOISE DATA
+
+echo -e "\033[33m"
+echo "Configuring dump1090-mutability to measure and save noise data."
+echo "Modifying the dump1090-mutability init script..."
+sudo sed -i 's/ARGS=""/ARGS="--measure-noise "/g' /etc/init.d/dump1090-mutability
+echo "Restarting dump1090-mutability..."
+echo -e "\033[37m"
+sudo /etc/init.d/dump1090-mutability restart
+
 ## BACKUP AND REPLACE COLLECTD.CONF
 
 echo -e "\033[33m"

build/portal/graphs/make-collectd-graphs.sh

@@ -500,21 +500,26 @@ signal_graph() {
   --step "$5" \
   --title "$3 Signal Level" \
   --vertical-label "dBFS" \
-  --upper-limit 2    \
-  --lower-limit -15 \
+  --upper-limit 1    \
+  --lower-limit -25 \
   --rigid \
   --units-exponent 0 \
   "TEXTALIGN:center" \
   "DEF:signal=$2/dump1090_dbfs-signal.rrd:value:AVERAGE" \
   "DEF:peak=$2/dump1090_dbfs-peak_signal.rrd:value:AVERAGE" \
+  "DEF:noise=$2/dump1090_dbfs-noise.rrd:value:AVERAGE" \
   "CDEF:us=signal,UN,-100,signal,IF" \
   "AREA:-100#00FF00:Mean Level\\:" \
   "AREA:us#FFFFFF" \
   "GPRINT:signal:AVERAGE:%4.1lf" \
-  "LINE1:peak#0000FF:Peak Level\\:" \
-  "GPRINT:peak:MAX:%4.1lf" \
+  "LINE1:peak#0000FF:Peak Level\:" \
+  "GPRINT:peak:MAX:%4.1lf\n" \
+  "LINE:noise#7F00FF:Noise" \
+  "GPRINT:noise:MAX:Max\: %4.1lf" \
+  "GPRINT:noise:MIN:Min\: %4.1lf" \
+  "GPRINT:noise:AVERAGE:Avg\: %4.1lf\n" \
   "LINE1:0#000000:Zero dBFS" \
-  "LINE1:-3#FF0000:-3 dBFS" \
+  "LINE1:-3#FF0000:-3 dBFS\n" \
   --watermark "Drawn: $nowlit";
 }