Start simulation of _diet-files

Merged
Refactored files to modules
2022-12-09 21:26:11 +01:00 · 2022-12-09 20:48:13 +01:00 · 2022-01-23 18:30:46 +01:00 · 2022-01-23 18:29:02 +01:00 · 2022-01-23 18:07:09 +01:00
9 changed files with 76 additions and 278 deletions
--- a/diet/webserver_diet.lua
+++ b/diet/webserver_diet.lua
@@ -1,268 +0,0 @@
-local o="config.lua"
-local n=false
-local t=0
-function sendPage(o,e,i)
-collectgarbage()
-print("Sending "..e.." "..t.."B already; "..node.heap().."B in heap")
-o:on("sent",function(a)
-if(t==0)then
-a:close()
-print("Page sent")
-collectgarbage()
-n=false
-else
-collectgarbage()
-sendPage(a,e,i)
-end
-end)
-if file.open(e,"r")then
-local e=""
-if(t<=0)then
-e=e.."HTTP/1.1 200 OK\r\n"
-e=e.."Content-Type: text/html\r\n"
-e=e.."Connection: close\r\n"
-e=e.."Date: Thu, 29 Dec 2016 20:18:20 GMT\r\n"
-e=e.."\r\n\r\n"
-end
-file.seek("set",t)
-local a=file.readline()
-while(a~=nil)do
-if(a:find("$")~=nil)then
-if(i~=nil)then
-for e,t in pairs(i)
-do
-a=string.gsub(a,e,t)
-end
-end
-end
-t=t+string.len(a)
-e=e..a
-if((string.len(e)>=500)or(node.heap()<2000))then
-a=nil
-o:send(e)
-print("Sent part of "..t.."B")
-return
-else
-a=file.readline()
-end
-end
-t=0
-if(string.len(e)>0)then
-o:send(e)
-print("Sent rest")
-end
-end
-end
-function fillDynamicMap()
-replaceMap={}
-ssid,_=wifi.sta.getconfig()
-if(ssid==nil)then return replaceMap end
-if(sntpserverhostname==nil)then sntpserverhostname="ptbtime1.ptb.de"end
-if(timezoneoffset==nil)then timezoneoffset=1 end
-if(color==nil)then color=string.char(0,0,250)end
-if(color1==nil)then color1=color end
-if(color2==nil)then color2=color end
-if(color3==nil)then color3=color end
-if(color4==nil)then color4=color end
-if(colorBg==nil)then colorBg=string.char(0,0,0)end
-local t="#"..string.format("%02x",string.byte(color,2))..string.format("%02x",string.byte(color,1))..string.format("%02x",string.byte(color,3))
-local n="#"..string.format("%02x",string.byte(color1,2))..string.format("%02x",string.byte(color1,1))..string.format("%02x",string.byte(color1,3))
-local e="#"..string.format("%02x",string.byte(color2,2))..string.format("%02x",string.byte(color2,1))..string.format("%02x",string.byte(color2,3))
-local i="#"..string.format("%02x",string.byte(color3,2))..string.format("%02x",string.byte(color3,1))..string.format("%02x",string.byte(color3,3))
-local o="#"..string.format("%02x",string.byte(color4,2))..string.format("%02x",string.byte(color4,1))..string.format("%02x",string.byte(color4,3))
-local a="#"..string.format("%02x",string.byte(colorBg,2))..string.format("%02x",string.byte(colorBg,1))..string.format("%02x",string.byte(colorBg,3))
-replaceMap["$SSID"]=ssid
-replaceMap["$SNTPSERVER"]=sntpserverhostname
-replaceMap["$TIMEOFFSET"]=timezoneoffset
-replaceMap["$THREEQUATER"]=(threequater and"checked"or"")
-replaceMap["$ADDITIONAL_LINE"]=""
-replaceMap["$HEXCOLORFG"]=t
-replaceMap["$HEXCOLOR1"]=n
-replaceMap["$HEXCOLOR2"]=e
-replaceMap["$HEXCOLOR3"]=i
-replaceMap["$HEXCOLOR4"]=o
-replaceMap["$HEXCOLORBG"]=a
-replaceMap["$INV46"]=((inv46~=nil and inv46=="on")and"checked"or"")
-replaceMap["$AUTODIM"]=((dim~=nil and dim=="on")and"checked"or"")
-return replaceMap
-end
-function startWebServer()
-srv=net.createServer(net.TCP)
-srv:listen(80,function(i)
-i:on("receive",function(t,e)
-if(n)then
-print("HTTP sending... be patient!")
-return
-end
-if(e:find("GET /")~=nil)then
-n=true
-if(color==nil)then
-color=string.char(0,128,0)
-end
-ws2812.write(string.char(0,0,0):rep(56)..color:rep(2)..string.char(0,0,0):rep(4)..color:rep(2)..string.char(0,0,0):rep(48))
-if(sendPage~=nil)then
-print("Sending webpage.html ("..tostring(node.heap()).."B free) ...")
-replaceMap=fillDynamicMap()
-sendPage(t,"webpage.html",replaceMap)
-end
-else if(e:find("POST /")~=nil)then
-_,postdatastart=e:find("\r\n\r\n")
-if postdatastart==nil then postdatastart=1 end
-local a=string.sub(e,postdatastart+1)
-local e={}
-for t,a in string.gmatch(a,"(%w+)=([^&]+)&*")do
-e[t]=a
-end
-if(e.action~=nil and e.action=="Reboot")then
-node.restart()
-return
-end
-if((e.ssid~=nil)and(e.sntpserver~=nil)and(e.timezoneoffset~=nil))then
-print("New config!")
-if(e.password==nil)then
-_,password,_,_=wifi.sta.getconfig()
-print("Restoring password : "..password)
-e.password=password
-password=nil
-end
-file.remove(o..".new")
-sec,_=rtctime.get()
-file.open(o..".new","w+")
-file.write("-- Config\n".."station_cfg={}\nstation_cfg.ssid=\""..e.ssid.."\"\nstation_cfg.pwd=\""..e.password.."\"\nstation_cfg.save=false\nwifi.sta.config(station_cfg)\n")
-file.write("sntpserverhostname=\""..e.sntpserver.."\"\n".."timezoneoffset=\""..e.timezoneoffset.."\"\n".."inv46=\""..tostring(e.inv46).."\"\n".."dim=\""..tostring(e.dim).."\"\n")
-if(e.fcolor~=nil)then
-print("Got fcolor: "..e.fcolor)
-local e=string.sub(e.fcolor,4)
-local t=tonumber(string.sub(e,1,2),16)
-local a=tonumber(string.sub(e,3,4),16)
-local e=tonumber(string.sub(e,5,6),16)
-file.write("color=string.char("..a..","..t..","..e..")\n")
-color=string.char(a,t,e)
-end
-if(e.colorMin1~=nil)then
-local e=string.sub(e.colorMin1,4)
-local t=tonumber(string.sub(e,1,2),16)
-local a=tonumber(string.sub(e,3,4),16)
-local e=tonumber(string.sub(e,5,6),16)
-file.write("color1=string.char("..a..","..t..","..e..")\n")
-color1=string.char(a,t,e)
-end
-if(e.colorMin2~=nil)then
-local e=string.sub(e.colorMin2,4)
-local a=tonumber(string.sub(e,1,2),16)
-local t=tonumber(string.sub(e,3,4),16)
-local e=tonumber(string.sub(e,5,6),16)
-file.write("color2=string.char("..t..","..a..","..e..")\n")
-color2=string.char(t,a,e)
-end
-if(e.colorMin3~=nil)then
-local e=string.sub(e.colorMin3,4)
-local t=tonumber(string.sub(e,1,2),16)
-local a=tonumber(string.sub(e,3,4),16)
-local e=tonumber(string.sub(e,5,6),16)
-file.write("color3=string.char("..a..","..t..","..e..")\n")
-color3=string.char(a,t,e)
-end
-if(e.colorMin4~=nil)then
-local e=string.sub(e.colorMin4,4)
-local t=tonumber(string.sub(e,1,2),16)
-local a=tonumber(string.sub(e,3,4),16)
-local e=tonumber(string.sub(e,5,6),16)
-file.write("color4=string.char("..a..","..t..","..e..")\n")
-color4=string.char(a,t,e)
-end
-if(e.bcolor~=nil)then
-local e=string.sub(e.bcolor,4)
-local t=tonumber(string.sub(e,1,2),16)
-local a=tonumber(string.sub(e,3,4),16)
-local e=tonumber(string.sub(e,5,6),16)
-file.write("colorBg=string.char("..a..","..t..","..e..")\n")
-colorBg=string.char(a,t,e)
-end
-if(getTime~=nil)then
-time=getTime(sec,timezoneoffset)
-file.write("print(\"Config from "..time.year.."-"..time.month.."-"..time.day.." "..time.hour..":"..time.minute..":"..time.second.."\")\n")
-end
-if(e.threequater~=nil)then
-file.write("threequater=true\n")
-threequater=true
-else
-file.write("threequater=nil\n")
-threequater=nil
-end
-file.close()
-collectgarbage()
-sec=nil
-file.remove(o)
-print("Rename config")
-if(file.rename(o..".new",o))then
-print("Successfully")
-local e=tmr.create()
-e:register(50,tmr.ALARM_SINGLE,function(e)
-replaceMap=fillDynamicMap()
-replaceMap["$ADDITIONAL_LINE"]="<h2><font color=\"green\">New configuration saved</font></h2>"
-print("Send success to client")
-sendPage(t,"webpage.html",replaceMap)
-e:unregister()
-end)
-e:start()
-else
-local e=tmr.create()
-e:register(50,tmr.ALARM_SINGLE,function(e)
-replaceMap=fillDynamicMap()
-replaceMap["$ADDITIONAL_LINE"]="<h2><font color=\"red\">ERROR</font></h2>"
-sendPage(t,"webpage.html",replaceMap)
-e:unregister()
-end)
-e:start()
-end
-else
-replaceMap=fillDynamicMap()
-replaceMap["$ADDITIONAL_LINE"]="<h2><font color=\"orange\">Not all parameters set</font></h2>"
-sendPage(t,"webpage.html",replaceMap)
-end
-else
-print("Hello via telnet")
-global_c=t
-function s_output(e)
-if(global_c~=nil)
-then global_c:send(e)
-end
-end
-node.output(s_output,0)
-global_c:on("receive",function(t,e)
-node.input(e)
-end)
-global_c:on("disconnection",function(e)
-node.output(nil)
-global_c=nil
-end)
-print("Welcome to Word Clock")
-end
-end
-end)
-i:on("disconnection",function(e)
-print("Goodbye")
-node.output(nil)
-collectgarbage()
-t=0
-end)
-end)
-end
-collectgarbage()
-wifi.setmode(wifi.SOFTAP)
-cfg={}
-cfg.ssid="wordclock"
-cfg.pwd="wordclock"
-wifi.ap.config(cfg)
-local t=string.char(0,128,0)
-local e=string.char(0,0,0)
-local a=e:rep(6)..t..e:rep(7)..t:rep(3)..e:rep(44)..t:rep(3)..e:rep(50)
-ws2812.write(a)
-t=nil
-e=nil
-a=nil
-print("Waiting in access point >wordclock< for Clients")
-print("Please visit 192.168.4.1")
-startWebServer()
-collectgarbage()
--- a/displayword.lua
+++ b/displayword.lua
@@ -369,4 +369,4 @@ M = {
    countChars   = countChars
 }
 end
-dw = M
+return M
--- a/init.lua
+++ b/init.lua
@@ -11,7 +11,7 @@ bootledtimer:register(75, tmr.ALARM_AUTO, function (timer)
    spaceLeds = math.max(MAXLEDS - (counter1*2), 0)
    ws2812.write(string.char(16,0,0):rep(counter1) .. string.char(0,0,0):rep(spaceLeds) .. string.char(0,0,8):rep(counter1))
    if ((counter1*2) > 114) then
-        timer:unregister()
+        bootledtimer:unregister()
    end
 end)
 bootledtimer:start()
--- a/main.lua
+++ b/main.lua
@@ -28,14 +28,17 @@ function displayTime()
     if (timezoneoffset == nil) then
        timezoneoffset=0
     end
-     mydofile("timecore")
+     local tc = require("timecore_diet")
     if (tc == nil) then
     	return
     end
     local time = tc.getTime(sec, timezoneoffset)
     tc = nil
+     timecore_diet=nil
+     package.loaded["timecore_diet"]=nil
+
     collectgarbage()
-     mydofile("wordclock")
+     local wc = require("wordclock_diet")
     if (wc ~= nil) then
       words = wc.timestat(time.hour, time.minute)
       if ((dim ~= nil) and (dim == "on")) then
@@ -48,9 +51,12 @@ function displayTime()
       end
     end
     wc = nil
+     wordclock_diet=nil
+     package.loaded["wordclock_diet"]=nil
+
     collectgarbage()
     print("wc: " .. tostring(node.heap()))
-     mydofile("displayword")
+     local dw = require("displayword_diet")
     if (dw ~= nil) then
        --if lines 4 to 6 are inverted due to hardware-fuckup, unfuck it here
        local invertRows=false
@@ -61,6 +67,9 @@ function displayTime()
        dw.generateLEDs(rgbBuffer, words, colorBg, color, color1, color2, color3, color4, invertRows, c)
     end
     dw = nil
+     displayword_diet=nil
+     package.loaded["displayword_diet"]=nil
+
     collectgarbage()
    
     -- cleanup
--- a/mqtt.lua
+++ b/mqtt.lua
@@ -125,6 +125,37 @@ function registerMqtt()
        print("MQTT " .. topic .. ":" .. data)
        if (topic == (mqttPrefix .. "/cmd/single")) then
            handleSingleCommand(client, topic, data)
+        elseif (topic == (mqttPrefix .. "/cmd/num/val")) then
+	    if (( data == "" ) or (data == nil)) then
+		tw=nil
+		print("MQTT | wordclock failed")
+	    else
+		    -- generate the temperatur to display, once as it will not change
+		    local dispTemp = tonumber(data)
+		    collectgarbage()
+		    if (dispTemp > 0) then
+		    local wc = require("wordclock_diet")
+		    if (wc ~= nil) then
+			tw  = wc.showText(dw, rgbBuffer, invertRows, dispTemp)
+			print("MQTT | generated words for: " .. tostring(dispTemp))
+		    else
+			print("MQTT | wordclock failed")
+		    end
+		    wc = nil
+		    wordclock_diet=nil
+                    package.loaded["wordclock_diet"]=nil
+		    else
+		      tw=nil
+		    end
+	    end
+       elseif (topic == (mqttPrefix .. "/cmd/num/col")) then
+	    -- Set number of the color to display
+	    if (( data ~= "" ) and (data ~= nil)) then
+	        tcol = parseBgColor(data, "num/col")
+	    else
+	        tcol = nil
+		print("MQTT | Hide number")
+	    end
       else
            -- Handle here the /cmd/# sublevel
            if (string.match(topic, "telnet$")) then
--- a/simulation/src/de/c3ma/ollo/WS2812Simulation.java
+++ b/simulation/src/de/c3ma/ollo/WS2812Simulation.java
@@ -75,6 +75,13 @@ public class WS2812Simulation implements LuaSimulation {
 			// Copy all files into the temporary folder
 			for (File f : sourceFolder.listFiles()) {
 				Files.copy(f.toPath(), new File(tempDir.getAbsolutePath() + File.separator + f.getName()).toPath());
+				// create a diet one
+				if (f.isFile() && 
+						(f.getName().endsWith(".lua") && 
+						(!f.getName().equals("config.lua")))) {
+					String dietName = f.getName().replace(".lua", "_diet.lc");
+					Files.copy(f.toPath(), new File(tempDir.getAbsolutePath() + File.separator + dietName).toPath());
+				}
 			}

 			espFile.setWorkingDirectory(tempDir);
--- a/simulation/src/de/c3ma/ollo/mockup/ESP8266File.java
+++ b/simulation/src/de/c3ma/ollo/mockup/ESP8266File.java
@@ -1,7 +1,8 @@
 package de.c3ma.ollo.mockup;

 import java.io.File;
-import java.util.ArrayList;
+import java.io.IOException;
+import java.nio.file.Files;

 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
@@ -21,6 +22,8 @@ public class ESP8266File extends TwoArgFunction {
    
    private File openedFile = null;
    
+    private String SHRINKED_FILE_POSTFIX = "_diet";
+    
    @Override
    public LuaValue call(LuaValue modname, LuaValue env) {
        env.checkglobals();
@@ -59,9 +62,25 @@ public class ESP8266File extends TwoArgFunction {
            
            final String codeFileName = fileName.checkjstring();
            final File f = new File( workingDir.getAbsolutePath() + File.separator + codeFileName);
-            //System.out.println("[FILE] Loading " + codeFileName);
+            // Check if the file exists as it
            if (f.exists()) {
                ESP8266File.this.openedFile = f;
+            } else {
+            	if (codeFileName.contains(SHRINKED_FILE_POSTFIX)) {
+                	File fShrinked = new File( workingDir.getAbsolutePath() + File.separator + codeFileName.replace(SHRINKED_FILE_POSTFIX, ""));
+                	File fShrinkedLC = new File(fShrinked.getAbsolutePath().replace(".lua", ".lc"));
+                	if (!fShrinkedLC.exists()) {
+	                	try {
+	                		System.out.println("[FILE] Generate " + codeFileName);
+	                    	Files.copy(fShrinked.toPath(), f.toPath());
+						} catch (IOException e) {
+							System.err.println("[FILE] Generate " + codeFileName + " failed: " + e.getMessage());
+						}
+                	} else {
+                		System.out.println("[FILE] Already found " + fShrinkedLC.getName());
+                		return LuaValue.valueOf(true);
+                	}
+            	}
            }
            
            return LuaValue.valueOf((f.exists()));
--- a/timecore.lua
+++ b/timecore.lua
@@ -146,4 +146,4 @@ M = {
    getTime = getTime
 }
 end
-tc = M
+return M
--- a/wordclock.lua
+++ b/wordclock.lua
@@ -192,4 +192,4 @@ M = {
    showText = showText
 }
 end
-wc = M
+return M
Author	SHA1	Message	Date
Ollo	acda0ded1c	Start simulation of _diet-files	2022-12-09 21:26:11 +01:00
Ollo	bba21e562b	Merged	2022-12-09 20:48:13 +01:00
Ollo	7e7736e12f	Refactored files to modules	2022-01-23 18:30:46 +01:00
Ollo	e676f6f8cf	Create diet files	2022-01-23 18:29:02 +01:00
Ollo	0b72ed49bf	Removed generated file	2022-01-23 18:07:09 +01:00