Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bugfix: charts realtime default language corrected 

fixes AREDN->ticket:233

Change-Id: I4ccc1051bf9e008cb320e6eac07f8fa67bc96234
This commit is contained in:
Darryl Quinn 2017-05-06 19:56:32 -05:00 committed by AE6XE
parent f532ee6a40
commit d5b06415c2
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/www/cgi-bin/signal
View File

@ -121,7 +121,7 @@ $header = <<EOF;
content += "Signal: N/A<br/>"; content += "Signal: N/A<br/>";
} }
content += "Noise: " + e.entries[0].dataPoint.y[1] + "dBm<br/>"; content += "Noise: " + e.entries[0].dataPoint.y[1] + "dBm<br/>";
content += "SNR: " + e.entries[0].dataPoint.m + "dBm<br/>"; content += "SNR: " + e.entries[0].dataPoint.m + "dB<br/>";
content += "TX Rate: " + e.entries[0].dataPoint.tx_rate + "Mbps<br/>"; content += "TX Rate: " + e.entries[0].dataPoint.tx_rate + "Mbps<br/>";
content += "TX MCS: " + e.entries[0].dataPoint.tx_mcs + "<br/>"; content += "TX MCS: " + e.entries[0].dataPoint.tx_mcs + "<br/>";
content += "RX Rate: " + e.entries[0].dataPoint.rx_rate + "Mbps<br/>"; content += "RX Rate: " + e.entries[0].dataPoint.rx_rate + "Mbps<br/>";
@ -144,7 +144,9 @@ $header = <<EOF;
\$.getJSON("/cgi-bin/signal.json?device=$parms{device}", function (result) { \$.getJSON("/cgi-bin/signal.json?device=$parms{device}", function (result) {
chart.options.data[0].dataPoints = result[0]; chart.options.data[0].dataPoints = result[0];
// chart.options.data[1].dataPoints = result[1]; // chart.options.data[1].dataPoints = result[1];
chart.render(); if(result.constructor === Array) {
chart.render();
};
}); });
}; };
@ -203,7 +205,7 @@ $parms{device}="" if(!/$parms{device}/ ~~ @files);
# default to "Strongest Signal" for Realtime # default to "Strongest Signal" for Realtime
if(! $parms{device} and $parms{realtime}) { if(! $parms{device} and $parms{realtime}) {
$page = $page . "<option selected value='strongest'>Strongest Signal</option>"; $page = $page . "<option selected value='strongest'>Average signal for all connected stations</option>";
} }
$firstSel=1; $firstSel=1;

2
files/www/cgi-bin/signal.json
View File

@ -93,7 +93,7 @@ if parms.realtime then
end end
-- get strongest signal -- get strongest signal
s=iwinfo["nl80211"].signal(wifiiface) s=iwinfo["nl80211"].signal(wifiiface)
m=tonumber(n)-tonumber(s) m=tonumber(s)-tonumber(n)
if s==0 then if s==0 then
s="null" s="null"
end end

4
files/www/help.html
View File

@ -102,7 +102,7 @@ name (if known) of the device accessing this page.
<p> <p>
The right column contains the signal strength reading and other attributes of The right column contains the signal strength reading and other attributes of
your node. The <b>Signal/Noise/Ratio</b> is a reading of the strongest neighbor Mesh RF signal your node. The <b>Signal/Noise/Ratio</b> is a reading of the strongest neighbor Mesh RF signal
strength in dBm, and it is available only when the node is in a Mesh or Client strength (in dBm) from all connected stations, and it is available only when the node is in a Mesh or Client
configuration. The <strong>Auto</strong> button will take you to an configuration. The <strong>Auto</strong> button will take you to an
automatically refreshing display of the current signal strength and an average automatically refreshing display of the current signal strength and an average
of the last 20 readings. This is provided as an aid to assist in antenna of the last 20 readings. This is provided as an aid to assist in antenna
@ -142,7 +142,7 @@ temporary files. Memory is the amount of RAM available for running processes.
<br><br><hr> <br><br><hr>
<a name=charts><h2>Charts Page</h2></a> <a name=charts><h2>Charts Page</h2></a>
<p>This page shows RF signal information in both a realtime and an archived view. The default view shows the STRONGEST RF signal in realtime.<br> <p>This page shows RF signal information in both a realtime and an archived view. The default view shows the Average signal of all connected stations in realtime.<br>
Below the node name, there will be a few control buttons:<br> Below the node name, there will be a few control buttons:<br>
<ul> <ul>
<li><strong>Archive</strong>: takes you to the charts for any archived signal data on this node.</li> <li><strong>Archive</strong>: takes you to the charts for any archived signal data on this node.</li>