Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-olsr: fix snr calc olsr neighbours and unit in Legend

Browse source
This commit is contained in:
Patrick Grimm 2013-07-10 18:11:09 +00:00
parent 25c4b954a6
commit 56b48f76a7
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
applications/luci-olsr/luasrc/controller/olsr.lua
View file

@ -227,9 +227,9 @@ function action_neigh(json)
for assocmac, assot in pairs(val.list) do for assocmac, assot in pairs(val.list) do
assocmac = string.lower(assocmac or "") assocmac = string.lower(assocmac or "")
if rmac == assocmac then if rmac == assocmac then
signal = tonumber(assot.signal)*-1 signal = tonumber(assot.signal)
noise = tonumber(assot.noise)*-1 noise = tonumber(assot.noise)
snr = noise - signal snr = (noise*-1) - (signal*-1)
end end
end end
end end

2
applications/luci-olsr/luasrc/view/status-olsr/legend.htm
View file

@ -9,7 +9,7 @@
<li><strong><span style="color:#ff6600"><%:Orange%></span></strong>:<%:Still usable (4 < ETX < 10)%></li> <li><strong><span style="color:#ff6600"><%:Orange%></span></strong>:<%:Still usable (4 < ETX < 10)%></li>
<li><strong><span style="color:#bb3333"><%:Red%></span></strong>:<%:Bad (ETX > 10)%></li> <li><strong><span style="color:#bb3333"><%:Red%></span></strong>:<%:Bad (ETX > 10)%></li>
</ul> </ul>
<li><strong>SNR: </strong><%:Signal Noise Ratio%></li> <li><strong>SNR: </strong><%:Signal Noise Ratio in dB%></li>
<ul> <ul>
<li><strong><span style="color:#00cc00"><%:Green%></span></strong>:<%:Very good (SNR > 30)%></li> <li><strong><span style="color:#00cc00"><%:Green%></span></strong>:<%:Very good (SNR > 30)%></li>
<li><strong><span style="color:#ffcb05"><%:Yellow%></span></strong>:<%:Good (30 > SNR > 20)%></li> <li><strong><span style="color:#ffcb05"><%:Yellow%></span></strong>:<%:Good (30 > SNR > 20)%></li>

8
applications/luci-olsr/luasrc/view/status-olsr/neighbors.htm
View file

@ -40,9 +40,9 @@ if luci.http.formvalue("status") == "1" then
lq = string.format("%.3f", link.linkQuality), lq = string.format("%.3f", link.linkQuality),
nlq = string.format("%.3f",link.neighborLinkQuality), nlq = string.format("%.3f",link.neighborLinkQuality),
cost = string.format("%.3f", link.linkCost), cost = string.format("%.3f", link.linkCost),
snr = string.format("%.3f", link.snr), snr = link.snr,
signal = string.format("%.3f", link.signal), signal = link.signal,
noise = string.format("%.3f", link.noise), noise = link.noise,
color = color, color = color,
snr_color = snr_color, snr_color = snr_color,
dfgcolor = defaultgw_color, dfgcolor = defaultgw_color,
@ -161,7 +161,7 @@ end
<td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><%=string.format("%.3f", link.linkQuality)%></td> <td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><%=string.format("%.3f", link.linkQuality)%></td>
<td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><%=string.format("%.3f", link.neighborLinkQuality)%></td> <td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><%=string.format("%.3f", link.neighborLinkQuality)%></td>
<td class="cbi-section-table-titles" style="background-color:<%=color%>"><%=string.format("%.3f", link.linkCost)%></td> <td class="cbi-section-table-titles" style="background-color:<%=color%>"><%=string.format("%.3f", link.linkCost)%></td>
<td class="cbi-section-table-titles" style="background-color:<%=snr_color%>" title="Signal: <%=string.format("%.3f", link.signal)%> Noise: <%=string.format("%.3f", link.noise)%>"><%=string.format("%.3f", link.snr)%></td> <td class="cbi-section-table-titles" style="background-color:<%=snr_color%>" title="Signal: <%=link.signal%> Noise: <%=link.noise%>"><%=link.snr%></td>
</tr> </tr>
<% <%
i = ((i % 2) + 1) i = ((i % 2) + 1)