From 13343fa645f0da3c116b5bb3f5aeae0d30307653 Mon Sep 17 00:00:00 2001 From: ollo Date: Fri, 3 May 2019 21:26:10 +0200 Subject: [PATCH] Dim functionality is always activated --- displayword.lua | 11 +++++++---- main.lua | 5 +++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/displayword.lua b/displayword.lua index 255efa5..ed67ac4 100644 --- a/displayword.lua +++ b/displayword.lua @@ -38,8 +38,6 @@ local round = function(num) end end --- Initial value of percentage -local briPercent=50 local data={} -- Module displaying of the words @@ -50,6 +48,11 @@ local generateLEDs = function(words, colorForground, colorMin1, colorMin2, color if (words == nil) then return nil end + + -- Initial value of percentage + if (words.briPercent == nil) then + words.briPercent=50 + end local minutes=1 if (words.min1 == 1) then @@ -63,8 +66,8 @@ local generateLEDs = function(words, colorForground, colorMin1, colorMin2, color end if (adc ~= nil) then local per = math.floor(100*adc.read(0)/1000) - briPercent = math.floor( ((briPercent * 4) + per) / 5) - print("Minutes : " .. tostring(minutes) .. " bright: " .. tostring(briPercent) .. "% current: " .. tostring(per) .. "%") + words.briPercent = tonumber( ((words.briPercent * 4) + per) / 5) + print("Minutes : " .. tostring(minutes) .. " bright: " .. tostring(words.briPercent) .. "% current: " .. tostring(per) .. "%") data.colorFg = string.char(string.byte(colorForground,1) * briPercent / 100, string.byte(colorForground,2) * briPercent / 100, string.byte(colorForground,3) * briPercent / 100) data.colorMin1 = string.char(string.byte(colorMin1,1) * briPercent / 100, string.byte(colorMin1,2) * briPercent / 100, string.byte(colorMin1,3) * briPercent / 100) data.colorMin2 = string.char(string.byte(colorMin2,1) * briPercent / 100, string.byte(colorMin2,2) * briPercent / 100, string.byte(colorMin2,3) * briPercent / 100) diff --git a/main.lua b/main.lua index 635d376..241c4a7 100644 --- a/main.lua +++ b/main.lua @@ -40,7 +40,7 @@ function syncTimeFromInternet() end ) end - +briPercent = 50 function displayTime() local sec, usec = rtctime.get() -- Handle lazy programmer: @@ -49,6 +49,7 @@ function displayTime() end local time = getTime(sec, timezoneoffset) local words = display_timestat(time.hour, time.minute) + words.briPercent=briPercent dp = dofile("displayword.lc") if (dp ~= nil) then ledBuf = dp.generateLEDs(words, color, color1, color2, color3, color4) @@ -82,7 +83,7 @@ function displayTime() end end -- cleanup - + briPercent=words.briPercent words=nil time=nil collectgarbage()