Color is again set
This commit is contained in:
ollo
parent
613cf39086
commit
9aa94b3372
142
displayword.lua
142
displayword.lua
@ -7,35 +7,31 @@ function updateColor(data, inverseRow, characters2draw)
|
||||
-- special case, and there are exactly 4 words to display (so each word for each minute)
|
||||
if (not inverseRow) then -- nomral row
|
||||
if (data.drawnCharacters < data.charsPerMinute) then
|
||||
if (data.words.min1 == 1 or data.words.min2 == 1 or data.words.min3 == 1 or data.words.min4 == 1) then
|
||||
return data.colorMin1
|
||||
else
|
||||
return data.colorFg
|
||||
end
|
||||
elseif (data.drawnCharacters < data.charsPerMinute*2) then
|
||||
if (data.words.min2 == 1 or data.words.min3 == 1 or data.words.min4 == 1) then
|
||||
return data.colorMin2
|
||||
else
|
||||
return data.colorFg
|
||||
end
|
||||
return data.colorMin1
|
||||
elseif (data.drawnCharacters < data.charsPerMinute*3) then
|
||||
if (data.words.min3 == 1 or data.words.min4 == 1) then
|
||||
return data.colorMin2
|
||||
elseif (data.drawnCharacters > data.charsPerMinute*4) then
|
||||
return data.colorMin3
|
||||
else
|
||||
return data.colorFg
|
||||
end
|
||||
elseif (data.drawnCharacters > data.charsPerMinute*3) then
|
||||
if (data.words.min4 == 1) then
|
||||
elseif (data.drawnCharacters > data.charsPerMinute*5) then
|
||||
return data.colorMin4
|
||||
else
|
||||
return data.colorFg
|
||||
end
|
||||
else -- inverse row
|
||||
--FIXME magic missing to start on the left side
|
||||
if (data.drawnCharacters < data.charsPerMinute) then
|
||||
return data.colorMin1
|
||||
elseif (data.drawnCharacters < data.charsPerMinute*2) then
|
||||
return data.colorMin2
|
||||
elseif (data.drawnCharacters < data.charsPerMinute*3) then
|
||||
return data.colorMin3
|
||||
elseif (data.drawnCharacters > data.charsPerMinute*4) then
|
||||
return data.colorMin4
|
||||
else
|
||||
return data.colorFg
|
||||
end
|
||||
else -- inverse row
|
||||
--FIXME magic missing
|
||||
return data.colorFg
|
||||
end
|
||||
end
|
||||
|
||||
@ -43,7 +39,10 @@ function drawLEDs(data, numberNewChars, inverseRow)
|
||||
if (inverseRow == nil) then
|
||||
inverseRow=false
|
||||
end
|
||||
print("charactes " .. tostring(data.charsPerMinute) .. " per minute; " .. tonumber(data.drawnCharacters) .. " used characters")
|
||||
if (numberNewChars == nil) then
|
||||
numberNewChars=0
|
||||
end
|
||||
print(tostring(numberNewChars) .. " charactes " .. tostring(data.charsPerMinute) .. " per minute; " .. tonumber(data.drawnCharacters) .. " used characters")
|
||||
local tmpBuf=nil
|
||||
for i=1,numberNewChars do
|
||||
if (tmpBuf == nil) then
|
||||
@ -72,12 +71,11 @@ function generateLEDs(words, colorForground, colorMin1, colorMin2, colorMin3, co
|
||||
elseif (words.min4 == 1) then
|
||||
minutes = minutes + 4
|
||||
end
|
||||
print("Minutes : " .. tostring(minutes) )
|
||||
-- data.charsPerMinute=characters - math.floor(characters / minutes) * minutes -- modulo
|
||||
data.charsPerMinute = math.ceil(characters / minutes)
|
||||
-- devide by five (Minute 0, Minute 1 to Minute 4 takes the last chars)
|
||||
print("Minutes : " .. tostring(minutes) .. " Char minutes: " .. tostring(data.charsPerMinute) )
|
||||
data.words=words
|
||||
data.colorFg=colorFg
|
||||
data.colorFg=colorForground
|
||||
data.colorMin1=colorMin1
|
||||
data.colorMin2=colorMin2
|
||||
data.colorMin3=colorMin3
|
||||
@ -96,134 +94,134 @@ function generateLEDs(words, colorForground, colorMin1, colorMin2, colorMin3, co
|
||||
|
||||
-- line 1----------------------------------------------
|
||||
if (words.it==1) then
|
||||
buf=colorFg:rep(2) -- ES
|
||||
buf=drawLEDs(data,2) -- ES
|
||||
else
|
||||
buf=space:rep(2)
|
||||
end
|
||||
-- K fill character
|
||||
buf=buf .. space:rep(1)
|
||||
if (words.is == 1) then
|
||||
buf=buf .. colorFg:rep(3) -- IST
|
||||
buf=buf .. drawLEDs(data,3) -- IST
|
||||
else
|
||||
buf=buf .. space:rep(3)
|
||||
end
|
||||
-- L fill character
|
||||
buf=buf .. space:rep(1)
|
||||
if (words.fiveMin== 1) then
|
||||
buf= buf .. colorFg:rep(4) -- FUENF
|
||||
buf= buf .. drawLEDs(data,4) -- FUENF
|
||||
else
|
||||
buf= buf .. space:rep(4)
|
||||
end
|
||||
-- line 2-- even row (so inverted) --------------------
|
||||
if (words.twenty == 1) then
|
||||
buf= buf .. colorFg:rep(7,true) -- ZWANZIG
|
||||
buf= buf .. drawLEDs(data,7,true) -- ZWANZIG
|
||||
else
|
||||
buf= buf .. space:rep(7)
|
||||
end
|
||||
if (words.tenMin == 1) then
|
||||
buf= buf .. colorFg:rep(4,true) -- ZEHN
|
||||
buf= buf .. drawLEDs(data,4,true) -- ZEHN
|
||||
else
|
||||
buf= buf .. space:rep(4)
|
||||
end
|
||||
-- line3----------------------------------------------
|
||||
if (words.threequater == 1) then
|
||||
buf= buf .. colorFg:rep(11) -- Dreiviertel
|
||||
buf= buf .. drawLEDs(data,11) -- Dreiviertel
|
||||
elseif (words.quater == 1) then
|
||||
buf= buf .. space:rep(4)
|
||||
buf= buf .. colorFg:rep(7) -- VIERTEL
|
||||
buf= buf .. drawLEDs(data,7) -- VIERTEL
|
||||
else
|
||||
buf= buf .. space:rep(11)
|
||||
end
|
||||
--line 4-------- even row (so inverted) -------------
|
||||
if (words.before == 1) then
|
||||
buf=buf .. space:rep(2)
|
||||
buf= buf .. colorFg:rep(3,true) -- VOR
|
||||
buf= buf .. drawLEDs(data,3,true) -- VOR
|
||||
else
|
||||
buf= buf .. space:rep(5)
|
||||
end
|
||||
if (words.after == 1) then
|
||||
buf= buf .. colorFg:rep(4,true) -- NACH
|
||||
buf= buf .. drawLEDs(data,4,true) -- NACH
|
||||
buf= buf .. space:rep(2) -- TG
|
||||
else
|
||||
buf= buf .. space:rep(6)
|
||||
end
|
||||
------------------------------------------------
|
||||
if (words.half == 1) then
|
||||
buf= buf .. colorFg:rep(4) -- HALB
|
||||
buf= buf .. drawLEDs(data,4) -- HALB
|
||||
buf= buf .. space:rep(1) -- X
|
||||
else
|
||||
buf= buf .. space:rep(5)
|
||||
end
|
||||
if (words.twelve == 1) then
|
||||
buf= buf .. colorFg:rep(5) -- ZWOELF
|
||||
buf= buf .. drawLEDs(data,5) -- ZWOELF
|
||||
buf= buf .. space:rep(1) -- P
|
||||
else
|
||||
buf= buf .. space:rep(6)
|
||||
end
|
||||
------------even row (so inverted) ---------------------
|
||||
if (words.seven == 1) then
|
||||
buf= buf .. colorFg:rep(6,true) -- SIEBEN
|
||||
buf= buf .. drawLEDs(data,6,true) -- SIEBEN
|
||||
buf= buf .. space:rep(5)
|
||||
elseif (words.oneLong == 1) then
|
||||
buf= buf .. space:rep(5)
|
||||
buf= buf .. colorFg:rep(4,true) -- EINS
|
||||
buf= buf .. drawLEDs(data,4,true) -- EINS
|
||||
buf= buf .. space:rep(2)
|
||||
elseif (words.one == 1) then
|
||||
buf= buf .. space:rep(6)
|
||||
buf= buf .. colorFg:rep(3,true) -- EIN
|
||||
buf= buf .. drawLEDs(data,3,true) -- EIN
|
||||
buf= buf .. space:rep(2)
|
||||
elseif (words.two == 1) then
|
||||
buf= buf .. space:rep(7)
|
||||
buf= buf .. colorFg:rep(4,true) -- ZWEI
|
||||
buf= buf .. drawLEDs(data,4,true) -- ZWEI
|
||||
else
|
||||
buf= buf .. space:rep(11)
|
||||
end
|
||||
------------------------------------------------
|
||||
if (words.three == 1) then
|
||||
buf= buf .. space:rep(1)
|
||||
buf= buf .. colorFg:rep(4) -- DREI
|
||||
buf= buf .. drawLEDs(data,4) -- DREI
|
||||
buf= buf .. space:rep(6)
|
||||
elseif (words.five == 1) then
|
||||
buf= buf .. space:rep(7)
|
||||
buf= buf .. colorFg:rep(4) -- FUENF
|
||||
buf= buf .. drawLEDs(data,4) -- FUENF
|
||||
else
|
||||
buf= buf .. space:rep(11)
|
||||
end
|
||||
------------even row (so inverted) ---------------------
|
||||
if (words.four == 1) then
|
||||
buf= buf .. colorFg:rep(4,true) -- VIER
|
||||
buf= buf .. drawLEDs(data,4,true) -- VIER
|
||||
buf= buf .. space:rep(7)
|
||||
elseif (words.nine == 1) then
|
||||
buf= buf .. space:rep(4)
|
||||
buf= buf .. colorFg:rep(4,true) -- NEUN
|
||||
buf= buf .. drawLEDs(data,4,true) -- NEUN
|
||||
buf= buf .. space:rep(3)
|
||||
elseif (words.eleven == 1) then
|
||||
buf= buf .. space:rep(8)
|
||||
buf= buf .. colorFg:rep(3,true) -- ELEVEN
|
||||
buf= buf .. drawLEDs(data,3,true) -- ELEVEN
|
||||
else
|
||||
buf= buf .. space:rep(11)
|
||||
end
|
||||
------------------------------------------------
|
||||
if (words.eight == 1) then
|
||||
buf= buf .. space:rep(1)
|
||||
buf= buf .. colorFg:rep(4) -- ACHT
|
||||
buf= buf .. drawLEDs(data,4) -- ACHT
|
||||
buf= buf .. space:rep(6)
|
||||
elseif (words.ten == 1) then
|
||||
buf= buf .. space:rep(5)
|
||||
buf= buf .. colorFg:rep(4) -- ZEHN
|
||||
buf= buf .. drawLEDs(data,4) -- ZEHN
|
||||
buf= buf .. space:rep(2)
|
||||
else
|
||||
buf= buf .. space:rep(11)
|
||||
end
|
||||
------------even row (so inverted) ---------------------
|
||||
if (words.clock == 1) then
|
||||
buf= buf .. colorFg:rep(3,true) -- UHR
|
||||
buf= buf .. drawLEDs(data,3,true) -- UHR
|
||||
else
|
||||
buf= buf .. space:rep(3)
|
||||
end
|
||||
if (words.six == 1) then
|
||||
buf= buf .. space:rep(2)
|
||||
buf= buf .. colorFg:rep(5,true) -- SECHS
|
||||
buf= buf .. drawLEDs(data,5,true) -- SECHS
|
||||
buf= buf .. space:rep(1)
|
||||
else
|
||||
buf= buf .. space:rep(8)
|
||||
@ -251,56 +249,6 @@ if (words.fiveMin== 1) then
|
||||
end
|
||||
collectgarbage()
|
||||
|
||||
local bufColored = string.char()
|
||||
--function to set some color to the LEDs
|
||||
local word=0
|
||||
local firstCharAfterSpace=true
|
||||
for x=0,9 do
|
||||
for y=0, (charsPerLine-1) do
|
||||
local start = ((x * charsPerLine) + y)*3 + 1
|
||||
item=string.byte(buf, start)
|
||||
-- Color the visible words
|
||||
if (item > 0) then
|
||||
if (firstCharAfterSpace == true) then
|
||||
word = word + 1
|
||||
return buf
|
||||
end
|
||||
firstCharAfterSpace=false
|
||||
if (characters == 4) then -- we have a word for each minute to color differently
|
||||
if (words.min4 == 1 and word == 4) then
|
||||
bufColored = bufColored .. colorMin4
|
||||
elseif (words.min3 == 1 and word == 3) then
|
||||
bufColored = bufColored .. colorMin3
|
||||
elseif (words.min2 == 1 and word == 2) then
|
||||
bufColored = bufColored .. colorMin2
|
||||
elseif (words.min1 == 1 and word == 1) then
|
||||
bufColored = bufColored .. colorMin1
|
||||
else
|
||||
bufColored = bufColored .. colorForground
|
||||
end
|
||||
else -- FIXME some more magic should be added here
|
||||
if (words.min4 == 1) then
|
||||
bufColored = bufColored .. colorMin4
|
||||
elseif (words.min3 == 1) then
|
||||
bufColored = bufColored .. colorMin3
|
||||
elseif (words.min2 == 1) then
|
||||
bufColored = bufColored .. colorMin2
|
||||
elseif (words.min1 == 1) then
|
||||
bufColored = bufColored .. colorMin1
|
||||
else
|
||||
bufColored = bufColored .. colorForground
|
||||
end
|
||||
end
|
||||
else
|
||||
firstCharAfterSpace=true
|
||||
-- update the background color, if set
|
||||
if (colorBg ~= nil) then
|
||||
bufColored = bufColored .. colorBg
|
||||
end
|
||||
end
|
||||
print (x .. "x" .. y .. " : " .. start .. " color " .. tostring(item) .. " len " .. string.len(buf) .. " word " .. tostring(word))
|
||||
end
|
||||
end
|
||||
collectgarbage()
|
||||
|
||||
return bufColored
|
||||
end
|
||||
|
||||
Loading…
Reference in New Issue
Block a user