Author: titmuss
Date: Mon Jan 21 07:15:30 2008
New Revision: 1540
URL: http://svn.slimdevices.com?rev=1540&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1539): titmuss | 2008-01-21 15:13:48 +0000
Bug: 6358
Description:
Tuned the wireless strengh as requested in the bug report.
Removed the NF and RSSI, just left SNR as an indication of wireless strength.
Added a transmit rate. This is current commented out, it did not seem to
provide useful info when testing just now.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupWireless/SetupWirelessApplet.lua
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupWireless/strings.txt
trunk/jive/src/pkg/jive_squeezeboxjive/share/jive/net/Wireless.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Jan 21 07:15:30 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1219
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1539
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=1540&root=Jive&r1=1539&r2=1540&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua Mon
Jan 21 07:15:30 2008
@@ -306,9 +306,10 @@
s.iconShuffle2 = _icon(75, screenHeight - 30, "icon_shuffle_album.png")
-- wireless status
- s.iconWireless1 = _icon(107, screenHeight - 30, "icon_wireless_2.png")
- s.iconWireless2 = _icon(107, screenHeight - 30, "icon_wireless_3.png")
- s.iconWireless3 = _icon(107, screenHeight - 30, "icon_wireless_4.png")
+ s.iconWireless1 = _icon(107, screenHeight - 30, "icon_wireless_1.png")
+ s.iconWireless2 = _icon(107, screenHeight - 30, "icon_wireless_2.png")
+ s.iconWireless3 = _icon(107, screenHeight - 30, "icon_wireless_3.png")
+ s.iconWireless4 = _icon(107, screenHeight - 30, "icon_wireless_4.png")
s.iconWirelessERROR = _icon(107, screenHeight - 30,
"icon_wireless_off.png")
s.iconWirelessSERVERERROR = _icon(107, screenHeight - 30,
"icon_wireless_noserver.png")
@@ -684,13 +685,16 @@
-- wireless icons for menus
s.wirelessLevel1 = {}
s.wirelessLevel1.align = "right"
- s.wirelessLevel1.img = Surface:loadImage(imgpath ..
"icon_wireless_2_shadow.png")
+ s.wirelessLevel1.img = Surface:loadImage(imgpath ..
"icon_wireless_1_shadow.png")
s.wirelessLevel2 = {}
s.wirelessLevel2.align = "right"
- s.wirelessLevel2.img = Surface:loadImage(imgpath ..
"icon_wireless_3_shadow.png")
+ s.wirelessLevel2.img = Surface:loadImage(imgpath ..
"icon_wireless_2_shadow.png")
s.wirelessLevel3 = {}
s.wirelessLevel3.align = "right"
- s.wirelessLevel3.img = Surface:loadImage(imgpath ..
"icon_wireless_4_shadow.png")
+ s.wirelessLevel3.img = Surface:loadImage(imgpath ..
"icon_wireless_3_shadow.png")
+ s.wirelessLevel4 = {}
+ s.wirelessLevel4.align = "right"
+ s.wirelessLevel4.img = Surface:loadImage(imgpath ..
"icon_wireless_4_shadow.png")
s.navcluster = {}
s.navcluster.img = Surface:loadImage(imgpath .. "navcluster.png")
Modified:
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupWireless/SetupWirelessApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupWireless/SetupWirelessApplet.lua?rev=1540&root=Jive&r1=1539&r2=1540&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupWireless/SetupWirelessApplet.lua
(original)
+++
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupWireless/SetupWirelessApplet.lua
Mon Jan 21 07:15:30 2008
@@ -1366,8 +1366,7 @@
local status = self.t_ctrl:t_wpaStatus()
local snr = self.t_ctrl:getSNR()
- local rssi = self.t_ctrl:getRSSI()
- local nf = self.t_ctrl:getNF()
+ local bitrate = self.t_ctrl:getTxBitRate()
local wpa_state = stateTxt[status.wpa_state] or "NETWORK_STATE_UNKNOWN"
@@ -1384,8 +1383,7 @@
values[4]:setValue(tostring(encryption))
values[5]:setValue(tostring(status.ip_address))
values[6]:setValue(tostring(snr))
- values[7]:setValue(tostring(rssi))
- values[8]:setValue(tostring(nf))
+ values[7]:setValue(tostring(bitrate))
end
@@ -1401,7 +1399,7 @@
local window = Window("window", self:string("NETWORK_STATUS"),
wirelessTitleStyle)
local values = {}
- for i=1,8 do
+ for i=1,7 do
values[i] = Label("value", "")
end
@@ -1414,8 +1412,7 @@
{ text = self:string("NETWORK_ENCRYPTION"),
icon = values[4] },
{ text = self:string("NETWORK_IP_ADDRESS"),
icon = values[5] },
{ text = self:string("NETWORK_SNR"), icon =
values[6] },
- { text = self:string("NETWORK_RSSI"), icon =
values[7] },
- { text = self:string("NETWORK_NF"), icon =
values[8] },
+-- { text = self:string("NETWORK_BITRATE"),
icon = values[7] },
})
window:addWidget(menu)
Modified:
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupWireless/strings.txt
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupWireless/strings.txt?rev=1540&root=Jive&r1=1539&r2=1540&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupWireless/strings.txt
(original)
+++
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupWireless/strings.txt
Mon Jan 21 07:15:30 2008
@@ -131,6 +131,10 @@
IT SNR:
NL SNR:
+NETWORK_BITRATE
+ EN Tx rate:
+
+
NETWORK_STATE
DE Zustand:
EN State:
Modified: trunk/jive/src/pkg/jive_squeezeboxjive/share/jive/net/Wireless.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/share/jive/net/Wireless.lua?rev=1540&root=Jive&r1=1539&r2=1540&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive_squeezeboxjive/share/jive/net/Wireless.lua
(original)
+++ trunk/jive/src/pkg/jive_squeezeboxjive/share/jive/net/Wireless.lua Mon Jan
21 07:15:30 2008
@@ -26,16 +26,18 @@
-- FIXME tune with production boards
local WIRELESS_LEVEL = {
0,
+ 175,
+ 180,
190,
- 200,
}
-- iwpriv snr -> quality
-- FIXME tune with production boards
local WIRELESS_SNR = {
0,
+ 10,
+ 18,
25,
- 30,
}
-- FIXME check this region mapping is correct for Marvell and Atheros
@@ -463,7 +465,7 @@
local quality = 1
for i, l in ipairs(WIRELESS_SNR) do
- if snr < l then
+ if snr <= l then
break
end
quality = i
@@ -509,6 +511,19 @@
f:close()
return tonumber(string.match(t, ":(%-?%d+)"))
+end
+
+
+function getTxBitRate(self)
+ local f = io.popen("/usr/sbin/iwconfig " .. self.interface)
+ if f == nil then
+ return "0"
+ end
+
+ local t = f:read("*all")
+ f:close()
+
+ return string.match(t, "Bit Rate:(%d+%s[^%s]+)")
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
