Author: fmueller
Date: Fri Jul 2 09:25:02 2010
New Revision: 8930
URL: http://svn.slimdevices.com/jive?rev=8930&view=rev
Log:
Bug: n/a
Description: Cleanup of wireless signal strength functions.
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua?rev=8930&r1=8929&r2=8930&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua
Fri Jul 2 09:25:02 2010
@@ -625,7 +625,9 @@
-- Bug #5227 if we are associated use the same quality indicator
-- as the icon bar
if associated and self._scanResults[associated] then
- self._scanResults[associated].quality = self:getLinkQuality()
+ local percentage, quality = self:getSignalStrength()
+
+ self._scanResults[associated].quality = quality
end
if callback then
@@ -1328,9 +1330,11 @@
--]]
function getLinkQuality(self)
- local strength = getSignalStrength(self)
-
- return math.ceil(strength / 25), strength
+ log:error("**** This function is deprecated - use getSignalStrength()
instead")
+
+ local percentage, quality = self:getSignalStrength()
+
+ return quality, percentage
end
@@ -1389,10 +1393,14 @@
-- jive: 5 - 71
-- baby: 5 - 72
- -- an SNR of 20dB should be adequate, this is
- -- tuned so 40 SNR = 100%
-
- return math.ceil((math.min(snr, 40) / 40) * 100), snr
+ -- an SNR of 20dB should be adequate, this is tuned so
+ -- percentage: 100% = 40 SNR
+ -- quality: 0 - 4
+
+ local percentage = math.ceil((math.min(snr, 40) / 40) * 100)
+ local quality = math.ceil(percentage / 25)
+
+ return percentage, quality
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
