From d86e5005d374fece6453f3f3e61a84a0f0750d0f Mon Sep 17 00:00:00 2001
From: mgunther68 <marcus.gunther@mail.com>
Date: Sun, 7 Feb 2016 12:22:58 +0000
Subject: [PATCH 1/7] Split measurement definition for Range and Temperature

---
 build/portal/html/admin/index.php | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/build/portal/html/admin/index.php b/build/portal/html/admin/index.php
index 96aed2b..2739158 100644
--- a/build/portal/html/admin/index.php
+++ b/build/portal/html/admin/index.php
@@ -82,7 +82,8 @@
         $common->updateSetting("enableDump1090", $enableDump1090);
         $common->updateSetting("enableDump978", $enableDump978);
         $common->updateSetting("enablePfclient", $enablePfclient);
-        $common->updateSetting("measurement", $_POST['measurement']);
+        $common->updateSetting("measurementRange", $_POST['measurementRange']);
+        $common->updateSetting("measurementTemperature", $_POST['measurementTemperature']);
         $common->updateSetting("networkInterface", $_POST['networkInterface']);
 
         // Set updated to TRUE since settings were updated.
@@ -102,8 +103,9 @@
     $enableDump978 = $common->getSetting("enableDump978");
     $enablePfclient = $common->getSetting("enablePfclient");
 
-    // Get unit of measurement setting from settings.xml.
-    $measurement = $common->getSetting("measurement");
+    // Get units of measurement setting from settings.xml.
+    $measurementRange = $common->getSetting("measurementRange");
+    $measurementTemperature = $common->getSetting("measurementTemperature");
 
     // Get the network interface from settings.xml.
     $networkInterface = $common->getSetting("networkInterface");
@@ -204,14 +206,27 @@
                 </div>
             </div>
             <div class="panel panel-default">
-                <div class="panel-heading">Unit of Measurement</div>
+                <div class="panel-heading">Unit of Measurement (Range)</div>
                 <div class="panel-body">
                     <div class="btn-group" data-toggle="buttons">
-                        <label class="btn btn-default<?php ($measurement == "imperial" ? print ' active' : ''); ?>">
-                            <input type="radio" name="measurement" id="imperial" value="imperial" autocomplete="off"<?php ($measurement == "imperial" ? print ' checked' : ''); ?>> Imperial
+                        <label class="btn btn-default<?php ($measurementRange == "imperial" ? print ' active' : ''); ?>">
+                            <input type="radio" name="measurementRange" id="imperial" value="imperial" autocomplete="off"<?php ($measurementRange == "imperial" ? print ' checked' : ''); ?>> Imperial
                         </label>
-                        <label class="btn btn-default<?php ($measurement == "metric" ? print ' active' : ''); ?>">
-                            <input type="radio" name="measurement" id="metric" value="metric" autocomplete="off"<?php ($measurement == "metric" ? print ' checked' : ''); ?>> Metric
+                        <label class="btn btn-default<?php ($measurementRange == "metric" ? print ' active' : ''); ?>">
+                            <input type="radio" name="measurementRange" id="metric" value="metric" autocomplete="off"<?php ($measurementRange == "metric" ? print ' checked' : ''); ?>> Metric
+                        </label>
+                    </div>
+                </div>
+            </div>
+            <div class="panel panel-default">
+                <div class="panel-heading">Unit of Measurement (Temperature)</div>
+                <div class="panel-body">
+                    <div class="btn-group" data-toggle="buttons">
+                        <label class="btn btn-default<?php ($measurementTemperature == "imperial" ? print ' active' : ''); ?>">
+                            <input type="radio" name="measurementTemperature" id="imperial" value="imperial" autocomplete="off"<?php ($measurementTemperature == "imperial" ? print ' checked' : ''); ?>> Imperial
+                        </label>
+                        <label class="btn btn-default<?php ($measurementTemperature == "metric" ? print ' active' : ''); ?>">
+                            <input type="radio" name="measurementTemperature" id="metric" value="metric" autocomplete="off"<?php ($measurementTemperature == "metric" ? print ' checked' : ''); ?>> Metric
                         </label>
                     </div>
                 </div>

From fb82efc3f142449914ba9262f104cd32d0c168dc Mon Sep 17 00:00:00 2001
From: mgunther68 <marcus.gunther@mail.com>
Date: Sun, 7 Feb 2016 12:28:23 +0000
Subject: [PATCH 2/7] Update settings.xml

---
 build/portal/html/data/settings.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/portal/html/data/settings.xml b/build/portal/html/data/settings.xml
index b4cd10d..1fb3bd8 100644
--- a/build/portal/html/data/settings.xml
+++ b/build/portal/html/data/settings.xml
@@ -37,7 +37,11 @@
         <value>1</value>
     </setting>
     <setting>
-        <name>measurement</name>
+        <name>measurementRange</name>
+        <value>imperial</value>
+    </setting>
+    <setting>
+        <name>measurementTemperature</name>
         <value>imperial</value>
     </setting>
     <setting>

From 66646cd04d9907dee18e38a03101e7d70d45ed48 Mon Sep 17 00:00:00 2001
From: mgunther68 <marcus.gunther@mail.com>
Date: Sun, 7 Feb 2016 12:32:46 +0000
Subject: [PATCH 3/7] Update graphs.tpl.php

---
 build/portal/html/templates/default/graphs.tpl.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build/portal/html/templates/default/graphs.tpl.php b/build/portal/html/templates/default/graphs.tpl.php
index c525572..340ecfc 100644
--- a/build/portal/html/templates/default/graphs.tpl.php
+++ b/build/portal/html/templates/default/graphs.tpl.php
@@ -5,8 +5,8 @@
     // ========================================================================== //
     // Template Set: default                                                      //
     // Template Name: graphs                                                      //
-    // Version: 1.0.1                                                             //
-    // Release Date: 03-02-2016                                                   //
+    // Version: 1.0.2                                                             //
+    // Release Date: 07-02-2016                                                   //
     // Author: Joe Prochazka                                                      //
     // Website: https://www.swiftbyte.com                                         //
     // Contributor: Marcus Gunther                                                //
@@ -167,7 +167,7 @@
     /////////////////////////////////////////////////
     // Content to be added to the scripts section.
     function scriptContent() {
-        global $measurement, $networkInterface;
+        global $measurementRange, $measurementTemperature, $networkInterface;
 ?>
         <script type="text/javascript">
             //*** BEGIN USER DEFINED VARIABLES ***//
@@ -210,7 +210,7 @@
                 $("#dump1090-aircraft_message_rate-image").attr("src", "graphs/dump1090-" + $hostName + "-aircraft_message_rate-" + $timeFrame + ".png?time=" + $timestamp);
                 $("#dump1090-aircraft-image").attr("src", "graphs/dump1090-" + $hostName + "-aircraft-" + $timeFrame + ".png?time=" + $timestamp);
                 $("#dump1090-tracks-image").attr("src", "graphs/dump1090-" + $hostName + "-tracks-" + $timeFrame + ".png?time=" + $timestamp);
-<?php   if ($measurement == "imperial") { ?>
+<?php   if ($measurementRange == "imperial") { ?>
                 $("#dump1090-range-image").attr("src", "graphs/dump1090-" + $hostName + "-range-imperial-" + $timeFrame + ".png?time=" + $timestamp);
 <?php   } else { ?>
                 $("#dump1090-range-image").attr("src", "graphs/dump1090-" + $hostName + "-range-metric-" + $timeFrame + ".png?time=" + $timestamp);
@@ -224,7 +224,7 @@
                 $("#system-wlan0_bandwidth-image").attr("src", "graphs/system-" + $hostName + "-wlan0_bandwidth-" + $timeFrame + ".png?time=" + $timestamp);
 <?php   } ?>
                 $("#system-memory-image").attr("src", "graphs/system-" + $hostName + "-memory-" + $timeFrame + ".png?time=" + $timestamp);
-<?php   if ($measurement == "imperial") { ?>
+<?php   if ($measurementTemperature == "imperial") { ?>
                 $("#system-temperature-image").attr("src", "graphs/system-" + $hostName + "-temperature-imperial-" + $timeFrame + ".png?time=" + $timestamp);
 <?php   } else { ?>
                 $("#system-temperature-image").attr("src", "graphs/system-" + $hostName + "-temperature-metric-" + $timeFrame + ".png?time=" + $timestamp);
@@ -239,7 +239,7 @@
                 $("#dump1090-aircraft_message_rate-link").attr("href", "graphs/dump1090-" + $hostName + "-aircraft_message_rate-" + $timeFrame + ".png");
                 $("#dump1090-aircraft-link").attr("href", "graphs/dump1090-" + $hostName + "-aircraft-" + $timeFrame + ".png");
                 $("#dump1090-tracks-link").attr("href", "graphs/dump1090-" + $hostName + "-tracks-" + $timeFrame + ".png");
-<?php   if ($measurement == "imperial") { ?>
+<?php   if ($measurementRange == "imperial") { ?>
                 $("#dump1090-range-link").attr("href", "graphs/dump1090-" + $hostName + "-range-imperial-" + $timeFrame + ".png");
 <?php   } else { ?>
                 $("#dump1090-range-link").attr("href", "graphs/dump1090-" + $hostName + "-range-metric-" + $timeFrame + ".png");
@@ -253,7 +253,7 @@
                 $("#system-wlan0_bandwidth-link").attr("href", "graphs/system-" + $hostName + "-wlan0_bandwidth-" + $timeFrame + ".png");
 <?php   } ?>
                 $("#system-memory-link").attr("href", "graphs/system-" + $hostName + "-memory-" + $timeFrame + ".png");
-<?php   if ($measurement == "imperial") { ?>
+<?php   if ($measurementTemperature == "imperial") { ?>
                 $("#system-temperature-link").attr("href", "graphs/system-" + $hostName + "-temperature-imperial-" + $timeFrame + ".png");
 <?php   } else { ?>
                 $("#system-temperature-link").attr("href", "graphs/system-" + $hostName + "-temperature-metric-" + $timeFrame + ".png");

From cddf5b695944137ff3103105362df2ffb8d91739 Mon Sep 17 00:00:00 2001
From: mgunther68 <marcus.gunther@mail.com>
Date: Sun, 7 Feb 2016 12:34:03 +0000
Subject: [PATCH 4/7] Update graphs.php

---
 build/portal/html/graphs.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/portal/html/graphs.php b/build/portal/html/graphs.php
index e5d71f7..b5292f1 100644
--- a/build/portal/html/graphs.php
+++ b/build/portal/html/graphs.php
@@ -51,7 +51,8 @@
     $enablePfclient = $common->getSetting("enablePfclient");
 
     // Measurement type to use.
-    $measurement = $common->getSetting("measurement");
+    $measurementRange = $common->getSetting("measurementRange");
+    $measurementTemperature = $common->getSetting("measurementTemperature");
 
     // Get the network interface being used.
     $networkInterface = $common->getSetting("networkInterface");

From c52954568f792edf3099660e7db2552c12b629e7 Mon Sep 17 00:00:00 2001
From: Joe Prochazka <jprochazka@users.noreply.github.com>
Date: Mon, 8 Feb 2016 16:19:06 -0500
Subject: [PATCH 5/7] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b63cbb3..f20bf68 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,11 @@
 # The ADS-B Feeder Project :airplane:
 
 This repository contains a set of bash scripts and files which can be used to setup an ADS-B
-feeder on a clean installation of a Debian derived operating system. The scripts are executed
+receiver on a clean installation of a Debian derived operating system. The scripts are executed
 in order by the main install script depending on the installation options choosen by the user.
 
+The project website is located at https://www.adsbreceiver.net.
+
 ### Obtaining And Using This Software
 
 #### For new installations...

From 75f591bd7eebeb0cc723b60d4b586aebc9f2fc7d Mon Sep 17 00:00:00 2001
From: mgunther68 <marcus.gunther@mail.com>
Date: Tue, 9 Feb 2016 15:39:05 +0000
Subject: [PATCH 6/7] Remove static 250nm line in metric range graph

---
 build/portal/graphs/make-collectd-graphs.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build/portal/graphs/make-collectd-graphs.sh b/build/portal/graphs/make-collectd-graphs.sh
index a8d0361..09e040d 100755
--- a/build/portal/graphs/make-collectd-graphs.sh
+++ b/build/portal/graphs/make-collectd-graphs.sh
@@ -520,8 +520,7 @@ range_graph_metric() {
   "VDEF:peakrange=range,MAXIMUM" \
   "GPRINT:avgrange:%1.1lf km" \
   "LINE1:peakrange#FF0000:Peak Range\\:" \
-  "GPRINT:peakrange:%1.1lf km" \
-  "LINE1:463#000000:250 NM\c" \
+  "GPRINT:peakrange:%1.1lf km\c" \
   "COMMENT: \n" \
   --watermark "Drawn: $nowlit";
 }
@@ -621,4 +620,4 @@ step="$2"
 nowlit=`date '+%m/%d/%y %H:%M %Z'`;
 
 dump1090_receiver_graphs localhost localhost "ADS-B" "$period" "$step"
-#hub_graphs localhost rpi "ADS-B" "$period" "$step"
\ No newline at end of file
+#hub_graphs localhost rpi "ADS-B" "$period" "$step"

From 5e65cb4dd412492b3dd5f5e8d4a97db15ffc6dba Mon Sep 17 00:00:00 2001
From: mgunther68 <marcus.gunther@mail.com>
Date: Tue, 9 Feb 2016 19:00:59 +0000
Subject: [PATCH 7/7] Further work on graphs

- more uniform use of Capitalisation
- show 'steal' legend in main CPU graph
- remove 100 as upper limit in both CPU graphs (this way, we see more detail but some people may prefer to see 100% as upper limit)
- start memory usage graph at 0 (lower limit = 0)
---
 build/portal/graphs/make-collectd-graphs.sh | 37 ++++++++++-----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/build/portal/graphs/make-collectd-graphs.sh b/build/portal/graphs/make-collectd-graphs.sh
index 09e040d..731bb68 100755
--- a/build/portal/graphs/make-collectd-graphs.sh
+++ b/build/portal/graphs/make-collectd-graphs.sh
@@ -72,7 +72,6 @@ cpu_graph_dump1090() {
   --title "$3 CPU Utilization" \
   --vertical-label "CPU %" \
   --lower-limit 0 \
-  --upper-limit 100 \
   --rigid \
   "DEF:demod=$2/dump1090_cpu-demod.rrd:value:AVERAGE" \
   "CDEF:demodp=demod,10,/" \
@@ -81,8 +80,8 @@ cpu_graph_dump1090() {
   "DEF:background=$2/dump1090_cpu-background.rrd:value:AVERAGE" \
   "CDEF:backgroundp=background,10,/" \
   "AREA:readerp#008000:USB" \
-  "AREA:backgroundp#00C000:other:STACK" \
-  "AREA:demodp#00FF00:demodulator\c:STACK" \
+  "AREA:backgroundp#00C000:Other:STACK" \
+  "AREA:demodp#00FF00:Demodulator\c:STACK" \
   "COMMENT: \n" \
   --watermark "Drawn: $nowlit";
 }
@@ -118,9 +117,8 @@ cpu_graph() {
   --height 200 \
   --step "$5" \
   --title "Overall CPU Utilization" \
-  --vertical-label "CPU / %" \
+  --vertical-label "CPU %" \
   --lower-limit 0 \
-  --upper-limit 100 \
   --rigid \
   --units-exponent 0 \
   "DEF:idle=$2/cpu-idle.rrd:value:AVERAGE" \
@@ -141,7 +139,7 @@ cpu_graph() {
   "CDEF:pwait=100,wait,*,all,/" \
   "AREA:pinterrupt#000080:irq" \
   "AREA:psoftirq#0000C0:softirq:STACK" \
-  "AREA:psteal#0000FF::STACK" \
+  "AREA:psteal#0000FF:steal:STACK" \
   "AREA:pwait#C00000:io:STACK" \
   "AREA:psystem#FF0000:sys:STACK" \
   "AREA:puser#40FF40:user:STACK" \
@@ -164,8 +162,8 @@ df_root_graph() {
   "DEF:reserved=$2/df_complex-reserved.rrd:value:AVERAGE" \
   "DEF:free=$2/df_complex-free.rrd:value:AVERAGE" \
   "CDEF:totalused=used,reserved,+" \
-  "AREA:totalused#4169E1:used:STACK" \
-  "AREA:free#32C734:free\c:STACK" \
+  "AREA:totalused#4169E1:Used:STACK" \
+  "AREA:free#32C734:Free\c:STACK" \
   "COMMENT: \n" \
   --watermark "Drawn: $nowlit";
 }
@@ -205,7 +203,7 @@ disk_io_octets_graph() {
   --height 200 \
   --step "$5" \
   --title "Disk I/O - Bandwidth" \
-  --vertical-label "Bytes/s" \
+  --vertical-label "Bytes/Sec" \
   "TEXTALIGN:center" \
   "DEF:read=$2/disk_octets.rrd:read:AVERAGE" \
   "DEF:write=$2/disk_octets.rrd:write:AVERAGE" \
@@ -232,7 +230,7 @@ eth0_graph() {
   --height 200 \
   --step "$5" \
   --title "Bandwidth Usage (eth0)" \
-  --vertical-label "bytes/sec" \
+  --vertical-label "Bytes/Sec" \
   "TEXTALIGN:center" \
   "DEF:rx=$2/if_octets.rrd:rx:AVERAGE" \
   "DEF:tx=$2/if_octets.rrd:tx:AVERAGE" \
@@ -257,6 +255,7 @@ memory_graph() {
   --width 496 \
   --height 200 \
   --step "$5" \
+  --lower-limit 0 \
   --title "Memory Utilization" \
   --vertical-label "" \
   "TEXTALIGN:center" \
@@ -264,10 +263,10 @@ memory_graph() {
   "DEF:cached=$2/memory-cached.rrd:value:AVERAGE" \
   "DEF:free=$2/memory-free.rrd:value:AVERAGE" \
   "DEF:used=$2/memory-used.rrd:value:AVERAGE" \
-  "AREA:used#4169E1:used:STACK" \
-  "AREA:buffered#32C734:buffered:STACK" \
-  "AREA:cached#00FF00:cached:STACK" \
-  "AREA:free#FFFFFF:free\c:STACK" \
+  "AREA:used#4169E1:Used:STACK" \
+  "AREA:buffered#32C734:Buffered:STACK" \
+  "AREA:cached#00FF00:Cached:STACK" \
+  "AREA:free#FFFFFF:Free\c:STACK" \
   "COMMENT: \n" \
   --watermark "Drawn: $nowlit";
 }
@@ -324,7 +323,7 @@ wlan0_graph() {
   --height 200 \
   --step "$5" \
   --title "Bandwidth Usage (wlan0)" \
-  --vertical-label "bytes/sec" \
+  --vertical-label "Bytes/Sec" \
   "TEXTALIGN:center" \
   "DEF:rx=$2/if_octets.rrd:rx:AVERAGE" \
   "DEF:tx=$2/if_octets.rrd:tx:AVERAGE" \
@@ -352,7 +351,7 @@ local_rate_graph() {
   --height 200 \
   --step "$5" \
   --title "$3 Message Rate" \
-  --vertical-label "messages/second" \
+  --vertical-label "Messages/Second" \
   --lower-limit 0  \
   --units-exponent 0 \
   --right-axis 360:0 \
@@ -361,9 +360,9 @@ local_rate_graph() {
   "DEF:positions=$2/dump1090_messages-positions.rrd:value:AVERAGE" \
   "CDEF:y2strong=strong,10,*" \
   "CDEF:y2positions=positions,10,*" \
-  "LINE1:messages#0000FF:messages received" \
-  "AREA:y2strong#FF0000:messages >-3dBFS / hr (RHS)" \
-  "LINE1:y2positions#00c0FF:positions / hr (RHS)\c" \
+  "LINE1:messages#0000FF:Messages Received" \
+  "AREA:y2strong#FF0000:Messages > -3dBFS / Hr (RHS)" \
+  "LINE1:y2positions#00c0FF:Positions / Hr (RHS)\c" \
   "COMMENT: \n" \
   --watermark "Drawn: $nowlit";
 }