From d0c032431b525ca988f81356acac60ed1855a30e Mon Sep 17 00:00:00 2001 From: Scott Sibley Date: Fri, 3 Sep 2010 13:09:51 +0000 Subject: [PATCH] Update in timer widget --- config.lua | 249 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 128 insertions(+), 121 deletions(-) diff --git a/config.lua b/config.lua index 4f5cb24..654d586 100644 --- a/config.lua +++ b/config.lua @@ -43,16 +43,8 @@ LCD4WoW.config = { update = 1000, repeating = true, expression = [[ -if ResourceServer then self.timer:Stop() return end -UpdateMem() -UpdateCPU() -if not StarLibs then - cpu, percent, cpudiff, totalCPU, totaldiff = GetCPUUsage("LCD4WoW") - mem, percent, memdiff, totalMem, totaldiff = GetMemUsage("LCD4WoW") -else - mem, percent, memdiff, totalMem, totaldiff = GetMemUsage("StarLibs-1.0") - cpu, percent, cpudiff, totalCPU, totaldiff = GetCPUUsage("StarLibs-1.0") -end +if ResourceServer then self.timer:Stop(); return end +Update() ]] }, ["layout_tiny"] = { @@ -70,9 +62,9 @@ end [10] = "widget_name" }, [2] = { - [1] = "widget_class_label", + [1] = "widget_class_label", [10] = "widget_class" - }, + }, [3] = { [1] = "widget_race_label", [10] = "widget_race", @@ -93,7 +85,7 @@ end }, ["transition"] = 1, ["timeout"] = 5000 - }, + }, ["layout_histogram_cpu"] = { ["layer2"] = { [1] = { @@ -121,7 +113,7 @@ end }, ["transition"] = 2, ["timeout"] = 2000 - }, + }, ["widget_name_label"] = { type = "text", value = 'return "Name:"', @@ -182,6 +174,7 @@ end ["widget_mem"] = { type = "text", value = [[ +mem = GetMemUsage("LCD4WoW") --do return random(100) .. "%" end if mem then return memshort(tonumber(format("%.2f", mem))) @@ -193,12 +186,14 @@ end }, ["widget_mem_perc"] = { type = "text", - value = [[ + value = [[ --do return random(100) .. "%" end +mem, percent, memdiff, totalMem, totaldiff = GetMemUsage("LCD4WoW") + if mem then if totaldiff == 0 then totaldiff = 1 end return '-==MEM:: ' .. format("%.2f", memdiff / totaldiff * 100) .. "%" .. "::MEM==-" -end +end ]], align = ALIGN_PINGPONG, direction = SCROLL_RIGHT, @@ -211,6 +206,8 @@ end type = "bar", expression = [[ --do return random(100) end +mem, percent, memdiff, totalMem, totaldiff = GetMemUsage("LCD4WoW") + if mem then if totaldiff == 0 then return 0 end return memdiff / totaldiff * 100 @@ -223,7 +220,9 @@ end ["widget_mem_histogram"] = { type = "histogram", expression = [[ -do return random(100) end +--do return random(100) end +mem, percent, memdiff, totalMem, totaldiff = GetMemUsage("LCD4WoW") + if mem then if totaldiff == 0 then return 0 end return memdiff / totaldiff * 100 @@ -236,7 +235,7 @@ end width = 30, height = 6, layer = 1 - }, + }, ["widget_cpu_label"] = { type = "text", value = "return 'CPU:'", @@ -247,6 +246,8 @@ end type = "text", value = [[ --do return timeshort(random(10000)) end +cpu = GetCPUUsage("LCD4WoW") + if cpu then return timeshort(cpu) end @@ -259,9 +260,11 @@ end type = "bar", expression = [[ --do return random(100) end +cpu, percent, cpudiff, totalCPU, totaldiff = GetCPUUsage("LCD4WoW") + if cpu then if totaldiff == 0 then return 0 end - return cpudiff / totaldiff * 100 + return cpudiff / totaldiff * 100 end ]], min = "return 0", @@ -272,10 +275,12 @@ end type = "histogram", expression = [[ if not scriptProfile then return random(100) end +cpu, percent, cpudiff, totalCPU, totaldiff = GetCPUUsage("LCD4WoW") + if cpu then if totaldiff == 0 then return 0 end - return cpudiff / totaldiff * 100 -end + return cpudiff / totaldiff * 100 +end ]], min = "return 0", max = "return 100", @@ -286,10 +291,12 @@ end type = "text", value = [[ --do return format("------%d%%-------", random(100)) end +cpu, percent, cpudiff, totalCPU, totaldiff = GetCPUUsage("LCD4WoW") + if cpu then if totaldiff == 0 then totaldiff = 1 end return '-==CPU::' .. format("%.2f", cpudiff / totaldiff * 100) .. "%" .. "::CPU==-" -end +end ]], align = ALIGN_PINGPONG, direction = SCROLL_RIGHT, @@ -297,145 +304,145 @@ end update = 1000, speed = 100, dontRtrim = true - }, + }, ["widget_icon_blob"] = { ["bitmap"] = { - ["row1"] = ".....|.....|.....", - ["row2"] = ".....|.....|.***.", - ["row3"] = ".....|.***.|*...*", - ["row4"] = "..*..|.*.*.|*...*", - ["row5"] = ".....|.***.|*...*", - ["row6"] = ".....|.....|.***.", - ["row7"] = ".....|.....|.....", + ["row1"] = ".....|.....|.....", + ["row2"] = ".....|.....|.***.", + ["row3"] = ".....|.***.|*...*", + ["row4"] = "..*..|.*.*.|*...*", + ["row5"] = ".....|.***.|*...*", + ["row6"] = ".....|.....|.***.", + ["row7"] = ".....|.....|.....", ["row8"] = ".....|.....|....." - }, - ["speed"] = "return foo", + }, + ["speed"] = "return foo", ["type"] = "icon" - }, + }, ["widget_icon_ekg"] = { ["bitmap"] = { - ["row1"] = ".....|.....|.....|.....|.....|.....|.....|.....", - ["row2"] = ".....|....*|...*.|..*..|.*...|*....|.....|.....", - ["row3"] = ".....|....*|...*.|..*..|.*...|*....|.....|.....", - ["row4"] = ".....|....*|...**|..**.|.**..|**...|*....|.....", - ["row5"] = ".....|....*|...**|..**.|.**..|**...|*....|.....", - ["row6"] = ".....|....*|...*.|..*.*|.*.*.|*.*..|.*...|*....", - ["row7"] = "*****|*****|****.|***..|**..*|*..**|..***|.****", + ["row1"] = ".....|.....|.....|.....|.....|.....|.....|.....", + ["row2"] = ".....|....*|...*.|..*..|.*...|*....|.....|.....", + ["row3"] = ".....|....*|...*.|..*..|.*...|*....|.....|.....", + ["row4"] = ".....|....*|...**|..**.|.**..|**...|*....|.....", + ["row5"] = ".....|....*|...**|..**.|.**..|**...|*....|.....", + ["row6"] = ".....|....*|...*.|..*.*|.*.*.|*.*..|.*...|*....", + ["row7"] = "*****|*****|****.|***..|**..*|*..**|..***|.****", ["row8"] = ".....|.....|.....|.....|.....|.....|.....|....." - }, - ["speed"] = "return foo", + }, + ["speed"] = "return foo", ["type"] = "icon" - }, + }, ["widget_icon_heart"] = { ["bitmap"] = { - ["row1"] = ".....|.....|.....|.....|.....|.....", - ["row2"] = ".*.*.|.....|.*.*.|.....|.....|.....", - ["row3"] = "*****|.*.*.|*****|.*.*.|.*.*.|.*.*.", - ["row4"] = "*****|.***.|*****|.***.|.***.|.***.", - ["row5"] = ".***.|.***.|.***.|.***.|.***.|.***.", - ["row6"] = ".***.|..*..|.***.|..*..|..*..|..*..", - ["row7"] = "..*..|.....|..*..|.....|.....|.....", + ["row1"] = ".....|.....|.....|.....|.....|.....", + ["row2"] = ".*.*.|.....|.*.*.|.....|.....|.....", + ["row3"] = "*****|.*.*.|*****|.*.*.|.*.*.|.*.*.", + ["row4"] = "*****|.***.|*****|.***.|.***.|.***.", + ["row5"] = ".***.|.***.|.***.|.***.|.***.|.***.", + ["row6"] = ".***.|..*..|.***.|..*..|..*..|..*..", + ["row7"] = "..*..|.....|..*..|.....|.....|.....", ["row8"] = ".....|.....|.....|.....|.....|....." - }, - ["speed"] = "return foo", + }, + ["speed"] = "return foo", ["type"] = "icon" - }, + }, ["widget_icon_heartbeat"] = { ["bitmap"] = { - ["row1"] = ".....|.....", - ["row2"] = ".*.*.|.*.*.", - ["row3"] = "*****|*.*.*", - ["row4"] = "*****|*...*", - ["row5"] = ".***.|.*.*.", - ["row6"] = ".***.|.*.*.", - ["row7"] = "..*..|..*..", + ["row1"] = ".....|.....", + ["row2"] = ".*.*.|.*.*.", + ["row3"] = "*****|*.*.*", + ["row4"] = "*****|*...*", + ["row5"] = ".***.|.*.*.", + ["row6"] = ".***.|.*.*.", + ["row7"] = "..*..|..*..", ["row8"] = ".....|....." - }, - ["speed"] = "return foo", + }, + ["speed"] = "return foo", ["type"] = "icon" - }, + }, ["widget_icon_karo"] = { ["bitmap"] = { - ["row1"] = ".....|.....|.....|.....|..*..|.....|.....|.....", - ["row2"] = ".....|.....|.....|..*..|.*.*.|..*..|.....|.....", - ["row3"] = ".....|.....|..*..|.*.*.|*...*|.*.*.|..*..|.....", - ["row4"] = ".....|..*..|.*.*.|*...*|.....|*...*|.*.*.|..*..", - ["row5"] = ".....|.....|..*..|.*.*.|*...*|.*.*.|..*..|.....", - ["row6"] = ".....|.....|.....|..*..|.*.*.|..*..|.....|.....", - ["row7"] = ".....|.....|.....|.....|..*..|.....|.....|.....", + ["row1"] = ".....|.....|.....|.....|..*..|.....|.....|.....", + ["row2"] = ".....|.....|.....|..*..|.*.*.|..*..|.....|.....", + ["row3"] = ".....|.....|..*..|.*.*.|*...*|.*.*.|..*..|.....", + ["row4"] = ".....|..*..|.*.*.|*...*|.....|*...*|.*.*.|..*..", + ["row5"] = ".....|.....|..*..|.*.*.|*...*|.*.*.|..*..|.....", + ["row6"] = ".....|.....|.....|..*..|.*.*.|..*..|.....|.....", + ["row7"] = ".....|.....|.....|.....|..*..|.....|.....|.....", ["row8"] = ".....|.....|.....|.....|.....|.....|.....|....." - }, - ["speed"] = "return foo", + }, + ["speed"] = "return foo", ["type"] = "icon" - }, + }, ["widget_icon_rain"] = { ["bitmap"] = { - ["row1"] = "...*.|.....|.....|.*...|....*|..*..|.....|*....", - ["row2"] = "*....|...*.|.....|.....|.*...|....*|..*..|.....", - ["row3"] = ".....|*....|...*.|.....|.....|.*...|....*|..*..", - ["row4"] = "..*..|.....|*....|...*.|.....|.....|.*...|....*", - ["row5"] = "....*|..*..|.....|*....|...*.|.....|.....|.*...", - ["row6"] = ".*...|....*|..*..|.....|*....|...*.|.....|.....", - ["row7"] = ".....|.*...|....*|..*..|.....|*....|...*.|.....", + ["row1"] = "...*.|.....|.....|.*...|....*|..*..|.....|*....", + ["row2"] = "*....|...*.|.....|.....|.*...|....*|..*..|.....", + ["row3"] = ".....|*....|...*.|.....|.....|.*...|....*|..*..", + ["row4"] = "..*..|.....|*....|...*.|.....|.....|.*...|....*", + ["row5"] = "....*|..*..|.....|*....|...*.|.....|.....|.*...", + ["row6"] = ".*...|....*|..*..|.....|*....|...*.|.....|.....", + ["row7"] = ".....|.*...|....*|..*..|.....|*....|...*.|.....", ["row8"] = ".....|.....|.*...|....*|..*..|.....|*....|...*." - }, - ["speed"] = "return foo", + }, + ["speed"] = "return foo", ["type"] = "icon" - }, + }, ["widget_icon_squirrel"] = { ["bitmap"] = { - ["row1"] = ".....|.....|.....|.....|.....|.....", - ["row2"] = ".....|.....|.....|.....|.....|.....", - ["row3"] = ".....|.....|.....|.....|.....|.....", - ["row4"] = "**...|.**..|..**.|...**|....*|.....", - ["row5"] = "*****|*****|*****|*****|*****|*****", - ["row6"] = "...**|..**.|.**..|**...|*....|.....", - ["row7"] = ".....|.....|.....|.....|.....|.....", + ["row1"] = ".....|.....|.....|.....|.....|.....", + ["row2"] = ".....|.....|.....|.....|.....|.....", + ["row3"] = ".....|.....|.....|.....|.....|.....", + ["row4"] = "**...|.**..|..**.|...**|....*|.....", + ["row5"] = "*****|*****|*****|*****|*****|*****", + ["row6"] = "...**|..**.|.**..|**...|*....|.....", + ["row7"] = ".....|.....|.....|.....|.....|.....", ["row8"] = ".....|.....|.....|.....|.....|....." - }, - ["speed"] = "return foo", + }, + ["speed"] = "return foo", ["type"] = "icon" - }, + }, ["widget_icon_timer"] = { ["bitmap"] = { - ["row1"] = ".....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|", - ["row2"] = ".***.|.*+*.|.*++.|.*++.|.*++.|.*++.|.*++.|.*++.|.*++.|.*++.|.*++.|.*++.|.+++.|.+*+.|.+**.|.+**.|.+**.|.+**.|.+**.|.+**.|.+**.|.+**.|.+**.|.+**.|", - ["row3"] = "*****|**+**|**++*|**+++|**++.|**++.|**+++|**+++|**+++|**+++|**+++|+++++|+++++|++*++|++**+|++***|++**.|++**.|++***|++***|++***|++***|++***|*****|", - ["row4"] = "*****|**+**|**+**|**+**|**+++|**+++|**+++|**+++|**+++|**+++|+++++|+++++|+++++|++*++|++*++|++*++|++***|++***|++***|++***|++***|++***|*****|*****|", - ["row5"] = "*****|*****|*****|*****|*****|***++|***++|**+++|*++++|+++++|+++++|+++++|+++++|+++++|+++++|+++++|+++++|+++**|+++**|++***|+****|*****|*****|*****|", - ["row6"] = ".***.|.***.|.***.|.***.|.***.|.***.|.**+.|.*++.|.+++.|.+++.|.+++.|.+++.|.+++.|.+++.|.+++.|.+++.|.+++.|.+++.|.++*.|.+**.|.***.|.***.|.***.|.***.|", - ["row7"] = ".....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|", + ["row1"] = ".....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|", + ["row2"] = ".***.|.*+*.|.*++.|.*++.|.*++.|.*++.|.*++.|.*++.|.*++.|.*++.|.*++.|.*++.|.+++.|.+*+.|.+**.|.+**.|.+**.|.+**.|.+**.|.+**.|.+**.|.+**.|.+**.|.+**.|", + ["row3"] = "*****|**+**|**++*|**+++|**++.|**++.|**+++|**+++|**+++|**+++|**+++|+++++|+++++|++*++|++**+|++***|++**.|++**.|++***|++***|++***|++***|++***|*****|", + ["row4"] = "*****|**+**|**+**|**+**|**+++|**+++|**+++|**+++|**+++|**+++|+++++|+++++|+++++|++*++|++*++|++*++|++***|++***|++***|++***|++***|++***|*****|*****|", + ["row5"] = "*****|*****|*****|*****|*****|***++|***++|**+++|*++++|+++++|+++++|+++++|+++++|+++++|+++++|+++++|+++++|+++**|+++**|++***|+****|*****|*****|*****|", + ["row6"] = ".***.|.***.|.***.|.***.|.***.|.***.|.**+.|.*++.|.+++.|.+++.|.+++.|.+++.|.+++.|.+++.|.+++.|.+++.|.+++.|.+++.|.++*.|.+**.|.***.|.***.|.***.|.***.|", + ["row7"] = ".....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|", ["row8"] = ".....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|" - }, - ["speed"] = "return foo", + }, + ["speed"] = "return foo", ["type"] = "icon" - }, + }, ["widget_icon_wave"] = { ["bitmap"] = { - ["row1"] = "..**.|.**..|**...|*....|.....|.....|.....|.....|....*|...**", - ["row2"] = ".*..*|*..*.|..*..|.*...|*....|.....|.....|....*|...*.|..*..", - ["row3"] = "*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...", - ["row4"] = "*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...", - ["row5"] = "*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...", - ["row6"] = ".....|.....|....*|...*.|..*..|.*..*|*..*.|..*..|.*...|*....", - ["row7"] = ".....|.....|.....|....*|...**|..**.|.**..|**...|*....|.....", + ["row1"] = "..**.|.**..|**...|*....|.....|.....|.....|.....|....*|...**", + ["row2"] = ".*..*|*..*.|..*..|.*...|*....|.....|.....|....*|...*.|..*..", + ["row3"] = "*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...", + ["row4"] = "*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...", + ["row5"] = "*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...", + ["row6"] = ".....|.....|....*|...*.|..*..|.*..*|*..*.|..*..|.*...|*....", + ["row7"] = ".....|.....|.....|....*|...**|..**.|.**..|**...|*....|.....", ["row8"] = ".....|.....|.....|.....|.....|.....|.....|.....|.....|....." - }, - ["speed"] = "return foo", + }, + ["speed"] = "return foo", ["type"] = "icon" - }, + }, ["widget_key_down"] = { - ["expression"] = "lcd.Transition(-1)", - ["key"] = 2, + ["expression"] = "lcd.Transition(-1)", + ["key"] = 2, ["type"] = "key" - }, + }, ["widget_key_up"] = { - ["expression"] = "lcd.Transition(1)", - ["key"] = 1, + ["expression"] = "lcd.Transition(1)", + ["key"] = 1, ["type"] = "key" - }, + }, ["widget_percent"] = { - ["expression"] = "'%'", + ["expression"] = "'%'", ["type"] = "text" - } + } } \ No newline at end of file -- 1.7.9.5