Color can be set externally

This commit is contained in:
ollo 2016-06-18 17:07:49 +02:00
parent 16b9675a4b
commit c19d33d24f
2 changed files with 24 additions and 7 deletions

View File

@ -1,7 +1,6 @@
-- Module displaying of the words -- Module displaying of the words
function generateLEDs(words) function generateLEDs(words, color)
color=string.char(0,0,50)
white=string.char(0,0,0) white=string.char(0,0,0)
buf=color buf=color
-- line 1---------------------------------------------- -- line 1----------------------------------------------
@ -153,4 +152,4 @@ function generateLEDs(words)
buf= buf .. white:rep(1) buf= buf .. white:rep(1)
end end
return buf return buf
end end

View File

@ -4,11 +4,20 @@ dofile("wordclock.lua")
dofile("displayword.lua") dofile("displayword.lua")
timezoneoffset=1 timezoneoffset=1
ledPin=4
color=string.char(0,0,250)
connect_counter=0
-- Wait to be connect to the WiFi access point. -- Wait to be connect to the WiFi access point.
tmr.alarm(0, 100, 1, function() tmr.alarm(0, 500, 1, function()
connect_counter=connect_counter+1
if wifi.sta.status() ~= 5 then if wifi.sta.status() ~= 5 then
print("Connecting to AP...") print("Connecting to AP...")
if (connect_counter % 2 == 0) then
ws2812.write(ledPin, string.char(255,0,0):rep(114))
else
ws2812.write(ledPin, string.char(0,0,0):rep(114))
end
else else
tmr.stop(0) tmr.stop(0)
print('IP: ',wifi.sta.getip()) print('IP: ',wifi.sta.getip())
@ -22,7 +31,16 @@ tmr.alarm(0, 100, 1, function()
print('failed!') print('failed!')
end end
) )
end
-- when no wifi available, open an accesspoint and ask the user
if (connect_counter == 300) then -- 300 is 30 sec in 100ms cycle
tmr.stop(0)
wifi.setmode(wifi.SOFTAP)
wifi.ap.config({ssid='clock',pwd='clock'})
print("Waiting in access point >clock< for Clients")
print("Please visit 192.168.4.1")
dofile("webserver.lua")
end end
end) end)
@ -33,9 +51,9 @@ tmr.alarm(1, 5000, 1 ,function()
print("Local time : " .. time.year .. "-" .. time.month .. "-" .. time.day .. " " .. time.hour .. ":" .. time.minute .. ":" .. time.second) print("Local time : " .. time.year .. "-" .. time.month .. "-" .. time.day .. " " .. time.hour .. ":" .. time.minute .. ":" .. time.second)
words = display_timestat(time.hour, time.minute) words = display_timestat(time.hour, time.minute)
ledBuf = generateLEDs(words) ledBuf = generateLEDs(words, color)
-- Write the buffer to the LEDs -- Write the buffer to the LEDs
ws2812.write(4, ledBuf) ws2812.write(ledPin, ledBuf)
for key,value in pairs(words) do for key,value in pairs(words) do
if (value > 0) then if (value > 0) then