Ollo/Wordclock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More local variables; ~ 2k more RAM

Browse Source
This commit is contained in:
ollo 2016-06-19 15:57:57 +02:00
parent 1c0b5883b9
commit d25d3d55a7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
timecore.lua
View File

@ -56,13 +56,13 @@ end
-- Source: -- Source:
-- http://www.jbox.dk/sanos/source/lib/time.c.html -- http://www.jbox.dk/sanos/source/lib/time.c.html
YEAR0=1900 local YEAR0=1900
EPOCH_YR=1970 local EPOCH_YR=1970
--SECS_DAY=(24L * 60L * 60L) --SECS_DAY=(24L * 60L * 60L)
SECS_DAY=86400 local SECS_DAY=86400
ytab = {} local ytab = {}
ytab[0] = {} ytab[0] = {}
ytab[1] = {} ytab[1] = {}
ytab[0][0] = 31 ytab[0][0] = 31
@ -106,7 +106,7 @@ end
function getUTCtime(unixtimestmp) function getUTCtime(unixtimestmp)
local year = EPOCH_YR local year = EPOCH_YR
local dayclock = math.floor(unixtimestmp % SECS_DAY) local dayclock = math.floor(unixtimestmp % SECS_DAY)
dayno = math.floor(unixtimestmp / SECS_DAY) local dayno = math.floor(unixtimestmp / SECS_DAY)
local sec = math.floor(dayclock % 60) local sec = math.floor(dayclock % 60)
local min = math.floor( (dayclock % 3600) / 60) local min = math.floor( (dayclock % 3600) / 60)
@ -119,20 +119,20 @@ function getUTCtime(unixtimestmp)
year=year + 1 year=year + 1
end end
--Day in whole year: local yday = dayno (Not needed) --Day in whole year: local yday = dayno (Not needed)
mon = 0 local mon = 0
while (dayno >= ytab[leapyear(year) and 1 or 0][mon]) while (dayno >= ytab[leapyear(year) and 1 or 0][mon])
do do
dayno = dayno - ytab[leapyear(year) and 1 or 0][mon]; dayno = dayno - ytab[leapyear(year) and 1 or 0][mon];
mon = mon + 1 mon = mon + 1
end end
mday = dayno + 1 local mday = dayno + 1
return { year = year, month = (mon+1), day = mday, hour = hour, minute = min, second = sec, dow = dow } return { year = year, month = (mon+1), day = mday, hour = hour, minute = min, second = sec, dow = dow }
end end
function getTime(unixtimestmp, timezoneoffset) function getTime(unixtimestmp, timezoneoffset)
time = getUTCtime(unixtimestmp + (3600 * timezoneoffset)) local time = getUTCtime(unixtimestmp + (3600 * timezoneoffset))
if ( isSummerTime(time) ) then if ( isSummerTime(time) ) then
time = getUTCtime(unixtimestmp + (3600 * (timezoneoffset + 1)) ) time = getUTCtime(unixtimestmp + (3600 * (timezoneoffset + 1)) )
end end

2
webserver.lua
View File

@ -14,7 +14,7 @@ function sendWebPage(conn,answertype)
if (timezoneoffset == nil) then if (timezoneoffset == nil) then
timezoneoffset=1 timezoneoffset=1
end end
buf="HTTP/1.1 200 OK\nServer: NodeMCU\nContent-Type: text/html\n\n" local buf="HTTP/1.1 200 OK\nServer: NodeMCU\nContent-Type: text/html\n\n"
if (node.heap() < 8000) then if (node.heap() < 8000) then
buf = buf .. "<h1>Busy, please come later again</h1>" buf = buf .. "<h1>Busy, please come later again</h1>"
else else