From 6bf3cceb7c68b87823168897c6afe78552b8ec90 Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Sun, 8 Jan 2017 12:23:27 +0100
Subject: [PATCH] Add average dBm value

---
 include/functions.php    | 56 ++++++++++++++++++++--------------------
 include/localtx.php      |  2 +-
 include/localtx_ajax.php |  2 +-
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index 79374be..a42d8e4 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -258,20 +258,20 @@ function getHeardList($logLines, $onlyLast) {
 				if (substr($ber, 6) != "-0/-0/-0 dBm") {
 					$rssiString = substr($ber, 6);
 					$rssiAvg = preg_replace('/-\d+\/-\d+\/(-\d+) dBm/', "\\1", $rssiString);
-					if ($rssiAvg > "-53") $rssi = "<img src=\"images/4.png\" \> S9+40dB";
-					else if ($rssiAvg > "-63") $rssi = "<img src=\"images/4.png\" \> S9+30dB";
-					else if ($rssiAvg > "-73") $rssi = "<img src=\"images/4.png\" \> S9+20dB";
-					else if ($rssiAvg > "-83") $rssi = "<img src=\"images/4.png\" \> S9+10dB";
-					else if ($rssiAvg > "-93") $rssi = "<img src=\"images/4.png\" \> S9";
-					else if ($rssiAvg > "-99") $rssi = "<img src=\"images/3.png\" \> S8";
-					else if ($rssiAvg > "-105") $rssi = "<img src=\"images/3.png\" \> S7";
-					else if ($rssiAvg > "-111") $rssi = "<img src=\"images/2.png\" \> S6";
-					else if ($rssiAvg > "-117") $rssi = "<img src=\"images/2.png\" \> S5";
-					else if ($rssiAvg > "-123") $rssi = "<img src=\"images/1.png\" \> S4";
-					else if ($rssiAvg > "-129") $rssi = "<img src=\"images/1.png\" \> S3";
-					else if ($rssiAvg > "-135") $rssi = "<img src=\"images/0.png\" \> S2";
-					else if ($rssiAvg > "-141") $rssi = "<img src=\"images/0.png\" \> S1";
-					else $rssi = "<img src=\"images/0.png\" \> S0";
+					if ($rssiAvg > "-53") $rssi = "<img src=\"images/4.png\" \> S9+40dB ($rssiAvg dBm)";
+					else if ($rssiAvg > "-63") $rssi = "<img src=\"images/4.png\" \> S9+30dB ($rssiAvg dBm)";
+					else if ($rssiAvg > "-73") $rssi = "<img src=\"images/4.png\" \> S9+20dB ($rssiAvg dBm)";
+					else if ($rssiAvg > "-83") $rssi = "<img src=\"images/4.png\" \> S9+10dB ($rssiAvg dBm)";
+					else if ($rssiAvg > "-93") $rssi = "<img src=\"images/4.png\" \> S9 ($rssiAvg dBm)";
+					else if ($rssiAvg > "-99") $rssi = "<img src=\"images/3.png\" \> S8 ($rssiAvg dBm)";
+					else if ($rssiAvg > "-105") $rssi = "<img src=\"images/3.png\" \> S7 ($rssiAvg dBm)";
+					else if ($rssiAvg > "-111") $rssi = "<img src=\"images/2.png\" \> S6 ($rssiAvg dBm)";
+					else if ($rssiAvg > "-117") $rssi = "<img src=\"images/2.png\" \> S5 ($rssiAvg dBm)";
+					else if ($rssiAvg > "-123") $rssi = "<img src=\"images/1.png\" \> S4 ($rssiAvg dBm)";
+					else if ($rssiAvg > "-129") $rssi = "<img src=\"images/1.png\" \> S3 ($rssiAvg dBm)";
+					else if ($rssiAvg > "-135") $rssi = "<img src=\"images/0.png\" \> S2 ($rssiAvg dBm)";
+					else if ($rssiAvg > "-141") $rssi = "<img src=\"images/0.png\" \> S1 ($rssiAvg dBm)";
+					else $rssi = "<img src=\"images/0.png\" \> S0 ($rssiAvg dBm)";
 				}
 				$ber = substr($loss, 5);
 				$loss = "";
@@ -283,20 +283,20 @@ function getHeardList($logLines, $onlyLast) {
 				if (array_key_exists(5,$lineTokens) && substr($lineTokens[5], 6) != "-0/-0/-0 dBm") {
 					$rssiString = substr($lineTokens[5], 6);
 					$rssiAvg = preg_replace('/-\d+\/-\d+\/(-\d+) dBm/', "\\1", $rssiString);
-					if ($rssiAvg > "-53") $rssi = "<img src=\"images/4.png\" \> S9+40dB";
-					else if ($rssiAvg > "-63") $rssi = "<img src=\"images/4.png\" \> S9+30dB";
-					else if ($rssiAvg > "-73") $rssi = "<img src=\"images/4.png\" \> S9+20dB";
-					else if ($rssiAvg > "-83") $rssi = "<img src=\"images/4.png\" \> S9+10dB";
-					else if ($rssiAvg > "-93") $rssi = "<img src=\"images/4.png\" \> S9";
-					else if ($rssiAvg > "-99") $rssi = "<img src=\"images/3.png\" \> S8";
-					else if ($rssiAvg > "-105") $rssi = "<img src=\"images/3.png\" \> S7";
-					else if ($rssiAvg > "-111") $rssi = "<img src=\"images/2.png\" \> S6";
-					else if ($rssiAvg > "-117") $rssi = "<img src=\"images/2.png\" \> S5";
-					else if ($rssiAvg > "-123") $rssi = "<img src=\"images/1.png\" \> S4";
-					else if ($rssiAvg > "-129") $rssi = "<img src=\"images/1.png\" \> S3";
-					else if ($rssiAvg > "-135") $rssi = "<img src=\"images/0.png\" \> S2";
-					else if ($rssiAvg > "-141") $rssi = "<img src=\"images/0.png\" \> S1";
-					else $rssi = "<img src=\"images/0.png\" \> S0";
+					if ($rssiAvg > "-53") $rssi = "<img src=\"images/4.png\" \> S9+40dB ($rssiAvg dBm)";
+					else if ($rssiAvg > "-63") $rssi = "<img src=\"images/4.png\" \> S9+30dB ($rssiAvg dBm)";
+					else if ($rssiAvg > "-73") $rssi = "<img src=\"images/4.png\" \> S9+20dB ($rssiAvg dBm)";
+					else if ($rssiAvg > "-83") $rssi = "<img src=\"images/4.png\" \> S9+10dB ($rssiAvg dBm)";
+					else if ($rssiAvg > "-93") $rssi = "<img src=\"images/4.png\" \> S9 ($rssiAvg dBm)";
+					else if ($rssiAvg > "-99") $rssi = "<img src=\"images/3.png\" \> S8 ($rssiAvg dBm)";
+					else if ($rssiAvg > "-105") $rssi = "<img src=\"images/3.png\" \> S7 ($rssiAvg dBm)";
+					else if ($rssiAvg > "-111") $rssi = "<img src=\"images/2.png\" \> S6 ($rssiAvg dBm)";
+					else if ($rssiAvg > "-117") $rssi = "<img src=\"images/2.png\" \> S5 ($rssiAvg dBm)";
+					else if ($rssiAvg > "-123") $rssi = "<img src=\"images/1.png\" \> S4 ($rssiAvg dBm)";
+					else if ($rssiAvg > "-129") $rssi = "<img src=\"images/1.png\" \> S3 ($rssiAvg dBm)";
+					else if ($rssiAvg > "-135") $rssi = "<img src=\"images/0.png\" \> S2 ($rssiAvg dBm)";
+					else if ($rssiAvg > "-141") $rssi = "<img src=\"images/0.png\" \> S1 ($rssiAvg dBm)";
+					else $rssi = "<img src=\"images/0.png\" \> S0 ($rssiAvg dBm)";
 				}
 			}
 
diff --git a/include/localtx.php b/include/localtx.php
index 92bcec9..2553e03 100644
--- a/include/localtx.php
+++ b/include/localtx.php
@@ -28,7 +28,7 @@ $localTXList = getHeardList($reverseLogLinesMMDVM, FALSE);
       <th>Dur (s)</th>
       <th>Loss</th>
       <th>BER</th>
-      <th>RSSI (min/max/avg)</th>
+      <th>RSSI</th>
     </tr>
    </thead>
    <tbody>
diff --git a/include/localtx_ajax.php b/include/localtx_ajax.php
index c96761a..8ab6e36 100644
--- a/include/localtx_ajax.php
+++ b/include/localtx_ajax.php
@@ -25,7 +25,7 @@ $totalLH = count($lastHeard);
       <th>Dur (s)</th>
       <th>Loss</th>
       <th>BER</th>
-      <th>RSSI (min/max/avg)</th>
+      <th>RSSI</th>
             </tr>
         </thead>
     </table>